Fix NPE in DynamicLogLevelFilter

Configuration or Processor may not be available. In that case the filter should not create exceptions.

Author: KarstenSchnitter

cf-java-logging-support-servlet/src/main/java/com/sap/hcp/cf/logging/servlet/filter/DynamicLogLevelFilter.java

@@ -11,8 +11,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.sap.hcp.cf.logging.servlet.dynlog.DynamicLogLevelConfiguration;
 import com.sap.hcp.cf.logging.servlet.dynlog.DynLogEnvironment;
+import com.sap.hcp.cf.logging.servlet.dynlog.DynamicLogLevelConfiguration;
 import com.sap.hcp.cf.logging.servlet.dynlog.DynamicLogLevelProcessor;
 
 /**
@@ -64,7 +64,7 @@ public DynamicLogLevelFilter(ConcurrentInitializer<DynamicLogLevelConfiguration>
             protected DynamicLogLevelProcessor initialize() throws ConcurrentException {
                 return getConfiguration().map(DynamicLogLevelConfiguration::getRsaPublicKey).map(
                                                                                                  DynamicLogLevelProcessor::new)
-                                         .get();
+                                         .orElse(null);
             }
         };
     }
@@ -94,7 +94,7 @@ public DynamicLogLevelFilter(ConcurrentInitializer<DynamicLogLevelConfiguration>
      */
     protected Optional<DynamicLogLevelConfiguration> getConfiguration() {
         try {
-            return Optional.of(configuration.get());
+            return Optional.ofNullable(configuration.get());
         } catch (ConcurrentException cause) {
             LOG.debug("Cannot initialize dynamic log level environment. Will continue without this feature", cause);
             return Optional.empty();
@@ -109,7 +109,7 @@ protected Optional<DynamicLogLevelConfiguration> getConfiguration() {
      */
     protected Optional<DynamicLogLevelProcessor> getProcessor() {
         try {
-            return Optional.of(processor.get());
+            return Optional.ofNullable(processor.get());
         } catch (ConcurrentException cause) {
             LOG.debug("Cannot initialize dynamic log level processor. Will continue without this feature", cause);
         }

cf-java-logging-support-servlet/src/test/java/com/sap/hcp/cf/logging/servlet/filter/DynamicLogLevelFilterTest.java

@@ -56,4 +56,14 @@ public void doesNotCallProcessorOnMissingHeader() throws Exception {
 
     }
 
+    @Test
+    public void doesNotFailOnDefaultConfiguration() throws Exception {
+        new DynamicLogLevelFilter().doFilter(request, response, chain);
+    }
+
+    @Test
+    public void doesNotFailOnAbsentConfiguration() throws Exception {
+        new DynamicLogLevelFilter(() -> null).doFilter(request, response, chain);
+
+    }
 }

cf-java-logging-support-servlet/src/test/java/com/sap/hcp/cf/logging/servlet/filter/RequestLoggingFilterTest.java

@@ -25,7 +25,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.hamcrest.Matchers;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -87,7 +86,7 @@ public Void answer(InvocationOnMock invocation) throws Throwable {
 	public void testSimple() throws IOException, ServletException {
 		FilterChain mockFilterChain = mock(FilterChain.class);
 
-		new RequestLoggingFilter().doFilter(mockReq, mockResp, mockFilterChain);
+        new NewRequestLoggingFilter().doFilter(mockReq, mockResp, mockFilterChain);
 		assertThat(getField(Fields.REQUEST), is(Defaults.UNKNOWN));
 		assertThat(getField(Fields.CORRELATION_ID), not(isEmptyOrNullString()));
 		assertThat(getField(Fields.REQUEST_ID), is(nullValue()));