diff options
Diffstat (limited to 'src/main/java')
3 files changed, 28 insertions, 5 deletions
diff --git a/src/main/java/org/onap/dcaegen2/services/pmmapper/config/ConfigHandler.java b/src/main/java/org/onap/dcaegen2/services/pmmapper/config/ConfigHandler.java index 273c953..31fa145 100644 --- a/src/main/java/org/onap/dcaegen2/services/pmmapper/config/ConfigHandler.java +++ b/src/main/java/org/onap/dcaegen2/services/pmmapper/config/ConfigHandler.java @@ -73,9 +73,6 @@ public class ConfigHandler { mapperConfigJson = sender.send(requestURL); } catch (Exception exception) { throw new CBSServerError("Error connecting to Configbinding Service: ", exception); - } finally { - logger.unwrap().info("Received pm-mapper configuration from ConfigBinding Service: \n"); - logger.unwrap().debug(mapperConfigJson); } return convertMapperConfigToObject(mapperConfigJson); diff --git a/src/main/java/org/onap/dcaegen2/services/pmmapper/model/MapperConfig.java b/src/main/java/org/onap/dcaegen2/services/pmmapper/model/MapperConfig.java index ac315ac..a71696b 100644 --- a/src/main/java/org/onap/dcaegen2/services/pmmapper/model/MapperConfig.java +++ b/src/main/java/org/onap/dcaegen2/services/pmmapper/model/MapperConfig.java @@ -25,7 +25,6 @@ import com.google.gson.annotations.SerializedName; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; -import lombok.ToString; import org.onap.dcaegen2.services.pmmapper.config.Configurable; import org.onap.dcaegen2.services.pmmapper.utils.DMaaPAdapter; import org.onap.dcaegen2.services.pmmapper.utils.GSONRequired; @@ -34,7 +33,6 @@ import org.onap.dcaegen2.services.pmmapper.utils.MeasFilterConfigAdapter; @Getter @EqualsAndHashCode @NoArgsConstructor -@ToString public class MapperConfig implements Configurable { public static final String CLIENT_NAME = "pm-mapper"; @@ -112,4 +110,21 @@ public class MapperConfig implements Configurable { this.aafPassword = mapperConfig.getAafPassword(); } } + + @Override + public String toString() { + return "MapperConfig{" + + "enableHttp=" + enableHttp + + ", keyStorePath='" + keyStorePath + '\'' + + ", keyStorePassPath='" + keyStorePassPath + '\'' + + ", trustStorePath='" + trustStorePath + '\'' + + ", trustStorePassPath='" + trustStorePassPath + '\'' + + ", dmaapDRDeleteEndpoint='" + dmaapDRDeleteEndpoint + '\'' + + ", filterConfig=" + filterConfig + + ", aafUsername='" + aafUsername + '\'' + + ", aafPassword= *****" + + ", subscriberConfig=" + subscriberConfig + + ", publisherConfig=" + publisherConfig + + '}'; + } }
\ No newline at end of file diff --git a/src/main/java/org/onap/dcaegen2/services/pmmapper/model/SubscriberConfig.java b/src/main/java/org/onap/dcaegen2/services/pmmapper/model/SubscriberConfig.java index 65f680b..c53d36d 100644 --- a/src/main/java/org/onap/dcaegen2/services/pmmapper/model/SubscriberConfig.java +++ b/src/main/java/org/onap/dcaegen2/services/pmmapper/model/SubscriberConfig.java @@ -44,4 +44,15 @@ public class SubscriberConfig { @GSONRequired @SerializedName("subscriber_id") private String subscriberId; + + @Override + public String toString() { + return "SubscriberConfig{" + + "username=" + username + + ", password= *****" + + ", drLocation='" + drLocation + '\'' + + ", deliveryUrl='" + deliveryUrl + '\'' + + ", subscriberId='" + subscriberId + '\'' + + '}'; + } } |