Code Review
/
dmaap
/
datarouter.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove major and minor code smells in dr-prov
[dmaap/datarouter.git]
/
datarouter-prov
/
src
/
main
/
java
/
org
/
onap
/
dmaap
/
datarouter
/
provisioning
/
ProxyServlet.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
ca63f46
..
7791777
100755
(executable)
--- 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
@@
-101,7
+101,7
@@
public class ProxyServlet extends BaseServlet {
sch = new Scheme("https", 443, socketFactory);
inited = true;
} catch (Exception e) {
sch = new Scheme("https", 443, socketFactory);
inited = true;
} catch (Exception e) {
- intlogger.error("ProxyServlet
: " + e.getMessage()
);
+ intlogger.error("ProxyServlet
.init: " + e.getMessage(), e
);
}
intlogger.info("ProxyServlet: inited = " + inited);
}
}
intlogger.info("ProxyServlet: inited = " + inited);
}
@@
-111,7
+111,7
@@
public class ProxyServlet extends BaseServlet {
try (FileInputStream instream = new FileInputStream(new File(store))) {
ks.load(instream, pass.toCharArray());
} catch (FileNotFoundException fileNotFoundException) {
try (FileInputStream instream = new FileInputStream(new File(store))) {
ks.load(instream, pass.toCharArray());
} catch (FileNotFoundException fileNotFoundException) {
- intlogger.error("ProxyServlet
: " + fileNotFoundException.getMessage()
);
+ intlogger.error("ProxyServlet
.readStore: " + fileNotFoundException.getMessage(), fileNotFoundException
);
} catch (Exception x) {
intlogger.error("READING TRUSTSTORE: " + x);
}
} catch (Exception x) {
intlogger.error("READING TRUSTSTORE: " + x);
}
@@
-130,7
+130,7
@@
public class ProxyServlet extends BaseServlet {
if (t != null) {
t = t.replaceAll("&", "&");
for (String s : t.split("&")) {
if (t != null) {
t = t.replaceAll("&", "&");
for (String s : t.split("&")) {
- if (
s.equals("noproxy"
) || s.startsWith("noproxy=")) {
+ if (
"noproxy".equals(s
) || s.startsWith("noproxy=")) {
return false;
}
}
return false;
}
}
@@
-211,7
+211,7
@@
public class ProxyServlet extends BaseServlet {
rv = true;
} catch (IOException e) {
rv = true;
} catch (IOException e) {
- intlogger.error("ProxyServlet
: " + e.getMessage()
);
+ intlogger.error("ProxyServlet
.doGetWithFallback: " + e.getMessage(), e
);
} finally {
proxy.releaseConnection();
httpclient.getConnectionManager().shutdown();
} finally {
proxy.releaseConnection();
httpclient.getConnectionManager().shutdown();
@@
-234,7
+234,7
@@
public class ProxyServlet extends BaseServlet {
// Copy request headers and request body
copyRequestHeaders(req, proxy);
// Copy request headers and request body
copyRequestHeaders(req, proxy);
- if (
method.equals("POST") || method.equals("PUT"
)) {
+ if (
"POST".equals(method) || "PUT".equals(method
)) {
BasicHttpEntity body = new BasicHttpEntity();
body.setContent(req.getInputStream());
body.setContentLength(-1); // -1 = unknown
BasicHttpEntity body = new BasicHttpEntity();
body.setContent(req.getInputStream());
body.setContentLength(-1); // -1 = unknown
@@
-250,7
+250,7
@@
public class ProxyServlet extends BaseServlet {
copyResponseHeaders(pxyResponse, resp);
copyEntityContent(pxyResponse, resp);
} catch (IOException e) {
copyResponseHeaders(pxyResponse, resp);
copyEntityContent(pxyResponse, resp);
} catch (IOException e) {
- intlogger.warn("ProxyServlet
: " +
e);
+ intlogger.warn("ProxyServlet
.doProxy: " + e.getMessage(),
e);
sendResponseError(resp, HttpServletResponse.SC_SERVICE_UNAVAILABLE, "", intlogger);
} finally {
proxy.releaseConnection();
sendResponseError(resp, HttpServletResponse.SC_SERVICE_UNAVAILABLE, "", intlogger);
} finally {
proxy.releaseConnection();
@@
-279,7
+279,7
@@
public class ProxyServlet extends BaseServlet {
List<String> list = Collections.list(from.getHeaderNames());
for (String name : list) {
// Proxy code will add this one
List<String> list = Collections.list(from.getHeaderNames());
for (String name : list) {
// Proxy code will add this one
- if (!
name.equalsIgnoreCase("Content-Length"
)) {
+ if (!
"Content-Length".equalsIgnoreCase(name
)) {
to.addHeader(name, from.getHeader(name));
}
}
to.addHeader(name, from.getHeader(name));
}
}
@@
-288,7
+288,7
@@
public class ProxyServlet extends BaseServlet {
private void copyResponseHeaders(HttpResponse from, HttpServletResponse to) {
for (Header hdr : from.getAllHeaders()) {
// Don't copy Date: our Jetty will add another Date header
private void copyResponseHeaders(HttpResponse from, HttpServletResponse to) {
for (Header hdr : from.getAllHeaders()) {
// Don't copy Date: our Jetty will add another Date header
- if (!
hdr.getName().equals("Date"
)) {
+ if (!
"Date".equals(hdr.getName()
)) {
to.addHeader(hdr.getName(), hdr.getValue());
}
}
to.addHeader(hdr.getName(), hdr.getValue());
}
}
@@
-300,7
+300,7
@@
public class ProxyServlet extends BaseServlet {
try (InputStream in = entity.getContent()) {
IOUtils.copy(in, resp.getOutputStream());
} catch (Exception e) {
try (InputStream in = entity.getContent()) {
IOUtils.copy(in, resp.getOutputStream());
} catch (Exception e) {
- intlogger.error("
Exception: " + e.getMessage()
);
+ intlogger.error("
ProxyServlet.copyEntityContent: " + e.getMessage(), e
);
}
}
}
}
}
}