Fix bug throwing exception when first event is collected

- Problem: When running app from jar (e.g. in docker env) ClassLoader
badly interprete classpath as root of app jar, while resources are
located in jar under BOOT-INF/classes/ in Spring Boot apps.

- Solution: Moved file from resources to etc directory so ClassLoader
isn't needed. Filepath of api_version_description.json which
previously was badly resolved now is configured in collector.properties.

Change-Id: I690394cc59e16c95f5902045efc3fdaf13bf9112
Signed-off-by: Michal Banka <michal.banka@nokia.com>
Issue-ID: DCAEGEN2-2426

1 files changed, 17 insertions, 23 deletions

diff --git a/src/main/java/org/onap/dcae/common/HeaderUtils.java b/src/main/java/org/onap/dcae/common/HeaderUtils.java
index c046fb4c..81277d07 100644
--- a/src/main/java/org/onap/dcae/common/HeaderUtils.java
+++ b/src/main/java/org/onap/dcae/common/HeaderUtils.java
@@ -3,7 +3,7 @@
  * PROJECT
  * ================================================================================
  * Copyright (C) 2019 VMware, Inc. All rights reserved.
- * Copyright (C) 2019 Nokia. All rights reserved.s
+ * Copyright (C) 2019-2020 Nokia. 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.
@@ -23,39 +23,33 @@ package org.onap.dcae.common;
 
 import java.util.Collections;
 import java.util.Map;
-import java.util.Objects;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
 import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Component;
 
 /**
- * @author nil
+ * A class with methods used in HTTP header management.
  */
 @Component
 public class HeaderUtils {
 
-  public String getApiVerFilePath(String fileName) {
-    return Objects.requireNonNull(ClassLoader.getSystemClassLoader().getResource(fileName))
-        .getPath();
-  }
+    public String getRestApiIdentify(String uri) {
+        return isBatchRequest(uri) ? "eventListener_eventBatch" : "eventListener";
+    }
 
-  public String getRestApiIdentify(String uri) {
-    return isBatchRequest(uri) ? "eventListener_eventBatch" : "eventListener";
-  }
+    public Map<String, String> extractHeaders(HttpServletRequest request) {
+        return Collections.list(request.getHeaderNames()).stream()
+                .collect(Collectors.toMap(h -> h, request::getHeader));
+    }
 
-  public Map<String, String> extractHeaders(HttpServletRequest request) {
-    return Collections.list(request.getHeaderNames()).stream()
-        .collect(Collectors.toMap(h -> h, request::getHeader));
-  }
+    public HttpHeaders fillHeaders(Map<String, String> headers) {
+        HttpHeaders httpHeaders = new HttpHeaders();
+        httpHeaders.setAll(headers);
+        return httpHeaders;
+    }
 
-  public HttpHeaders fillHeaders(Map<String, String> headers) {
-    HttpHeaders httpHeaders = new HttpHeaders();
-    httpHeaders.setAll(headers);
-    return httpHeaders;
-  }
-
-  private boolean isBatchRequest(String request) {
-    return request.contains("eventBatch");
-  }
+    private boolean isBatchRequest(String request) {
+        return request.contains("eventBatch");
+    }
 }