Handle conflict

axonivy-market · Jul 22, 2024 · 22daa94 · 22daa94
1 parent 022e5f1
commit 22daa94
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 46 deletions.
diff --git a/marketplace-service/src/main/java/com/axonivy/market/controller/ProductController.java b/marketplace-service/src/main/java/com/axonivy/market/controller/ProductController.java
@@ -9,9 +9,6 @@
 import com.axonivy.market.model.ProductModel;
 import com.axonivy.market.service.ProductService;
 import io.swagger.v3.oas.annotations.Operation;
-import static com.axonivy.market.constants.RequestMappingConstants.PRODUCT;
-import static com.axonivy.market.constants.RequestMappingConstants.SYNC;
-
 import org.apache.commons.lang3.time.StopWatch;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
@@ -20,22 +17,10 @@
 import org.springframework.hateoas.PagedModel;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
-import com.axonivy.market.assembler.ProductModelAssembler;
-import com.axonivy.market.entity.Product;
-import com.axonivy.market.enums.ErrorCode;
-import com.axonivy.market.model.Message;
-import com.axonivy.market.model.ProductModel;
-import com.axonivy.market.service.ProductService;
-
-import io.swagger.v3.oas.annotations.Operation;
+import static com.axonivy.market.constants.RequestMappingConstants.PRODUCT;
+import static com.axonivy.market.constants.RequestMappingConstants.SYNC;
 
 @RestController
 @RequestMapping(PRODUCT)

diff --git a/...place-service/src/main/java/com/axonivy/market/github/service/impl/GitHubServiceImpl.java b/...place-service/src/main/java/com/axonivy/market/github/service/impl/GitHubServiceImpl.java
@@ -1,52 +1,34 @@
 package com.axonivy.market.github.service.impl;
 
-import static org.apache.commons.lang3.StringUtils.EMPTY;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
 import com.axonivy.market.constants.GitHubConstants;
 import com.axonivy.market.entity.User;
 import com.axonivy.market.enums.ErrorCode;
 import com.axonivy.market.exceptions.model.NotFoundException;
 import com.axonivy.market.exceptions.model.Oauth2ExchangeCodeException;
 import com.axonivy.market.exceptions.model.UnauthorizedException;
 import com.axonivy.market.github.model.GitHubAccessTokenResponse;
+import com.axonivy.market.github.model.GitHubProperty;
 import com.axonivy.market.github.service.GitHubService;
 import com.axonivy.market.github.util.GitHubUtils;
 import com.axonivy.market.repository.UserRepository;
-import org.kohsuke.github.GHContent;
-import org.kohsuke.github.GHOrganization;
-import org.kohsuke.github.GHRepository;
-import org.kohsuke.github.GitHub;
-import org.kohsuke.github.GitHubBuilder;
+import org.kohsuke.github.*;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
-import org.springframework.util.ResourceUtils;
 import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.RestTemplate;
 
-import com.axonivy.market.constants.GitHubConstants;
-import com.axonivy.market.entity.User;
-import com.axonivy.market.enums.ErrorCode;
-import com.axonivy.market.exceptions.model.NotFoundException;
-import com.axonivy.market.exceptions.model.Oauth2ExchangeCodeException;
-import com.axonivy.market.github.model.GitHubProperty;
-import com.axonivy.market.github.service.GitHubService;
-import com.axonivy.market.model.GitHubAccessTokenResponse;
-import com.axonivy.market.repository.UserRepository;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import static org.apache.commons.lang3.StringUtils.EMPTY;
 
 @Service
 public class GitHubServiceImpl implements GitHubService {