VES 7.0.1 updates

Initial commit to include the support for below
- VES 7.1 API
- updated spec and data-format
- Response code update per new spec
- springfox for swagger doc
- New topic defaults

Todo
- Swagger instrumention to include necessary annotation
- Event Transformation 7.x to 5.x
- VES7.x response header
- AAF cert integration

Change-Id: I9bc2223fa362b35ae8a7105acd651fe524a403c5
Signed-off-by: VENKATESH KUMAR <vv770d@att.com>
Issue-ID: DCAEGEN2-600

2 files changed, 212 insertions, 144 deletions

diff --git a/src/main/java/org/onap/dcae/restapi/SwaggerConfig.java b/src/main/java/org/onap/dcae/restapi/SwaggerConfig.java
new file mode 100644
index 00000000..d8554cbe
--- /dev/null
+++ b/src/main/java/org/onap/dcae/restapi/SwaggerConfig.java
@@ -0,0 +1,55 @@
+/*
+ * ============LICENSE_START=======================================================
+ * PROJECT
+ * ================================================================================
+ * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.dcae.restapi;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+@Configuration
+@EnableSwagger2
+public class SwaggerConfig extends WebMvcConfigurationSupport {
+  @Bean
+  public Docket api() {
+    return new Docket(DocumentationType.SWAGGER_2)
+        .select()
+        .apis(RequestHandlerSelectors.any())
+        .paths(PathSelectors.any())
+        .build();
+  }
+
+  @Override
+  protected void addResourceHandlers(ResourceHandlerRegistry registry) {
+    registry
+        .addResourceHandler("swagger-ui.html")
+        .addResourceLocations("classpath:/META-INF/resources/");
+
+    registry
+        .addResourceHandler("/webjars/**")
+        .addResourceLocations("classpath:/META-INF/resources/webjars/");
+  }
+}
diff --git a/src/main/java/org/onap/dcae/restapi/VesRestController.java b/src/main/java/org/onap/dcae/restapi/VesRestController.java
index 92e8d004..58b52765 100644
--- a/src/main/java/org/onap/dcae/restapi/VesRestController.java
+++ b/src/main/java/org/onap/dcae/restapi/VesRestController.java
@@ -55,159 +55,172 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 public class VesRestController {
 
-    private static final Logger LOG = LoggerFactory.getLogger(VesRestController.class);
-
-    private static final String FALLBACK_VES_VERSION = "v5";
-
-    @Autowired
-    private ApplicationSettings collectorProperties;
-
-    @Autowired
-    private CollectorSchemas schemas;
-
-    @Autowired
-    @Qualifier("metriclog")
-    private Logger metriclog;
-
-    @Autowired
-    @Qualifier("incomingRequestsLogger")
-    private Logger incomingRequestsLogger;
-
-    @Autowired
-    @Qualifier("errorLog")
-    private Logger errorLog;
-
-    private LinkedBlockingQueue<JSONObject> inputQueue;
-    private String version;
-
-    @Autowired
-    VesRestController(@Qualifier("incomingRequestsLogger") Logger incomingRequestsLogger,
-                      @Qualifier("inputQueue") LinkedBlockingQueue<JSONObject> inputQueue) {
-        this.incomingRequestsLogger = incomingRequestsLogger;
-        this.inputQueue = inputQueue;
-    }
-
-    @GetMapping("/")
-    String mainPage() {
-        return "Welcome to VESCollector";
+  private static final Logger LOG = LoggerFactory.getLogger(VesRestController.class);
+
+  private static final String FALLBACK_VES_VERSION = "v5";
+
+  @Autowired private ApplicationSettings collectorProperties;
+
+  @Autowired private CollectorSchemas schemas;
+
+  @Autowired
+  @Qualifier("metriclog")
+  private Logger metriclog;
+
+  @Autowired
+  @Qualifier("incomingRequestsLogger")
+  private Logger incomingRequestsLogger;
+
+  @Autowired
+  @Qualifier("errorLog")
+  private Logger errorLog;
+
+  private LinkedBlockingQueue<JSONObject> inputQueue;
+  private String version;
+
+  @Autowired
+  VesRestController(
+      @Qualifier("incomingRequestsLogger") Logger incomingRequestsLogger,
+      @Qualifier("inputQueue") LinkedBlockingQueue<JSONObject> inputQueue) {
+    this.incomingRequestsLogger = incomingRequestsLogger;
+    this.inputQueue = inputQueue;
+  }
+
+  @GetMapping("/")
+  String mainPage() {
+    return "Welcome to VESCollector";
+  }
+
+  // refactor in next iteration
+  @PostMapping(
+      value = {
+        "/eventListener/v1",
+        "/eventListener/v1/eventBatch",
+        "/eventListener/v2",
+        "/eventListener/v2/eventBatch",
+        "/eventListener/v3",
+        "/eventListener/v3/eventBatch",
+        "/eventListener/v4",
+        "/eventListener/v4/eventBatch",
+        "/eventListener/v5",
+        "/eventListener/v5/eventBatch",
+        "/eventListener/v7",
+        "/eventListener/v7/eventBatch"
+      },
+      consumes = "application/json")
+  ResponseEntity<String> receiveEvent(
+      @RequestBody String jsonPayload, HttpServletRequest httpServletRequest) {
+    String request = httpServletRequest.getRequestURI();
+    extractVersion(request);
+
+    JSONObject jsonObject;
+    try {
+      jsonObject = new JSONObject(jsonPayload);
+    } catch (Exception e) {
+      return ResponseEntity.badRequest().body(ApiException.INVALID_JSON_INPUT.toJSON().toString());
     }
 
-    //refactor in next iteration
-    @PostMapping(value = {"/eventListener/v1",
-            "/eventListener/v1/eventBatch",
-            "/eventListener/v2",
-            "/eventListener/v2/eventBatch",
-            "/eventListener/v3",
-            "/eventListener/v3/eventBatch",
-            "/eventListener/v4",
-            "/eventListener/v4/eventBatch",
-            "/eventListener/v5",
-            "/eventListener/v5/eventBatch"}, consumes = "application/json")
-    ResponseEntity<String> receiveEvent(@RequestBody String jsonPayload, HttpServletRequest httpServletRequest) {
-        String request = httpServletRequest.getRequestURI();
-        extractVersion(request);
-
-        JSONObject jsonObject;
-        try {
-            jsonObject = new JSONObject(jsonPayload);
-        } catch (Exception e) {
-            return ResponseEntity.badRequest().body(ApiException.INVALID_JSON_INPUT.toJSON().toString());
-        }
+    String uuid = setUpECOMPLoggingForRequest();
+    incomingRequestsLogger.info(
+        String.format(
+            "Received a VESEvent '%s', marked with unique identifier '%s', on api version '%s', from host: '%s'",
+            jsonObject, uuid, version, httpServletRequest.getRemoteHost()));
 
-        String uuid = setUpECOMPLoggingForRequest();
-        incomingRequestsLogger.info(String.format(
-                "Received a VESEvent '%s', marked with unique identifier '%s', on api version '%s', from host: '%s'",
-                jsonObject, uuid, version, httpServletRequest.getRemoteHost()));
-
-        if (collectorProperties.jsonSchemaValidationEnabled()) {
-            if (isBatchRequest(request) && (jsonObject.has("eventList") && (!jsonObject.has("event")))) {
-                if (!conformsToSchema(jsonObject, version)) {
-                    return errorResponse(ApiException.SCHEMA_VALIDATION_FAILED);
-                }
-            } else if (!isBatchRequest(request) && (!jsonObject.has("eventList") && (jsonObject.has("event")))) {
-                if (!conformsToSchema(jsonObject, version)) {
-                    return errorResponse(ApiException.SCHEMA_VALIDATION_FAILED);
-                }
-            } else {
-                return errorResponse(ApiException.INVALID_JSON_INPUT);
-            }
+    if (collectorProperties.jsonSchemaValidationEnabled()) {
+      if (isBatchRequest(request) && (jsonObject.has("eventList") && (!jsonObject.has("event")))) {
+        if (!conformsToSchema(jsonObject, version)) {
+          return errorResponse(ApiException.SCHEMA_VALIDATION_FAILED);
         }
-
-        JSONArray commonlyFormatted = convertToJSONArrayCommonFormat(jsonObject, request, uuid, version);
-
-        if (!putEventsOnProcessingQueue(commonlyFormatted)) {
-            errorLog.error("EVENT_RECEIPT_FAILURE: QueueFull " + ApiException.NO_SERVER_RESOURCES);
-            return errorResponse(ApiException.NO_SERVER_RESOURCES);
+      } else if (!isBatchRequest(request)
+          && (!jsonObject.has("eventList") && (jsonObject.has("event")))) {
+        if (!conformsToSchema(jsonObject, version)) {
+          return errorResponse(ApiException.SCHEMA_VALIDATION_FAILED);
         }
-        return ok().contentType(MediaType.APPLICATION_JSON).body("Message Accepted");
-    }
-
-    private void extractVersion(String httpServletRequest) {
-        version = httpServletRequest.split("/")[2];
+      } else {
+        return errorResponse(ApiException.INVALID_JSON_INPUT);
+      }
     }
 
-    private ResponseEntity<String> errorResponse(ApiException noServerResources) {
-        return ResponseEntity.status(noServerResources.httpStatusCode)
-                .body(noServerResources.toJSON().toString());
-    }
-
-    private boolean putEventsOnProcessingQueue(JSONArray arrayOfEvents) {
-        for (int i = 0; i < arrayOfEvents.length(); i++) {
-            metriclog.info("EVENT_PUBLISH_START");
-            if (!inputQueue.offer((JSONObject) arrayOfEvents.get(i))) {
-                return false;
-            }
-        }
-        LOG.debug("CommonStartup.handleEvents:EVENTS has been published successfully!");
-        metriclog.info("EVENT_PUBLISH_END");
-        return true;
-    }
+    JSONArray commonlyFormatted =
+        convertToJSONArrayCommonFormat(jsonObject, request, uuid, version);
 
-    private boolean conformsToSchema(JSONObject payload, String version) {
-        try {
-            JsonSchema schema = ofNullable(schemas.getJSONSchemasMap(version).get(version))
-                    .orElse(schemas.getJSONSchemasMap(version).get(FALLBACK_VES_VERSION));
-            ProcessingReport report = schema.validate(JsonLoader.fromString(payload.toString()));
-            if (!report.isSuccess()) {
-                LOG.warn("Schema validation failed for event: " + payload);
-                stream(report.spliterator(), false).forEach(e -> LOG.warn(e.getMessage()));
-                return false;
-            }
-            return report.isSuccess();
-        } catch (Exception e) {
-            throw new RuntimeException("Unable to validate against schema", e);
-        }
+    if (!putEventsOnProcessingQueue(commonlyFormatted)) {
+      errorLog.error("EVENT_RECEIPT_FAILURE: QueueFull " + ApiException.NO_SERVER_RESOURCES);
+      return errorResponse(ApiException.NO_SERVER_RESOURCES);
     }
-
-    private static JSONArray convertToJSONArrayCommonFormat(JSONObject jsonObject, String request,
-                                                            String uuid, String version) {
-        JSONArray asArrayEvents = new JSONArray();
-        String vesUniqueIdKey = "VESuniqueId";
-        String vesVersionKey = "VESversion";
-        if (isBatchRequest(request)) {
-            JSONArray events = jsonObject.getJSONArray("eventList");
-            for (int i = 0; i < events.length(); i++) {
-                JSONObject event = new JSONObject().put("event", events.getJSONObject(i));
-                event.put(vesUniqueIdKey, uuid + "-" + i);
-                event.put(vesVersionKey, version);
-                asArrayEvents.put(event);
-            }
-        } else {
-            jsonObject.put(vesUniqueIdKey, uuid);
-            jsonObject.put(vesVersionKey, version);
-            asArrayEvents = new JSONArray().put(jsonObject);
-        }
-        return asArrayEvents;
+    // HttpStatus.SC_NO_CONTENT
+    return org.springframework.http.ResponseEntity.accepted()
+        .contentType(MediaType.APPLICATION_JSON)
+        .body("Accepted");
+  }
+
+  private void extractVersion(String httpServletRequest) {
+    version = httpServletRequest.split("/")[2];
+  }
+
+  private ResponseEntity<String> errorResponse(ApiException noServerResources) {
+    return ResponseEntity.status(noServerResources.httpStatusCode)
+        .body(noServerResources.toJSON().toString());
+  }
+
+  private boolean putEventsOnProcessingQueue(JSONArray arrayOfEvents) {
+    for (int i = 0; i < arrayOfEvents.length(); i++) {
+      metriclog.info("EVENT_PUBLISH_START");
+      if (!inputQueue.offer((JSONObject) arrayOfEvents.get(i))) {
+        return false;
+      }
     }
-
-    private static String setUpECOMPLoggingForRequest() {
-        final UUID uuid = UUID.randomUUID();
-        LoggingContext localLC = VESLogger.getLoggingContextForThread(uuid);
-        localLC.put(EcompFields.kBeginTimestampMs, SaClock.now());
-        return uuid.toString();
+    LOG.debug("CommonStartup.handleEvents:EVENTS has been published successfully!");
+    metriclog.info("EVENT_PUBLISH_END");
+    return true;
+  }
+
+  private boolean conformsToSchema(JSONObject payload, String version) {
+    try {
+      JsonSchema schema =
+          ofNullable(schemas.getJSONSchemasMap(version).get(version))
+              .orElse(schemas.getJSONSchemasMap(version).get(FALLBACK_VES_VERSION));
+      ProcessingReport report = schema.validate(JsonLoader.fromString(payload.toString()));
+      if (!report.isSuccess()) {
+        LOG.warn("Schema validation failed for event: " + payload);
+        stream(report.spliterator(), false).forEach(e -> LOG.warn(e.getMessage()));
+        return false;
+      }
+      return report.isSuccess();
+    } catch (Exception e) {
+      throw new RuntimeException("Unable to validate against schema", e);
     }
-
-    private static boolean isBatchRequest(String request) {
-        return request.contains("eventBatch");
+  }
+
+  private static JSONArray convertToJSONArrayCommonFormat(
+      JSONObject jsonObject, String request, String uuid, String version) {
+    JSONArray asArrayEvents = new JSONArray();
+    String vesUniqueIdKey = "VESuniqueId";
+    String vesVersionKey = "VESversion";
+    if (isBatchRequest(request)) {
+      JSONArray events = jsonObject.getJSONArray("eventList");
+      for (int i = 0; i < events.length(); i++) {
+        JSONObject event = new JSONObject().put("event", events.getJSONObject(i));
+        event.put(vesUniqueIdKey, uuid + "-" + i);
+        event.put(vesVersionKey, version);
+        asArrayEvents.put(event);
+      }
+    } else {
+      jsonObject.put(vesUniqueIdKey, uuid);
+      jsonObject.put(vesVersionKey, version);
+      asArrayEvents = new JSONArray().put(jsonObject);
     }
-}
\ No newline at end of file
+    return asArrayEvents;
+  }
+
+  private static String setUpECOMPLoggingForRequest() {
+    final UUID uuid = UUID.randomUUID();
+    LoggingContext localLC = VESLogger.getLoggingContextForThread(uuid);
+    localLC.put(EcompFields.kBeginTimestampMs, SaClock.now());
+    return uuid.toString();
+  }
+
+  private static boolean isBatchRequest(String request) {
+    return request.contains("eventBatch");
+  }
+}