summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authordfarrelly <david.farrelly@est.tech>2019-07-24 16:17:13 +0000
committerdfarrelly <david.farrelly@est.tech>2019-07-24 16:17:13 +0000
commit924a805b71005f56fed260e1b92e4e27ef0a381f (patch)
treeebfa129f17b3b5d8cfb6091b9e18fa478d325aa1 /src/main/java
parent2c8ddf3501cfc5106d20b51ef077cc6d07ab65dc (diff)
Align PM Mapper to new build guidelines
*Switch to Fabric8 docker maven plugin *Add git commit plugin *Remove shaded jar *Remove some unused imports *Add a human readable log file Issue-ID: DCAEGEN2-1683 Change-Id: I1028f3195d3f03a9d919c91073398b01ccd6d7d1 Signed-off-by: dfarrelly <david.farrelly@est.tech>
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/org/onap/dcaegen2/services/pmmapper/App.java6
-rw-r--r--src/main/java/org/onap/dcaegen2/services/pmmapper/config/ConfigHandler.java3
-rw-r--r--src/main/java/org/onap/dcaegen2/services/pmmapper/healthcheck/HealthCheckHandler.java2
-rw-r--r--src/main/java/org/onap/dcaegen2/services/pmmapper/utils/DMaaPAdapter.java1
-rw-r--r--src/main/java/org/onap/dcaegen2/services/pmmapper/utils/RequestSender.java1
5 files changed, 9 insertions, 4 deletions
diff --git a/src/main/java/org/onap/dcaegen2/services/pmmapper/App.java b/src/main/java/org/onap/dcaegen2/services/pmmapper/App.java
index a5eb68d..11a91f8 100644
--- a/src/main/java/org/onap/dcaegen2/services/pmmapper/App.java
+++ b/src/main/java/org/onap/dcaegen2/services/pmmapper/App.java
@@ -20,6 +20,7 @@
package org.onap.dcaegen2.services.pmmapper;
+import ch.qos.logback.classic.util.ContextInitializer;
import io.undertow.Handlers;
import io.undertow.Undertow;
import io.undertow.util.StatusCodes;
@@ -60,6 +61,11 @@ import java.util.ArrayList;
import java.util.List;
public class App {
+
+ static {
+ System.setProperty(ContextInitializer.CONFIG_FILE_PROPERTY, "/opt/app/pm-mapper/etc/logback.xml");
+ }
+
private static final ONAPLogAdapter logger = new ONAPLogAdapter(LoggerFactory.getLogger(App.class));
private static Path mappingTemplate = Paths.get("/opt/app/pm-mapper/etc/mapping.ftl");
private static Path xmlSchema = Paths.get("/opt/app/pm-mapper/etc/measCollec_plusString.xsd");
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 e98849e..fef1d19 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
@@ -77,7 +77,8 @@ public class ConfigHandler {
} catch (Exception exception) {
throw new CBSServerError("Error connecting to Configbinding Service: ", exception);
} finally {
- logger.unwrap().info("Received pm-mapper configuration from ConfigBinding Service:\n{}", mapperConfigJson);
+ 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/healthcheck/HealthCheckHandler.java b/src/main/java/org/onap/dcaegen2/services/pmmapper/healthcheck/HealthCheckHandler.java
index 756ee7b..70a9596 100644
--- a/src/main/java/org/onap/dcaegen2/services/pmmapper/healthcheck/HealthCheckHandler.java
+++ b/src/main/java/org/onap/dcaegen2/services/pmmapper/healthcheck/HealthCheckHandler.java
@@ -39,7 +39,7 @@ public class HealthCheckHandler implements HttpHandler {
exchange.setStatusCode(StatusCodes.OK)
.getResponseSender()
.send(StatusCodes.OK_STRING);
-
+ logger.unwrap().info("Healthcheck request successful");
} finally {
logger.exiting();
}
diff --git a/src/main/java/org/onap/dcaegen2/services/pmmapper/utils/DMaaPAdapter.java b/src/main/java/org/onap/dcaegen2/services/pmmapper/utils/DMaaPAdapter.java
index fa01740..cc4413a 100644
--- a/src/main/java/org/onap/dcaegen2/services/pmmapper/utils/DMaaPAdapter.java
+++ b/src/main/java/org/onap/dcaegen2/services/pmmapper/utils/DMaaPAdapter.java
@@ -26,7 +26,6 @@ import com.google.gson.TypeAdapter;
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
-import java.util.Optional;
import org.onap.dcaegen2.services.pmmapper.model.PublisherConfig;
import org.onap.dcaegen2.services.pmmapper.model.SubscriberConfig;
diff --git a/src/main/java/org/onap/dcaegen2/services/pmmapper/utils/RequestSender.java b/src/main/java/org/onap/dcaegen2/services/pmmapper/utils/RequestSender.java
index ba57387..411196c 100644
--- a/src/main/java/org/onap/dcaegen2/services/pmmapper/utils/RequestSender.java
+++ b/src/main/java/org/onap/dcaegen2/services/pmmapper/utils/RequestSender.java
@@ -27,7 +27,6 @@ import java.io.OutputStream;
import java.net.HttpURLConnection;
import java.net.URL;
import java.nio.charset.StandardCharsets;
-import java.util.Base64;
import java.util.Optional;
import java.util.UUID;
import java.util.stream.Collectors;