diff options
| author |   Piotr Wielebski <piotr.wielebski@nokia.com> | 2019-05-31 12:10:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-05-31 12:10:41 +0000 |
| commit | 20c84fd46a3cf1ffa2e07e740cdccc3c1b77c13c (patch) | |
| tree | fe3d962113e4ccb452b307a1a07332dd74d72d52 /prh-app-server/src/main/java | |
| parent | 4fba32ec50d81f3cfa860e95357732722c08ae26 (diff) | |
| parent | bd4a0ac841a80a95bca881546dbb4421b354ef9f (diff) | |
Merge "replace local copy of 'MdcVariables' with one from SDK"
Diffstat (limited to 'prh-app-server/src/main/java')
| -rw-r--r-- | prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/MainApp.java | 6 | ||||
| -rw-r--r-- | prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasks.java | 12 |
2 files changed, 10 insertions, 8 deletions
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/MainApp.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/MainApp.java index 6ce5d64a..60955eae 100644 --- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/MainApp.java +++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/MainApp.java @@ -20,9 +20,6 @@ package org.onap.dcaegen2.services.prh; -import static org.onap.dcaegen2.services.prh.model.logging.MdcVariables.INVOCATION_ID; -import static org.onap.dcaegen2.services.prh.model.logging.MdcVariables.REQUEST_ID; - import java.util.Map; import java.util.UUID; import org.onap.dcaegen2.services.prh.configuration.ConsulConfigFileReader; @@ -37,6 +34,8 @@ import org.springframework.scheduling.TaskScheduler; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.concurrent.ConcurrentTaskScheduler; +import static org.onap.dcaegen2.services.sdk.rest.services.model.logging.MdcVariables.INVOCATION_ID; + /** * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 3/23/18 */ @@ -51,7 +50,6 @@ public class MainApp { @Bean Map<String, String> mdcContextMap() { - MDC.put(REQUEST_ID, "SampleRequestID"); MDC.put(INVOCATION_ID, UUID.randomUUID().toString()); return MDC.getCopyOfContextMap(); } diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasks.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasks.java index dbcde5c8..5d438e37 100644 --- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasks.java +++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasks.java @@ -23,9 +23,13 @@ package org.onap.dcaegen2.services.prh.tasks; import org.onap.dcaegen2.services.prh.exceptions.DmaapEmptyResponseException; import org.onap.dcaegen2.services.prh.exceptions.PrhTaskException; import org.onap.dcaegen2.services.prh.model.ConsumerDmaapModel; -import org.onap.dcaegen2.services.prh.model.logging.MdcVariables; import org.onap.dcaegen2.services.sdk.rest.services.dmaap.client.model.MessageRouterPublishResponse; -import org.slf4j.*; +import org.onap.dcaegen2.services.sdk.rest.services.model.logging.MdcVariables; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.MDC; +import org.slf4j.Marker; +import org.slf4j.MarkerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.http.HttpStatus; @@ -39,8 +43,8 @@ import java.util.UUID; import java.util.concurrent.CountDownLatch; import java.util.function.Predicate; -import static org.onap.dcaegen2.services.prh.model.logging.MdcVariables.INSTANCE_UUID; -import static org.onap.dcaegen2.services.prh.model.logging.MdcVariables.RESPONSE_CODE; +import static org.onap.dcaegen2.services.sdk.rest.services.model.logging.MdcVariables.INSTANCE_UUID; +import static org.onap.dcaegen2.services.sdk.rest.services.model.logging.MdcVariables.RESPONSE_CODE; /** * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 3/23/18 |