[SDNC-5] Rebase sdnc-core

Upgrade to OpenDaylight Boron release, and sync changes made since 16.10 release to ONAP SDN-C distribution

Change-Id: I20bef9e6d0008c4436b5624ce839bbb70ecc20a5
Signed-off-by: Dan Timoney <dtimoney@att.com>

4 files changed, 316 insertions, 5 deletions

diff --git a/filters/provider/pom.xml b/filters/provider/pom.xml
index cf31a0c..6afa2d2 100755
--- a/filters/provider/pom.xml
+++ b/filters/provider/pom.xml
@@ -49,7 +49,11 @@
                         <artifactId>commons-codec</artifactId>
                         <version>${commons.codec.version}</version>
                 </dependency>
-
+                <dependency>
+                	<groupId>org.openecomp.sdnc.core</groupId>
+                	<artifactId>sli-common</artifactId>
+                	<version>${sdnctl.sli.version}</version>
+                </dependency>
 <!--
 		<dependency>
 			<groupId>mysql</groupId>
diff --git a/filters/provider/src/main/java/org/openecomp/sdnc/filters/LogFilter.java b/filters/provider/src/main/java/org/openecomp/sdnc/filters/LogFilter.java
index 40100c3..809cfb2 100644
--- a/filters/provider/src/main/java/org/openecomp/sdnc/filters/LogFilter.java
+++ b/filters/provider/src/main/java/org/openecomp/sdnc/filters/LogFilter.java
@@ -47,7 +47,7 @@ import java.util.TimeZone;
 
 
 /**
- * Logs IN request according ECOMP Logging Guidelines
+ * Logs IN request according ECOMP Logging Guidelines at https://tspace.web.att.com/viewer/app/lcfiles/ae5f7751-39da-4c6b-8a83-5836c8c815e1/content
  */
 public class LogFilter implements Filter {
 
diff --git a/filters/provider/src/main/java/org/openecomp/sdnc/filters/RequestResponseDbLoggingFilter.java b/filters/provider/src/main/java/org/openecomp/sdnc/filters/RequestResponseDbLoggingFilter.java
new file mode 100644
index 0000000..183301b
--- /dev/null
+++ b/filters/provider/src/main/java/org/openecomp/sdnc/filters/RequestResponseDbLoggingFilter.java
@@ -0,0 +1,297 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * openECOMP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdnc.filters;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.util.zip.GZIPInputStream;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletInputStream;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.openecomp.sdnc.sli.MessageWriter;
+
+public class RequestResponseDbLoggingFilter implements Filter {
+
+	private static Logger log = LoggerFactory.getLogger(RequestResponseDbLoggingFilter.class);
+
+	public static final String REQUEST_ID = "X-ECOMP-RequestID";
+
+	private static class ByteArrayServletStream extends ServletOutputStream {
+
+		ByteArrayOutputStream baos;
+
+		ByteArrayServletStream(ByteArrayOutputStream baos) {
+			this.baos = baos;
+		}
+
+		@Override
+		public void write(int param) throws IOException {
+			baos.write(param);
+		}
+	}
+
+	private static class ByteArrayPrintWriter {
+
+		private ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+		private PrintWriter pw = new PrintWriter(baos);
+
+		private ServletOutputStream sos = new ByteArrayServletStream(baos);
+
+		public PrintWriter getWriter() {
+			return pw;
+		}
+
+		public ServletOutputStream getStream() {
+			return sos;
+		}
+
+		byte[] toByteArray() {
+			return baos.toByteArray();
+		}
+	}
+
+	private class BufferedServletInputStream extends ServletInputStream {
+
+		ByteArrayInputStream bais;
+
+		public BufferedServletInputStream(ByteArrayInputStream bais) {
+			this.bais = bais;
+		}
+
+		@Override
+		public int available() {
+			return bais.available();
+		}
+
+		@Override
+		public int read() {
+			return bais.read();
+		}
+
+		@Override
+		public int read(byte[] buf, int off, int len) {
+			return bais.read(buf, off, len);
+		}
+
+	}
+
+	private class BufferedRequestWrapper extends HttpServletRequestWrapper {
+
+		ByteArrayInputStream bais;
+
+		ByteArrayOutputStream baos;
+
+		BufferedServletInputStream bsis;
+
+		byte[] buffer;
+
+		public BufferedRequestWrapper(HttpServletRequest req) throws IOException {
+			super(req);
+
+			InputStream is = req.getInputStream();
+			baos = new ByteArrayOutputStream();
+			byte buf[] = new byte[1024];
+			int letti;
+			while ((letti = is.read(buf)) > 0) {
+				baos.write(buf, 0, letti);
+			}
+			buffer = baos.toByteArray();
+
+		}
+
+		@Override
+		public ServletInputStream getInputStream() {
+			try {
+				bais = new ByteArrayInputStream(buffer);
+				bsis = new BufferedServletInputStream(bais);
+			} catch (Exception ex) {
+				ex.printStackTrace();
+			}
+
+			return bsis;
+		}
+
+		public byte[] getBuffer() {
+			return buffer;
+		}
+
+	}
+
+	@Override
+	public void init(FilterConfig filterConfig) throws ServletException {
+	}
+
+	@Override
+	public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain filterChain)
+	        throws IOException, ServletException {
+
+		if (request == null || !(request instanceof HttpServletRequest)) {
+			filterChain.doFilter(request, response);
+			return;
+		}
+
+		long t1 = System.currentTimeMillis();
+
+		final HttpServletRequest httpRequest = (HttpServletRequest) request;
+		BufferedRequestWrapper bufferedRequest = new BufferedRequestWrapper(httpRequest);
+
+		String requestId = httpRequest.getHeader(REQUEST_ID);
+		if (requestId == null || requestId.trim().length() == 0) {
+			log.warn("Could not write request in DB: " + REQUEST_ID + " is missing in the HTTP headers.");
+			return;
+		}
+
+		String requestHost = request.getRemoteHost();
+		if (requestHost == null)
+			requestHost = request.getRemoteAddr();
+
+		String requestStr = new String(bufferedRequest.getBuffer());
+
+		MessageWriter.saveIncomingRequest(requestId, null, requestHost, requestStr);
+
+		long t2 = System.currentTimeMillis();
+
+		log.info("Request saved in DB for request-id: " + requestId + ". TIme: " + (t2 - t1));
+
+		final HttpServletResponse httpResponse = (HttpServletResponse) response;
+
+		final ByteArrayPrintWriter pw = new ByteArrayPrintWriter();
+		HttpServletResponse wrappedResp = new HttpServletResponseWrapper(httpResponse) {
+
+			@Override
+			public PrintWriter getWriter() {
+				return pw.getWriter();
+			}
+
+			@Override
+			public ServletOutputStream getOutputStream() {
+				return pw.getStream();
+			}
+		};
+
+		try {
+
+			filterChain.doFilter(bufferedRequest, wrappedResp);
+
+		} finally {
+
+			if (request != null && request instanceof HttpServletRequest) {
+
+				t1 = System.currentTimeMillis();
+
+				byte[] bytes = pw.toByteArray();
+				response.getOutputStream().write(bytes);
+				response.getOutputStream().flush();
+
+				String responseStr = null;
+				if ("gzip".equals(httpResponse.getHeader("Content-Encoding"))) {
+					responseStr = decompressGZIPByteArray(bytes);
+				} else {
+					responseStr = new String(bytes);
+				}
+
+				MessageWriter.saveIncomingResponse(requestId, httpResponse.getStatus(), responseStr);
+
+				t2 = System.currentTimeMillis();
+
+				log.info("Response saved in DB for request-id: " + requestId + ". TIme: " + (t2 - t1));
+			}
+		}
+
+	}
+
+	@Override
+	public void destroy() {
+	}
+
+	private String decompressGZIPByteArray(byte[] bytes) {
+
+		BufferedReader in = null;
+		InputStreamReader inR = null;
+		ByteArrayInputStream byteS = null;
+		GZIPInputStream gzS = null;
+		StringBuilder str = new StringBuilder();
+		try {
+			byteS = new ByteArrayInputStream(bytes);
+			gzS = new GZIPInputStream(byteS);
+			inR = new InputStreamReader(gzS);
+			in = new BufferedReader(inR);
+
+			if (in != null) {
+
+				String content;
+
+				while ((content = in.readLine()) != null) {
+					str.append(content);
+				}
+			}
+
+		} catch (Exception e) {
+			log.error("Failed get read GZIPInputStream", e);
+		} finally {
+
+			if (byteS != null)
+				try {
+					byteS.close();
+				} catch (IOException e1) {
+					log.error("Failed to close ByteStream", e1);
+				}
+			if (gzS != null)
+				try {
+					gzS.close();
+				} catch (IOException e2) {
+					log.error("Failed to close GZStream", e2);
+				}
+			if (inR != null)
+				try {
+					inR.close();
+				} catch (IOException e3) {
+					log.error("Failed to close InputReader", e3);
+				}
+			if (in != null)
+				try {
+					in.close();
+				} catch (IOException e) {
+					log.error("Failed to close BufferedReader", e);
+				}
+		}
+		return str.toString();
+	}
+}
diff --git a/filters/provider/src/main/java/org/openecomp/sdnc/filters/RequestResponseLoggingFilter.java b/filters/provider/src/main/java/org/openecomp/sdnc/filters/RequestResponseLoggingFilter.java
index 48f0689..b15932f 100644
--- a/filters/provider/src/main/java/org/openecomp/sdnc/filters/RequestResponseLoggingFilter.java
+++ b/filters/provider/src/main/java/org/openecomp/sdnc/filters/RequestResponseLoggingFilter.java
@@ -30,7 +30,6 @@ import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.util.Enumeration;
 import java.util.zip.GZIPInputStream;
-import java.util.zip.Inflater;
 
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
@@ -57,6 +56,7 @@ public class RequestResponseLoggingFilter implements Filter {
 			this.baos = baos;
 		}
 
+		@Override
 		public void write(int param) throws IOException {
 			baos.write(param);
 		}
@@ -91,14 +91,17 @@ public class RequestResponseLoggingFilter implements Filter {
 			this.bais = bais;
 		}
 
+		@Override
 		public int available() {
 			return bais.available();
 		}
 
+		@Override
 		public int read() {
 			return bais.read();
 		}
 
+		@Override
 		public int read(byte[] buf, int off, int len) {
 			return bais.read(buf, off, len);
 		}
@@ -129,6 +132,7 @@ public class RequestResponseLoggingFilter implements Filter {
 
 		}
 
+		@Override
 		public ServletInputStream getInputStream() {
 			try {
 				bais = new ByteArrayInputStream(buffer);
@@ -146,9 +150,11 @@ public class RequestResponseLoggingFilter implements Filter {
 
 	}
 
+	@Override
 	public void init(FilterConfig filterConfig) throws ServletException {
 	}
 
+	@Override
 	public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain)
 			throws IOException, ServletException {
 
@@ -177,10 +183,12 @@ public class RequestResponseLoggingFilter implements Filter {
 
 		final ByteArrayPrintWriter pw = new ByteArrayPrintWriter();
 		HttpServletResponse wrappedResp = new HttpServletResponseWrapper(response) {
+			@Override
 			public PrintWriter getWriter() {
 				return pw.getWriter();
 			}
 
+			@Override
 			public ServletOutputStream getOutputStream() {
 				return pw.getStream();
 			}
@@ -188,15 +196,16 @@ public class RequestResponseLoggingFilter implements Filter {
 		};
 
 		try {
-			
+
 		filterChain.doFilter(bufferedRequest, wrappedResp);
-		
+
 		}catch (Exception e){
 			log.error("Chain Exception",e);
 			throw e;
 		} finally {
 		byte[] bytes = pw.toByteArray();
 		response.getOutputStream().write(bytes);
+		response.getOutputStream().flush();
 
 		StringBuilder responseHeaders = new StringBuilder("RESPONSE HEADERS|");
 
@@ -220,6 +229,7 @@ public class RequestResponseLoggingFilter implements Filter {
 		}
 	}
 
+	@Override
 	public void destroy() {
 	}