Merge "revert few sonar fixes"

diff --git a/INFO.yaml b/INFO.yaml
index 3c821b8..5022087 100644 (file)
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -9,50 +9,67 @@ project_lead: &onap_releng_ptl
     company: 'ATT'
     timezone: 'America/Dallas'
 primary_contact: *onap_releng_ptl
+project_category: ''
 issue_tracking:
     type: 'jira'
     url: 'https://jira.onap.org/projects/DMAAP'
     key: 'DMAAP'
+mailing_list:
+    type: 'groups.io'
+    url: 'lists.onap.org'
+    tag: '<[sub-project_name]>'
+realtime_discussion: ''
 meetings:
     - type: 'zoom'
-        agenda: ''
-        url: 'https://wiki.onap.org/pages/viewpage.action?pageId=13599275'
-        server: 'n/a'
-        channel: 'n/a'
-        repeats: 'weekly'
-        time: '13:00 UTC'
+      agenda: ''
+      url: 'https://wiki.onap.org/pages/viewpage.action?pageId=13599275'
+      server: 'n/a'
+      channel: 'n/a'
+      repeats: 'weekly'
+      time: '13:00 UTC'
+repositories:
+    - 'dmaap-buscontroller'
+    - 'dmaap-datarouter'
+    - 'dmaap-dbcapi'
+    - 'dmaap-kafka11aaf'
+    - 'dmaap-messagerouter-dmaapclient'
+    - 'dmaap-messagerouter-messageservice'
+    - 'dmaap-messagerouter-mirroragent'
+    - 'dmaap-messagerouter-msgrtr'
+    - 'dmaap-oom'
+    - 'dmaap-zookeeper'
 committers:
     - <<: *onap_releng_ptl
     - name: 'Mandar Sawant'
-        email: 'ms5838@att.com'
-        company: 'ATT'
-        id: 'sawantmandar'
-        timezone: 'America/Dallas'
+      email: 'ms5838@att.com'
+      company: 'ATT'
+      id: 'sawantmandar'
+      timezone: 'America/Dallas'
     - name: 'Varun Gudisena'
-        email: 'vg411h@att.com'
-        company: 'ATT'
-        id: 'vg411h'
-        timezone: 'America/Dallas'
+      email: 'vg411h@att.com'
+      company: 'ATT'
+      id: 'vg411h'
+      timezone: 'America/Dallas'
     - name: 'Bhanu Ramesh'
-        email: 'bg6954@att.com'
-        company: 'ATT'
-        id: 'BhanuRamesh'
-        timezone: 'America/Dallas'
+      email: 'bg6954@att.com'
+      company: 'ATT'
+      id: 'BhanuRamesh'
+      timezone: 'America/Dallas'
     - name: 'Dominic Lunanuova'
-        email: 'dgl@research.att.com'
-        company: 'ATT'
-        id: 'dglFromAtt'
-        timezone: 'America/Dallas'
+      email: 'dgl@research.att.com'
+      company: 'ATT'
+      id: 'dglFromAtt'
+      timezone: 'America/Dallas'
     - name: 'Sunil Unnava'
-        email: 'su622b@att.com'
-        company: 'ATT'
-        id: 'su622b'
-        timezone: 'America/Louisville'
+      email: 'su622b@att.com'
+      company: 'ATT'
+      id: 'su622b'
+      timezone: 'America/Louisville'
     - name: 'Conor Ward'
-        email: 'conor.ward@ericsson.com'
-        company: 'ericsson'
-        id: 'econwar'
-        timezone: 'America/Dallas'
+      email: 'conor.ward@ericsson.com'
+      company: 'ericsson'
+      id: 'econwar'
+      timezone: 'America/Dallas'
 tsc:
     approval: 'https://lists.onap.org/pipermail/onap-tsc'
     changes:

diff --git a/src/main/java/org/onap/dmaap/mr/filter/ContentLengthFilter.java b/src/main/java/org/onap/dmaap/mr/filter/ContentLengthFilter.java
index a175b16..dbf4246 100644 (file)
--- a/src/main/java/org/onap/dmaap/mr/filter/ContentLengthFilter.java
+++ b/src/main/java/org/onap/dmaap/mr/filter/ContentLengthFilter.java
@@ -74,8 +74,6 @@ public class ContentLengthFilter implements Filter {
         */
        public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException,
                        ServletException {
-               // TODO Auto-generated method stub
-               // place your code here
                log.info("inside servlet do filter content length checking before pub/sub");
                HttpServletRequest request = (HttpServletRequest) req;
                JSONObject jsonObj = null;
@@ -105,12 +103,14 @@ public class ContentLengthFilter implements Filter {
                                chain.doFilter(req, res);
                        }
                } catch (CambriaApiException | NumberFormatException e) {
-                       log.error("message size is greater then default");
-                       ErrorResponse errRes = new ErrorResponse(HttpStatus.SC_EXPECTATION_FAILED,
-                                       DMaaPResponseCode.MSG_SIZE_EXCEEDS_MSG_LIMIT.getResponseCode(), errorMessages.getMsgSizeExceeds()
-                                                       + jsonObj.toString());
-                       log.info(errRes.toString());
-                       
+                       log.error("message size is greater then default", e);
+            if (jsonObj != null) {
+                ErrorResponse errRes = new ErrorResponse(HttpStatus.SC_EXPECTATION_FAILED,
+                        DMaaPResponseCode.MSG_SIZE_EXCEEDS_MSG_LIMIT.getResponseCode(),
+                        errorMessages.getMsgSizeExceeds()
+                                + jsonObj.toString());
+                log.info(errRes.toString());
+            }
                }
 
        }
@@ -119,14 +119,13 @@ public class ContentLengthFilter implements Filter {
         * @see Filter#init(FilterConfig)
         */
        public void init(FilterConfig fConfig) throws ServletException {
-               // TODO Auto-generated method stub
                this.filterConfig = fConfig;
                log.info("Filter Content Length Initialize");
                ApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(fConfig
                                .getServletContext());
                DefaultLength defLength = (DefaultLength) ctx.getBean("defLength");
-               DMaaPErrorMessages errorMessages = (DMaaPErrorMessages) ctx.getBean("DMaaPErrorMessages");
-               this.errorMessages = errorMessages;
+               DMaaPErrorMessages errMessages = (DMaaPErrorMessages) ctx.getBean("DMaaPErrorMessages");
+               this.errorMessages = errMessages;
                this.defaultLength = defLength;
 
        }

diff --git a/src/main/java/org/onap/dmaap/mr/filter/DefaultLength.java b/src/main/java/org/onap/dmaap/mr/filter/DefaultLength.java
index 598ef1b..3425823 100644 (file)
--- a/src/main/java/org/onap/dmaap/mr/filter/DefaultLength.java
+++ b/src/main/java/org/onap/dmaap/mr/filter/DefaultLength.java
@@ -24,14 +24,14 @@ package org.onap.dmaap.mr.filter;
 
 public class DefaultLength {
        
-       String defaultLength;
+       String defLength;
 
        public String getDefaultLength() {
-               return defaultLength;
+               return defLength;
        }
 
        public void setDefaultLength(String defaultLength) {
-               this.defaultLength = defaultLength;
+               this.defLength = defaultLength;
        }
 
 }