Do not leak Kryo from atomix.storage

[controller.git] / third-party / atomix / storage / src / test / java / io / atomix / storage / journal / AbstractJournalTest.java

diff --git a/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/AbstractJournalTest.java b/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/AbstractJournalTest.java
index eaddd3d28d28716591148f7a30a920d01af60a42..222d0bfe391307e7b49528be431cf82c37523665 100644 (file)
--- a/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/AbstractJournalTest.java
+++ b/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/AbstractJournalTest.java
@@ -1,5 +1,6 @@
 /*
- * Copyright 2017-present Open Networking Foundation
+ * Copyright 2017-2021 Open Networking Foundation
+ * Copyright 2023 PANTHEON.tech, s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,13 +16,11 @@
  */
 package io.atomix.storage.journal;
 
-import com.esotericsoftware.kryo.serializers.DefaultArraySerializers.ByteArraySerializer;
-import io.atomix.utils.serializer.Namespace;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 import java.nio.file.FileVisitResult;
@@ -32,12 +31,11 @@ import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
 import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 
 /**
  * Base journal test.
@@ -46,9 +44,9 @@ import static org.junit.Assert.assertTrue;
  */
 @RunWith(Parameterized.class)
 public abstract class AbstractJournalTest {
-  private static final Namespace NAMESPACE = Namespace.builder()
-      .register(new TestEntrySerializer(), TestEntry.class)
-      .register(new ByteArraySerializer(), byte[].class)
+  private static final JournalSerdes NAMESPACE = JournalSerdes.builder()
+      .register(new TestEntrySerdes(), TestEntry.class)
+      .register(new ByteArraySerdes(), byte[].class)
       .build();
 
   protected static final TestEntry ENTRY = new TestEntry(32);
@@ -57,10 +55,10 @@ public abstract class AbstractJournalTest {
   private final int maxSegmentSize;
   protected final int entriesPerSegment;
 
-  protected AbstractJournalTest(int maxSegmentSize) {
+  protected AbstractJournalTest(final int maxSegmentSize) {
     this.maxSegmentSize = maxSegmentSize;
-    int entryLength = (NAMESPACE.serialize(ENTRY).length + 8);
-    this.entriesPerSegment = (maxSegmentSize - 64) / entryLength;
+    int entryLength = NAMESPACE.serialize(ENTRY).length + 8;
+    entriesPerSegment = (maxSegmentSize - 64) / entryLength;
   }
 
   protected abstract StorageLevel storageLevel();
@@ -70,7 +68,7 @@ public abstract class AbstractJournalTest {
     List<Object[]> runs = new ArrayList<>();
     for (int i = 1; i <= 10; i++) {
       for (int j = 1; j <= 10; j++) {
-        runs.add(new Object[]{64 + (i * (NAMESPACE.serialize(ENTRY).length + 8) + j)});
+        runs.add(new Object[]{64 + i * (NAMESPACE.serialize(ENTRY).length + 8) + j});
       }
     }
     return runs;
@@ -373,13 +371,13 @@ public abstract class AbstractJournalTest {
     if (Files.exists(PATH)) {
       Files.walkFileTree(PATH, new SimpleFileVisitor<Path>() {
         @Override
-        public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+        public FileVisitResult visitFile(final Path file, final BasicFileAttributes attrs) throws IOException {
           Files.delete(file);
           return FileVisitResult.CONTINUE;
         }
 
         @Override
-        public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
+        public FileVisitResult postVisitDirectory(final Path dir, final IOException exc) throws IOException {
           Files.delete(dir);
           return FileVisitResult.CONTINUE;
         }