3 files changed, 22 insertions, 24 deletions

diff --git a/src/main/java/org/onap/dcae/ApplicationSettings.java b/src/main/java/org/onap/dcae/ApplicationSettings.java
index 7d5c7db2..9462a380 100644
--- a/src/main/java/org/onap/dcae/ApplicationSettings.java
+++ b/src/main/java/org/onap/dcae/ApplicationSettings.java
@@ -196,6 +196,10 @@ public class ApplicationSettings {
         return eventTransformations;
     }
 
+    public String getApiVersionDescriptionFilepath() {
+        return properties.getString("collector.description.api.version.location", "etc/api_version_description.json");
+    }
+
     private void loadPropertiesFromFile() {
         try {
             properties.load(configurationFileLocation);
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");
+    }
 }
diff --git a/src/main/java/org/onap/dcae/restapi/VesRestController.java b/src/main/java/org/onap/dcae/restapi/VesRestController.java
index de0392e6..0a5930f6 100644
--- a/src/main/java/org/onap/dcae/restapi/VesRestController.java
+++ b/src/main/java/org/onap/dcae/restapi/VesRestController.java
@@ -137,7 +137,7 @@ public class VesRestController {
     private CustomHeaderUtils createHeaderUtils(String version, HttpServletRequest request) {
         return new CustomHeaderUtils(version.toLowerCase().replace("v", ""),
                 headerUtils.extractHeaders(request),
-                headerUtils.getApiVerFilePath("api_version_config.json"),
+                settings.getApiVersionDescriptionFilepath(),
                 headerUtils.getRestApiIdentify(request.getRequestURI()));
 
     }