Repackaging of Jackson FasterXML package-private classes (#56)

* Cleanup before module extraction
rfoltyns · Dec 9, 2020 · 63cf944 · 63cf944
1 parent 8b22a62
commit 63cf944
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 56 deletions.
diff --git a/...lasticsearch-core/src/main/java/com/fasterxml/jackson/core/JsonStreamContextAccessor.java b/...lasticsearch-core/src/main/java/com/fasterxml/jackson/core/JsonStreamContextAccessor.java
diff --git a/...n/core/json/JsonWriteContextAccessor.java → ...asticsearch/JsonWriteContextAccessor.java b/...n/core/json/JsonWriteContextAccessor.java → ...asticsearch/JsonWriteContextAccessor.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.core.json;
+package org.appenders.log4j2.elasticsearch;
 
 /*-
  * #%L
@@ -20,17 +20,15 @@
  * #L%
  */
 
-import com.fasterxml.jackson.core.JsonStreamContextAccessor;
+import com.fasterxml.jackson.core.json.JsonWriteContext;
 
-import static com.fasterxml.jackson.core.JsonStreamContextAccessor.TYPE_ROOT;
+import static com.fasterxml.jackson.core.JsonStreamContext.TYPE_ROOT;
 
 /**
  * Helper class to allow {@code com.fasterxml.jackson.core.json.JsonWriteContext} state access.
  */
 public class JsonWriteContextAccessor {
 
-    private final JsonStreamContextAccessor streamCtxAccess = new JsonStreamContextAccessor();
-
     public JsonWriteContext reset(JsonWriteContext ctx) {
 
         if (ctx.getParent() == null) {
@@ -46,8 +44,8 @@ public JsonWriteContext reset(JsonWriteContext ctx) {
         return parent.reset(TYPE_ROOT);
     }
 
-    int getType(JsonWriteContext ctx) {
-        return streamCtxAccess.getType(ctx);
+    /* visible for testing */
+    boolean inRoot(JsonWriteContext ctxAfterReset) {
+        return ctxAfterReset.inRoot();
     }
-
 }
diff --git a/...arch-core/src/main/java/org/appenders/log4j2/elasticsearch/ReusableUTF8JsonGenerator.java b/...arch-core/src/main/java/org/appenders/log4j2/elasticsearch/ReusableUTF8JsonGenerator.java
@@ -23,7 +23,6 @@
 import com.fasterxml.jackson.core.JsonStreamContext;
 import com.fasterxml.jackson.core.ObjectCodec;
 import com.fasterxml.jackson.core.io.IOContext;
-import com.fasterxml.jackson.core.json.JsonWriteContextAccessor;
 import com.fasterxml.jackson.core.json.UTF8JsonGenerator;
 
 import java.io.IOException;

diff --git a/...search-core/src/main/java/org/appenders/log4j2/elasticsearch/SingleThreadJsonFactory.java b/...search-core/src/main/java/org/appenders/log4j2/elasticsearch/SingleThreadJsonFactory.java
@@ -26,7 +26,6 @@
 import com.fasterxml.jackson.core.ObjectCodec;
 import com.fasterxml.jackson.core.io.CharacterEscapes;
 import com.fasterxml.jackson.core.io.IOContext;
-import com.fasterxml.jackson.core.json.JsonWriteContextAccessor;
 import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
 
 import java.io.DataOutput;

diff --git a/...rch-core/src/test/java/com/fasterxml/jackson/core/json/ReusableUTF8JsonGeneratorTest.java b/...rch-core/src/test/java/com/fasterxml/jackson/core/json/ReusableUTF8JsonGeneratorTest.java
@@ -23,6 +23,7 @@
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.util.BufferRecycler;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.appenders.log4j2.elasticsearch.JsonWriteContextAccessor;
 import org.appenders.log4j2.elasticsearch.OutputStreamDelegate;
 import org.appenders.log4j2.elasticsearch.ReusableIOContext;
 import org.appenders.log4j2.elasticsearch.ReusableUTF8JsonGenerator;

diff --git a/...re/json/JsonWriteContextAccessorTest.java → ...csearch/JsonWriteContextAccessorTest.java b/...re/json/JsonWriteContextAccessorTest.java → ...csearch/JsonWriteContextAccessorTest.java
@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.core.json;
+package org.appenders.log4j2.elasticsearch;
 
 /*-
  * #%L
@@ -20,12 +20,12 @@
  * #L%
  */
 
+import com.fasterxml.jackson.core.json.JsonWriteContext;
 import org.junit.Test;
 
-import static com.fasterxml.jackson.core.JsonStreamContextAccessor.TYPE_ROOT;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
 
 public class JsonWriteContextAccessorTest {
 
@@ -34,14 +34,14 @@ public void resetResetsCurrentContextImmediatelyIfContextHasNoParent() {
 
         // given
         JsonWriteContextAccessor ctxAccess = new JsonWriteContextAccessor();
-        JsonWriteContext context = new JsonWriteContext(TYPE_ROOT, null, null);
+        JsonWriteContext context = JsonWriteContext.createRootContext(null);
 
         // when
         JsonWriteContext ctxAfterReset = ctxAccess.reset(context);
 
         // then
         assertSame(context, ctxAfterReset);
-        assertEquals(ctxAccess.getType(ctxAfterReset), TYPE_ROOT);
+        assertTrue(ctxAccess.inRoot(ctxAfterReset));
 
     }
 
@@ -50,21 +50,18 @@ public void resetResetsAndReturnsRootContextIfContextHasParent() {
 
         // given
         JsonWriteContextAccessor ctxAccess = new JsonWriteContextAccessor();
-        JsonWriteContext grandpaContext = new JsonWriteContext(TYPE_ROOT, null, null);
+        JsonWriteContext grandpaContext = JsonWriteContext.createRootContext(null);
         JsonWriteContext parentContext = grandpaContext.createChildObjectContext();
         JsonWriteContext childContext = parentContext.createChildObjectContext();
 
-        int childContextType = ctxAccess.getType(childContext);
-
-        assertNotEquals(ctxAccess.getType(childContext), TYPE_ROOT);
+        assertFalse(ctxAccess.inRoot(childContext));
 
         // when
         JsonWriteContext ctxAfterReset = ctxAccess.reset(childContext);
 
         // then
         assertSame(grandpaContext, ctxAfterReset);
-        assertEquals(TYPE_ROOT, ctxAccess.getType(ctxAfterReset));
-        assertEquals(childContextType, ctxAccess.getType(childContext));
+        assertTrue(ctxAccess.inRoot(ctxAfterReset));
 
     }