From a65d9718484626cb424da5273e5881f8ce99bd81 Mon Sep 17 00:00:00 2001 From: somiljain2006 Date: Wed, 15 Apr 2026 07:22:25 +0530 Subject: [PATCH] Refactor SecretSourceResolver map initialization and clarify UpdateCenterConfigurator intent --- .../plugins/casc/SecretSourceResolver.java | 33 +++++++++++-------- .../casc/core/UpdateCenterConfigurator.java | 3 -- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/plugin/src/main/java/io/jenkins/plugins/casc/SecretSourceResolver.java b/plugin/src/main/java/io/jenkins/plugins/casc/SecretSourceResolver.java index fcc267e0d6..a4f986faa2 100644 --- a/plugin/src/main/java/io/jenkins/plugins/casc/SecretSourceResolver.java +++ b/plugin/src/main/java/io/jenkins/plugins/casc/SecretSourceResolver.java @@ -10,8 +10,6 @@ import java.nio.file.InvalidPathException; import java.nio.file.Paths; import java.util.Base64; -import java.util.Collections; -import java.util.HashMap; import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; @@ -38,18 +36,25 @@ public class SecretSourceResolver { private final StringSubstitutor substitutor; public SecretSourceResolver(ConfigurationContext configurationContext) { - // TODO update to use Map.of in JDK11+ - Map map = new HashMap<>(16); - map.put("base64", Base64Lookup.INSTANCE); - map.put("fileBase64", FileBase64Lookup.INSTANCE); - map.put("readFileBase64", FileBase64Lookup.INSTANCE); - map.put("file", FileStringLookup.INSTANCE); - map.put("readFile", FileStringLookup.INSTANCE); - map.put("sysProp", SystemPropertyLookup.INSTANCE); - map.put("decodeBase64", DecodeBase64Lookup.INSTANCE); - map.put("json", JsonLookup.INSTANCE); - map.put("trim", TrimLookup.INSTANCE); - map = Collections.unmodifiableMap(map); + Map map = Map.of( + "base64", + Base64Lookup.INSTANCE, + "fileBase64", + FileBase64Lookup.INSTANCE, + "readFileBase64", + FileBase64Lookup.INSTANCE, + "file", + FileStringLookup.INSTANCE, + "readFile", + FileStringLookup.INSTANCE, + "sysProp", + SystemPropertyLookup.INSTANCE, + "decodeBase64", + DecodeBase64Lookup.INSTANCE, + "json", + JsonLookup.INSTANCE, + "trim", + TrimLookup.INSTANCE); substitutor = new StringSubstitutor(new FixedInterpolatorStringLookup( map, new ConfigurationContextStringLookup(configurationContext))) diff --git a/plugin/src/main/java/io/jenkins/plugins/casc/core/UpdateCenterConfigurator.java b/plugin/src/main/java/io/jenkins/plugins/casc/core/UpdateCenterConfigurator.java index 1a90b3f4ba..0495d29ae3 100644 --- a/plugin/src/main/java/io/jenkins/plugins/casc/core/UpdateCenterConfigurator.java +++ b/plugin/src/main/java/io/jenkins/plugins/casc/core/UpdateCenterConfigurator.java @@ -17,9 +17,6 @@ import org.kohsuke.accmod.Restricted; import org.kohsuke.accmod.restrictions.NoExternalUse; -/** - * TODO would not be required if UpdateCenter had a DataBoundConstructor - */ @Extension @Restricted(NoExternalUse.class) public class UpdateCenterConfigurator extends BaseConfigurator {