Refactor RuntimeValues to allow storing Objects

LEDfan · LEDfan · commit 1a7571f5f986 · 2021-06-21T14:28:04.000+02:00
diff --git a/src/main/java/eu/openanalytics/containerproxy/backend/docker/AbstractDockerBackend.java b/src/main/java/eu/openanalytics/containerproxy/backend/docker/AbstractDockerBackend.java
@@ -155,7 +155,7 @@ protected List<String> convertEnv(Map<String, String> env) {
 		return res;
 	}
 
-	protected Map<RuntimeValueKey, RuntimeValue> parseLabelsAsRuntimeValues(String containerId, ImmutableMap<String, String> labels) {
+	protected Map<RuntimeValueKey<?>, RuntimeValue> parseLabelsAsRuntimeValues(String containerId, ImmutableMap<String, String> labels) {
 	    if (labels == null) {
 	    	return null;
 		}
@@ -166,9 +166,9 @@ protected Map<RuntimeValueKey, RuntimeValue> parseLabelsAsRuntimeValues(String c
 			return null;
 		}
 
-		Map<RuntimeValueKey, RuntimeValue> runtimeValues = new HashMap<>();
+		Map<RuntimeValueKey<?>, RuntimeValue> runtimeValues = new HashMap<>();
 
-		for (RuntimeValueKey key : RuntimeValueKeyRegistry.getRuntimeValueKeys()) {
+		for (RuntimeValueKey<?> key : RuntimeValueKeyRegistry.getRuntimeValueKeys()) {
 			if (key.getIncludeAsLabel() || key.getIncludeAsAnnotation()) {
 				String value = labels.get(key.getKeyAsLabel());
 				if (value != null) {
diff --git a/src/main/java/eu/openanalytics/containerproxy/backend/docker/DockerEngineBackend.java b/src/main/java/eu/openanalytics/containerproxy/backend/docker/DockerEngineBackend.java
@@ -172,7 +172,7 @@ public List<ExistingContainerInfo> scanExistingContainers() throws Exception {
 				continue; // not recovering stopped/broken apps
 			}
 
-			Map<RuntimeValueKey, RuntimeValue> runtimeValues = parseLabelsAsRuntimeValues(container.id(), container.labels());
+			Map<RuntimeValueKey<?>, RuntimeValue> runtimeValues = parseLabelsAsRuntimeValues(container.id(), container.labels());
 			if (runtimeValues == null) {
 				continue;
 			}
diff --git a/src/main/java/eu/openanalytics/containerproxy/backend/docker/DockerSwarmBackend.java b/src/main/java/eu/openanalytics/containerproxy/backend/docker/DockerSwarmBackend.java
@@ -205,7 +205,7 @@ public List<ExistingContainerInfo> scanExistingContainers() throws Exception {
 				continue;
 			}
 
-			Map<RuntimeValueKey, RuntimeValue> runtimeValues = parseLabelsAsRuntimeValues(containersInService.get(0).id(), containerSpec.labels());
+			Map<RuntimeValueKey<?>, RuntimeValue> runtimeValues = parseLabelsAsRuntimeValues(containersInService.get(0).id(), containerSpec.labels());
 			if (runtimeValues == null) {
 				continue;
 			}
diff --git a/src/main/java/eu/openanalytics/containerproxy/backend/kubernetes/KubernetesBackend.java b/src/main/java/eu/openanalytics/containerproxy/backend/kubernetes/KubernetesBackend.java
@@ -524,7 +524,7 @@ public List<ExistingContainerInfo> scanExistingContainers() {
 					continue; // this isn't a container created by us
 				}
 
-				Map<RuntimeValueKey, RuntimeValue> runtimeValues = parseLabelsAndAnnotationsAsRuntimeValues(containerId, labels, annotations);
+				Map<RuntimeValueKey<?>, RuntimeValue> runtimeValues = parseLabelsAndAnnotationsAsRuntimeValues(containerId, labels, annotations);
 				if (runtimeValues == null) {
 					continue;
 				}
@@ -553,7 +553,7 @@ public List<ExistingContainerInfo> scanExistingContainers() {
 		return containers;
 	}
 
-	private Map<RuntimeValueKey, RuntimeValue> parseLabelsAndAnnotationsAsRuntimeValues(String containerId,
+	private Map<RuntimeValueKey<?>, RuntimeValue> parseLabelsAndAnnotationsAsRuntimeValues(String containerId,
 																						Map<String, String> labels,
 																						Map<String, String> annotations) {
 
@@ -563,9 +563,9 @@ private Map<RuntimeValueKey, RuntimeValue> parseLabelsAndAnnotationsAsRuntimeVal
 			return null;
 		}
 
-		Map<RuntimeValueKey, RuntimeValue> runtimeValues = new HashMap<>();
+		Map<RuntimeValueKey<?>, RuntimeValue> runtimeValues = new HashMap<>();
 
-		for (RuntimeValueKey key : RuntimeValueKeyRegistry.getRuntimeValueKeys()) {
+		for (RuntimeValueKey<?> key : RuntimeValueKeyRegistry.getRuntimeValueKeys()) {
 			if (key.getIncludeAsLabel()) {
 				String value = labels.get(key.getKeyAsLabel());
 				if (value != null) {
diff --git a/src/main/java/eu/openanalytics/containerproxy/model/runtime/ExistingContainerInfo.java b/src/main/java/eu/openanalytics/containerproxy/model/runtime/ExistingContainerInfo.java
@@ -31,7 +31,7 @@
 public class ExistingContainerInfo {
 
     public ExistingContainerInfo(String containerId,
-                                 Map<RuntimeValueKey, RuntimeValue> runtimeValues,
+                                 Map<RuntimeValueKey<?>, RuntimeValue> runtimeValues,
                                  String image,
                                  Map<Integer, Integer> portBindings,
                                  Map<String, Object> parameters
@@ -45,7 +45,7 @@ public ExistingContainerInfo(String containerId,
     }
 
     private final String containerId;
-    private final Map<RuntimeValueKey, RuntimeValue> runtimeValues;
+    private final Map<RuntimeValueKey<?>, RuntimeValue> runtimeValues;
     private final String image;
     private final Map<Integer, Integer> portBindings;
     private final Map<String, Object> parameters;
@@ -54,7 +54,7 @@ public String getContainerId() {
         return containerId;
     }
 
-    public Map<RuntimeValueKey, RuntimeValue> getRuntimeValues() {
+    public Map<RuntimeValueKey<?>, RuntimeValue> getRuntimeValues() {
         return runtimeValues;
     }
 
@@ -71,7 +71,7 @@ public Map<String, Object> getParameters() {
         return parameters;
     }
 
-    public RuntimeValue getRuntimeValue(RuntimeValueKey key) {
+    public RuntimeValue getRuntimeValue(RuntimeValueKey<?> key) {
         return runtimeValues.get(key);
     }
 
diff --git a/src/main/java/eu/openanalytics/containerproxy/model/runtime/Proxy.java b/src/main/java/eu/openanalytics/containerproxy/model/runtime/Proxy.java
@@ -25,7 +25,6 @@
 import eu.openanalytics.containerproxy.model.runtime.runtimevalues.RuntimeValueKey;
 import eu.openanalytics.containerproxy.model.runtime.runtimevalues.RuntimeValueKeyRegistry;
 import eu.openanalytics.containerproxy.model.spec.ProxySpec;
-import eu.openanalytics.containerproxy.model.spec.WebSocketReconnectionMode;
 import net.minidev.json.annotate.JsonIgnore;
 
 import java.net.URI;
@@ -35,16 +34,6 @@
 import java.util.Map;
 import java.util.Objects;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.fasterxml.jackson.databind.annotation.JsonNaming;
-import eu.openanalytics.containerproxy.model.runtime.runtimevalues.RuntimeValue;
-import eu.openanalytics.containerproxy.model.runtime.runtimevalues.RuntimeValueKey;
-import eu.openanalytics.containerproxy.model.runtime.runtimevalues.RuntimeValueKeyRegistry;
-import eu.openanalytics.containerproxy.model.spec.ProxySpec;
-import eu.openanalytics.containerproxy.model.spec.WebSocketReconnectionMode;
-import net.minidev.json.annotate.JsonIgnore;
-
 public class Proxy {
 
 	private String id;
@@ -56,12 +45,11 @@ public class Proxy {
 	private long startupTimestamp;
 	private long createdTimestamp;
 	private String userId;
-	private WebSocketReconnectionMode webSocketReconnectionMode;
-	
+
 	private List<Container> containers;
 	private Map<String,URI> targets;
 
-	private Map<RuntimeValueKey, RuntimeValue> runtimeValues = new HashMap<>();
+	private Map<RuntimeValueKey<?>, RuntimeValue> runtimeValues = new HashMap<>();
 
 	public Proxy() {
 		containers = new ArrayList<>();
@@ -136,14 +124,6 @@ public void setTargets(Map<String, URI> targets) {
 		this.targets = targets;
 	}
 
-	public WebSocketReconnectionMode getWebSocketReconnectionMode() {
-		return webSocketReconnectionMode;
-	}
-
-	public void setWebSocketReconnectionMode(WebSocketReconnectionMode webSocketReconnectionMode) {
-	    this.webSocketReconnectionMode = webSocketReconnectionMode;
-	}
-
 	@JsonProperty("runtimeValues")
 	public Map<String, String> getRuntimeValuesJson() {
 	    // only output key<->value in JSON
@@ -155,11 +135,11 @@ public Map<String, String> getRuntimeValuesJson() {
 	}
 
 	@JsonIgnore
-	public Map<RuntimeValueKey, RuntimeValue> getRuntimeValues() {
+	public Map<RuntimeValueKey<?>, RuntimeValue> getRuntimeValues() {
 		return runtimeValues;
 	}
 
-	public void setRuntimeValues(Map<RuntimeValueKey, RuntimeValue> runtimeValues) {
+	public void setRuntimeValues(Map<RuntimeValueKey<?>, RuntimeValue> runtimeValues) {
 		this.runtimeValues = runtimeValues;
 	}
 
@@ -177,7 +157,7 @@ public void addRuntimeValues(List<RuntimeValue> runtimeValues) {
 		}
 	}
 
-	public void addRuntimeValues(Map<RuntimeValueKey, RuntimeValue> runtimeValues) {
+	public void addRuntimeValues(Map<RuntimeValueKey<?>, RuntimeValue> runtimeValues) {
 		for (RuntimeValue runtimeValue: runtimeValues.values()) {
 			addRuntimeValue(runtimeValue);
 		}
@@ -191,7 +171,14 @@ public String getRuntimeValue(String keyAsEnvVar) {
 		return getRuntimeValue(RuntimeValueKeyRegistry.getRuntimeValue(keyAsEnvVar));
 	}
 
-	public String getRuntimeValue(RuntimeValueKey key) {
+	public <T> T getRuntimeObject(RuntimeValueKey<T> key) {
+		Objects.requireNonNull(key, "key may not be null");
+		RuntimeValue runtimeValue = runtimeValues.get(key);
+		Objects.requireNonNull(runtimeValue, "did not found a value for key " + key.getKeyAsEnvVar());
+		return runtimeValue.getObject();
+	}
+
+	public <T> String getRuntimeValue(RuntimeValueKey<T> key) {
 		Objects.requireNonNull(key, "key may not be null");
 		RuntimeValue runtimeValue = runtimeValues.get(key);
 		Objects.requireNonNull(runtimeValue, "did not found a value for key " + key.getKeyAsEnvVar());
diff --git a/src/main/java/eu/openanalytics/containerproxy/model/runtime/runtimevalues/CreatedTimestampKey.java b/src/main/java/eu/openanalytics/containerproxy/model/runtime/runtimevalues/CreatedTimestampKey.java
@@ -20,15 +20,15 @@
  */
 package eu.openanalytics.containerproxy.model.runtime.runtimevalues;
 
-public class CreatedTimestampKey extends RuntimeValueKey {
+public class CreatedTimestampKey extends RuntimeValueKey<String> {
 
     private CreatedTimestampKey() {
         super("openanalytics.eu/sp-proxy-created-timestamp",
                 "SHINYPROXY_CREATED_TIMESTAMP",
                 false,
                 true,
                 false,
-                true);
+                true, String.class);
     }
 
     public static CreatedTimestampKey inst = new CreatedTimestampKey();
diff --git a/src/main/java/eu/openanalytics/containerproxy/model/runtime/runtimevalues/InstanceIdKey.java b/src/main/java/eu/openanalytics/containerproxy/model/runtime/runtimevalues/InstanceIdKey.java
@@ -20,15 +20,15 @@
  */
 package eu.openanalytics.containerproxy.model.runtime.runtimevalues;
 
-public class InstanceIdKey extends RuntimeValueKey {
+public class InstanceIdKey extends RuntimeValueKey<String> {
 
     private InstanceIdKey() {
         super("openanalytics.eu/sp-instance",
                 "SHINYPROXY_INSTANCE",
                 true,
                 false,
                 false,
-                true);
+                true, String.class);
     }
 
     public static InstanceIdKey inst = new InstanceIdKey();
diff --git a/src/main/java/eu/openanalytics/containerproxy/model/runtime/runtimevalues/ProxiedAppKey.java b/src/main/java/eu/openanalytics/containerproxy/model/runtime/runtimevalues/ProxiedAppKey.java
@@ -20,15 +20,15 @@
  */
 package eu.openanalytics.containerproxy.model.runtime.runtimevalues;
 
-public class ProxiedAppKey extends RuntimeValueKey {
+public class ProxiedAppKey extends RuntimeValueKey<String> {
 
     private ProxiedAppKey() {
         super("openanalytics.eu/sp-proxied-app",
                 "SHINYPROXY_PROXIED_APP",
                 true,
                 false,
                 false,
-                true);
+                true, String.class);
     }
 
     public static ProxiedAppKey inst = new ProxiedAppKey();
diff --git a/src/main/java/eu/openanalytics/containerproxy/model/runtime/runtimevalues/ProxyIdKey.java b/src/main/java/eu/openanalytics/containerproxy/model/runtime/runtimevalues/ProxyIdKey.java
@@ -20,15 +20,15 @@
  */
 package eu.openanalytics.containerproxy.model.runtime.runtimevalues;
 
-public class ProxyIdKey extends RuntimeValueKey {
+public class ProxyIdKey extends RuntimeValueKey<String> {
 
     private ProxyIdKey() {
         super("openanalytics.eu/sp-proxy-id",
                 "SHINYPROXY_PROXY_ID",
                 true,
                 false,
                 false,
-                true);
+                true, String.class);
     }
 
     public static ProxyIdKey inst = new ProxyIdKey();
diff --git a/src/main/java/eu/openanalytics/containerproxy/model/runtime/runtimevalues/ProxySpecIdKey.java b/src/main/java/eu/openanalytics/containerproxy/model/runtime/runtimevalues/ProxySpecIdKey.java
@@ -20,15 +20,15 @@
  */
 package eu.openanalytics.containerproxy.model.runtime.runtimevalues;
 
-public class ProxySpecIdKey extends RuntimeValueKey {
+public class ProxySpecIdKey extends RuntimeValueKey<String> {
 
     private ProxySpecIdKey() {
         super("openanalytics.eu/sp-spec-id",
                 "SHINYPROXY_SPEC_ID",
                 false,
                 true,
                 false,
-                true);
+                true, String.class);
     }
 
     public static ProxySpecIdKey inst = new ProxySpecIdKey();
diff --git a/src/main/java/eu/openanalytics/containerproxy/model/runtime/runtimevalues/RealmIdKey.java b/src/main/java/eu/openanalytics/containerproxy/model/runtime/runtimevalues/RealmIdKey.java
@@ -20,15 +20,15 @@
  */
 package eu.openanalytics.containerproxy.model.runtime.runtimevalues;
 
-public class RealmIdKey extends RuntimeValueKey {
+public class RealmIdKey extends RuntimeValueKey<String> {
 
     private RealmIdKey() {
         super("openanalytics.eu/sp-realm-id",
                 "SHINYPROXY_REALM_ID",
                 false,
                 true,
                 false,
-                false);
+                false, String.class);
     }
 
     public static RealmIdKey inst = new RealmIdKey();
diff --git a/src/main/java/eu/openanalytics/containerproxy/model/runtime/runtimevalues/RuntimeValue.java b/src/main/java/eu/openanalytics/containerproxy/model/runtime/runtimevalues/RuntimeValue.java
@@ -28,23 +28,33 @@
  */
 public class RuntimeValue {
 
-    private final RuntimeValueKey key;
+    private final RuntimeValueKey<?> key;
 
-    private final String value;
+    private final Object value;
 
-    public RuntimeValue(RuntimeValueKey key, String value) {
+    public RuntimeValue(RuntimeValueKey<?> key, Object value) {
         this.key = Objects.requireNonNull(key, "key may not be null");
         this.value = Objects.requireNonNull(value, "value may not be null for key " + key.getKeyAsEnvVar());
     }
 
-    public RuntimeValueKey getKey() {
+    public RuntimeValueKey<?> getKey() {
         return key;
     }
 
     public String getValue() {
-        return value;
+        return value.toString();
     }
 
+    public <T> T getObject() {
+        return (T) getObject(key.getClazz());
+    }
+
+    private <T> T getObject(Class<T> clazz) {
+        if (!clazz.isInstance(value)) {
+            throw new RuntimeException("Cannot convert RuntimeObject to the desired type!");
+        }
+        return clazz.cast(value);
+    }
 
 }
 
diff --git a/src/main/java/eu/openanalytics/containerproxy/model/runtime/runtimevalues/RuntimeValueKey.java b/src/main/java/eu/openanalytics/containerproxy/model/runtime/runtimevalues/RuntimeValueKey.java
@@ -27,7 +27,7 @@
  * Each implementation of this class should have a private constructor and a `public static` field called `inst`
  * containing the singleton of this key.
  */
-public abstract class RuntimeValueKey {
+public abstract class RuntimeValueKey<T> {
 
     private final String keyAsLabel;
     private final String keyAsEnvVar;
@@ -40,13 +40,16 @@ public abstract class RuntimeValueKey {
 
     private final Boolean isRequired;
 
-    public RuntimeValueKey(String keyAsLabel, String keyAsEnvVar, Boolean includeAsLabel, Boolean includeAsAnnotation, Boolean includeAsEnvironmentVariable, Boolean isRequired) {
+    private final Class<T> clazz;
+
+    public RuntimeValueKey(String keyAsLabel, String keyAsEnvVar, Boolean includeAsLabel, Boolean includeAsAnnotation, Boolean includeAsEnvironmentVariable, Boolean isRequired, Class<T> clazz) {
         this.keyAsLabel = Objects.requireNonNull(keyAsLabel, "keyAsLabel may not be null");
         this.keyAsEnvVar = Objects.requireNonNull(keyAsEnvVar, "keyAsEnvVar may not be null");
         this.includeAsLabel = includeAsLabel;
         this.includeAsAnnotation = includeAsAnnotation;
         this.includeAsEnvironmentVariable = includeAsEnvironmentVariable;
         this.isRequired = isRequired;
+        this.clazz = clazz;
     }
 
     public String getKeyAsLabel() {
@@ -72,4 +75,8 @@ public Boolean getIncludeAsEnvironmentVariable() {
     public Boolean isRequired() {
         return isRequired;
     }
+
+    public Class<T> getClazz() {
+        return clazz;
+    }
 }
diff --git a/src/main/java/eu/openanalytics/containerproxy/model/runtime/runtimevalues/RuntimeValueKeyRegistry.java b/src/main/java/eu/openanalytics/containerproxy/model/runtime/runtimevalues/RuntimeValueKeyRegistry.java
diff --git a/src/main/java/eu/openanalytics/containerproxy/model/runtime/runtimevalues/UserGroupsKey.java b/src/main/java/eu/openanalytics/containerproxy/model/runtime/runtimevalues/UserGroupsKey.java
diff --git a/src/main/java/eu/openanalytics/containerproxy/model/runtime/runtimevalues/UserIdKey.java b/src/main/java/eu/openanalytics/containerproxy/model/runtime/runtimevalues/UserIdKey.java
diff --git a/src/main/java/eu/openanalytics/containerproxy/model/spec/ProxySpec.java b/src/main/java/eu/openanalytics/containerproxy/model/spec/ProxySpec.java
diff --git a/src/main/java/eu/openanalytics/containerproxy/model/spec/WebSocketReconnectionMode.java b/src/main/java/eu/openanalytics/containerproxy/model/spec/WebSocketReconnectionMode.java
diff --git a/src/main/java/eu/openanalytics/containerproxy/service/HeartbeatService.java b/src/main/java/eu/openanalytics/containerproxy/service/HeartbeatService.java
diff --git a/src/main/java/eu/openanalytics/containerproxy/service/ProxyService.java b/src/main/java/eu/openanalytics/containerproxy/service/ProxyService.java

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ protected List<String> convertEnv(Map<String, String> env) {`
`155`	`155`	`return res;`
`156`	`156`	`}`
`157`	`157`
`158`		`- protected Map<RuntimeValueKey, RuntimeValue> parseLabelsAsRuntimeValues(String containerId, ImmutableMap<String, String> labels) {`
	`158`	`+ protected Map<RuntimeValueKey<?>, RuntimeValue> parseLabelsAsRuntimeValues(String containerId, ImmutableMap<String, String> labels) {`
`159`	`159`	`if (labels == null) {`
`160`	`160`	`return null;`
`161`	`161`	`}`
`@@ -166,9 +166,9 @@ protected Map<RuntimeValueKey, RuntimeValue> parseLabelsAsRuntimeValues(String c`
`166`	`166`	`return null;`
`167`	`167`	`}`
`168`	`168`
`169`		`- Map<RuntimeValueKey, RuntimeValue> runtimeValues = new HashMap<>();`
	`169`	`+ Map<RuntimeValueKey<?>, RuntimeValue> runtimeValues = new HashMap<>();`
`170`	`170`
`171`		`- for (RuntimeValueKey key : RuntimeValueKeyRegistry.getRuntimeValueKeys()) {`
	`171`	`+ for (RuntimeValueKey<?> key : RuntimeValueKeyRegistry.getRuntimeValueKeys()) {`
`172`	`172`	`if (key.getIncludeAsLabel() \|\| key.getIncludeAsAnnotation()) {`
`173`	`173`	`String value = labels.get(key.getKeyAsLabel());`
`174`	`174`	`if (value != null) {`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ public List<ExistingContainerInfo> scanExistingContainers() throws Exception {`
`172`	`172`	`continue; // not recovering stopped/broken apps`
`173`	`173`	`}`
`174`	`174`
`175`		`- Map<RuntimeValueKey, RuntimeValue> runtimeValues = parseLabelsAsRuntimeValues(container.id(), container.labels());`
	`175`	`+ Map<RuntimeValueKey<?>, RuntimeValue> runtimeValues = parseLabelsAsRuntimeValues(container.id(), container.labels());`
`176`	`176`	`if (runtimeValues == null) {`
`177`	`177`	`continue;`
`178`	`178`	`}`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ public List<ExistingContainerInfo> scanExistingContainers() throws Exception {`
`205`	`205`	`continue;`
`206`	`206`	`}`
`207`	`207`
`208`		`- Map<RuntimeValueKey, RuntimeValue> runtimeValues = parseLabelsAsRuntimeValues(containersInService.get(0).id(), containerSpec.labels());`
	`208`	`+ Map<RuntimeValueKey<?>, RuntimeValue> runtimeValues = parseLabelsAsRuntimeValues(containersInService.get(0).id(), containerSpec.labels());`
`209`	`209`	`if (runtimeValues == null) {`
`210`	`210`	`continue;`
`211`	`211`	`}`
Original file line number	Diff line number	Diff line change
`@@ -524,7 +524,7 @@ public List<ExistingContainerInfo> scanExistingContainers() {`
`524`	`524`	`continue; // this isn't a container created by us`
`525`	`525`	`}`
`526`	`526`
`527`		`- Map<RuntimeValueKey, RuntimeValue> runtimeValues = parseLabelsAndAnnotationsAsRuntimeValues(containerId, labels, annotations);`
	`527`	`+ Map<RuntimeValueKey<?>, RuntimeValue> runtimeValues = parseLabelsAndAnnotationsAsRuntimeValues(containerId, labels, annotations);`
`528`	`528`	`if (runtimeValues == null) {`
`529`	`529`	`continue;`
`530`	`530`	`}`
`@@ -553,7 +553,7 @@ public List<ExistingContainerInfo> scanExistingContainers() {`
`553`	`553`	`return containers;`
`554`	`554`	`}`
`555`	`555`
`556`		`- private Map<RuntimeValueKey, RuntimeValue> parseLabelsAndAnnotationsAsRuntimeValues(String containerId,`
	`556`	`+ private Map<RuntimeValueKey<?>, RuntimeValue> parseLabelsAndAnnotationsAsRuntimeValues(String containerId,`
`557`	`557`	`Map<String, String> labels,`
`558`	`558`	`Map<String, String> annotations) {`
`559`	`559`
`@@ -563,9 +563,9 @@ private Map<RuntimeValueKey, RuntimeValue> parseLabelsAndAnnotationsAsRuntimeVal`
`563`	`563`	`return null;`
`564`	`564`	`}`
`565`	`565`
`566`		`- Map<RuntimeValueKey, RuntimeValue> runtimeValues = new HashMap<>();`
	`566`	`+ Map<RuntimeValueKey<?>, RuntimeValue> runtimeValues = new HashMap<>();`
`567`	`567`
`568`		`- for (RuntimeValueKey key : RuntimeValueKeyRegistry.getRuntimeValueKeys()) {`
	`568`	`+ for (RuntimeValueKey<?> key : RuntimeValueKeyRegistry.getRuntimeValueKeys()) {`
`569`	`569`	`if (key.getIncludeAsLabel()) {`
`570`	`570`	`String value = labels.get(key.getKeyAsLabel());`
`571`	`571`	`if (value != null) {`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`public class ExistingContainerInfo {`
`32`	`32`
`33`	`33`	`public ExistingContainerInfo(String containerId,`
`34`		`- Map<RuntimeValueKey, RuntimeValue> runtimeValues,`
	`34`	`+ Map<RuntimeValueKey<?>, RuntimeValue> runtimeValues,`
`35`	`35`	`String image,`
`36`	`36`	`Map<Integer, Integer> portBindings,`
`37`	`37`	`Map<String, Object> parameters`
`@@ -45,7 +45,7 @@ public ExistingContainerInfo(String containerId,`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`private final String containerId;`
`48`		`- private final Map<RuntimeValueKey, RuntimeValue> runtimeValues;`
	`48`	`+ private final Map<RuntimeValueKey<?>, RuntimeValue> runtimeValues;`
`49`	`49`	`private final String image;`
`50`	`50`	`private final Map<Integer, Integer> portBindings;`
`51`	`51`	`private final Map<String, Object> parameters;`
`@@ -54,7 +54,7 @@ public String getContainerId() {`
`54`	`54`	`return containerId;`
`55`	`55`	`}`
`56`	`56`
`57`		`- public Map<RuntimeValueKey, RuntimeValue> getRuntimeValues() {`
	`57`	`+ public Map<RuntimeValueKey<?>, RuntimeValue> getRuntimeValues() {`
`58`	`58`	`return runtimeValues;`
`59`	`59`	`}`
`60`	`60`
`@@ -71,7 +71,7 @@ public Map<String, Object> getParameters() {`
`71`	`71`	`return parameters;`
`72`	`72`	`}`
`73`	`73`
`74`		`- public RuntimeValue getRuntimeValue(RuntimeValueKey key) {`
	`74`	`+ public RuntimeValue getRuntimeValue(RuntimeValueKey<?> key) {`
`75`	`75`	`return runtimeValues.get(key);`
`76`	`76`	`}`
`77`	`77`