Move implementations to core package

oneandonlyflexo · Aug 8, 2023 · 9413622 · 9413622
1 parent 58b10e8
commit 9413622
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 23 deletions.
diff --git a/logbook-api/pom.xml b/logbook-api/pom.xml
@@ -16,13 +16,6 @@
         <developerConnection>scm:git:git@github.com:zalando/logbook.git</developerConnection>
     </scm>
 
-    <dependencies>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-    </dependencies>
-
     <build>
         <plugins>
             <plugin>

diff --git a/logbook-core/pom.xml b/logbook-core/pom.xml
@@ -23,6 +23,10 @@
             <groupId>org.zalando</groupId>
             <artifactId>logbook-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
         <!-- testing -->
         <dependency>
             <groupId>org.zalando</groupId>

diff --git a/logbook-core/src/main/java/org/zalando/logbook/core/DefaultLogbook.java b/logbook-core/src/main/java/org/zalando/logbook/core/DefaultLogbook.java
@@ -14,7 +14,7 @@
 import org.zalando.logbook.Sink;
 import org.zalando.logbook.Strategy;
 import org.zalando.logbook.attributes.AttributeExtractor;
-import org.zalando.logbook.attributes.CompositeAttributeExtractor;
+import org.zalando.logbook.core.attributes.CompositeAttributeExtractor;
 import org.zalando.logbook.attributes.HttpAttributes;
 
 import java.io.IOException;

diff --git a/...tributes/CompositeAttributeExtractor.java → ...tributes/CompositeAttributeExtractor.java b/...tributes/CompositeAttributeExtractor.java → ...tributes/CompositeAttributeExtractor.java
@@ -1,10 +1,12 @@
-package org.zalando.logbook.attributes;
+package org.zalando.logbook.core.attributes;
 
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import org.zalando.logbook.HttpRequest;
 import org.zalando.logbook.HttpResponse;
+import org.zalando.logbook.attributes.AttributeExtractor;
+import org.zalando.logbook.attributes.HttpAttributes;
 
 import javax.annotation.Nonnull;
 import java.util.HashMap;

diff --git a/...ibutes/JwtAllMatchingClaimsExtractor.java → ...ibutes/JwtAllMatchingClaimsExtractor.java b/...ibutes/JwtAllMatchingClaimsExtractor.java → ...ibutes/JwtAllMatchingClaimsExtractor.java
@@ -1,10 +1,11 @@
-package org.zalando.logbook.attributes;
+package org.zalando.logbook.core.attributes;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import org.apiguardian.api.API;
 import org.zalando.logbook.HttpRequest;
+import org.zalando.logbook.attributes.HttpAttributes;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

diff --git a/.../logbook/attributes/JwtBaseExtractor.java → ...ook/core/attributes/JwtBaseExtractor.java b/.../logbook/attributes/JwtBaseExtractor.java → ...ook/core/attributes/JwtBaseExtractor.java
@@ -1,4 +1,4 @@
-package org.zalando.logbook.attributes;
+package org.zalando.logbook.core.attributes;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -8,6 +8,7 @@
 import org.apiguardian.api.API;
 import org.zalando.logbook.HttpHeaders;
 import org.zalando.logbook.HttpRequest;
+import org.zalando.logbook.attributes.AttributeExtractor;
 
 import javax.annotation.Nonnull;
 import java.util.Base64;

diff --git a/...butes/JwtFirstMatchingClaimExtractor.java → ...butes/JwtFirstMatchingClaimExtractor.java b/...butes/JwtFirstMatchingClaimExtractor.java → ...butes/JwtFirstMatchingClaimExtractor.java
@@ -1,10 +1,11 @@
-package org.zalando.logbook.attributes;
+package org.zalando.logbook.core.attributes;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import org.apiguardian.api.API;
 import org.zalando.logbook.HttpRequest;
+import org.zalando.logbook.attributes.HttpAttributes;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

diff --git a/logbook-core/src/test/java/org/zalando/logbook/core/DefaultLogbookTest.java b/logbook-core/src/test/java/org/zalando/logbook/core/DefaultLogbookTest.java
@@ -12,7 +12,7 @@
 import org.zalando.logbook.QueryFilter;
 import org.zalando.logbook.Sink;
 import org.zalando.logbook.attributes.AttributeExtractor;
-import org.zalando.logbook.attributes.CompositeAttributeExtractor;
+import org.zalando.logbook.core.attributes.CompositeAttributeExtractor;
 import org.zalando.logbook.test.MockHttpRequest;
 import org.zalando.logbook.test.MockHttpResponse;
 

diff --git a/...utes/CompositeAttributeExtractorTest.java → ...utes/CompositeAttributeExtractorTest.java b/...utes/CompositeAttributeExtractorTest.java → ...utes/CompositeAttributeExtractorTest.java
@@ -1,8 +1,10 @@
-package org.zalando.logbook.attributes;
+package org.zalando.logbook.core.attributes;
 
 import org.junit.jupiter.api.Test;
 import org.zalando.logbook.HttpRequest;
 import org.zalando.logbook.HttpResponse;
+import org.zalando.logbook.attributes.AttributeExtractor;
+import org.zalando.logbook.attributes.HttpAttributes;
 
 import java.util.ArrayList;
 import java.util.HashMap;

diff --git a/...es/JwtAllMatchingClaimsExtractorTest.java → ...es/JwtAllMatchingClaimsExtractorTest.java b/...es/JwtAllMatchingClaimsExtractorTest.java → ...es/JwtAllMatchingClaimsExtractorTest.java
@@ -1,11 +1,13 @@
-package org.zalando.logbook.attributes;
+package org.zalando.logbook.core.attributes;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.Test;
 import org.zalando.logbook.HttpHeaders;
 import org.zalando.logbook.HttpRequest;
+import org.zalando.logbook.attributes.AttributeExtractor;
+import org.zalando.logbook.attributes.HttpAttributes;
 
 import java.util.Arrays;
 import java.util.Collections;

diff --git a/...book/attributes/JwtBaseExtractorTest.java → ...core/attributes/JwtBaseExtractorTest.java b/...book/attributes/JwtBaseExtractorTest.java → ...core/attributes/JwtBaseExtractorTest.java
@@ -1,4 +1,4 @@
-package org.zalando.logbook.attributes;
+package org.zalando.logbook.core.attributes;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;

diff --git a/...s/JwtFirstMatchingClaimExtractorTest.java → ...s/JwtFirstMatchingClaimExtractorTest.java b/...s/JwtFirstMatchingClaimExtractorTest.java → ...s/JwtFirstMatchingClaimExtractorTest.java
@@ -1,11 +1,13 @@
-package org.zalando.logbook.attributes;
+package org.zalando.logbook.core.attributes;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.SneakyThrows;
 import org.junit.jupiter.api.Test;
 import org.zalando.logbook.HttpHeaders;
 import org.zalando.logbook.HttpRequest;
+import org.zalando.logbook.attributes.AttributeExtractor;
+import org.zalando.logbook.attributes.HttpAttributes;
 
 import java.util.Arrays;
 import java.util.Collections;

diff --git a/...toconfigure/src/main/java/org/zalando/logbook/autoconfigure/LogbookAutoConfiguration.java b/...toconfigure/src/main/java/org/zalando/logbook/autoconfigure/LogbookAutoConfiguration.java
@@ -38,7 +38,7 @@
 import org.zalando.logbook.Sink;
 import org.zalando.logbook.Strategy;
 import org.zalando.logbook.attributes.AttributeExtractor;
-import org.zalando.logbook.attributes.CompositeAttributeExtractor;
+import org.zalando.logbook.core.attributes.CompositeAttributeExtractor;
 import org.zalando.logbook.attributes.NoOpAttributeExtractor;
 import org.zalando.logbook.core.BodyOnlyIfStatusAtLeastStrategy;
 import org.zalando.logbook.core.ChunkingSink;

diff --git a/...boot-autoconfigure/src/main/java/org/zalando/logbook/autoconfigure/LogbookProperties.java b/...boot-autoconfigure/src/main/java/org/zalando/logbook/autoconfigure/LogbookProperties.java
@@ -6,8 +6,8 @@
 import org.apiguardian.api.API;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.zalando.logbook.attributes.AttributeExtractor;
-import org.zalando.logbook.attributes.JwtAllMatchingClaimsExtractor;
-import org.zalando.logbook.attributes.JwtFirstMatchingClaimExtractor;
+import org.zalando.logbook.core.attributes.JwtAllMatchingClaimsExtractor;
+import org.zalando.logbook.core.attributes.JwtFirstMatchingClaimExtractor;
 import org.zalando.logbook.servlet.FormRequestMode;
 
 import javax.annotation.Nonnull;

diff --git a/...autoconfigure/src/test/java/org/zalando/logbook/autoconfigure/AttributeExtractorTest.java b/...autoconfigure/src/test/java/org/zalando/logbook/autoconfigure/AttributeExtractorTest.java
@@ -4,9 +4,9 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.zalando.logbook.attributes.AttributeExtractor;
-import org.zalando.logbook.attributes.CompositeAttributeExtractor;
-import org.zalando.logbook.attributes.JwtAllMatchingClaimsExtractor;
-import org.zalando.logbook.attributes.JwtFirstMatchingClaimExtractor;
+import org.zalando.logbook.core.attributes.CompositeAttributeExtractor;
+import org.zalando.logbook.core.attributes.JwtAllMatchingClaimsExtractor;
+import org.zalando.logbook.core.attributes.JwtFirstMatchingClaimExtractor;
 import org.zalando.logbook.attributes.NoOpAttributeExtractor;
 import org.zalando.logbook.autoconfigure.LogbookProperties.ExtractorProperty;