Fix compilation warnings

srozange · Sep 2, 2023 · a895e58 · a895e58
1 parent dea38ae
commit a895e58
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 40 deletions.
diff --git a/src/main/java/io/github/yupd/business/YamlRepoUpdater.java b/src/main/java/io/github/yupd/business/YamlRepoUpdater.java
@@ -93,17 +93,7 @@ private static String computePathEntryDescription(YamlPathEntry entry) {
         return "- [yamlpath] " + entry.getPath() + "=" + entry.getReplacement();
     }
 
-    public static class YamlUpdateResult {
-
-        public final boolean updated;
-        public final String originalContent;
-        public final String newContent;
-
-        public YamlUpdateResult(boolean updated, String originalContent, String newContent) {
-            this.updated = updated;
-            this.originalContent = originalContent;
-            this.newContent = newContent;
-        }
+    public record YamlUpdateResult(boolean updated, String originalContent, String newContent) {
 
         public static YamlUpdateResult updated(String originalContent, String newContent) {
             return new YamlUpdateResult(true, originalContent, newContent);

diff --git a/src/main/java/io/github/yupd/infrastructure/git/impl/GithubConnector.java b/src/main/java/io/github/yupd/infrastructure/git/impl/GithubConnector.java
@@ -15,7 +15,7 @@
 
 public class GithubConnector implements GitConnector {
 
-    private GHRepository githubRepository;
+    private final GHRepository githubRepository;
 
     public GithubConnector(GitRepository gitRepository) {
         GitHubBuilder gitHubBuilder = new GitHubBuilder().withOAuthToken(gitRepository.getToken());

diff --git a/src/main/java/io/github/yupd/infrastructure/git/impl/GitlabConnector.java b/src/main/java/io/github/yupd/infrastructure/git/impl/GitlabConnector.java
@@ -14,8 +14,8 @@
 
 public class GitlabConnector implements GitConnector {
 
-    private GitlabAPI gitlabAPI;
-    private GitlabProject gitlabProject;
+    private final GitlabAPI gitlabAPI;
+    private final GitlabProject gitlabProject;
 
     public GitlabConnector(GitRepository gitRepository) {
         this.gitlabAPI = computeGitlabApi(gitRepository);

diff --git a/src/main/java/io/github/yupd/infrastructure/utils/IOUtils.java b/src/main/java/io/github/yupd/infrastructure/utils/IOUtils.java
@@ -29,7 +29,7 @@ public static String readFile(String resource) {
 
     public static void writeFile(Path path, String content) {
         try {
-            Files.write(path, content.getBytes(StandardCharsets.UTF_8));
+            Files.writeString(path, content);
         } catch (IOException e) {
             throw new RuntimeException("Could not write file " + path, e);
         }

diff --git a/src/main/java/io/github/yupd/infrastructure/yaml/ObjectMapperFactory.java b/src/main/java/io/github/yupd/infrastructure/yaml/ObjectMapperFactory.java
@@ -58,10 +58,10 @@ public boolean needToQuoteValue(String value) {
     }
 
     public static class Parameter {
-        Set<YAMLGenerator.Feature> withYamlGeneratorFeatures = EnumSet.noneOf(YAMLGenerator.Feature.class);
-        Set<YAMLGenerator.Feature> withoutYamlGeneratorFeatures = EnumSet.noneOf(YAMLGenerator.Feature.class);
-        Set<SerializationFeature> withSerializationFeature = EnumSet.noneOf(SerializationFeature.class);
-        Set<SerializationFeature> withoutSerializationFeature = EnumSet.noneOf(SerializationFeature.class);
+        final Set<YAMLGenerator.Feature> withYamlGeneratorFeatures = EnumSet.noneOf(YAMLGenerator.Feature.class);
+        final Set<YAMLGenerator.Feature> withoutYamlGeneratorFeatures = EnumSet.noneOf(YAMLGenerator.Feature.class);
+        final Set<SerializationFeature> withSerializationFeature = EnumSet.noneOf(SerializationFeature.class);
+        final Set<SerializationFeature> withoutSerializationFeature = EnumSet.noneOf(SerializationFeature.class);
 
         public Parameter with(YAMLGenerator.Feature feature) {
             withYamlGeneratorFeatures.add(feature);

diff --git a/src/test/java/io/github/yupd/business/YamlRepoUpdaterTest.java b/src/test/java/io/github/yupd/business/YamlRepoUpdaterTest.java
@@ -77,9 +77,9 @@ void should_update_file_when_contents_are_different() {
 
         // Assert
         verify(connector).updateFile(parameter.getGitFile(), COMMIT_MESSAGE, NEW_CONTENT);
-        assertThat(result.updated).isTrue();
-        assertThat(result.originalContent).isEqualTo(ORIGINAL_CONTENT);
-        assertThat(result.newContent).isEqualTo(NEW_CONTENT);
+        assertThat(result.updated()).isTrue();
+        assertThat(result.originalContent()).isEqualTo(ORIGINAL_CONTENT);
+        assertThat(result.newContent()).isEqualTo(NEW_CONTENT);
     }
 
     @Test
@@ -97,9 +97,9 @@ void should_update_file_and_create_merge_request_when_contents_are_different() {
         verify(connector).updateFile(parameter.getGitFile().builderFrom().withBranch(MR_SOURCE_BRANCH).build(), COMMIT_MESSAGE, NEW_CONTENT);
         verify(connector).createMergeRequest(COMMIT_MESSAGE, MR_SOURCE_BRANCH, TARGET_BRANCH, "Proposed update in " + FILE_PATH + ":\n- [yamlpath] path=replacement\n");
 
-        assertThat(result.updated).isTrue();
-        assertThat(result.originalContent).isEqualTo(ORIGINAL_CONTENT);
-        assertThat(result.newContent).isEqualTo(NEW_CONTENT);
+        assertThat(result.updated()).isTrue();
+        assertThat(result.originalContent()).isEqualTo(ORIGINAL_CONTENT);
+        assertThat(result.newContent()).isEqualTo(NEW_CONTENT);
     }
 
     @Test
@@ -117,9 +117,9 @@ void should_update_file_when_contents_are_different_and_template_is_provided(@Te
 
         // Assert
         verify(connector).updateFile(parameter.getGitFile(), COMMIT_MESSAGE, NEW_CONTENT);
-        assertThat(result.updated).isTrue();
-        assertThat(result.originalContent).isEqualTo(ORIGINAL_CONTENT);
-        assertThat(result.newContent).isEqualTo(NEW_CONTENT);
+        assertThat(result.updated()).isTrue();
+        assertThat(result.originalContent()).isEqualTo(ORIGINAL_CONTENT);
+        assertThat(result.newContent()).isEqualTo(NEW_CONTENT);
     }
 
     @Test
@@ -134,9 +134,9 @@ void should_not_update_file_when_contents_are_different_and_dry_mode_is_activate
 
         // Assert
         verify(connector, never()).updateFile(parameter.getGitFile(), COMMIT_MESSAGE, NEW_CONTENT);
-        assertThat(result.updated).isTrue();
-        assertThat(result.originalContent).isEqualTo(ORIGINAL_CONTENT);
-        assertThat(result.newContent).isEqualTo(NEW_CONTENT);
+        assertThat(result.updated()).isTrue();
+        assertThat(result.originalContent()).isEqualTo(ORIGINAL_CONTENT);
+        assertThat(result.newContent()).isEqualTo(NEW_CONTENT);
     }
 
 
@@ -152,9 +152,9 @@ void should_not_update_file_when_contents_are_the_same() {
 
         // Assert
         verify(connector, times(0)).updateFile(eq(parameter.getGitFile()), eq(COMMIT_MESSAGE), anyString());
-        assertThat(result.updated).isFalse();
-        assertThat(result.originalContent).isEqualTo(ORIGINAL_CONTENT);
-        assertThat(result.newContent).isEqualTo(ORIGINAL_CONTENT);
+        assertThat(result.updated()).isFalse();
+        assertThat(result.originalContent()).isEqualTo(ORIGINAL_CONTENT);
+        assertThat(result.newContent()).isEqualTo(ORIGINAL_CONTENT);
     }
 
 }
diff --git a/src/test/java/io/github/yupd/infrastructure/yaml/YamlPathUpdatorTest.java b/src/test/java/io/github/yupd/infrastructure/yaml/YamlPathUpdatorTest.java
@@ -9,7 +9,7 @@
 class YamlPathUpdatorTest {
 
     @Test
-    public void testMonoDocument() throws Exception{
+    public void testMonoDocument() {
         String content = IOUtils.readFile("YamlPathUpdator/deployment.yml");
         String newContent = new YamlPathUpdator().update(content, new YamlPathEntry("*.containers[0].image", "nginx:newversion"));
         String expected = IOUtils.readFile("YamlPathUpdator/deployment_expected.yml");

diff --git a/src/test/java/io/github/yupd/integration/AbstractIntegrationTest.java b/src/test/java/io/github/yupd/integration/AbstractIntegrationTest.java
@@ -31,7 +31,7 @@ void setup() {
         doAnswer(yamlRepoUpdaterResultCaptor).when(yamlRepoUpdater).update(Mockito.any());
     }
 
-    public class ResultCaptor<T> implements Answer {
+    public static class ResultCaptor<T> implements Answer {
         private T result = null;
         public T getResult() {
             return result;

diff --git a/src/test/java/io/github/yupd/integration/GithubHttpMockedRepositoryTest.java b/src/test/java/io/github/yupd/integration/GithubHttpMockedRepositoryTest.java
@@ -27,7 +27,7 @@ void repo_file_is_updated() {
         int exitCode = yupd.run(args);
 
         assertThat(exitCode).isEqualTo(0);
-        assertThat(yamlRepoUpdaterResultCaptor.getResult().updated).isTrue();
+        assertThat(yamlRepoUpdaterResultCaptor.getResult().updated()).isTrue();
     }
 
     @Test
@@ -49,7 +49,7 @@ void repo_file_is_updated_with_pull_request() {
         int exitCode = yupd.run(args);
 
         assertThat(exitCode).isEqualTo(0);
-        assertThat(yamlRepoUpdaterResultCaptor.getResult().updated).isTrue();
+        assertThat(yamlRepoUpdaterResultCaptor.getResult().updated()).isTrue();
     }
 
     @Override

diff --git a/src/test/java/io/github/yupd/integration/GitlabHttpMockedRepositoryTest.java b/src/test/java/io/github/yupd/integration/GitlabHttpMockedRepositoryTest.java
@@ -27,7 +27,7 @@ void repo_file_is_updated() {
         int exitCode = yupd.run(args);
 
         assertThat(exitCode).isEqualTo(0);
-        assertThat(yamlRepoUpdaterResultCaptor.getResult().updated).isTrue();
+        assertThat(yamlRepoUpdaterResultCaptor.getResult().updated()).isTrue();
     }
 
     @Test
@@ -49,7 +49,7 @@ void repo_file_is_updated_with_merge_request() {
         int exitCode = yupd.run(args);
 
         assertThat(exitCode).isEqualTo(0);
-        assertThat(yamlRepoUpdaterResultCaptor.getResult().updated).isTrue();
+        assertThat(yamlRepoUpdaterResultCaptor.getResult().updated()).isTrue();
     }
 
     @Override