MARP-572: Fix warning codes

axonivy-market · Jul 26, 2024 · f82ccd2 · f82ccd2
1 parent 4a3f4e2
commit f82ccd2
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 11 deletions.
diff --git a/marketplace-service/src/main/java/com/axonivy/market/constants/ProductJsonConstants.java b/marketplace-service/src/main/java/com/axonivy/market/constants/ProductJsonConstants.java
@@ -12,7 +12,6 @@ public class ProductJsonConstants {
   public static final String TYPE = "type";
   public static final String DEPENDENCIES = "dependencies";
   public static final String INSTALLERS = "installers";
-  public static final String DEPENDENCY_SUFFIX = "-dependency";
   public static final String MAVEN_IMPORT_INSTALLER_ID = "maven-import";
   public static final String MAVEN_DROPIN_INSTALLER_ID = "maven-dropins";
   public static final String MAVEN_DEPENDENCY_INSTALLER_ID = "maven-dependency";

diff --git a/...src/main/java/com/axonivy/market/github/service/impl/GHAxonIvyProductRepoServiceImpl.java b/...src/main/java/com/axonivy/market/github/service/impl/GHAxonIvyProductRepoServiceImpl.java
@@ -164,7 +164,7 @@ public ProductModuleContent getReadmeAndProductContentsFromTag(Product product,
         }
       }
     } catch (Exception e) {
-      log.error("Cannot get product.json and README file's content {}", e);
+      log.error("Cannot get product.json and README file's content {}", e.getMessage());
       return null;
     }
     return productModuleContent;

diff --git a/marketplace-service/src/main/java/com/axonivy/market/github/util/GitHubUtils.java b/marketplace-service/src/main/java/com/axonivy/market/github/util/GitHubUtils.java
@@ -20,7 +20,6 @@
 public class GitHubUtils {
 
   private static String pathToProductFolderFromTagContent;
-  private static String pathToImageFolder;
 
   public static long getGHCommitDate(GHCommit commit) {
     long commitTime = 0L;
@@ -111,6 +110,7 @@ public static String getNonStandardProductFilePath(String productId) {
   }
 
   public static String getNonStandardImageFolder(String productId) {
+    String pathToImageFolder;
     switch (productId) {
     case NonStandardProductPackageConstants.EXCEL_IMPORTER:
       pathToImageFolder = "doc";

diff --git a/marketplace-service/src/main/java/com/axonivy/market/repository/ProductRepository.java b/marketplace-service/src/main/java/com/axonivy/market/repository/ProductRepository.java
@@ -16,8 +16,6 @@ public interface ProductRepository extends MongoRepository<Product, String> {
 
   Product findByLogoUrl(String logoUrl);
 
-  Product findByIdAndType(String id, String type);
-
   Optional<Product> findById(String productId);
 
   @Query("{'marketDirectory': {$regex : ?0, $options: 'i'}}")

diff --git a/...ace-service/src/test/java/com/axonivy/market/controller/ProductDetailsControllerTest.java b/...ace-service/src/test/java/com/axonivy/market/controller/ProductDetailsControllerTest.java
@@ -85,7 +85,7 @@ void testFindProductVersionsById() {
     Mockito.when(
             versionService.getArtifactsAndVersionToDisplay(Mockito.anyString(), Mockito.anyBoolean(), Mockito.anyString()))
         .thenReturn(models);
-    ResponseEntity<List<MavenArtifactVersionModel>> result = productDetailsController.findProductVersionsById("protal",
+    ResponseEntity<List<MavenArtifactVersionModel>> result = productDetailsController.findProductVersionsById("portal",
         true, "10.0.1");
     Assertions.assertEquals(HttpStatus.OK, result.getStatusCode());
     Assertions.assertEquals(1, Objects.requireNonNull(result.getBody()).size());

diff --git a/...service/src/test/java/com/axonivy/market/service/GHAxonIvyProductRepoServiceImplTest.java b/...service/src/test/java/com/axonivy/market/service/GHAxonIvyProductRepoServiceImplTest.java
@@ -80,7 +80,7 @@ void setup() throws IOException {
   }
 
   @AfterEach
-  void after() throws IOException {
+  void after() {
     reset(mockGHOrganization);
     reset(gitHubService);
   }
@@ -230,7 +230,7 @@ void testGetReadmeAndProductContentFromTag_ImageFromFolder() throws IOException
     when(mockImageFile.isDirectory()).thenReturn(true);
     when(mockImageFile.getDownloadUrl()).thenReturn(IMAGE_DOWNLOAD_URL);
 
-    PagedIterable<GHContent> pagedIterable = mock(PagedIterable.class);
+    PagedIterable<GHContent> pagedIterable = Mockito.mock(String.valueOf(GHContent.class));
     when(mockImageFile.listDirectoryContent()).thenReturn(pagedIterable);
     when(pagedIterable.toList()).thenReturn(List.of(mockImageFile));
 
@@ -340,7 +340,7 @@ private static InputStream getMockInputStreamWithOutProjectAndDependency() {
     return new ByteArrayInputStream(jsonContent.getBytes(StandardCharsets.UTF_8));
   }
 
-  private Product createMockProduct() throws IOException {
+  private Product createMockProduct() {
     Product product = new Product();
     product.setId("docuware-connector");
     product.setLanguage("en");

diff --git a/marketplace-service/src/test/java/com/axonivy/market/service/ProductServiceImplTest.java b/marketplace-service/src/test/java/com/axonivy/market/service/ProductServiceImplTest.java
@@ -280,7 +280,7 @@ void testSyncProductsFirstTime() throws IOException {
     when(ghAxonIvyProductRepoService.getReadmeAndProductContentsFromTag(any(), any(), anyString())).thenReturn(
         mockReadmeProductContent());
     when(gitHubService.getRepository(any())).thenReturn(ghRepository);
-    PagedIterable<GHTag> pagedIterable = mock(PagedIterable.class);
+    PagedIterable<GHTag> pagedIterable = Mockito.mock(String.valueOf(GHTag.class));
     when(ghRepository.listTags()).thenReturn(pagedIterable);
 
     GHTag mockTag = mock(GHTag.class);
@@ -341,7 +341,7 @@ void testFetchProductDetail() {
     String id = "amazon-comprehend";
     Product mockProduct = mockResultReturn.getContent().get(0);
     mockProduct.setSynchronizedInstallationCount(true);
-    when(productRepository.findById(id)).thenReturn(Optional.ofNullable(mockProduct));
+    when(productRepository.findById(id)).thenReturn(Optional.of(mockProduct));
     Product result = productService.fetchProductDetail(id);
     assertEquals(mockProduct, result);
     verify(productRepository, times(1)).findById(id);