diff --git a/logback-appender/src/main/java/pl/tkowalcz/tjahzi/logback/Label.java b/logback-appender/src/main/java/pl/tkowalcz/tjahzi/logback/Label.java index 25202c9..e535cc1 100644 --- a/logback-appender/src/main/java/pl/tkowalcz/tjahzi/logback/Label.java +++ b/logback-appender/src/main/java/pl/tkowalcz/tjahzi/logback/Label.java @@ -1,6 +1,5 @@ package pl.tkowalcz.tjahzi.logback; -import java.util.Map; import java.util.regex.Pattern; public class Label { @@ -39,11 +38,6 @@ public class Label { this.value = value; } - // @VisibleForTests - public Map.Entry asEntry() { - return Map.entry(getName(), getValue()); - } - public static boolean hasValidName(String label) { return LABEL_NAME_PATTER.matcher(label).matches(); } diff --git a/logback-appender/src/test/java/pl/tkowalcz/tjahzi/logback/LabelFactoryTest.java b/logback-appender/src/test/java/pl/tkowalcz/tjahzi/logback/LabelFactoryTest.java index 20bad63..f6ea05d 100644 --- a/logback-appender/src/test/java/pl/tkowalcz/tjahzi/logback/LabelFactoryTest.java +++ b/logback-appender/src/test/java/pl/tkowalcz/tjahzi/logback/LabelFactoryTest.java @@ -30,8 +30,8 @@ class LabelFactoryTest { // Then assertThat(actual).containsOnly( - thisShouldStay.asEntry(), - thisTooShouldStay.asEntry() + asEntry(thisShouldStay), + asEntry(thisTooShouldStay) ); } @@ -55,8 +55,8 @@ class LabelFactoryTest { // Then assertThat(actual).containsOnly( - thisShouldStay.asEntry(), - thisShouldStayToo.asEntry() + asEntry(thisShouldStay), + asEntry(thisShouldStayToo) ); } @@ -78,8 +78,8 @@ class LabelFactoryTest { // Then assertThat(actual).containsOnly( - label1.asEntry(), - label2.asEntry() + asEntry(label1), + asEntry(label2) ); } @@ -100,8 +100,8 @@ class LabelFactoryTest { HashMap labels = new HashMap<>( Map.ofEntries( - thisShouldStay.asEntry(), - thisShouldBeRemovedDueToConflict.asEntry() + asEntry(thisShouldStay), + asEntry(thisShouldBeRemovedDueToConflict) ) ); @@ -110,7 +110,7 @@ class LabelFactoryTest { // Then assertThat(labels).containsOnly( - thisShouldStay.asEntry() + asEntry(thisShouldStay) ); assertThat(actual).isEqualTo(logLevelLabel); @@ -142,4 +142,8 @@ class LabelFactoryTest { // Then assertThat(actual).isNull(); } + + public Map.Entry asEntry(Label label) { + return Map.entry(label.getName(), label.getValue()); + } }