From 9413622d0c0a946aa50af3c67f2f95f024891b69 Mon Sep 17 00:00:00 2001
From: Sadeq Dousti <3616518+msdousti@users.noreply.github.com>
Date: Tue, 8 Aug 2023 23:11:01 +0200
Subject: [PATCH] Move implementations to core package

---
 logbook-api/pom.xml                                        | 7 -------
 logbook-core/pom.xml                                       | 4 ++++
 .../main/java/org/zalando/logbook/core/DefaultLogbook.java | 2 +-
 .../core}/attributes/CompositeAttributeExtractor.java      | 4 +++-
 .../core}/attributes/JwtAllMatchingClaimsExtractor.java    | 3 ++-
 .../zalando/logbook/core}/attributes/JwtBaseExtractor.java | 3 ++-
 .../core}/attributes/JwtFirstMatchingClaimExtractor.java   | 3 ++-
 .../java/org/zalando/logbook/core/DefaultLogbookTest.java  | 2 +-
 .../core}/attributes/CompositeAttributeExtractorTest.java  | 4 +++-
 .../attributes/JwtAllMatchingClaimsExtractorTest.java      | 4 +++-
 .../logbook/core}/attributes/JwtBaseExtractorTest.java     | 2 +-
 .../attributes/JwtFirstMatchingClaimExtractorTest.java     | 4 +++-
 .../logbook/autoconfigure/LogbookAutoConfiguration.java    | 2 +-
 .../zalando/logbook/autoconfigure/LogbookProperties.java   | 4 ++--
 .../logbook/autoconfigure/AttributeExtractorTest.java      | 6 +++---
 15 files changed, 31 insertions(+), 23 deletions(-)
 rename {logbook-api/src/main/java/org/zalando/logbook => logbook-core/src/main/java/org/zalando/logbook/core}/attributes/CompositeAttributeExtractor.java (94%)
 rename {logbook-api/src/main/java/org/zalando/logbook => logbook-core/src/main/java/org/zalando/logbook/core}/attributes/JwtAllMatchingClaimsExtractor.java (96%)
 rename {logbook-api/src/main/java/org/zalando/logbook => logbook-core/src/main/java/org/zalando/logbook/core}/attributes/JwtBaseExtractor.java (95%)
 rename {logbook-api/src/main/java/org/zalando/logbook => logbook-core/src/main/java/org/zalando/logbook/core}/attributes/JwtFirstMatchingClaimExtractor.java (96%)
 rename {logbook-api/src/test/java/org/zalando/logbook => logbook-core/src/test/java/org/zalando/logbook/core}/attributes/CompositeAttributeExtractorTest.java (94%)
 rename {logbook-api/src/test/java/org/zalando/logbook => logbook-core/src/test/java/org/zalando/logbook/core}/attributes/JwtAllMatchingClaimsExtractorTest.java (97%)
 rename {logbook-api/src/test/java/org/zalando/logbook => logbook-core/src/test/java/org/zalando/logbook/core}/attributes/JwtBaseExtractorTest.java (99%)
 rename {logbook-api/src/test/java/org/zalando/logbook => logbook-core/src/test/java/org/zalando/logbook/core}/attributes/JwtFirstMatchingClaimExtractorTest.java (97%)

diff --git a/logbook-api/pom.xml b/logbook-api/pom.xml
index c9d5602ec..f9a615fb1 100644
--- 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
index 61fe9bc34..49d10d091 100644
--- 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
index fea0efa93..5e9d07ddb 100644
--- 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/logbook-api/src/main/java/org/zalando/logbook/attributes/CompositeAttributeExtractor.java b/logbook-core/src/main/java/org/zalando/logbook/core/attributes/CompositeAttributeExtractor.java
similarity index 94%
rename from logbook-api/src/main/java/org/zalando/logbook/attributes/CompositeAttributeExtractor.java
rename to logbook-core/src/main/java/org/zalando/logbook/core/attributes/CompositeAttributeExtractor.java
index aec19666e..7a0b5f3ea 100644
--- a/logbook-api/src/main/java/org/zalando/logbook/attributes/CompositeAttributeExtractor.java
+++ b/logbook-core/src/main/java/org/zalando/logbook/core/attributes/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/logbook-api/src/main/java/org/zalando/logbook/attributes/JwtAllMatchingClaimsExtractor.java b/logbook-core/src/main/java/org/zalando/logbook/core/attributes/JwtAllMatchingClaimsExtractor.java
similarity index 96%
rename from logbook-api/src/main/java/org/zalando/logbook/attributes/JwtAllMatchingClaimsExtractor.java
rename to logbook-core/src/main/java/org/zalando/logbook/core/attributes/JwtAllMatchingClaimsExtractor.java
index 2a63978a8..cf54ac833 100644
--- a/logbook-api/src/main/java/org/zalando/logbook/attributes/JwtAllMatchingClaimsExtractor.java
+++ b/logbook-core/src/main/java/org/zalando/logbook/core/attributes/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-api/src/main/java/org/zalando/logbook/attributes/JwtBaseExtractor.java b/logbook-core/src/main/java/org/zalando/logbook/core/attributes/JwtBaseExtractor.java
similarity index 95%
rename from logbook-api/src/main/java/org/zalando/logbook/attributes/JwtBaseExtractor.java
rename to logbook-core/src/main/java/org/zalando/logbook/core/attributes/JwtBaseExtractor.java
index 0d1b338c6..9a852b702 100644
--- a/logbook-api/src/main/java/org/zalando/logbook/attributes/JwtBaseExtractor.java
+++ b/logbook-core/src/main/java/org/zalando/logbook/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/logbook-api/src/main/java/org/zalando/logbook/attributes/JwtFirstMatchingClaimExtractor.java b/logbook-core/src/main/java/org/zalando/logbook/core/attributes/JwtFirstMatchingClaimExtractor.java
similarity index 96%
rename from logbook-api/src/main/java/org/zalando/logbook/attributes/JwtFirstMatchingClaimExtractor.java
rename to logbook-core/src/main/java/org/zalando/logbook/core/attributes/JwtFirstMatchingClaimExtractor.java
index e19132e34..18b2e85ca 100644
--- a/logbook-api/src/main/java/org/zalando/logbook/attributes/JwtFirstMatchingClaimExtractor.java
+++ b/logbook-core/src/main/java/org/zalando/logbook/core/attributes/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
index e9985309e..f9c7f3efd 100644
--- 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/logbook-api/src/test/java/org/zalando/logbook/attributes/CompositeAttributeExtractorTest.java b/logbook-core/src/test/java/org/zalando/logbook/core/attributes/CompositeAttributeExtractorTest.java
similarity index 94%
rename from logbook-api/src/test/java/org/zalando/logbook/attributes/CompositeAttributeExtractorTest.java
rename to logbook-core/src/test/java/org/zalando/logbook/core/attributes/CompositeAttributeExtractorTest.java
index e44fc6964..767ff9ac9 100644
--- a/logbook-api/src/test/java/org/zalando/logbook/attributes/CompositeAttributeExtractorTest.java
+++ b/logbook-core/src/test/java/org/zalando/logbook/core/attributes/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/logbook-api/src/test/java/org/zalando/logbook/attributes/JwtAllMatchingClaimsExtractorTest.java b/logbook-core/src/test/java/org/zalando/logbook/core/attributes/JwtAllMatchingClaimsExtractorTest.java
similarity index 97%
rename from logbook-api/src/test/java/org/zalando/logbook/attributes/JwtAllMatchingClaimsExtractorTest.java
rename to logbook-core/src/test/java/org/zalando/logbook/core/attributes/JwtAllMatchingClaimsExtractorTest.java
index 05a4ce88d..1e00cdb94 100644
--- a/logbook-api/src/test/java/org/zalando/logbook/attributes/JwtAllMatchingClaimsExtractorTest.java
+++ b/logbook-core/src/test/java/org/zalando/logbook/core/attributes/JwtAllMatchingClaimsExtractorTest.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;
@@ -6,6 +6,8 @@
 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/logbook-api/src/test/java/org/zalando/logbook/attributes/JwtBaseExtractorTest.java b/logbook-core/src/test/java/org/zalando/logbook/core/attributes/JwtBaseExtractorTest.java
similarity index 99%
rename from logbook-api/src/test/java/org/zalando/logbook/attributes/JwtBaseExtractorTest.java
rename to logbook-core/src/test/java/org/zalando/logbook/core/attributes/JwtBaseExtractorTest.java
index 10e03ffba..88152ed4b 100644
--- a/logbook-api/src/test/java/org/zalando/logbook/attributes/JwtBaseExtractorTest.java
+++ b/logbook-core/src/test/java/org/zalando/logbook/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/logbook-api/src/test/java/org/zalando/logbook/attributes/JwtFirstMatchingClaimExtractorTest.java b/logbook-core/src/test/java/org/zalando/logbook/core/attributes/JwtFirstMatchingClaimExtractorTest.java
similarity index 97%
rename from logbook-api/src/test/java/org/zalando/logbook/attributes/JwtFirstMatchingClaimExtractorTest.java
rename to logbook-core/src/test/java/org/zalando/logbook/core/attributes/JwtFirstMatchingClaimExtractorTest.java
index b7e7b22de..e3210aeb3 100644
--- a/logbook-api/src/test/java/org/zalando/logbook/attributes/JwtFirstMatchingClaimExtractorTest.java
+++ b/logbook-core/src/test/java/org/zalando/logbook/core/attributes/JwtFirstMatchingClaimExtractorTest.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;
@@ -6,6 +6,8 @@
 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/logbook-spring-boot-autoconfigure/src/main/java/org/zalando/logbook/autoconfigure/LogbookAutoConfiguration.java b/logbook-spring-boot-autoconfigure/src/main/java/org/zalando/logbook/autoconfigure/LogbookAutoConfiguration.java
index 4968cc25b..bafd1c8aa 100644
--- a/logbook-spring-boot-autoconfigure/src/main/java/org/zalando/logbook/autoconfigure/LogbookAutoConfiguration.java
+++ b/logbook-spring-boot-autoconfigure/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/logbook-spring-boot-autoconfigure/src/main/java/org/zalando/logbook/autoconfigure/LogbookProperties.java b/logbook-spring-boot-autoconfigure/src/main/java/org/zalando/logbook/autoconfigure/LogbookProperties.java
index ff2b35332..f46cc69ea 100644
--- a/logbook-spring-boot-autoconfigure/src/main/java/org/zalando/logbook/autoconfigure/LogbookProperties.java
+++ b/logbook-spring-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/logbook-spring-boot-autoconfigure/src/test/java/org/zalando/logbook/autoconfigure/AttributeExtractorTest.java b/logbook-spring-boot-autoconfigure/src/test/java/org/zalando/logbook/autoconfigure/AttributeExtractorTest.java
index 9fe9c1cd9..488d26b77 100644
--- a/logbook-spring-boot-autoconfigure/src/test/java/org/zalando/logbook/autoconfigure/AttributeExtractorTest.java
+++ b/logbook-spring-boot-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;