1 files changed, 3 insertions, 31 deletions
diff --git a/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/configuration/PublisherConfiguration.java b/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/configuration/PublisherConfiguration.java
index d7451bdb..fa7d7841 100644
--- a/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/configuration/PublisherConfiguration.java
+++ b/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/configuration/PublisherConfiguration.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START======================================================================
  * Copyright (C) 2018,2019 Nordix Foundation. All rights reserved.
+ * Copyright (C) 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. You may obtain a copy of the License at
@@ -16,13 +17,10 @@
 
 package org.onap.dcaegen2.collectors.datafile.configuration;
 
-import java.net.MalformedURLException;
-import java.net.URL;
 
 import org.immutables.gson.Gson;
 import org.immutables.value.Value;
-import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.config.DmaapPublisherConfiguration;
-import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.config.ImmutableDmaapPublisherConfiguration;
+
 
 @Value.Immutable
 @Value.Style(redactedMask = "####")
@@ -36,7 +34,7 @@ public interface PublisherConfiguration {
     String userName();
 
     @Value.Redacted
-    String passWord();
+    String password();
 
     String trustStorePath();
 
@@ -50,30 +48,4 @@ public interface PublisherConfiguration {
 
     String changeIdentifier();
 
-    /**
-     * Get the publisher configuration in SDK format.
-     *
-     * @return a <code>DmaapPublisherConfiguration</code> contining the publisher configuration.
-     * @throws MalformedURLException if the publish URL is malformed.
-     */
-    default DmaapPublisherConfiguration toDmaap() throws MalformedURLException {
-        URL url = new URL(publishUrl());
-        String urlPath = url.getPath();
-
-        return new ImmutableDmaapPublisherConfiguration.Builder() //
-            .endpointUrl(publishUrl()) //
-            .dmaapContentType("application/octet-stream") //
-            .dmaapPortNumber(url.getPort()) //
-            .dmaapHostName(url.getHost()) //
-            .dmaapTopicName(urlPath) //
-            .dmaapProtocol(url.getProtocol()) //
-            .dmaapUserName(this.userName()) //
-            .dmaapUserPassword(this.passWord()) //
-            .trustStorePath(this.trustStorePath()) //
-            .trustStorePasswordPath(this.trustStorePasswordPath()) //
-            .keyStorePath(this.keyStorePath()) //
-            .keyStorePasswordPath(this.keyStorePasswordPath()) //
-            .enableDmaapCertAuth(this.enableDmaapCertAuth()) //
-            .build();
-    }
 }