Code Review / dmaap / datarouter.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Checkstyle fixes for prov eelf and utils
[dmaap/datarouter.git] / datarouter-prov / src / main / java / org / onap / dmaap / datarouter / provisioning / utils / DRProvCadiFilter.java
diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DRProvCadiFilter.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DRProvCadiFilter.java
index d5521ba..8301bf9 100644 (file)
--- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DRProvCadiFilter.java
+++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DRProvCadiFilter.java
@@ -18,25 +18,25 @@
  * SPDX-License-Identifier: Apache-2.0
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.dmaap.datarouter.provisioning.utils;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
-import org.onap.aaf.cadi.PropAccess;
-import org.onap.aaf.cadi.filter.CadiFilter;
-import org.onap.dmaap.datarouter.provisioning.BaseServlet;
-import org.onap.dmaap.datarouter.provisioning.beans.EventLogRecord;
-import org.onap.dmaap.datarouter.provisioning.beans.Feed;
-import org.onap.dmaap.datarouter.provisioning.beans.Subscription;
-
+import java.io.IOException;
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 
+import org.onap.aaf.cadi.PropAccess;
+import org.onap.aaf.cadi.filter.CadiFilter;
+import org.onap.dmaap.datarouter.provisioning.BaseServlet;
+import org.onap.dmaap.datarouter.provisioning.beans.EventLogRecord;
+import org.onap.dmaap.datarouter.provisioning.beans.Feed;
+import org.onap.dmaap.datarouter.provisioning.beans.Subscription;
 
 public class DRProvCadiFilter extends CadiFilter {
     protected static EELFLogger eventlogger = EELFManager.getInstance().getLogger("EventLog");
@@ -48,25 +48,28 @@ public class DRProvCadiFilter extends CadiFilter {
     }
 
     @Override
-    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+            throws IOException, ServletException {
         HttpServletRequest httpRequest = (HttpServletRequest) request;
         HttpServletResponse httpResponse = (HttpServletResponse) response;
 
         EventLogRecord elr = new EventLogRecord(httpRequest);
-        String excludeAAF = httpRequest.getHeader(BaseServlet.EXCLUDE_AAF_HEADER);//send this param value as true, if want to add legacy feed/subscriber in AAF env
+        String excludeAAF = httpRequest.getHeader(BaseServlet.EXCLUDE_AAF_HEADER);
+        //send this param value as true, if want to add legacy feed/subscriber in AAF env
 
         String pathUrl = httpRequest.getServletPath();
-        if (!(pathUrl.contains("internal") ||
-                pathUrl.contains("sublog") ||
-                pathUrl.contains("feedlog") ||
-                pathUrl.contains("statistics") ||
-                pathUrl.contains("publish") ||
-                pathUrl.contains("group"))) {
+        if (!(pathUrl.contains("internal")
+                || pathUrl.contains("sublog")
+                || pathUrl.contains("feedlog")
+                || pathUrl.contains("statistics")
+                || pathUrl.contains("publish")
+                || pathUrl.contains("group"))) {
 
             String method = httpRequest.getMethod().toUpperCase();
-            if (!(method.equals("POST"))) { // if request method is PUT method (publish or Feed update) Needs to check for DELETE
+            if (!(method.equals("POST"))) {
+                // if request method is PUT method (publish or Feed update) Needs to check for DELETE
                 if (method.equals("PUT") || method.equals("DELETE")) {
-                    if ((pathUrl.contains("subs"))) {//edit subscriber
+                    if ((pathUrl.contains("subs"))) { //edit subscriber
                         int subId = BaseServlet.getIdFromPath(httpRequest);
                         if (subId <= 0) {
                             String message = String.format("Invalid request URI - %s", httpRequest.getPathInfo());
@@ -76,21 +79,23 @@ public class DRProvCadiFilter extends CadiFilter {
                             httpResponse.sendError(HttpServletResponse.SC_NOT_FOUND, message);
                             return;
                         }
-                        if (isAAFSubscriber(subId)) {//edit AAF Subscriber
-                            String message = String.format("DRProvCadiFilter - Edit AAF Subscriber : %d : AAF Instance - %s", subId, aafInstance);
+                        if (isAAFSubscriber(subId)) { //edit AAF Subscriber
+                            String message = String.format("DRProvCadiFilter - "
+                                            + "Edit AAF Subscriber : %d : AAF Instance - %s", subId, aafInstance);
                             elr.setMessage(message);
                             eventlogger.info(elr.toString());
-                            //request.setAttribute("aafInstance", aafInstance);// no need to set it in request since it is taken care in respective servlets
+                            //request.setAttribute("aafInstance", aafInstance);//
+                            // no need to set it in request since it is taken care in respective servlets
                             super.doFilter(request, response, chain);
 
-                        } else {//Edit or publish legacy Subscriber
+                        } else { //Edit or publish legacy Subscriber
                             String message = "DRProvCadiFilter - Edit/Publish Legacy Subscriber :" + subId;
                             elr.setMessage(message);
                             eventlogger.info(elr.toString());
                             chain.doFilter(request, response);
                         }
 
-                    } else {//edit or publish Feed
+                    } else { //edit or publish Feed
                         int feedId = BaseServlet.getIdFromPath(httpRequest);
                         if (feedId <= 0) {
                             String message = "Invalid request URI - " + httpRequest.getPathInfo();
@@ -101,28 +106,30 @@ public class DRProvCadiFilter extends CadiFilter {
                             return;
                         }
 
-                        if (isAAFFeed(feedId)) {//edit AAF Feed
-                            String message = "DRProvCadiFilter - Edit AAF Feed:" + feedId + ":" + "AAF Instance -" + aafInstance;
+                        if (isAAFFeed(feedId)) { //edit AAF Feed
+                            String message = "DRProvCadiFilter - Edit AAF Feed:"
+                                                     + feedId + ":" + "AAF Instance -" + aafInstance;
                             elr.setMessage(message);
                             eventlogger.info(elr.toString());
                             super.doFilter(request, response, chain);
 
-                        } else {//Edit or publish legacy Feed
+                        } else { //Edit or publish legacy Feed
                             String message = "DRProvCadiFilter - Edit/Publish Legacy Feed:" + feedId;
                             elr.setMessage(message);
                             eventlogger.info(elr.toString());
                             chain.doFilter(request, response);
                         }
                     }
-                } else {// in all other cases defaults to legacy behavior
-                    String message = "DRProvCadiFilter - Default Legacy Feed/Subscriber URI -:" + httpRequest.getPathInfo();
+                } else { // in all other cases defaults to legacy behavior
+                    String message = "DRProvCadiFilter - Default Legacy Feed/Subscriber URI -:"
+                                             + httpRequest.getPathInfo();
                     elr.setMessage(message);
                     eventlogger.info(elr.toString());
                     chain.doFilter(request, response);
                 }
             } else {
                 //check to add legacy/AAF subscriber
-                if ((pathUrl.contains("subscribe"))) {//add subscriber
+                if ((pathUrl.contains("subscribe"))) { //add subscriber
                     int feedId = BaseServlet.getIdFromPath(httpRequest);
                     if (feedId <= 0) {
                         String message = "Invalid request URI - " + httpRequest.getPathInfo();
@@ -132,47 +139,52 @@ public class DRProvCadiFilter extends CadiFilter {
                         httpResponse.sendError(HttpServletResponse.SC_NOT_FOUND, message);
                         return;
                     }
-                    if (isAAFFeed(feedId)) {//check if AAF Feed or legacy to add new subscriber
+                    if (isAAFFeed(feedId)) { //check if AAF Feed or legacy to add new subscriber
                         if (excludeAAF == null) {
-                            String message = "DRProvCadiFilter -Invalid request Header Parmeter " + BaseServlet.EXCLUDE_AAF_HEADER + " = " + httpRequest.getHeader(BaseServlet.EXCLUDE_AAF_HEADER);
+                            String message = "DRProvCadiFilter -Invalid request Header Parmeter "
+                                       + BaseServlet.EXCLUDE_AAF_HEADER
+                                       + " = " + httpRequest.getHeader(BaseServlet.EXCLUDE_AAF_HEADER);
                             elr.setMessage(message);
                             elr.setResult(HttpServletResponse.SC_BAD_REQUEST);
                             eventlogger.error(elr.toString());
                             httpResponse.sendError(HttpServletResponse.SC_BAD_REQUEST, message);
                             return;
                         }
-                        if (excludeAAF.equalsIgnoreCase("true")) {//Check to add legacy subscriber to AAF Feed
+                        if (excludeAAF.equalsIgnoreCase("true")) { //Check to add legacy subscriber to AAF Feed
                             String message = "DRProvCadiFilter - add legacy subscriber to AAF Feed, FeedID:" + feedId;
                             elr.setMessage(message);
                             eventlogger.info(elr.toString());
                             chain.doFilter(request, response);
                         } else {
-                            String message = "DRProvCadiFilter - Add AAF subscriber to AAF Feed, FeedID:" + feedId + ":" + "AAF Instance -" + aafInstance;
+                            String message = "DRProvCadiFilter - Add AAF subscriber to AAF Feed, FeedID:"
+                                                     + feedId + ":" + "AAF Instance -" + aafInstance;
                             elr.setMessage(message);
                             eventlogger.info(elr.toString());
                             super.doFilter(request, response, chain);
                         }
-                    } else {//Add legacy susbcriber to legacy Feed
+                    } else { //Add legacy susbcriber to legacy Feed
                         String message = "DRProvCadiFilter - add legacy subscriber to legacy Feed:" + feedId;
                         elr.setMessage(message);
                         eventlogger.info(elr.toString());
                         chain.doFilter(request, response);
                     }
-                } else {//add AAF feed
+                } else { //add AAF feed
                     if (excludeAAF == null) {
-                        String message = "DRProvCadiFilter -Invalid request Header Parmeter " + BaseServlet.EXCLUDE_AAF_HEADER + " = " + httpRequest.getHeader(BaseServlet.EXCLUDE_AAF_HEADER);
+                        String message = "DRProvCadiFilter -Invalid request Header Parmeter "
+                                                 + BaseServlet.EXCLUDE_AAF_HEADER
+                                                 + " = " + httpRequest.getHeader(BaseServlet.EXCLUDE_AAF_HEADER);
                         elr.setMessage(message);
                         elr.setResult(HttpServletResponse.SC_BAD_REQUEST);
                         eventlogger.error(elr.toString());
                         httpResponse.sendError(HttpServletResponse.SC_BAD_REQUEST, message);
                         return;
                     }
-                    if (excludeAAF.equalsIgnoreCase("true")) {//add legacy feed
+                    if (excludeAAF.equalsIgnoreCase("true")) { //add legacy feed
                         String message = "DRProvCadiFilter - Create new legacy Feed : EXCLUDE_AAF = " + excludeAAF;
                         elr.setMessage(message);
                         eventlogger.info(elr.toString());
                         chain.doFilter(request, response);
-                    } else {//add AAF Feed
+                    } else { //add AAF Feed
                         String message = "DRProvCadiFilter - Create new AAF Feed : EXCLUDE_AAF = " + excludeAAF;
                         elr.setMessage(message);
                         eventlogger.info(elr.toString());
@@ -197,7 +209,8 @@ public class DRProvCadiFilter extends CadiFilter {
         try {
             Feed feed = Feed.getFeedById(feedId);
             if (feed != null) {
-                if (!((feed.getAafInstance().equalsIgnoreCase("legacy")) || feed.getAafInstance() == null || feed.getAafInstance().equals(""))) { //also apply null check and empty check too
+                if (!((feed.getAafInstance().equalsIgnoreCase("legacy")) || feed.getAafInstance() == null
+                              || feed.getAafInstance().equals(""))) { //also apply null check and empty check too
                     aafInstance = feed.getAafInstance();
                     String message = "DRProvCadiFilter.isAAFFeed: aafInstance-:" + aafInstance + "; feedId:- " + feedId;
                     intlogger.debug(message);
@@ -228,9 +241,12 @@ public class DRProvCadiFilter extends CadiFilter {
         try {
             Subscription subscriber = Subscription.getSubscriptionById(subId);
             if (subscriber != null) {
-                if (!((subscriber.getAafInstance().equalsIgnoreCase("legacy")) || subscriber.getAafInstance() == null || subscriber.getAafInstance().equals(""))) { //also apply null check and empty check too
+                if (!((subscriber.getAafInstance().equalsIgnoreCase("legacy"))
+                              || subscriber.getAafInstance() == null
+                              || subscriber.getAafInstance().equals(""))) { //also apply null check and empty check too
                     aafInstance = subscriber.getAafInstance();
-                    String message = "DRProvCadiFilter.isAAFSubscriber: aafInstance-:" + aafInstance + "; subId:- " + subId;
+                    String message = "DRProvCadiFilter.isAAFSubscriber: aafInstance-:" + aafInstance + "; subId:- "
+                                             + subId;
                     intlogger.debug(message);
                     return true;
                 } else {
The Data Routing System project is intended to provide a common framework by which data producers can make data available to data consumers and a way for potential consumers to find feeds with the data they require. The interface to DR is exposed as a RESTful web service known as the DR Publishing and Delivery API