GNM-703
diff --git a/servicesDistributionDevLocal.json b/servicesDistributionDevLocal.json index d7ff796..ec1db9b 100644 --- a/servicesDistributionDevLocal.json +++ b/servicesDistributionDevLocal.json
@@ -61,6 +61,16 @@ "portApp": "9010", "portHealth": "9011", "description": "Mics Central Service-Configures and dispatches different service clusters for different modules" + }, + { + "active": "true", + "name": "cim-cache", + "protocol": "https", + "host": "169.50.13.154", + "urlPath": "/domain", + "portApp": "443", + "portHealth": "", + "description": "CIM-Cache Domain API" } ] }
diff --git a/servicesDistributionDevServer.json b/servicesDistributionDevServer.json index bd0136b..af6b818 100644 --- a/servicesDistributionDevServer.json +++ b/servicesDistributionDevServer.json
@@ -61,6 +61,16 @@ "portApp": "9010", "portHealth": "9011", "description": "Mics Central Service-Configures and dispatches different service clusters for different modules" + }, + { + "active": "true", + "name": "cim-cache", + "protocol": "https", + "host": "169.50.13.154", + "urlPath": "/domain", + "portApp": "443", + "portHealth": "", + "description": "CIM-Cache Domain API" } ] }
diff --git a/servicesDistributionDocker.json b/servicesDistributionDocker.json index b67cef1..b2afaa4 100644 --- a/servicesDistributionDocker.json +++ b/servicesDistributionDocker.json
@@ -50,6 +50,16 @@ "portApp": "9010", "portHealth": "9011", "description": "Mics Central Service-Configures and dispatches different service clusters for different modules" + }, + { + "active": "true", + "name": "cim-cache", + "protocol": "https", + "host": "169.50.13.154", + "urlPath": "/domain", + "portApp": "443", + "portHealth": "", + "description": "CIM-Cache Domain API" } ] }
diff --git a/src/main/java/org/eclipse/openk/api/ServiceRequestEnvelope.java b/src/main/java/org/eclipse/openk/api/ServiceRequestEnvelope.java index 76a9e2a..61abca8 100644 --- a/src/main/java/org/eclipse/openk/api/ServiceRequestEnvelope.java +++ b/src/main/java/org/eclipse/openk/api/ServiceRequestEnvelope.java
@@ -43,7 +43,6 @@ } private String serviceName; - private boolean isHttps; private String method; private String uriFragment; private String payload; @@ -60,16 +59,6 @@ } @JsonProperty - public boolean isHttps() { - return isHttps; - } - - @JsonProperty - public void setHttps(boolean https) { - isHttps = https; - } - - @JsonProperty public String getMethod() { return method; }
diff --git a/src/main/java/org/eclipse/openk/core/controller/DispatchController.java b/src/main/java/org/eclipse/openk/core/controller/DispatchController.java index 62cae57..68125bb 100644 --- a/src/main/java/org/eclipse/openk/core/controller/DispatchController.java +++ b/src/main/java/org/eclipse/openk/core/controller/DispatchController.java
@@ -30,7 +30,7 @@ private static Logger logger = Logger.getLogger(DispatchController.class); public Response dispatch(String clustername, ServiceRequestEnvelope envelope) throws HttpStatusException { - RestServiceWrapper rsWrap = createRestServiceWrapper(envelope.isHttps()); + List<RestServiceWrapper.HttpHeader> transformedList = Lists.newArrayList(envelope.getHeaders()).stream() .map(header -> RestServiceWrapper.createHeader(header.getAttribute(), header.getValue())).collect(toList()); @@ -39,6 +39,7 @@ clustername, envelope.getServiceName()) + envelope.getUriFragment(); + RestServiceWrapper rsWrap = createRestServiceWrapper(url.toUpperCase().startsWith("HTTPS")); return rsWrap.performHttpRequest(resolveMethod(envelope.getMethod()), url, transformedList, envelope.getPayloadDecode()); }
diff --git a/src/test/java/org/eclipse/openk/api/ServiceRequestEnvelopeTest.java b/src/test/java/org/eclipse/openk/api/ServiceRequestEnvelopeTest.java index 13b6ac5..8e8258f 100644 --- a/src/test/java/org/eclipse/openk/api/ServiceRequestEnvelopeTest.java +++ b/src/test/java/org/eclipse/openk/api/ServiceRequestEnvelopeTest.java
@@ -21,10 +21,9 @@ @Test public void testPojo() { - final String payload = "Testme Accurate"; + final String payload = "Testme Accurate"; final String payloadEncoded = Base64.encodeAsString(payload); ServiceRequestEnvelope env = new ServiceRequestEnvelope(); - env.setHttps(true); env.setMethod("POST"); env.setPayloadEncode(payload); env.setUriFragment("Fraggel"); @@ -39,7 +38,6 @@ headers[1].setValue("2ndValue"); env.setHeaders(headers); - assertEquals(true, env.isHttps()); assertEquals("POST", env.getMethod()); assertEquals(payload, env.getPayloadDecode()); assertEquals(payloadEncoded, env.getPayload());