diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-06-03 18:46:17 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-06-03 19:44:28 +0200 |
| commit | 8dacb5f7063a07aa08ec9069163421a56bfd43e3 (patch) | |
| tree | 309645da49f4fd7a01e5d89c395e3bc41a1e2dd7 /security-tools | |
| parent | cc02a582762ad298df1ef81dc8adaae569227bd1 (diff) | |
Inline method
Diffstat (limited to 'security-tools')
| -rw-r--r-- | security-tools/src/main/java/com/yahoo/vespa/security/tool/securityenv/Main.java | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/security-tools/src/main/java/com/yahoo/vespa/security/tool/securityenv/Main.java b/security-tools/src/main/java/com/yahoo/vespa/security/tool/securityenv/Main.java index 4fbf48cc953..f83d9198f08 100644 --- a/security-tools/src/main/java/com/yahoo/vespa/security/tool/securityenv/Main.java +++ b/security-tools/src/main/java/com/yahoo/vespa/security/tool/securityenv/Main.java @@ -54,13 +54,13 @@ public class Main { } Map<OutputVariable, String> outputVariables = new TreeMap<>(); options.get().getCaCertificatesFile() - .ifPresent(caCertFile -> addOutputVariable(outputVariables, OutputVariable.CA_CERTIFICATE, caCertFile.toString())); + .ifPresent(caCertFile -> outputVariables.put(OutputVariable.CA_CERTIFICATE, caCertFile.toString())); MixedMode mixedMode = TransportSecurityUtils.getInsecureMixedMode(envVars); if (mixedMode != MixedMode.PLAINTEXT_CLIENT_MIXED_SERVER) { options.get().getCertificatesFile() - .ifPresent(certificateFile -> addOutputVariable(outputVariables, OutputVariable.CERTIFICATE, certificateFile.toString())); + .ifPresent(certificateFile -> outputVariables.put(OutputVariable.CERTIFICATE, certificateFile.toString())); options.get().getPrivateKeyFile() - .ifPresent(privateKeyFile -> addOutputVariable(outputVariables, OutputVariable.PRIVATE_KEY, privateKeyFile.toString())); + .ifPresent(privateKeyFile -> outputVariables.put(OutputVariable.PRIVATE_KEY, privateKeyFile.toString())); } shell.writeOutputVariables(stdOut, outputVariables); return 0; @@ -73,10 +73,6 @@ public class Main { } } - private static void addOutputVariable(Map<OutputVariable, String> outputVariables, OutputVariable variable, String value) { - outputVariables.put(variable, value); - } - private int handleException(String message, Exception exception, boolean debugMode) { stdError.println(message); if (debugMode) { |