Minor improvements to array creation and one unit test (#1122)

jenkinsci · Oct 3, 2019 · 221d390 · 221d390
1 parent c505013
commit 221d390
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/integrations/src/test/java/io/jenkins/plugins/casc/CredentialsTest.java b/integrations/src/test/java/io/jenkins/plugins/casc/CredentialsTest.java
@@ -117,7 +117,7 @@ public void checkUsernamePasswordIsSecret() {
 
     @Nonnull
     private <T> Attribute<T,?> getFromDatabound(Class<T> clazz, @Nonnull String attributeName) {
-        DataBoundConfigurator<T> cfg = new DataBoundConfigurator<T>(clazz);
+        DataBoundConfigurator<T> cfg = new DataBoundConfigurator<>(clazz);
         Set<Attribute<T,?>> attributes = cfg.describe();
         for (Attribute<T,?> a : attributes) {
             if(attributeName.equals(a.getName())) {

diff --git a/plugin/src/main/java/io/jenkins/plugins/casc/RootElementConfigurator.java b/plugin/src/main/java/io/jenkins/plugins/casc/RootElementConfigurator.java
@@ -18,9 +18,9 @@
 public interface RootElementConfigurator<T> extends Configurator<T> {
 
     static List<RootElementConfigurator> all() {
-        List<RootElementConfigurator> configurators = new ArrayList<>();
         final Jenkins jenkins = Jenkins.getInstance();
-        configurators.addAll(jenkins.getExtensionList(RootElementConfigurator.class));
+        List<RootElementConfigurator> configurators = new ArrayList<>(
+            jenkins.getExtensionList(RootElementConfigurator.class));
 
         for (GlobalConfigurationCategory category : GlobalConfigurationCategory.all()) {
             configurators.add(new GlobalConfigurationCategoryConfigurator(category));

diff --git a/plugin/src/main/java/io/jenkins/plugins/casc/SecretSource.java b/plugin/src/main/java/io/jenkins/plugins/casc/SecretSource.java
@@ -23,8 +23,7 @@ public void init() {
     public abstract Optional<String> reveal(String secret) throws IOException;
 
     public static List<SecretSource> all() {
-        List<SecretSource> all = new ArrayList<>();
-        all.addAll(Jenkins.getInstance().getExtensionList(SecretSource.class));
-        return all;
+        return new ArrayList<>(
+            Jenkins.getInstance().getExtensionList(SecretSource.class));
     }
 }
diff --git a/...n/src/test/java/io/jenkins/plugins/casc/impl/configurators/PrimitiveConfiguratorTest.java b/...n/src/test/java/io/jenkins/plugins/casc/impl/configurators/PrimitiveConfiguratorTest.java
@@ -54,7 +54,7 @@ public void _int() throws Exception {
     public void _Integer() throws Exception {
         Configurator c = registry.lookupOrFail(Integer.class);
         final Object value = c.configure(new Scalar("123"), context);
-        assertTrue(123 == (Integer) value);
+        assertEquals(123, (int) value);
     }
 
     @Test
@@ -87,7 +87,7 @@ public void _Integer_env() throws Exception {
         environment.set("ENV_FOR_TEST", "123");
         Configurator c = registry.lookupOrFail(Integer.class);
         final Object value = c.configure(new Scalar("${ENV_FOR_TEST}"), context);
-        assertTrue(123 == (Integer) value);
+        assertEquals(123, (int) value);
     }
 
     @Test

diff --git a/plugin/src/test/java/io/jenkins/plugins/casc/misc/JenkinsConfiguredWithReadmeRule.java b/plugin/src/test/java/io/jenkins/plugins/casc/misc/JenkinsConfiguredWithReadmeRule.java
@@ -20,6 +20,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -53,7 +54,8 @@ public void before() throws Throwable {
                     try {
                         File codeBlockFile = File.createTempFile("integrations", "markdown");
                         InputStream inputStream = clazz.getClassLoader().getResourceAsStream(s);
-                        List<String> lines = Arrays.asList(transformFencedCodeBlockFromMarkdownToString(inputStream));
+                        List<String> lines = Collections.singletonList(
+                            transformFencedCodeBlockFromMarkdownToString(inputStream));
                         Path file = Paths.get(codeBlockFile.getCanonicalPath());
                         Files.write(file, lines, StandardCharsets.UTF_8);
                         return  codeBlockFile.toURI().toString();