From cc02a582762ad298df1ef81dc8adaae569227bd1 Mon Sep 17 00:00:00 2001
From: Bjørn Christian Seime <bjorncs@verizonmedia.com>
Date: Mon, 3 Jun 2019 18:45:47 +0200
Subject: Change type of key from String to OutputVariabel

---
 .../com/yahoo/vespa/security/tool/securityenv/Main.java  |  6 +++---
 .../yahoo/vespa/security/tool/securityenv/UnixShell.java | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'security-tools/src')

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 74c08c2d602..4fbf48cc953 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
@@ -52,7 +52,7 @@ public class Main {
             if (options.isEmpty()) {
                 return 0;
             }
-            Map<String, String> outputVariables = new TreeMap<>();
+            Map<OutputVariable, String> outputVariables = new TreeMap<>();
             options.get().getCaCertificatesFile()
                     .ifPresent(caCertFile -> addOutputVariable(outputVariables, OutputVariable.CA_CERTIFICATE, caCertFile.toString()));
             MixedMode mixedMode = TransportSecurityUtils.getInsecureMixedMode(envVars);
@@ -73,8 +73,8 @@ public class Main {
         }
     }
 
-    private static void addOutputVariable(Map<String, String> outputVariables, OutputVariable variable, String value) {
-        outputVariables.put(variable.variableName(), value);
+    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) {
diff --git a/security-tools/src/main/java/com/yahoo/vespa/security/tool/securityenv/UnixShell.java b/security-tools/src/main/java/com/yahoo/vespa/security/tool/securityenv/UnixShell.java
index 74630b4e1f4..4e04e198763 100644
--- a/security-tools/src/main/java/com/yahoo/vespa/security/tool/securityenv/UnixShell.java
+++ b/security-tools/src/main/java/com/yahoo/vespa/security/tool/securityenv/UnixShell.java
@@ -15,23 +15,23 @@ import java.util.Map;
 enum UnixShell {
     BOURNE("bourne", List.of("bash", "sh")) {
         @Override
-        void writeOutputVariables(PrintStream out, Map<String, String> outputVariables) {
-            outputVariables.forEach((name, value) -> {
-                out.print(name);
+        void writeOutputVariables(PrintStream out, Map<OutputVariable, String> variables) {
+            variables.forEach((variable, value) -> {
+                out.print(variable.variableName());
                 out.print("=\"");
                 out.print(value); // note: value is assumed to need no escaping
                 out.print("\"; export ");
-                out.print(name);
+                out.print(variable.variableName());
                 out.println(';');
             });
         }
     },
     CSHELL("cshell", List.of("csh", "fish")) {
         @Override
-        void writeOutputVariables(PrintStream out, Map<String, String> outputVariables) {
-            outputVariables.forEach((name, value) -> {
+        void writeOutputVariables(PrintStream out, Map<OutputVariable, String> variables) {
+            variables.forEach((variable, value) -> {
                 out.print("setenv ");
-                out.print(name);
+                out.print(variable.variableName());
                 out.print(" \"");
                 out.print(value); // note: value is assumed to need no escaping
                 out.println("\";");
@@ -49,7 +49,7 @@ enum UnixShell {
         this.knownShellBinaries = knownShellBinaries;
     }
 
-    abstract void writeOutputVariables(PrintStream out, Map<String, String> outputVariables);
+    abstract void writeOutputVariables(PrintStream out, Map<OutputVariable, String> variables);
 
     String configName() {
         return configName;
-- 
cgit v1.2.3