private Marker addMarkerIfAbsent(final String name, final org.apache.logging.log4j.Marker log4jMarker) { final Marker marker = new Log4jMarker(log4jMarker); final Marker existing = markerMap.putIfAbsent(name, marker); return existing == null ? marker : existing; }
@Test public void testEquals() { final Marker markerA = MarkerManager.getMarker(Log4jMarkerTest.class.getName() + "-A"); final Marker markerB = MarkerManager.getMarker(Log4jMarkerTest.class.getName() + "-B"); final Log4jMarker marker1 = new Log4jMarker(markerA); final Log4jMarker marker2 = new Log4jMarker(markerA); final Log4jMarker marker3 = new Log4jMarker(markerB); Assert.assertEquals(marker1, marker2); Assert.assertNotEquals(marker1, null); Assert.assertNotEquals(null, marker1); Assert.assertNotEquals(marker1, marker3); } }
@Test public void testAddNullMarker() { final String childMarkerName = CHILD_MAKER_NAME + "-ANM"; final String parentMakerName = PARENT_MARKER_NAME + "-ANM"; final org.slf4j.Marker slf4jMarker = org.slf4j.MarkerFactory.getMarker(childMarkerName); final org.slf4j.Marker slf4jParent = org.slf4j.MarkerFactory.getMarker(parentMakerName); slf4jMarker.add(slf4jParent); final Marker log4jParent = MarkerManager.getMarker(parentMakerName); final Marker log4jMarker = MarkerManager.getMarker(childMarkerName); final Log4jMarker log4jSlf4jParent = new Log4jMarker(log4jParent); final Log4jMarker log4jSlf4jMarker = new Log4jMarker(log4jMarker); final org.slf4j.Marker nullMarker = null; try { log4jSlf4jParent.add(nullMarker); fail("Expected " + IllegalArgumentException.class.getName()); } catch (final IllegalArgumentException e) { // expected } try { log4jSlf4jMarker.add(nullMarker); fail("Expected " + IllegalArgumentException.class.getName()); } catch (final IllegalArgumentException e) { // expected } }
@Test public void testRemoveNullMarker() { final String childMakerName = CHILD_MAKER_NAME + "-CM"; final String parentMakerName = PARENT_MARKER_NAME + "-CM"; final org.slf4j.Marker slf4jMarker = org.slf4j.MarkerFactory.getMarker(childMakerName); final org.slf4j.Marker slf4jParent = org.slf4j.MarkerFactory.getMarker(parentMakerName); slf4jMarker.add(slf4jParent); final Marker log4jParent = MarkerManager.getMarker(parentMakerName); final Marker log4jMarker = MarkerManager.getMarker(childMakerName); final Log4jMarker log4jSlf4jParent = new Log4jMarker(log4jParent); final Log4jMarker log4jSlf4jMarker = new Log4jMarker(log4jMarker); final org.slf4j.Marker nullMarker = null; Assert.assertFalse(log4jSlf4jParent.remove(nullMarker)); Assert.assertFalse(log4jSlf4jMarker.remove(nullMarker)); }
@Test public void testContainsNullString() { final String childMarkerName = CHILD_MAKER_NAME + "-CS"; final String parentMakerName = PARENT_MARKER_NAME + "-CS"; final org.slf4j.Marker slf4jMarker = org.slf4j.MarkerFactory.getMarker(childMarkerName); final org.slf4j.Marker slf4jParent = org.slf4j.MarkerFactory.getMarker(parentMakerName); slf4jMarker.add(slf4jParent); final Marker log4jParent = MarkerManager.getMarker(parentMakerName); final Marker log4jMarker = MarkerManager.getMarker(childMarkerName); final Log4jMarker log4jSlf4jParent = new Log4jMarker(log4jParent); final Log4jMarker log4jSlf4jMarker = new Log4jMarker(log4jMarker); final String nullStr = null; Assert.assertFalse(log4jSlf4jParent.contains(nullStr)); Assert.assertFalse(log4jSlf4jMarker.contains(nullStr)); }
@Test public void testContainsNullMarker() { final String childMarkerName = CHILD_MAKER_NAME + "-CM"; final String parentMakerName = PARENT_MARKER_NAME + "-CM"; final org.slf4j.Marker slf4jMarker = org.slf4j.MarkerFactory.getMarker(childMarkerName); final org.slf4j.Marker slf4jParent = org.slf4j.MarkerFactory.getMarker(parentMakerName); slf4jMarker.add(slf4jParent); final Marker log4jParent = MarkerManager.getMarker(parentMakerName); final Marker log4jMarker = MarkerManager.getMarker(childMarkerName); final Log4jMarker log4jSlf4jParent = new Log4jMarker(log4jParent); final Log4jMarker log4jSlf4jMarker = new Log4jMarker(log4jMarker); final org.slf4j.Marker nullMarker = null; try { Assert.assertFalse(log4jSlf4jParent.contains(nullMarker)); fail("Expected " + IllegalArgumentException.class.getName()); } catch (final IllegalArgumentException e) { // expected } try { Assert.assertFalse(log4jSlf4jMarker.contains(nullMarker)); fail("Expected " + IllegalArgumentException.class.getName()); } catch (final IllegalArgumentException e) { // expected } }
private Marker addMarkerIfAbsent(final String name, final org.apache.logging.log4j.Marker log4jMarker) { final Marker marker = new Log4jMarker(this, log4jMarker); final Marker existing = markerMap.putIfAbsent(name, marker); return existing == null ? marker : existing; }
private Result filter(Marker marker) { if (!isStarted()) { return Result.NEUTRAL; } org.apache.logging.slf4j.Log4jMarker slf4jMarker = new Log4jMarker( marker); for (org.slf4j.Marker matcher : markersToMatch) { if (slf4jMarker.contains(matcher.getName())) { return Result.ACCEPT; } } return Result.DENY; }
private Result filter(Marker marker) { if (!isStarted()) { return Result.NEUTRAL; } org.apache.logging.slf4j.Log4jMarker slf4jMarker = new Log4jMarker( marker); for (org.slf4j.Marker matcher : markersToMatch) { if (slf4jMarker.contains(matcher.getName())) { return Result.DENY; } } return Result.NEUTRAL; }
Log4jMarker eventMarker = new Log4jMarker(sourceMarker); if (!eventMarker.contains(SecurityMarkers.CONFIDENTIAL)) { return source;