Sonar Fixes, Formatting

[aaf/authz.git] / auth / auth-core / src / main / java / org / onap / aaf / auth / rserv / Route.java

diff --git a/auth/auth-core/src/main/java/org/onap/aaf/auth/rserv/Route.java b/auth/auth-core/src/main/java/org/onap/aaf/auth/rserv/Route.java
index 81b3d0a..a328284 100644 (file)
--- a/auth/auth-core/src/main/java/org/onap/aaf/auth/rserv/Route.java
+++ b/auth/auth-core/src/main/java/org/onap/aaf/auth/rserv/Route.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
- * 
+ *
  * 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.
@@ -36,49 +36,43 @@ public class Route<TRANS extends Trans> {
     public final String auditText;
     public final HttpMethods meth;
     public final String path;
-    
+
     private Match match;
     // package on purpose
     private final TypedCode<TRANS> content;
-    private final boolean isGet;
-    
+    private final boolean isContentType;
+
     public Route(HttpMethods meth, String path) {
         this.path = path;
         auditText = meth.name() + ' ' + path;
         this.meth = meth; // Note: Using Spark def for now.
-        isGet = meth.compareTo(HttpMethods.GET) == 0;
+        isContentType = meth.compareTo(HttpMethods.GET) == 0 || meth.compareTo(HttpMethods.DELETE)==0;
         match = new Match(path);
         content = new TypedCode<TRANS>();
     }
-    
+
     public void add(HttpCode<TRANS,?> code, String ... others) {
         code.match = match;
         content.add(code, others);
     }
-    
-//    public void add(HttpCode<TRANS,?> code, Class<?> cls, String version, String ... others) {
-//        code.match = match;
-//        content.add(code, cls, version, others);
-//    }
-//
+
     public HttpCode<TRANS,?> getCode(TRANS trans, HttpServletRequest req, HttpServletResponse resp) throws IOException, ServletException {
         // Type is associated with Accept for GET (since it is what is being returned
         // We associate the rest with ContentType.
         // FYI, thought about this a long time before implementing this way.
         String compare;
-//        String special[]; // todo, expose Charset (in special) to outside
-        if(isGet) {
+        if (isContentType) {
             compare = req.getHeader("Accept"); // Accept is used for read, as we want to agree on what caller is ready to handle
         } else {
             compare = req.getContentType(); // Content type used to declare what data is being created, updated or deleted (might be used for key)
         }
 
         Pair<String, Pair<HttpCode<TRANS, ?>, List<Pair<String, Object>>>> hl = content.prep(trans, compare);
-        if(hl==null) {
+        if (hl==null) {
             resp.setStatus(406); // NOT_ACCEPTABLE
         } else {
-            if(isGet) { // Set Content Type to expected content
-                if("*".equals(hl.x) || "*/*".equals(hl.x)) {// if wild-card, then choose first kind of type
+            if (isContentType) { // Set Content Type to expected content
+                if ("*".equals(hl.x) || "*/*".equals(hl.x)) {// if wild-card, then choose first kind of type
                     resp.setContentType(content.first());
                 } else {
                     resp.setContentType(hl.x);
@@ -88,11 +82,11 @@ public class Route<TRANS extends Trans> {
         }
         return null;
     }
-    
+
     public Route<TRANS> matches(String method, String path) {
         return meth.name().equalsIgnoreCase(method) && match.match(path)?this:null;
     }
-    
+
     public TimeTaken start(Trans trans, String auditText, HttpCode<TRANS,?> code, String type) {
         StringBuilder sb = new StringBuilder(auditText);
         sb.append(", ");
@@ -106,9 +100,9 @@ public class Route<TRANS extends Trans> {
     boolean resolvesTo(HttpMethods hm, String p) {
         return(path.equals(p) && hm.equals(meth));
     }
-    
+
     public String toString() {
-        return auditText + ' ' + content; 
+        return auditText + ' ' + content;
     }
 
     public String report(HttpCode<TRANS, ?> code) {