From f09604a09059d6c3ecf05b253c9058c1a2e81ca2 Mon Sep 17 00:00:00 2001 From: efiacor Date: Thu, 25 Jul 2019 11:05:54 +0000 Subject: FINAL unit test covergae commit Change-Id: Ieb9e9d49931c253b89026ed4884edbdc8d6c6024 Issue-ID: DMAAP-1226 Signed-off-by: efiacor --- .../datarouter/provisioning/ProxyServlet.java | 38 ++++++++++++---------- 1 file changed, 21 insertions(+), 17 deletions(-) (limited to 'datarouter-prov/src/main/java') diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/ProxyServlet.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/ProxyServlet.java index 75423602..e47f9fbb 100755 --- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/ProxyServlet.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/ProxyServlet.java @@ -24,6 +24,8 @@ package org.onap.dmaap.datarouter.provisioning; +import static org.onap.dmaap.datarouter.provisioning.utils.HttpServletUtils.sendResponseError; + import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -54,8 +56,6 @@ import org.apache.http.impl.client.DefaultHttpClient; import org.onap.dmaap.datarouter.provisioning.utils.DB; import org.onap.dmaap.datarouter.provisioning.utils.URLUtilities; -import static org.onap.dmaap.datarouter.provisioning.utils.HttpServletUtils.sendResponseError; - /** * This class is the base class for those servlets that need to proxy their requests from the standby to active server. * Its methods perform the proxy function to the active server. If the active server is not reachable, a 503 @@ -96,7 +96,7 @@ public class ProxyServlet extends BaseServlet { // We are connecting with the node name, but the certificate will have the CNAME // So we need to accept a non-matching certificate name SSLSocketFactory socketFactory = new SSLSocketFactory(keyStore, - props.getProperty(Main.KEYSTORE_PASS_PROPERTY), trustStore); + props.getProperty(Main.KEYSTORE_PASS_PROPERTY), trustStore); socketFactory.setHostnameVerifier(SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER); sch = new Scheme("https", 443, socketFactory); inited = true; @@ -125,7 +125,7 @@ public class ProxyServlet extends BaseServlet { * @param req the HTTP request * @return true or false */ - protected boolean isProxyOK(final HttpServletRequest req) { + boolean isProxyOK(final HttpServletRequest req) { String t = req.getQueryString(); if (t != null) { t = t.replaceAll("&", "&"); @@ -144,7 +144,7 @@ public class ProxyServlet extends BaseServlet { * * @return true if this server is the standby (and hence a proxy server). */ - public boolean isProxyServer() { + boolean isProxyServer() { SynchronizerTask st = SynchronizerTask.getSynchronizer(); return st.getPodState() == SynchronizerTask.STANDBY_POD; } @@ -187,7 +187,7 @@ public class ProxyServlet extends BaseServlet { * * @return true if the proxy succeeded */ - public boolean doGetWithFallback(HttpServletRequest req, HttpServletResponse resp) { + boolean doGetWithFallback(HttpServletRequest req, HttpServletResponse resp) { boolean rv = false; if (inited) { String url = buildUrl(req); @@ -234,12 +234,8 @@ public class ProxyServlet extends BaseServlet { // Copy request headers and request body copyRequestHeaders(req, proxy); - if ("POST".equals(method) || "PUT".equals(method)) { - BasicHttpEntity body = new BasicHttpEntity(); - body.setContent(req.getInputStream()); - body.setContentLength(-1); // -1 = unknown - proxy.setEntity(body); - } + + handlePutOrPost(req, method, proxy); // Execute the request HttpResponse pxyResponse = httpclient.execute(proxy); @@ -263,6 +259,15 @@ public class ProxyServlet extends BaseServlet { } } + private void handlePutOrPost(HttpServletRequest req, String method, ProxyHttpRequest proxy) throws IOException { + if ("POST".equals(method) || "PUT".equals(method)) { + BasicHttpEntity body = new BasicHttpEntity(); + body.setContent(req.getInputStream()); + body.setContentLength(-1); // -1 = unknown + proxy.setEntity(body); + } + } + private String buildUrl(HttpServletRequest req) { StringBuilder sb = new StringBuilder("https://"); sb.append(URLUtilities.getPeerPodName()); @@ -275,7 +280,6 @@ public class ProxyServlet extends BaseServlet { } private void copyRequestHeaders(HttpServletRequest from, HttpRequestBase to) { - @SuppressWarnings("unchecked") List list = Collections.list(from.getHeaderNames()); for (String name : list) { // Proxy code will add this one @@ -285,7 +289,7 @@ public class ProxyServlet extends BaseServlet { } } - private void copyResponseHeaders(HttpResponse from, HttpServletResponse to) { + void copyResponseHeaders(HttpResponse from, HttpServletResponse to) { for (Header hdr : from.getAllHeaders()) { // Don't copy Date: our Jetty will add another Date header if (!"Date".equals(hdr.getName())) { @@ -294,7 +298,7 @@ public class ProxyServlet extends BaseServlet { } } - private void copyEntityContent(HttpResponse pxyResponse, HttpServletResponse resp) { + void copyEntityContent(HttpResponse pxyResponse, HttpServletResponse resp) { HttpEntity entity = pxyResponse.getEntity(); if (entity != null) { try (InputStream in = entity.getContent()) { @@ -305,11 +309,11 @@ public class ProxyServlet extends BaseServlet { } } - public class ProxyHttpRequest extends HttpEntityEnclosingRequestBase { + public static class ProxyHttpRequest extends HttpEntityEnclosingRequestBase { private final String method; - public ProxyHttpRequest(final String method, final String uri) { + ProxyHttpRequest(final String method, final String uri) { super(); this.method = method; setURI(URI.create(uri)); -- cgit 1.2.3-korg