Remove package prefix and move logging specific code to logging

api/build.gradle

@@ -1,10 +1,7 @@
 plugins {
     id 'java-library'
-    id 'java-test-fixtures'
 }
 
 dependencies {
-    // https://mvnrepository.com/artifact/com.jayway.jsonpath/json-path
-    implementation "com.jayway.jsonpath:json-path:$jsonPathVersion"
     implementation 'org.pcollections:pcollections:4.0.1'
 }

api/src/main/java/echopraxia/spi/AttributesAware.java → api/src/main/java/echopraxia/api/AttributesAware.java

@@ -1,9 +1,5 @@
-package echopraxia.spi;
+package echopraxia.api;
 
-import echopraxia.api.Attribute;
-import echopraxia.api.AttributeKey;
-import echopraxia.api.Attributes;
-import echopraxia.api.Field;
 import java.util.Collection;
 import org.jetbrains.annotations.NotNull;
 

api/src/main/java/echopraxia/spi/DefaultField.java → api/src/main/java/echopraxia/api/DefaultField.java

@@ -1,6 +1,5 @@
-package echopraxia.spi;
+package echopraxia.api;
 
-import echopraxia.api.*;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;

api/src/main/java/echopraxia/spi/DefaultToStringFormatter.java → api/src/main/java/echopraxia/api/DefaultToStringFormatter.java

@@ -1,8 +1,5 @@
-package echopraxia.spi;
+package echopraxia.api;
 
-import static echopraxia.spi.PresentationHintAttributes.*;
-
-import echopraxia.api.*;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.jetbrains.annotations.NotNull;
@@ -44,12 +41,16 @@ public String formatField(@NotNull Field field) {
   // if the field has elided, tostringvalue, abbreviateafter, or ascardinal,
   // it should apply to the value instead.
   Attributes collectValueAttributes(Attributes fa, Attributes valueAttributes) {
-    if (fa.containsKey(ABBREVIATE_AFTER)) {
-      return valueAttributes.plus(abbreviateAfter(fa.get(ABBREVIATE_AFTER)));
-    } else if (fa.containsKey(AS_CARDINAL)) {
-      return valueAttributes.plus(asCardinal());
-    } else if (fa.containsKey(TOSTRING_VALUE)) {
-      return valueAttributes.plus(withToStringValue(fa.get(TOSTRING_VALUE)));
+    if (fa.containsKey(PresentationHintAttributes.ABBREVIATE_AFTER)) {
+      return valueAttributes.plus(
+          PresentationHintAttributes.abbreviateAfter(
+              fa.get(PresentationHintAttributes.ABBREVIATE_AFTER)));
+    } else if (fa.containsKey(PresentationHintAttributes.AS_CARDINAL)) {
+      return valueAttributes.plus(PresentationHintAttributes.asCardinal());
+    } else if (fa.containsKey(PresentationHintAttributes.TOSTRING_VALUE)) {
+      return valueAttributes.plus(
+          PresentationHintAttributes.withToStringValue(
+              fa.get(PresentationHintAttributes.TOSTRING_VALUE)));
     } else {
       return valueAttributes;
     }
@@ -181,11 +182,11 @@ private void formatName(
   }
 
   private static boolean isToStringFormat(Attributes attributes) {
-    return attributes.containsKey(TOSTRING_FORMAT);
+    return attributes.containsKey(PresentationHintAttributes.TOSTRING_FORMAT);
   }
 
   private static @Nullable FieldVisitor getToStringFormat(Attributes attributes) {
-    return attributes.get(TOSTRING_FORMAT);
+    return attributes.get(PresentationHintAttributes.TOSTRING_FORMAT);
   }
 
   private static boolean isDisplayName(@NotNull Attributes attributes) {
@@ -197,15 +198,15 @@ private static boolean isDisplayName(@NotNull Attributes attributes) {
   }
 
   private boolean isAbbreviateAfter(@NotNull Attributes attributes) {
-    return attributes.containsKey(ABBREVIATE_AFTER);
+    return attributes.containsKey(PresentationHintAttributes.ABBREVIATE_AFTER);
   }
 
   private static @Nullable Integer getAbbreviateAfter(@NotNull Attributes attributes) {
-    return attributes.get(ABBREVIATE_AFTER);
+    return attributes.get(PresentationHintAttributes.ABBREVIATE_AFTER);
   }
 
   private boolean isAsCardinal(@NotNull Attributes attributes) {
-    return attributes.containsKey(AS_CARDINAL);
+    return attributes.containsKey(PresentationHintAttributes.AS_CARDINAL);
   }
 
   private boolean isValueOnly(Attributes attributes) {
@@ -217,10 +218,10 @@ private boolean isElided(Attributes attributes) {
   }
 
   private boolean isToStringValue(Attributes attributes) {
-    return attributes.containsKey(TOSTRING_VALUE);
+    return attributes.containsKey(PresentationHintAttributes.TOSTRING_VALUE);
   }
 
   private String getToStringValue(Attributes attributes) {
-    return attributes.get(TOSTRING_VALUE);
+    return attributes.get(PresentationHintAttributes.TOSTRING_VALUE);
   }
 }

api/src/main/java/echopraxia/api/Field.java

@@ -1,7 +1,5 @@
 package echopraxia.api;
 
-import echopraxia.spi.DefaultField;
-import echopraxia.spi.PresentationHintAttributes;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.concurrent.atomic.LongAdder;

api/src/main/java/echopraxia/api/FieldBuilder.java

@@ -1,8 +1,7 @@
 package echopraxia.api;
 
-import static echopraxia.spi.FieldConstants.EXCEPTION;
+import static echopraxia.api.FieldConstants.EXCEPTION;
 
-import echopraxia.spi.DefaultField;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.List;

api/src/main/java/echopraxia/spi/FieldConstants.java → api/src/main/java/echopraxia/api/FieldConstants.java

@@ -1,4 +1,4 @@
-package echopraxia.spi;
+package echopraxia.api;
 
 import java.util.ResourceBundle;
 

api/src/main/java/echopraxia/api/PresentationField.java

@@ -1,7 +1,4 @@
 package echopraxia.api;
 
-import echopraxia.spi.AttributesAware;
-import echopraxia.spi.PresentationHints;
-
 public interface PresentationField
     extends Field, PresentationHints<PresentationField>, AttributesAware<PresentationField> {}

api/src/main/java/echopraxia/api/PresentationFieldBuilder.java

@@ -1,8 +1,7 @@
 package echopraxia.api;
 
-import static echopraxia.spi.FieldConstants.EXCEPTION;
+import static echopraxia.api.FieldConstants.EXCEPTION;
 
-import echopraxia.spi.DefaultField;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.List;

api/src/main/java/echopraxia/spi/PresentationHintAttributes.java → api/src/main/java/echopraxia/api/PresentationHintAttributes.java

@@ -1,10 +1,5 @@
-package echopraxia.spi;
+package echopraxia.api;
 
-import echopraxia.api.*;
-import echopraxia.api.Attribute;
-import echopraxia.api.AttributeKey;
-import echopraxia.api.Attributes;
-import echopraxia.api.FieldVisitor;
 import org.jetbrains.annotations.NotNull;
 
 /**

api/src/main/java/echopraxia/spi/PresentationHints.java → api/src/main/java/echopraxia/api/PresentationHints.java

@@ -1,7 +1,5 @@
-package echopraxia.spi;
+package echopraxia.api;
 
-import echopraxia.api.Field;
-import echopraxia.api.FieldVisitor;
 import org.jetbrains.annotations.NotNull;
 
 /**

api/src/main/java/echopraxia/api/SimpleFieldVisitor.java

@@ -1,6 +1,5 @@
 package echopraxia.api;
 
-import echopraxia.spi.DefaultField;
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.List;

api/src/main/java/echopraxia/api/ToStringFormatter.java

@@ -1,6 +1,5 @@
 package echopraxia.api;
 
-import echopraxia.spi.DefaultToStringFormatter;
 import org.jetbrains.annotations.NotNull;
 
 /**

api/src/main/java/echopraxia/api/Value.java

@@ -1,6 +1,5 @@
 package echopraxia.api;
 
-import echopraxia.spi.PresentationHintAttributes;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.*;

api/src/test/java/echopraxia/api/AbbreviateAfterTests.java

@@ -2,7 +2,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import echopraxia.spi.PresentationHintAttributes;
 import org.junit.jupiter.api.Test;
 
 public class AbbreviateAfterTests {

api/src/test/java/echopraxia/spi/AbbreviationTests.java → api/src/test/java/echopraxia/api/AbbreviationTests.java

@@ -1,9 +1,7 @@
-package echopraxia.spi;
+package echopraxia.api;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import echopraxia.api.Field;
-import echopraxia.api.Value;
 import org.junit.jupiter.api.Test;
 
 public class AbbreviationTests {

api/src/test/java/echopraxia/api/CardinalTests.java

@@ -1,10 +1,8 @@
 package echopraxia.api;
 
-import static echopraxia.spi.PresentationHintAttributes.asCardinal;
+import static echopraxia.api.PresentationHintAttributes.asCardinal;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import echopraxia.spi.DefaultField;
-import echopraxia.spi.PresentationHintAttributes;
 import java.util.UUID;
 import org.junit.jupiter.api.Test;
 

api/src/test/java/echopraxia/spi/DisplayNameTests.java → api/src/test/java/echopraxia/api/DisplayNameTests.java

@@ -1,12 +1,8 @@
-package echopraxia.spi;
+package echopraxia.api;
 
-import static echopraxia.spi.PresentationHintAttributes.withDisplayName;
+import static echopraxia.api.PresentationHintAttributes.withDisplayName;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import echopraxia.api.*;
-import echopraxia.api.Attributes;
-import echopraxia.api.Field;
-import echopraxia.api.Value;
 import org.junit.jupiter.api.Test;
 
 public class DisplayNameTests {

api/src/test/java/echopraxia/api/ElidedTests.java

@@ -4,8 +4,6 @@
 import static echopraxia.api.Value.string;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import echopraxia.spi.DefaultField;
-import echopraxia.spi.PresentationHintAttributes;
 import java.util.List;
 import org.junit.jupiter.api.Test;
 

api/src/test/java/echopraxia/api/EqualityTests.java

@@ -2,7 +2,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import echopraxia.spi.DefaultField;
 import java.math.BigDecimal;
 import java.util.List;
 import org.junit.jupiter.api.Test;

api/src/test/java/echopraxia/api/ToStringFormatTests.java

@@ -4,7 +4,6 @@
 import static echopraxia.api.Value.string;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import echopraxia.spi.DefaultField;
 import java.time.Duration;
 import java.util.*;
 import org.jetbrains.annotations.NotNull;

api/src/test/java/echopraxia/api/ToStringValueTests.java

@@ -1,6 +1,6 @@
 package echopraxia.api;
 
-import static echopraxia.spi.PresentationHintAttributes.withToStringValue;
+import static echopraxia.api.PresentationHintAttributes.withToStringValue;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.time.Duration;

async/build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-    api project(":api")
+    api project(":logging")
 
     jmhImplementation project(":logstash")
 

async/src/main/java/echopraxia/async/AsyncLogger.java

@@ -1,11 +1,10 @@
 package echopraxia.async;
 
-import echopraxia.api.*;
-import echopraxia.api.Condition;
 import echopraxia.api.FieldBuilderResult;
-import echopraxia.api.LoggerHandle;
-import echopraxia.spi.AbstractLoggerSupport;
-import echopraxia.spi.CoreLogger;
+import echopraxia.logging.api.Condition;
+import echopraxia.logging.api.LoggerHandle;
+import echopraxia.logging.spi.AbstractLoggerSupport;
+import echopraxia.logging.spi.CoreLogger;
 import java.util.concurrent.Executor;
 import java.util.function.Consumer;
 import java.util.function.Function;

async/src/main/java/echopraxia/async/AsyncLoggerFactory.java

@@ -1,9 +1,9 @@
 package echopraxia.async;
 
 import echopraxia.api.PresentationFieldBuilder;
-import echopraxia.spi.Caller;
-import echopraxia.spi.CoreLogger;
-import echopraxia.spi.CoreLoggerFactory;
+import echopraxia.logging.spi.Caller;
+import echopraxia.logging.spi.CoreLogger;
+import echopraxia.logging.spi.CoreLoggerFactory;
 import org.jetbrains.annotations.NotNull;
 
 /**

async/src/main/java/echopraxia/async/AsyncLoggerMethods.java

@@ -1,8 +1,8 @@
 package echopraxia.async;
 
-import echopraxia.api.Condition;
 import echopraxia.api.FieldBuilderResult;
-import echopraxia.api.LoggerHandle;
+import echopraxia.logging.api.Condition;
+import echopraxia.logging.api.LoggerHandle;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import org.jetbrains.annotations.NotNull;

async/src/main/java/echopraxia/async/DefaultAsyncLoggerMethods.java

@@ -1,15 +1,14 @@
 package echopraxia.async;
 
-import static echopraxia.api.Level.*;
+import static echopraxia.api.FieldConstants.EXCEPTION;
 import static echopraxia.api.Value.exception;
-import static echopraxia.spi.FieldConstants.EXCEPTION;
+import static echopraxia.logging.api.Level.*;
 
-import echopraxia.api.*;
-import echopraxia.api.Condition;
 import echopraxia.api.Field;
 import echopraxia.api.FieldBuilderResult;
-import echopraxia.api.LoggerHandle;
-import echopraxia.spi.DefaultMethodsSupport;
+import echopraxia.logging.api.Condition;
+import echopraxia.logging.api.LoggerHandle;
+import echopraxia.logging.spi.DefaultMethodsSupport;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import org.jetbrains.annotations.NotNull;

diff/build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-    api project(":api")
+    api project(":logging")
     api project(":jackson")
 
     // https://github.com/flipkart-incubator/zjsonpatch/

diff/src/test/java/echopraxia/diff/DiffFieldBuilderTests.java

@@ -6,13 +6,12 @@
 import ch.qos.logback.classic.LoggerContext;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.read.ListAppender;
-import echopraxia.Logger;
-import echopraxia.LoggerFactory;
-import echopraxia.api.*;
+import echopraxia.api.DefaultField;
 import echopraxia.api.Field;
 import echopraxia.api.FieldBuilder;
 import echopraxia.api.Value;
-import echopraxia.spi.DefaultField;
+import echopraxia.logger.Logger;
+import echopraxia.logger.LoggerFactory;
 import java.util.List;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -21,8 +20,7 @@ public class DiffFieldBuilderTests {
 
   @Test
   public void testLogger() {
-    Logger<PersonFieldBuilder> logger =
-        LoggerFactory.getLogger().withFieldBuilder(PersonFieldBuilder.instance);
+    Logger<PersonFieldBuilder> logger = LoggerFactory.getLogger(PersonFieldBuilder.instance);
 
     Person before = new Person("Eloise", 1);
     Person after = before.withName("Will");
@@ -31,6 +29,8 @@ public void testLogger() {
 
     ListAppender<ILoggingEvent> listAppender = getListAppender();
     List<ILoggingEvent> list = listAppender.list;
+    assertThat(list).isNotEmpty();
+
     ILoggingEvent event = list.get(0);
     assertThat(event.getFormattedMessage())
         .isEqualTo("personDiff=[{op=replace, path=/name, value=Will}]");