Fix raw type warnings

We are using a number of generics, make sure to add parameters as
appropriate. Also removes unnecessary raw casts in test code.

JIRA: CONTROLLER-2071
Change-Id: I44a9c6059c0d1de34aba6f483aa871b995c076a9
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/FileChannelJournalSegmentWriter.java b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/FileChannelJournalSegmentWriter.java
index c1ca7a272008f575dcccc6cff5f9e0fc2a4011ae..e9f28e34bd752dc5af7668544307123486cafbea 100644 (file)
--- a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/FileChannelJournalSegmentWriter.java
+++ b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/FileChannelJournalSegmentWriter.java
@@ -45,7 +45,7 @@ import java.util.zip.Checksum;
  */
 class FileChannelJournalSegmentWriter<E> implements JournalWriter<E> {
   private final FileChannel channel;
-  private final JournalSegment segment;
+  private final JournalSegment<E> segment;
   private final int maxEntrySize;
   private final JournalIndex index;
   private final Namespace namespace;
@@ -55,7 +55,7 @@ class FileChannelJournalSegmentWriter<E> implements JournalWriter<E> {
 
   FileChannelJournalSegmentWriter(
       FileChannel channel,
-      JournalSegment segment,
+      JournalSegment<E> segment,
       int maxEntrySize,
       JournalIndex index,
       Namespace namespace) {

diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/SegmentedJournal.java b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/SegmentedJournal.java
index 07496c5dc1855e79bd7b4599db7adcb63aae2f86..74923f602614ce72f2d694d26aab6108a4ef9148 100644 (file)
--- a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/SegmentedJournal.java
+++ b/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/SegmentedJournal.java
@@ -70,7 +70,7 @@ public class SegmentedJournal<E> implements Journal<E> {
   private volatile long commitIndex;
 
   private final NavigableMap<Long, JournalSegment<E>> segments = new ConcurrentSkipListMap<>();
-  private final Collection<SegmentedJournalReader> readers = Sets.newConcurrentHashSet();
+  private final Collection<SegmentedJournalReader<E>> readers = Sets.newConcurrentHashSet();
   private JournalSegment<E> currentSegment;
 
   private volatile boolean open = true;
@@ -359,7 +359,7 @@ public class SegmentedJournal<E> implements Journal<E> {
     assertOpen();
     assertDiskSpace();
 
-    JournalSegment lastSegment = getLastSegment();
+    JournalSegment<E> lastSegment = getLastSegment();
     JournalSegmentDescriptor descriptor = JournalSegmentDescriptor.builder()
         .withId(lastSegment != null ? lastSegment.descriptor().id() + 1 : 1)
         .withIndex(currentSegment.lastIndex() + 1)
@@ -410,7 +410,7 @@ public class SegmentedJournal<E> implements Journal<E> {
    *
    * @param segment The segment to remove.
    */
-  synchronized void removeSegment(JournalSegment segment) {
+  synchronized void removeSegment(JournalSegment<E> segment) {
     segments.remove(segment.index());
     segment.close();
     segment.delete();
@@ -552,7 +552,7 @@ public class SegmentedJournal<E> implements Journal<E> {
    * @param index The index at which to reset readers.
    */
   void resetHead(long index) {
-    for (SegmentedJournalReader reader : readers) {
+    for (SegmentedJournalReader<E> reader : readers) {
       if (reader.getNextIndex() < index) {
         reader.reset(index);
       }
@@ -565,14 +565,14 @@ public class SegmentedJournal<E> implements Journal<E> {
    * @param index The index at which to reset readers.
    */
   void resetTail(long index) {
-    for (SegmentedJournalReader reader : readers) {
+    for (SegmentedJournalReader<E> reader : readers) {
       if (reader.getNextIndex() >= index) {
         reader.reset(index);
       }
     }
   }
 
-  void closeReader(SegmentedJournalReader reader) {
+  void closeReader(SegmentedJournalReader<E> reader) {
     readers.remove(reader);
   }
 
@@ -616,7 +616,7 @@ public class SegmentedJournal<E> implements Journal<E> {
       SortedMap<Long, JournalSegment<E>> compactSegments = segments.headMap(segmentEntry.getValue().index());
       if (!compactSegments.isEmpty()) {
         log.debug("{} - Compacting {} segment(s)", name, compactSegments.size());
-        for (JournalSegment segment : compactSegments.values()) {
+        for (JournalSegment<E> segment : compactSegments.values()) {
           log.trace("Deleting segment: {}", segment);
           segment.close();
           segment.delete();

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 8e027da8ba06ddeb83d82449e64e4c353b96ab35..e9284a5c54bbdcaaf149c318bf2021b4c044b40d 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
@@ -31,7 +31,6 @@ import java.nio.file.Paths;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
@@ -69,7 +68,7 @@ public abstract class AbstractJournalTest {
   protected abstract StorageLevel storageLevel();
 
   @Parameterized.Parameters
-  public static Collection primeNumbers() {
+  public static List<Object[]> primeNumbers() {
     List<Object[]> runs = new ArrayList<>();
     for (int i = 1; i <= 10; i++) {
       for (int j = 1; j <= 10; j++) {
@@ -104,7 +103,6 @@ public abstract class AbstractJournalTest {
   }
 
   @Test
-  @SuppressWarnings("unchecked")
   public void testWriteRead() throws Exception {
     try (Journal<TestEntry> journal = createJournal()) {
       JournalWriter<TestEntry> writer = journal.writer();
@@ -126,7 +124,7 @@ public abstract class AbstractJournalTest {
       // Test reading an entry
       Indexed<TestEntry> entry1;
       reader.reset();
-      entry1 = (Indexed) reader.next();
+      entry1 = reader.next();
       assertEquals(1, entry1.index());
       assertEquals(entry1, reader.getCurrentEntry());
       assertEquals(1, reader.getCurrentIndex());
@@ -135,7 +133,7 @@ public abstract class AbstractJournalTest {
       Indexed<TestEntry> entry2;
       assertTrue(reader.hasNext());
       assertEquals(2, reader.getNextIndex());
-      entry2 = (Indexed) reader.next();
+      entry2 = reader.next();
       assertEquals(2, entry2.index());
       assertEquals(entry2, reader.getCurrentEntry());
       assertEquals(2, reader.getCurrentIndex());
@@ -144,7 +142,7 @@ public abstract class AbstractJournalTest {
       // Test opening a new reader and reading from the journal.
       reader = journal.openReader(1);
       assertTrue(reader.hasNext());
-      entry1 = (Indexed) reader.next();
+      entry1 = reader.next();
       assertEquals(1, entry1.index());
       assertEquals(entry1, reader.getCurrentEntry());
       assertEquals(1, reader.getCurrentIndex());
@@ -152,7 +150,7 @@ public abstract class AbstractJournalTest {
 
       assertTrue(reader.hasNext());
       assertEquals(2, reader.getNextIndex());
-      entry2 = (Indexed) reader.next();
+      entry2 = reader.next();
       assertEquals(2, entry2.index());
       assertEquals(entry2, reader.getCurrentEntry());
       assertEquals(2, reader.getCurrentIndex());
@@ -164,7 +162,7 @@ public abstract class AbstractJournalTest {
       // Test opening a new reader and reading from the journal.
       reader = journal.openReader(1);
       assertTrue(reader.hasNext());
-      entry1 = (Indexed) reader.next();
+      entry1 = reader.next();
       assertEquals(1, entry1.index());
       assertEquals(entry1, reader.getCurrentEntry());
       assertEquals(1, reader.getCurrentIndex());
@@ -172,7 +170,7 @@ public abstract class AbstractJournalTest {
 
       assertTrue(reader.hasNext());
       assertEquals(2, reader.getNextIndex());
-      entry2 = (Indexed) reader.next();
+      entry2 = reader.next();
       assertEquals(2, entry2.index());
       assertEquals(entry2, reader.getCurrentEntry());
       assertEquals(2, reader.getCurrentIndex());
@@ -194,7 +192,7 @@ public abstract class AbstractJournalTest {
       assertEquals(1, reader.getCurrentEntry().index());
       assertTrue(reader.hasNext());
       assertEquals(2, reader.getNextIndex());
-      entry2 = (Indexed) reader.next();
+      entry2 = reader.next();
       assertEquals(2, entry2.index());
       assertEquals(entry2, reader.getCurrentEntry());
       assertEquals(2, reader.getCurrentIndex());
@@ -268,7 +266,6 @@ public abstract class AbstractJournalTest {
   }
 
   @Test
-  @SuppressWarnings("unchecked")
   public void testWriteReadEntries() throws Exception {
     try (Journal<TestEntry> journal = createJournal()) {
       JournalWriter<TestEntry> writer = journal.writer();
@@ -278,11 +275,11 @@ public abstract class AbstractJournalTest {
         writer.append(ENTRY);
         assertTrue(reader.hasNext());
         Indexed<TestEntry> entry;
-        entry = (Indexed) reader.next();
+        entry = reader.next();
         assertEquals(i, entry.index());
         assertEquals(32, entry.entry().bytes().length);
         reader.reset(i);
-        entry = (Indexed) reader.next();
+        entry = reader.next();
         assertEquals(i, entry.index());
         assertEquals(32, entry.entry().bytes().length);
 
@@ -301,7 +298,7 @@ public abstract class AbstractJournalTest {
         assertTrue(reader.hasNext());
         reader.reset(i);
         assertTrue(reader.hasNext());
-        entry = (Indexed) reader.next();
+        entry = reader.next();
         assertEquals(i, entry.index());
         assertEquals(32, entry.entry().bytes().length);
       }
@@ -309,7 +306,6 @@ public abstract class AbstractJournalTest {
   }
 
   @Test
-  @SuppressWarnings("unchecked")
   public void testWriteReadCommittedEntries() throws Exception {
     try (Journal<TestEntry> journal = createJournal()) {
       JournalWriter<TestEntry> writer = journal.writer();
@@ -321,11 +317,11 @@ public abstract class AbstractJournalTest {
         writer.commit(i);
         assertTrue(reader.hasNext());
         Indexed<TestEntry> entry;
-        entry = (Indexed) reader.next();
+        entry = reader.next();
         assertEquals(i, entry.index());
         assertEquals(32, entry.entry().bytes().length);
         reader.reset(i);
-        entry = (Indexed) reader.next();
+        entry = reader.next();
         assertEquals(i, entry.index());
         assertEquals(32, entry.entry().bytes().length);
       }

diff --git a/third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/SerializerBuilder.java b/third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/SerializerBuilder.java
index 0b6c82b57f50990781b15bf91e53dff5e41aa83c..0d9c7489ee579763d592da1a1c572214d35c4046 100644 (file)
--- a/third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/SerializerBuilder.java
+++ b/third-party/atomix/utils/src/main/java/io/atomix/utils/serializer/SerializerBuilder.java
@@ -114,7 +114,7 @@ public class SerializerBuilder implements Builder<Serializer> {
    * @param types the serializable types
    * @return the serializer builder
    */
-  public SerializerBuilder addSerializer(com.esotericsoftware.kryo.Serializer serializer, Class<?>... types) {
+  public SerializerBuilder addSerializer(com.esotericsoftware.kryo.Serializer<?> serializer, Class<?>... types) {
     namespaceBuilder.register(serializer, types);
     return this;
   }