Remove jackson module

StefanBratanov · Dec 29, 2024 · b4fd155 · b4fd155
1 parent 19c82a5
commit b4fd155
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 76 deletions.
diff --git a/data/serializer/build.gradle b/data/serializer/build.gradle
@@ -6,7 +6,6 @@ dependencies {
   implementation project(':ethereum:spec')
   implementation project(':infrastructure:bls')
   implementation project(':infrastructure:bytes')
-  implementation project(':infrastructure:jackson')
   implementation project(':infrastructure:async')
 
   implementation 'io.tmio:tuweni-units'

diff --git a/ethereum/execution-types/build.gradle b/ethereum/execution-types/build.gradle
@@ -3,7 +3,6 @@ dependencies {
     implementation project(':infrastructure:crypto')
     implementation project(':infrastructure:json')
 
-    testFixturesApi project(':infrastructure:jackson')
     testImplementation project(':ethereum:json-types')
 
     testImplementation testFixtures(project(':infrastructure:json'))

diff --git a/infrastructure/jackson/build.gradle b/infrastructure/jackson/build.gradle
diff --git a/...ava/tech/pegasys/teku/infrastructure/jackson/deserializers/bytes/Bytes32Deserializer.java b/...ava/tech/pegasys/teku/infrastructure/jackson/deserializers/bytes/Bytes32Deserializer.java
diff --git a/...in/java/tech/pegasys/teku/infrastructure/jackson/deserializers/bytes/BytesSerializer.java b/...in/java/tech/pegasys/teku/infrastructure/jackson/deserializers/bytes/BytesSerializer.java
diff --git a/infrastructure/yaml/build.gradle b/infrastructure/yaml/build.gradle
@@ -1,5 +1,4 @@
 dependencies {
-  implementation project(':infrastructure:jackson')
   implementation 'io.tmio:tuweni-bytes'
   implementation 'com.fasterxml.jackson.core:jackson-databind'
   implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'

diff --git a/infrastructure/yaml/src/main/java/tech/pegasys/teku/data/yaml/YamlProvider.java b/infrastructure/yaml/src/main/java/tech/pegasys/teku/data/yaml/YamlProvider.java
@@ -33,11 +33,10 @@
 import java.io.OutputStream;
 import java.io.StringWriter;
 import java.io.UncheckedIOException;
+import java.util.Locale;
 import java.util.stream.Stream;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
-import tech.pegasys.teku.infrastructure.jackson.deserializers.bytes.Bytes32Deserializer;
-import tech.pegasys.teku.infrastructure.jackson.deserializers.bytes.BytesSerializer;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
 
 public class YamlProvider {
@@ -113,4 +112,22 @@ public void serialize(
       gen.writeNumber(value.bigIntegerValue());
     }
   }
+
+  public static class Bytes32Deserializer extends JsonDeserializer<Bytes32> {
+
+    @Override
+    public Bytes32 deserialize(final JsonParser p, final DeserializationContext ctxt)
+        throws IOException {
+      return Bytes32.fromHexString(p.getValueAsString());
+    }
+  }
+
+  public static class BytesSerializer extends JsonSerializer<Bytes> {
+    @Override
+    public void serialize(
+        final Bytes value, final JsonGenerator gen, final SerializerProvider provider)
+        throws IOException {
+      gen.writeString(value.toHexString().toLowerCase(Locale.ROOT));
+    }
+  }
 }
diff --git a/settings.gradle b/settings.gradle
@@ -33,7 +33,6 @@ include 'infrastructure:events'
 include 'infrastructure:exceptions'
 include 'infrastructure:http'
 include 'infrastructure:io'
-include 'infrastructure:jackson'
 include 'infrastructure:json'
 include 'infrastructure:kzg'
 include 'infrastructure:metrics'

diff --git a/validator/client/build.gradle b/validator/client/build.gradle
@@ -4,7 +4,6 @@ dependencies {
   implementation project(':infrastructure:crypto')
   implementation project(':infrastructure:exceptions')
   implementation project(':infrastructure:io')
-  implementation project(':infrastructure:jackson')
   implementation project(':infrastructure:metrics')
   implementation project(':infrastructure:http')
   implementation project(':ethereum:json-types')

diff --git a/...alizers/bytes/Bytes48KeyDeserializer.java → ...config/loader/Bytes48KeyDeserializer.java b/...alizers/bytes/Bytes48KeyDeserializer.java → ...config/loader/Bytes48KeyDeserializer.java
@@ -11,7 +11,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package tech.pegasys.teku.infrastructure.jackson.deserializers.bytes;
+package tech.pegasys.teku.validator.client.proposerconfig.loader;
 
 import com.fasterxml.jackson.core.JacksonException;
 import com.fasterxml.jackson.databind.DeserializationContext;

diff --git a/...n/java/tech/pegasys/teku/validator/client/proposerconfig/loader/ProposerConfigLoader.java b/...n/java/tech/pegasys/teku/validator/client/proposerconfig/loader/ProposerConfigLoader.java
@@ -27,7 +27,6 @@
 import tech.pegasys.teku.infrastructure.exceptions.ExceptionUtil;
 import tech.pegasys.teku.infrastructure.exceptions.InvalidConfigurationException;
 import tech.pegasys.teku.infrastructure.http.UrlSanitizer;
-import tech.pegasys.teku.infrastructure.jackson.deserializers.bytes.Bytes48KeyDeserializer;
 import tech.pegasys.teku.validator.client.ProposerConfig;
 
 public class ProposerConfigLoader {