1 files changed, 31 insertions, 21 deletions

diff --git a/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/tasks/PublishedChecker.java b/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/tasks/PublishedChecker.java
index e18da248..4d8d679d 100644
--- a/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/tasks/PublishedChecker.java
+++ b/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/tasks/PublishedChecker.java
@@ -21,18 +21,23 @@
 package org.onap.dcaegen2.collectors.datafile.tasks;
 
 import java.io.InputStream;
+import java.net.MalformedURLException;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.time.Duration;
 import java.util.Map;
+
 import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
 import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.utils.URIBuilder;
 import org.onap.dcaegen2.collectors.datafile.configuration.AppConfig;
+import org.onap.dcaegen2.collectors.datafile.configuration.PublisherConfiguration;
+import org.onap.dcaegen2.collectors.datafile.exceptions.DatafileTaskException;
 import org.onap.dcaegen2.collectors.datafile.model.logging.MappedDiagnosticContext;
 import org.onap.dcaegen2.collectors.datafile.service.producer.DmaapProducerHttpClient;
-import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.config.DmaapPublisherConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
@@ -44,12 +49,9 @@ import org.slf4j.MDC;
  *
  */
 public class PublishedChecker {
-    private static final String FEEDLOG_TOPIC = "feedlog";
-    private static final String DEFAULT_FEED_ID = "1";
-    private static final Duration WEB_CLIENT_TIMEOUT = Duration.ofSeconds(4);
 
+    private static final Duration WEB_CLIENT_TIMEOUT = Duration.ofSeconds(4);
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
     private final AppConfig appConfig;
 
     /**
@@ -66,19 +68,24 @@ public class PublishedChecker {
      *
      * @param fileName the name of the file used when it is published.
      *
-     * @return <code>true</code> if the file has been published before, <code>false</code> otherwise.
+     * @return <code>true</code> if the file has been published before, <code>false</code>
+     *         otherwise.
+     * @throws DatafileTaskException if the check fails
      */
-    public boolean isFilePublished(String fileName, Map<String, String> contextMap) {
+    public boolean isFilePublished(String fileName, String changeIdentifier, Map<String, String> contextMap)
+            throws DatafileTaskException {
         MDC.setContextMap(contextMap);
-        DmaapProducerHttpClient producerClient = resolveClient();
+        PublisherConfiguration publisherConfig = resolveConfiguration(changeIdentifier);
+
+        DmaapProducerHttpClient producerClient = resolveClient(publisherConfig);
 
         HttpGet getRequest = new HttpGet();
         MappedDiagnosticContext.appendTraceInfo(getRequest);
 
-        getRequest.setURI(getPublishedQueryUri(fileName, producerClient));
-        producerClient.addUserCredentialsToHead(getRequest);
-
         try {
+            getRequest.setURI(getPublishedQueryUri(fileName, publisherConfig));
+            producerClient.addUserCredentialsToHead(getRequest);
+
             HttpResponse response = producerClient.getDmaapProducerResponseWithCustomTimeout(getRequest,
                     WEB_CLIENT_TIMEOUT, contextMap);
 
@@ -95,20 +102,23 @@ public class PublishedChecker {
         }
     }
 
-    private URI getPublishedQueryUri(String fileName, DmaapProducerHttpClient producerClient) {
-        return producerClient.getBaseUri() //
-                .pathSegment(FEEDLOG_TOPIC) //
-                .pathSegment(DEFAULT_FEED_ID) //
-                .queryParam("type", "pub") //
-                .queryParam("filename", fileName) //
+    private static URI getPublishedQueryUri(String fileName, PublisherConfiguration config) throws URISyntaxException {
+        return new URIBuilder(config.logUrl()) //
+                .addParameter("type", "pub") //
+                .addParameter("filename", fileName) //
                 .build();
     }
 
-    protected DmaapPublisherConfiguration resolveConfiguration() {
-        return appConfig.getDmaapPublisherConfiguration();
+    protected PublisherConfiguration resolveConfiguration(String changeIdentifier) throws DatafileTaskException {
+        return appConfig.getPublisherConfiguration(changeIdentifier);
     }
 
-    protected DmaapProducerHttpClient resolveClient() {
-        return new DmaapProducerHttpClient(resolveConfiguration());
+    protected DmaapProducerHttpClient resolveClient(PublisherConfiguration publisherConfig)
+            throws DatafileTaskException {
+        try {
+            return new DmaapProducerHttpClient(publisherConfig.toDmaap());
+        } catch (MalformedURLException e) {
+            throw new DatafileTaskException("Cannot create published checker client", e);
+        }
     }
 }