Merge branch 'async'

Signed-off-by: Karsten Schnitter <[email protected]>

Author: KarstenSchnitter

README.md

@@ -27,7 +27,7 @@ All in all, you should do the following:
 * adjust your logging configuration accordingly.
 
 
-Say, you want to make use of the *servlet filter* feature, then you need to add the following dependency to your POM with property `cf-logging-version` referring to the latest nexus version (currently `2.1.5`):
+Say, you want to make use of the *servlet filter* feature, then you need to add the following dependency to your POM with property `cf-logging-version` referring to the latest nexus version (currently `2.2.0`):
 
 ```xml
 <properties>

cf-java-logging-support-core/pom.xml

@@ -32,7 +32,7 @@
     <parent>
         <groupId>com.sap.hcp.cf.logging</groupId>
         <artifactId>cf-java-logging-support-parent</artifactId>
-        <version>2.1.5</version>
+        <version>2.2.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <build>

cf-java-logging-support-core/src/main/java/com/sap/hcp/cf/logging/common/RequestRecord.java

@@ -1,6 +1,5 @@
 package com.sap.hcp.cf.logging.common;
 
-import java.io.Closeable;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -39,7 +38,7 @@
  *
  *
  */
-public class RequestRecord implements Closeable {
+public class RequestRecord {
 
     /*
      * -- default values for request fields that are marked as "required"
@@ -100,7 +99,6 @@ public RequestRecord(String layerKey, Direction direction) {
         addTag(Fields.DIRECTION, direction.toString());
         setDefaults();
         start();
-        RequestRecordHolder.add(this);
     }
 
     /**
@@ -198,11 +196,6 @@ public long stop() {
         return endMs;
     }
 
-    @Override
-    public void close() {
-        RequestRecordHolder.remove(this);
-    }
-
     @Override
     public String toString() {
         /*

cf-java-logging-support-core/src/main/java/com/sap/hcp/cf/logging/common/RequestRecordHolder.java

@@ -20,7 +20,6 @@ public void testAddingSingleActivatedOptionalTagToRequestRecord() throws JSONObj
         String tag = "TestTag";
 
         to(requestRecord).addOptionalTag(canBeLogged, key, tag);
-        requestRecord.close();
 
         assertEquals(tag, getFieldFromRequestRecord(requestRecord, key));
     }
@@ -33,7 +32,6 @@ public void testAddingSingleForbiddenOptionalTagToRequestRecord() throws JSONObj
         String tag = "TestTag";
 
         to(requestRecord).addOptionalTag(canBeLogged, key, tag);
-        requestRecord.close();
 
         assertEquals(Defaults.REDACTED, getFieldFromRequestRecord(requestRecord, key));
     }
@@ -46,7 +44,6 @@ public void testAddingSingleForbiddenOptionalNullTagToRequestRecord() throws JSO
         String tag = Defaults.UNKNOWN;
 
         to(requestRecord).addOptionalTag(canBeLogged, key, tag);
-        requestRecord.close();
 
         assertEquals(Defaults.UNKNOWN, getFieldFromRequestRecord(requestRecord, key));
     }
@@ -59,7 +56,6 @@ public void testAddingSingleActivatedOptionalNullTagToRequestRecord() throws JSO
         String tag = Defaults.UNKNOWN;
 
         to(requestRecord).addOptionalTag(canBeLogged, key, tag);
-        requestRecord.close();
 
         assertEquals(Defaults.UNKNOWN, getFieldFromRequestRecord(requestRecord, key));
     }

cf-java-logging-support-core/src/test/java/com/sap/hcp/cf/logging/common/RequestRecordConfiguratorTest.java

@@ -58,7 +58,6 @@ public void testLogRecordMsgNotFlattened() {
         RequestRecord lrec = new RequestRecord(LOG_PROVIDER);
         String lmsg = lrec.toString();
         assertThat(formatMsg(jmc, lmsg), is(lmsg));
-        lrec.close();
     }
 
     @Test
@@ -68,7 +67,6 @@ public void testLogRecordMsgFlattened() {
         RequestRecord lrec = new RequestRecord(LOG_PROVIDER);
         String lmsg = lrec.toString();
         assertThat(formatMsg(jmc, lmsg), is(lmsg.substring(1, lmsg.length() - 1)));
-        lrec.close();
     }
 
     @Test

cf-java-logging-support-core/src/test/java/com/sap/hcp/cf/logging/common/converter/TestJsonMessageConverter.java

@@ -9,7 +9,7 @@
         <relativePath>../pom.xml</relativePath>
         <groupId>com.sap.hcp.cf.logging</groupId>
         <artifactId>cf-java-logging-support-parent</artifactId>
-        <version>2.1.5</version>
+        <version>2.2.0</version>
     </parent>
 
     <name>cf-java-logging-support-jersey</name>

cf-java-logging-support-jersey/pom.xml

@@ -20,10 +20,6 @@ public void handle(ResponseContextAdapter responseContext, RequestRecord rr) {
             rr.addValue(Fields.RESPONSE_STATUS, new LongValue(responseContext.getStatus()));
             rr.stop();
             LOGGER.info(Markers.REQUEST_MARKER, "{}", rr);
-            /*
-             * -- close this instance
-             */
-            rr.close();
         } else {
             LOGGER.error("No record found to handle response {}", responseContext);
         }

cf-java-logging-support-jersey/src/main/java/com/sap/hcp/cf/logging/jersey/filter/ResponseHandler.java

@@ -11,7 +11,7 @@
         <relativePath>../pom.xml</relativePath>
         <groupId>com.sap.hcp.cf.logging</groupId>
         <artifactId>cf-java-logging-support-parent</artifactId>
-        <version>2.1.5</version>
+        <version>2.2.0</version>
     </parent>
 
     <dependencies>

cf-java-logging-support-log4j2/pom.xml

@@ -56,7 +56,6 @@ public void testLogRecordMsgNotFlattened() {
         RequestRecord lrec = new RequestRecord(LOG_PROVIDER);
         String lmsg = lrec.toString();
         assertThat(format(jmc, makeEvent(lmsg, NO_ARGS)), is(lmsg));
-        lrec.close();
     }
 
     @Test
@@ -65,7 +64,6 @@ public void testLogRecordMsgFlattened() {
         RequestRecord lrec = new RequestRecord(LOG_PROVIDER);
         String lmsg = lrec.toString();
         assertThat(format(jmc, makeEvent(lmsg, NO_ARGS)), is(lmsg.substring(1, lmsg.length() - 1)));
-        lrec.close();
     }
 
     @Test