Fix sonar issues + merge

[aai/schema-service.git] / aai-schema-service / src / main / java / org / onap / aai / schemaservice / interceptors / post / ResponseHeaderManipulation.java

diff --git a/aai-schema-service/src/main/java/org/onap/aai/schemaservice/interceptors/post/ResponseHeaderManipulation.java b/aai-schema-service/src/main/java/org/onap/aai/schemaservice/interceptors/post/ResponseHeaderManipulation.java
index 6e3848c..76d14b6 100644 (file)
--- a/aai-schema-service/src/main/java/org/onap/aai/schemaservice/interceptors/post/ResponseHeaderManipulation.java
+++ b/aai-schema-service/src/main/java/org/onap/aai/schemaservice/interceptors/post/ResponseHeaderManipulation.java
@@ -7,9 +7,9 @@
  * 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
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
  * 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.
@@ -17,25 +17,28 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.aai.schemaservice.interceptors.post;
 
-import org.onap.aai.schemaservice.interceptors.AAIContainerFilter;
-import org.onap.aai.schemaservice.interceptors.AAIHeaderProperties;
+package org.onap.aai.schemaservice.interceptors.post;
 
+import java.io.IOException;
 import javax.annotation.Priority;
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.container.ContainerResponseContext;
 import javax.ws.rs.container.ContainerResponseFilter;
 import javax.ws.rs.core.MediaType;
-import java.io.IOException;
+import org.onap.aai.schemaservice.interceptors.AAIContainerFilter;
+import org.onap.aai.schemaservice.interceptors.AAIHeaderProperties;
 
 @Priority(AAIResponseFilterPriority.HEADER_MANIPULATION)
-public class ResponseHeaderManipulation extends AAIContainerFilter implements ContainerResponseFilter {
+public class ResponseHeaderManipulation extends AAIContainerFilter
+    implements ContainerResponseFilter {
 
     private static final String DEFAULT_XML_TYPE = MediaType.APPLICATION_XML;
+    private static final String CONTENT_TYPE_HEADER = "Content-Type";
 
     @Override
-    public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+    public void filter(ContainerRequestContext requestContext,
+                       ContainerResponseContext responseContext)
         throws IOException {
 
         updateResponseHeaders(requestContext, responseContext);
@@ -45,17 +48,17 @@ public class ResponseHeaderManipulation extends AAIContainerFilter implements Co
     private void updateResponseHeaders(ContainerRequestContext requestContext,
                                        ContainerResponseContext responseContext) {
 
-        responseContext.getHeaders().add(AAIHeaderProperties.AAI_TX_ID, requestContext.getProperty(AAIHeaderProperties.AAI_TX_ID));
+        responseContext.getHeaders().add(AAIHeaderProperties.AAI_TX_ID,
+            requestContext.getProperty(AAIHeaderProperties.AAI_TX_ID));
 
-        String responseContentType = responseContext.getHeaderString("Content-Type");
+        String responseContentType = responseContext.getHeaderString(CONTENT_TYPE_HEADER);
 
         if (responseContentType == null) {
             String acceptType = requestContext.getHeaderString("Accept");
-
             if (acceptType == null || "*/*".equals(acceptType)) {
-                responseContext.getHeaders().putSingle("Content-Type", DEFAULT_XML_TYPE);
+                responseContext.getHeaders().putSingle(CONTENT_TYPE_HEADER, DEFAULT_XML_TYPE);
             } else {
-                responseContext.getHeaders().putSingle("Content-Type", acceptType);
+                responseContext.getHeaders().putSingle(CONTENT_TYPE_HEADER, acceptType);
             }
         }