Use latest workflow parent pom for workflow-frontend

- use 1.13.2-SNAPSHOT parent pom
- adjust SSLProxyServlet class to revert changes that were
  made for the jetty 10 upgrade
- add sleep for the TracingTest since the test sometimes fails
  because the trace is not exported fast enough in the background

Issue-ID: SDC-4734
Change-Id: I3b7f846136c55275d57859496f81f753497aa5b3
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

diff --git a/sdc-workflow-designer-be/src/test/java/org/onap/sdc/workflow/TracingTest.java b/sdc-workflow-designer-be/src/test/java/org/onap/sdc/workflow/TracingTest.java
index dd58a54..96bfb3a 100644 (file)
--- a/sdc-workflow-designer-be/src/test/java/org/onap/sdc/workflow/TracingTest.java
+++ b/sdc-workflow-designer-be/src/test/java/org/onap/sdc/workflow/TracingTest.java
@@ -80,6 +80,7 @@ public class TracingTest {
       .accept(MediaType.APPLICATION_JSON))
       .andExpect(MockMvcResultMatchers.status().isOk());
 
+    Thread.sleep(500);
     verify(postRequestedFor(urlEqualTo("/api/v2/spans")));
   }
 

diff --git a/sdc-workflow-designer-init/pom.xml b/sdc-workflow-designer-init/pom.xml
index 07ef830..7419c92 100644 (file)
--- a/sdc-workflow-designer-init/pom.xml
+++ b/sdc-workflow-designer-init/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.onap.sdc.sdc-workflow-designer</groupId>
         <artifactId>sdc-workflow-designer-parent</artifactId>
-        <version>1.13.1-SNAPSHOT</version>
+        <version>1.13.2-SNAPSHOT</version>
     </parent>
 
     <profiles>

diff --git a/sdc-workflow-designer-ui/pom.xml b/sdc-workflow-designer-ui/pom.xml
index c82f02d..c5d104e 100644 (file)
--- a/sdc-workflow-designer-ui/pom.xml
+++ b/sdc-workflow-designer-ui/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.sdc.sdc-workflow-designer</groupId>
         <artifactId>sdc-workflow-designer-parent</artifactId>
-        <version>1.13.1-SNAPSHOT</version>
+        <version>1.13.2-SNAPSHOT</version>
     </parent>
 
     <properties>

diff --git a/sdc-workflow-designer-ui/src/main/java/org/onap/workflow/web/SSLProxyServlet.java b/sdc-workflow-designer-ui/src/main/java/org/onap/workflow/web/SSLProxyServlet.java
index 91d456d..6491011 100644 (file)
--- a/sdc-workflow-designer-ui/src/main/java/org/onap/workflow/web/SSLProxyServlet.java
+++ b/sdc-workflow-designer-ui/src/main/java/org/onap/workflow/web/SSLProxyServlet.java
@@ -30,11 +30,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.api.Request;
-import org.eclipse.jetty.client.dynamic.HttpClientTransportDynamic;
-import org.eclipse.jetty.http.HttpFields;
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.http.HttpScheme;
-import org.eclipse.jetty.io.ClientConnector;
 import org.eclipse.jetty.proxy.ProxyServlet;
 import org.eclipse.jetty.util.URIUtil;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
@@ -116,12 +113,12 @@ public class SSLProxyServlet extends ProxyServlet {
         Enumeration<String> headerNames = request.getHeaderNames();
         while (headerNames.hasMoreElements()) {
             String headerName = headerNames.nextElement();
-            if (!proxyRequest.getHeaders().contains(headerName)) {
+            if (!proxyRequest.getHeaders().containsKey(headerName)) {
                 String headerVal = request.getHeader(headerName);
                 proxyRequest.header(headerName, headerVal);
             }
         }
-        ((HttpFields.Mutable) proxyRequest.getHeaders()).remove(HttpHeader.HOST);
+        proxyRequest.getHeaders().remove(HttpHeader.HOST);
         super.sendProxyRequest(request, response, proxyRequest);
 
     }
@@ -160,9 +157,7 @@ public class SSLProxyServlet extends ProxyServlet {
                     sslContextFactory.setIncludeCipherSuites(System.getProperty(KEYSTORE_CYPHER));
                 }
             }
-            ClientConnector clientConnector = new ClientConnector();
-            clientConnector.setSslContextFactory(sslContextFactory);
-            return new HttpClient(new HttpClientTransportDynamic(clientConnector));
+            return new HttpClient(sslContextFactory);
 
         } else {
             return super.newHttpClient();
@@ -181,6 +176,7 @@ public class SSLProxyServlet extends ProxyServlet {
         // calling the parent and setting the configuration for our implementation
         HttpClient client = super.createHttpClient();
         setTimeout(TIMEOUT);
+        client.setStopTimeout(TIMEOUT);
         client.setIdleTimeout(TIMEOUT);
         if (System.getProperty(MAX_POOL_CONNECTIONS) != null) {
             client.setMaxConnectionsPerDestination(