Merge "Changed to unmaintained"

diff --git a/pom.xml b/pom.xml
index 3970944..f86b273 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>org.onap.logging-analytics</groupId>
   <artifactId>logging-analytics</artifactId>
-  <version>1.6.9-SNAPSHOT</version>
+  <version>1.6.10-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>logging-analytics</name>

diff --git a/pylog/pom.xml b/pylog/pom.xml
index 33e7f28..a8a6606 100644 (file)
--- a/pylog/pom.xml
+++ b/pylog/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.onap.logging-analytics</groupId>
         <artifactId>logging-analytics</artifactId>
-        <version>1.6.9-SNAPSHOT</version>
+        <version>1.6.10-SNAPSHOT</version>
     </parent>
 
     <artifactId>logging-pylog</artifactId>

diff --git a/pylog/setup.py b/pylog/setup.py
index ed40d85..d0bb0e0 100644 (file)
--- a/pylog/setup.py
+++ b/pylog/setup.py
@@ -21,7 +21,7 @@ setup(
     long_description="python-package onappylog could be used in any python"
                      "project to record MDC information and reload logging"
                      "at runtime",
-    version="1.6.7",
+    version="1.6.10",
     license="Apache 2.0",
     author='ke liang',
     author_email="lokyse@163.com",

diff --git a/pylog/version.properties b/pylog/version.properties
index 1b177d8..ada21df 100644 (file)
--- a/pylog/version.properties
+++ b/pylog/version.properties
@@ -19,7 +19,7 @@
 # 1.2.6-SNAPSHOT is off 1.2.2
 major=1
 minor=6
-patch=9
+patch=10
 
 base_version=${major}.${minor}.${patch}
 

diff --git a/reference/logging-demo/pom.xml b/reference/logging-demo/pom.xml
index 6f2e6ab..cb0baf7 100644 (file)
--- a/reference/logging-demo/pom.xml
+++ b/reference/logging-demo/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.onap.logging-analytics</groupId>
     <artifactId>logging-reference</artifactId>
-    <version>1.6.9-SNAPSHOT</version>
+    <version>1.6.10-SNAPSHOT</version>
   </parent>
 
   <artifactId>logging-demo</artifactId>

diff --git a/reference/logging-docker-root/pom.xml b/reference/logging-docker-root/pom.xml
index 43a17ee..9c75069 100644 (file)
--- a/reference/logging-docker-root/pom.xml
+++ b/reference/logging-docker-root/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.onap.logging-analytics</groupId>
     <artifactId>logging-reference</artifactId>
-    <version>1.6.9-SNAPSHOT</version>
+    <version>1.6.10-SNAPSHOT</version>
   </parent>
 
   <artifactId>logging-docker-root</artifactId>

diff --git a/reference/logging-filter/logging-filter-base/pom.xml b/reference/logging-filter/logging-filter-base/pom.xml
index d91fec1..09a5048 100644 (file)
--- a/reference/logging-filter/logging-filter-base/pom.xml
+++ b/reference/logging-filter/logging-filter-base/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.onap.logging-analytics</groupId>
     <artifactId>logging-filter-parent</artifactId>
-    <version>1.6.9-SNAPSHOT</version>
+    <version>1.6.10-SNAPSHOT</version>
   </parent>
 
   <artifactId>logging-filter-base</artifactId>

diff --git a/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/CustomResponseStatus.java b/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/CustomResponseStatus.java
new file mode 100644 (file)
index 0000000..91626bb
--- /dev/null
+++ b/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/CustomResponseStatus.java
@@ -0,0 +1,62 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - Logging
+ * ================================================================================
+ * Copyright (C) 2021 AT&T 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.logging.filter.base;
+
+public enum CustomResponseStatus {
+    PROCESSING(102, "Processing"),
+    MULTI_STATUS(207, "Multi-Status"),
+    ALREADY_REPORTED(208, "Already Reported"),
+    UNPROCESSABLE_ENTITY(422, "Unprocessable Entity"),
+    LOCKED(423, "Locked"),
+    FAILED_DEPENDENCY(424, "Failed Dependency"),
+    INSUFFICIENT_STORAGE(508, "Insufficient Storage"),
+    LOOP_DETECTED(508, "Loop Detected");
+
+    private final int code;
+    private final String reason;
+
+    CustomResponseStatus(int statusCode, String reasonPhrase) {
+        this.code = statusCode;
+        this.reason = reasonPhrase;
+    }
+
+    public static CustomResponseStatus fromStatusCode(int statusCode) {
+        for (CustomResponseStatus s : values()) {
+            if (s.code == statusCode) {
+                return s;
+            }
+        }
+
+        return null;
+    }
+
+    public int getStatusCode() {
+        return this.code;
+    }
+
+    public String getReasonPhrase() {
+        return this.toString();
+    }
+
+    public String toString() {
+        return this.reason;
+    }
+}

diff --git a/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/MDCSetup.java b/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/MDCSetup.java
index 1bcc6e3..a90f053 100644 (file)
--- a/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/MDCSetup.java
+++ b/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/MDCSetup.java
@@ -211,7 +211,7 @@ public class MDCSetup {
         } else {
             statusCode = ONAPLogConstants.ResponseStatus.ERROR.toString();
             setErrorCode(code);
-            setErrorDesc(code);
+            setErrorDescription(code);
         }
         MDC.put(ONAPLogConstants.MDCs.RESPONSE_STATUS_CODE, statusCode);
     }
@@ -233,15 +233,27 @@ public class MDCSetup {
     }
 
     public void setResponseDescription(int statusCode) {
-        MDC.put(ONAPLogConstants.MDCs.RESPONSE_DESCRIPTION, Response.Status.fromStatusCode(statusCode).toString());
+        MDC.put(ONAPLogConstants.MDCs.RESPONSE_DESCRIPTION, extractDescription(statusCode));
+    }
+
+    private String extractDescription(int statusCode) {
+        Response.Status responseStatus = Response.Status.fromStatusCode(statusCode);
+        if (responseStatus != null) {
+            return responseStatus.toString();
+        }
+        CustomResponseStatus customResponseStatus = CustomResponseStatus.fromStatusCode(statusCode);
+        if (customResponseStatus != null) {
+            return customResponseStatus.toString();
+        }
+        return String.format("Unknown description for response code %d.", statusCode);
     }
 
     public void setErrorCode(int statusCode) {
         MDC.put(ONAPLogConstants.MDCs.ERROR_CODE, String.valueOf(statusCode));
     }
 
-    public void setErrorDesc(int statusCode) {
-        MDC.put(ONAPLogConstants.MDCs.ERROR_DESC, Response.Status.fromStatusCode(statusCode).toString());
+    public void setErrorDescription(int statusCode) {
+        MDC.put(ONAPLogConstants.MDCs.ERROR_DESC, extractDescription(statusCode));
     }
 
     public String getProperty(String property) {

diff --git a/reference/logging-filter/logging-filter-spring/pom.xml b/reference/logging-filter/logging-filter-spring/pom.xml
index 6a7c670..97d3246 100644 (file)
--- a/reference/logging-filter/logging-filter-spring/pom.xml
+++ b/reference/logging-filter/logging-filter-spring/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.onap.logging-analytics</groupId>
     <artifactId>logging-filter-parent</artifactId>
-    <version>1.6.9-SNAPSHOT</version>
+    <version>1.6.10-SNAPSHOT</version>
   </parent>
 
   <artifactId>logging-filter-spring</artifactId>

diff --git a/reference/logging-filter/pom.xml b/reference/logging-filter/pom.xml
index 58af24f..36e0fd0 100644 (file)
--- a/reference/logging-filter/pom.xml
+++ b/reference/logging-filter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.onap.logging-analytics</groupId>
     <artifactId>logging-reference</artifactId>
-    <version>1.6.9-SNAPSHOT</version>
+    <version>1.6.10-SNAPSHOT</version>
   </parent>
 
   <artifactId>logging-filter-parent</artifactId>

diff --git a/reference/logging-kubernetes/pom.xml b/reference/logging-kubernetes/pom.xml
index 40e410f..ef40370 100644 (file)
--- a/reference/logging-kubernetes/pom.xml
+++ b/reference/logging-kubernetes/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.onap.logging-analytics</groupId>
     <artifactId>logging-reference</artifactId>
-    <version>1.6.9-SNAPSHOT</version>
+    <version>1.6.10-SNAPSHOT</version>
   </parent>
 
   <artifactId>logging-kubernetes</artifactId>

diff --git a/reference/logging-library/pom.xml b/reference/logging-library/pom.xml
index f8c4483..a7b7ba2 100644 (file)
--- a/reference/logging-library/pom.xml
+++ b/reference/logging-library/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.onap.logging-analytics</groupId>
     <artifactId>logging-reference</artifactId>
-    <version>1.6.9-SNAPSHOT</version>
+    <version>1.6.10-SNAPSHOT</version>
   </parent>
 
   <artifactId>logging-library</artifactId>

diff --git a/reference/logging-mock-service/pom.xml b/reference/logging-mock-service/pom.xml
index ca76d5c..1cdbf51 100644 (file)
--- a/reference/logging-mock-service/pom.xml
+++ b/reference/logging-mock-service/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.onap.logging-analytics</groupId>
     <artifactId>logging-reference</artifactId>
-    <version>1.6.9-SNAPSHOT</version>
+    <version>1.6.10-SNAPSHOT</version>
   </parent>
 
   <artifactId>logging-mock-service</artifactId>

diff --git a/reference/logging-slf4j-demo/pom.xml b/reference/logging-slf4j-demo/pom.xml
index 081cea8..63830b6 100644 (file)
--- a/reference/logging-slf4j-demo/pom.xml
+++ b/reference/logging-slf4j-demo/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.onap.logging-analytics</groupId>
     <artifactId>logging-reference</artifactId>
-    <version>1.6.9-SNAPSHOT</version>
+    <version>1.6.10-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/reference/logging-slf4j/pom.xml b/reference/logging-slf4j/pom.xml
index 87b00bd..57a7107 100644 (file)
--- a/reference/logging-slf4j/pom.xml
+++ b/reference/logging-slf4j/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.onap.logging-analytics</groupId>
     <artifactId>logging-reference</artifactId>
-    <version>1.6.9-SNAPSHOT</version>
+    <version>1.6.10-SNAPSHOT</version>
   </parent>
 
   <artifactId>logging-slf4j</artifactId>

diff --git a/reference/pom.xml b/reference/pom.xml
index 0b913e5..068a3c2 100644 (file)
--- a/reference/pom.xml
+++ b/reference/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.onap.logging-analytics</groupId>
     <artifactId>logging-analytics</artifactId>
-    <version>1.6.9-SNAPSHOT</version>
+    <version>1.6.10-SNAPSHOT</version>
   </parent>
 
   <artifactId>logging-reference</artifactId>

diff --git a/reference/provider/pom.xml b/reference/provider/pom.xml
index c23d657..6a6e054 100644 (file)
--- a/reference/provider/pom.xml
+++ b/reference/provider/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.onap.logging-analytics</groupId>
     <artifactId>logging-reference</artifactId>
-    <version>1.6.9-SNAPSHOT</version>
+    <version>1.6.10-SNAPSHOT</version>
   </parent>
 
   <artifactId>logging-provider</artifactId>

diff --git a/releases/1.6.9.yaml b/releases/1.6.9.yaml
new file mode 100644 (file)
index 0000000..208addd
--- /dev/null
+++ b/releases/1.6.9.yaml
@@ -0,0 +1,5 @@
+--- 
+distribution_type: 'maven' 
+version: '1.6.9'
+project: 'logging-analytics' 
+log_dir: 'logging-analytics-maven-stage-master/759/'
\ No newline at end of file

diff --git a/version.properties b/version.properties
index c2e792a..e914c2a 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -19,7 +19,7 @@
 # 1.2.6-SNAPSHOT is off 1.2.5
 major=1
 minor=6
-patch=9
+patch=10
 
 base_version=${major}.${minor}.${patch}