aboutsummaryrefslogtreecommitdiffstats
path: root/prh-commons/src
diff options
context:
space:
mode:
Diffstat (limited to 'prh-commons/src')
-rw-r--r--prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/logging/MDCVariables.java43
-rw-r--r--prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/utils/HttpUtils.java3
-rw-r--r--prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/CommonFunctionsTest.java5
3 files changed, 47 insertions, 4 deletions
diff --git a/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/logging/MDCVariables.java b/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/logging/MDCVariables.java
new file mode 100644
index 00000000..33d0c87d
--- /dev/null
+++ b/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/logging/MDCVariables.java
@@ -0,0 +1,43 @@
+/*
+ * ============LICENSE_START=======================================================
+ * PNF-REGISTRATION-HANDLER
+ * ================================================================================
+ * Copyright (C) 2018 NOKIA Intellectual Property. 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.dcaegen2.services.prh.model.logging;
+
+import java.util.Map;
+import org.slf4j.MDC;
+
+public final class MDCVariables {
+
+ public static final String X_ONAP_REQUEST_ID = "X-ONAP-RequestID";
+ public static final String X_INVOCATION_ID = "X-InvocationID";
+ public static final String REQUEST_ID = "RequestID";
+ public static final String INVOCATION_ID = "InvocationID";
+ public static final String INSTANCE_UUID = "InstanceUUID";
+ public static final String RESPONSE_CODE = "ResponseCode";
+ public static final String SERVICE_NAME = "ServiceName";
+
+ public static void setMdcContextMap(Map<String,String> mdcContextMap) {
+ if(mdcContextMap != null)
+ MDC.setContextMap(mdcContextMap);
+ }
+
+ private MDCVariables() {
+ }
+}
diff --git a/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/utils/HttpUtils.java b/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/utils/HttpUtils.java
index 11fca099..e0264eb3 100644
--- a/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/utils/HttpUtils.java
+++ b/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/utils/HttpUtils.java
@@ -24,7 +24,8 @@ import org.apache.http.HttpStatus;
public final class HttpUtils implements HttpStatus {
- private HttpUtils() {}
+ private HttpUtils() {
+ }
public static boolean isSuccessfulResponseCode(Integer statusCode) {
return statusCode >= 200 && statusCode < 300;
diff --git a/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/CommonFunctionsTest.java b/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/CommonFunctionsTest.java
index 470704a2..b3fc87a1 100644
--- a/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/CommonFunctionsTest.java
+++ b/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/CommonFunctionsTest.java
@@ -32,12 +32,11 @@ import org.junit.jupiter.api.Test;
class CommonFunctionsTest {
- // Given
- private ConsumerDmaapModel model = new ConsumerDmaapModelForUnitTest();
-
private static final HttpResponse httpResponseMock = mock(HttpResponse.class);
private static final HttpEntity httpEntityMock = mock(HttpEntity.class);
private static final StatusLine statusLineMock = mock(StatusLine.class);
+ // Given
+ private ConsumerDmaapModel model = new ConsumerDmaapModelForUnitTest();
@BeforeAll
static void setup() {