Skip to content

Commit ac12440

Browse files
Refactor SecretSourceResolver map initialization and clarify UpdateCenterConfigurator intent (#2832)
1 parent a57f83f commit ac12440

2 files changed

Lines changed: 19 additions & 17 deletions

File tree

plugin/src/main/java/io/jenkins/plugins/casc/SecretSourceResolver.java

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
import java.nio.file.InvalidPathException;
1111
import java.nio.file.Paths;
1212
import java.util.Base64;
13-
import java.util.Collections;
14-
import java.util.HashMap;
1513
import java.util.Map;
1614
import java.util.logging.Level;
1715
import java.util.logging.Logger;
@@ -38,18 +36,25 @@ public class SecretSourceResolver {
3836
private final StringSubstitutor substitutor;
3937

4038
public SecretSourceResolver(ConfigurationContext configurationContext) {
41-
// TODO update to use Map.of in JDK11+
42-
Map<String, org.apache.commons.text.lookup.StringLookup> map = new HashMap<>(16);
43-
map.put("base64", Base64Lookup.INSTANCE);
44-
map.put("fileBase64", FileBase64Lookup.INSTANCE);
45-
map.put("readFileBase64", FileBase64Lookup.INSTANCE);
46-
map.put("file", FileStringLookup.INSTANCE);
47-
map.put("readFile", FileStringLookup.INSTANCE);
48-
map.put("sysProp", SystemPropertyLookup.INSTANCE);
49-
map.put("decodeBase64", DecodeBase64Lookup.INSTANCE);
50-
map.put("json", JsonLookup.INSTANCE);
51-
map.put("trim", TrimLookup.INSTANCE);
52-
map = Collections.unmodifiableMap(map);
39+
Map<String, StringLookup> map = Map.of(
40+
"base64",
41+
Base64Lookup.INSTANCE,
42+
"fileBase64",
43+
FileBase64Lookup.INSTANCE,
44+
"readFileBase64",
45+
FileBase64Lookup.INSTANCE,
46+
"file",
47+
FileStringLookup.INSTANCE,
48+
"readFile",
49+
FileStringLookup.INSTANCE,
50+
"sysProp",
51+
SystemPropertyLookup.INSTANCE,
52+
"decodeBase64",
53+
DecodeBase64Lookup.INSTANCE,
54+
"json",
55+
JsonLookup.INSTANCE,
56+
"trim",
57+
TrimLookup.INSTANCE);
5358

5459
substitutor = new StringSubstitutor(new FixedInterpolatorStringLookup(
5560
map, new ConfigurationContextStringLookup(configurationContext)))

plugin/src/main/java/io/jenkins/plugins/casc/core/UpdateCenterConfigurator.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
import org.kohsuke.accmod.Restricted;
1818
import org.kohsuke.accmod.restrictions.NoExternalUse;
1919

20-
/**
21-
* TODO would not be required if UpdateCenter had a DataBoundConstructor
22-
*/
2320
@Extension
2421
@Restricted(NoExternalUse.class)
2522
public class UpdateCenterConfigurator extends BaseConfigurator<UpdateCenter> {

0 commit comments

Comments
 (0)