Move MixedMode to separate class

2 files changed, 29 insertions, 23 deletions

diff --git a/security-utils/src/main/java/com/yahoo/security/tls/MixedMode.java b/security-utils/src/main/java/com/yahoo/security/tls/MixedMode.java
new file mode 100644
index 00000000000..1365a81cf10
--- /dev/null
+++ b/security-utils/src/main/java/com/yahoo/security/tls/MixedMode.java
@@ -0,0 +1,29 @@
+// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.security.tls;
+
+import java.util.Arrays;
+
+/**
+ * @author bjorncs
+ */
+public enum MixedMode {
+    PLAINTEXT_CLIENT_MIXED_SERVER("plaintext_client_mixed_server"),
+    TLS_CLIENT_MIXED_SERVER("tls_client_mixed_server");
+
+    final String configValue;
+
+    MixedMode(String configValue) {
+        this.configValue = configValue;
+    }
+
+    public String configValue() {
+        return configValue;
+    }
+
+    static MixedMode fromConfigValue(String configValue) {
+        return Arrays.stream(values())
+                .filter(v -> v.configValue.equals(configValue))
+                .findFirst()
+                .orElseThrow(() -> new IllegalArgumentException("Unknown value: " + configValue));
+    }
+}
diff --git a/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityUtils.java b/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityUtils.java
index adae2e82873..e93b880b085 100644
--- a/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityUtils.java
+++ b/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityUtils.java
@@ -3,7 +3,6 @@ package com.yahoo.security.tls;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Arrays;
 import java.util.Optional;
 
 /**
@@ -16,28 +15,6 @@ public class TransportSecurityUtils {
     public static final String CONFIG_FILE_ENVIRONMENT_VARIABLE = "VESPA_TLS_CONFIG_FILE";
     public static final String INSECURE_MIXED_MODE_ENVIRONMENT_VARIABLE = "VESPA_TLS_INSECURE_MIXED_MODE";
 
-    public enum MixedMode {
-        PLAINTEXT_CLIENT_MIXED_SERVER("plaintext_client_mixed_server"),
-        TLS_CLIENT_MIXED_SERVER("tls_client_mixed_server");
-
-        final String configValue;
-
-        MixedMode(String configValue) {
-            this.configValue = configValue;
-        }
-
-        public String configValue() {
-            return configValue;
-        }
-
-        static MixedMode fromConfigValue(String configValue) {
-            return Arrays.stream(values())
-                    .filter(v -> v.configValue.equals(configValue))
-                    .findFirst()
-                    .orElseThrow(() -> new IllegalArgumentException("Unknown value: " + configValue));
-        }
-    }
-
     private TransportSecurityUtils() {}
 
     public static boolean isTransportSecurityEnabled() {