Fix simple Sonar Lint issues

Address all the trivial Sonar issues (ignoring some duplicated strings)

Change-Id: I5a15d42e6ae316f4c5b1dea5f42f604cec8c82a8
Issue-ID: AAI-1650
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>

1 files changed, 76 insertions, 79 deletions

diff --git a/src/main/java/org/onap/aai/sa/rest/AnalyzerApi.java b/src/main/java/org/onap/aai/sa/rest/AnalyzerApi.java
index 59b526f..664124d 100644
--- a/src/main/java/org/onap/aai/sa/rest/AnalyzerApi.java
+++ b/src/main/java/org/onap/aai/sa/rest/AnalyzerApi.java
@@ -1,4 +1,4 @@
-/**
+/**
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
@@ -46,116 +46,113 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/services/search-data-service/v1/analyzers/search")
 public class AnalyzerApi {
 
-    private SearchServiceApi searchService = null;
+  private SearchServiceApi searchService = null;
 
-    // Set up the loggers.
-    private static Logger logger = LoggerFactory.getInstance().getLogger(IndexApi.class.getName());
+  // Set up the loggers.
+  private static Logger logger = LoggerFactory.getInstance().getLogger(IndexApi.class.getName());
     private static Logger auditLogger = LoggerFactory.getInstance().getAuditLogger(IndexApi.class.getName());
 
-    public AnalyzerApi(@Qualifier("searchServiceApi") SearchServiceApi searchService) {
-        this.searchService = searchService;
-    }
+  public AnalyzerApi( @Qualifier("searchServiceApi") SearchServiceApi searchService) {
+    this.searchService = searchService;
+  }
 
     @RequestMapping(method = RequestMethod.GET, consumes = {"application/json"}, produces = {"application/json"})
     public ResponseEntity<String> processGet(HttpServletRequest request, @RequestHeader HttpHeaders headers,
-            ApiUtils apiUtils) {
+                                           ApiUtils apiUtils) {
 
-        HttpStatus responseCode = HttpStatus.INTERNAL_SERVER_ERROR;
-        String responseString = "Undefined error";
+    HttpStatus responseCode = HttpStatus.INTERNAL_SERVER_ERROR;
+        String responseString;
 
-        // Initialize the MDC Context for logging purposes.
-        ApiUtils.initMdcContext(request, headers);
+    // Initialize the MDC Context for logging purposes.
+    ApiUtils.initMdcContext(request, headers);
 
-        // Validate that the request is correctly authenticated before going
-        // any further.
-        try {
+    // Validate that the request is correctly authenticated before going
+    // any further.
+    try {
 
             if (!searchService.validateRequest(headers, request, ApiUtils.Action.GET,
                     ApiUtils.SEARCH_AUTH_POLICY_NAME)) {
-                logger.warn(SearchDbMsgs.GET_ANALYZERS_FAILURE, "Authentication failure.");
+        logger.warn(SearchDbMsgs.GET_ANALYZERS_FAILURE, "Authentication failure.");
                 return ResponseEntity.status(HttpStatus.FORBIDDEN).contentType(MediaType.APPLICATION_JSON)
                         .body("Authentication failure.");
-            }
+      }
 
-        } catch (Exception e) {
+    } catch (Exception e) {
 
-            logger.warn(SearchDbMsgs.GET_ANALYZERS_FAILURE,
-                    "Unexpected authentication failure - cause: " + e.getMessage());
+      logger.warn(SearchDbMsgs.GET_ANALYZERS_FAILURE,
+          "Unexpected authentication failure - cause: " + e.getMessage());
             return ResponseEntity.status(HttpStatus.FORBIDDEN).contentType(MediaType.APPLICATION_JSON)
                     .body("Authentication failure.");
-        }
+    }
 
 
-        // Now, build the list of analyzers.
-        try {
+    // Now, build the list of analyzers.
+    try {
             responseString = buildAnalyzerList(ElasticSearchHttpController.getInstance().getAnalysisConfig());
-            responseCode = HttpStatus.OK;
-
-        } catch (Exception e) {
-
-            logger.warn(SearchDbMsgs.GET_ANALYZERS_FAILURE,
-                    "Unexpected failure retrieving analysis configuration - cause: " + e.getMessage());
-            responseString = "Failed to retrieve analysis configuration.  Cause: " + e.getMessage();
-        }
+      responseCode = HttpStatus.OK;
+    } catch (Exception e) {
+      logger.warn(SearchDbMsgs.GET_ANALYZERS_FAILURE,
+          "Unexpected failure retrieving analysis configuration - cause: " + e.getMessage());
+      responseString = "Failed to retrieve analysis configuration.  Cause: " + e.getMessage();
+    }
 
-        // Build the HTTP response.
-        ResponseEntity response =
+    // Build the HTTP response.
+        ResponseEntity<String> response =
                 ResponseEntity.status(responseCode).contentType(MediaType.APPLICATION_JSON).body(responseString);
 
-        // Generate our audit log.
-        auditLogger.info(SearchDbMsgs.PROCESS_REST_REQUEST,
+    // Generate our audit log.
+    auditLogger.info(SearchDbMsgs.PROCESS_REST_REQUEST,
                 new LogFields().setField(LogLine.DefinedFields.RESPONSE_CODE, responseCode.value())
-                        .setField(LogLine.DefinedFields.RESPONSE_DESCRIPTION, responseCode.value()),
-                (request != null) ? request.getMethod() : "Unknown",
-                (request != null) ? request.getRequestURL().toString() : "Unknown",
-                (request != null) ? request.getRemoteHost() : "Unknown",
-                Integer.toString(response.getStatusCodeValue()));
-
-        // Clear the MDC context so that no other transaction inadvertently
-        // uses our transaction id.
-        ApiUtils.clearMdcContext();
+            .setField(LogLine.DefinedFields.RESPONSE_DESCRIPTION, responseCode.value()),
+        (request != null) ? request.getMethod() : "Unknown",
+        (request != null) ? request.getRequestURL ().toString () : "Unknown",
+        (request != null) ? request.getRemoteHost () : "Unknown",
+        Integer.toString(response.getStatusCodeValue ()));
 
-        return response;
-    }
+    // Clear the MDC context so that no other transaction inadvertently
+    // uses our transaction id.
+    ApiUtils.clearMdcContext();
 
+    return response;
+  }
 
-    /**
+  /**
      * This method takes a list of analyzer objects and generates a simple json structure to enumerate them.
-     *
+   *
      * <p>
      * Note, this includes only the aspects of the analyzer object that we want to make public to an external client.
-     *
+   *
      * @param analysisConfig - The analysis configuration object to extract the analyzers from.
-     * @return - A json string enumerating the defined analyzers.
-     */
-    private String buildAnalyzerList(AnalysisConfiguration analysisConfig) {
-
-        StringBuilder sb = new StringBuilder();
-
-        sb.append("{");
-        AtomicBoolean firstAnalyzer = new AtomicBoolean(true);
-        for (AnalyzerSchema analyzer : analysisConfig.getAnalyzers()) {
-
-            if (!firstAnalyzer.compareAndSet(true, false)) {
-                sb.append(", ");
-            }
-
-            sb.append("{");
-            sb.append("\"name\": \"").append(analyzer.getName()).append("\", ");
-            sb.append("\"description\": \"").append(analyzer.getDescription()).append("\", ");
-            sb.append("\"behaviours\": [");
-            AtomicBoolean firstBehaviour = new AtomicBoolean(true);
-            for (String behaviour : analyzer.getBehaviours()) {
-                if (!firstBehaviour.compareAndSet(true, false)) {
-                    sb.append(", ");
-                }
-                sb.append("\"").append(behaviour).append("\"");
-            }
-            sb.append("]");
-            sb.append("}");
+   * @return - A json string enumerating the defined analyzers.
+   */
+  private String buildAnalyzerList(AnalysisConfiguration analysisConfig) {
+
+    StringBuilder sb = new StringBuilder();
+
+    sb.append("{");
+    AtomicBoolean firstAnalyzer = new AtomicBoolean(true);
+    for (AnalyzerSchema analyzer : analysisConfig.getAnalyzers()) {
+
+      if (!firstAnalyzer.compareAndSet(true, false)) {
+        sb.append(", ");
+      }
+
+      sb.append("{");
+      sb.append("\"name\": \"").append(analyzer.getName()).append("\", ");
+      sb.append("\"description\": \"").append(analyzer.getDescription()).append("\", ");
+      sb.append("\"behaviours\": [");
+      AtomicBoolean firstBehaviour = new AtomicBoolean(true);
+      for (String behaviour : analyzer.getBehaviours()) {
+        if (!firstBehaviour.compareAndSet(true, false)) {
+          sb.append(", ");
         }
-        sb.append("}");
-
-        return sb.toString();
+        sb.append("\"").append(behaviour).append("\"");
+      }
+      sb.append("]");
+      sb.append("}");
     }
+    sb.append("}");
+
+    return sb.toString();
+  }
 }