Code cleanup

Author: jyemin

bson/src/main/org/bson/internal/ChildCodecRegistry.java

@@ -22,6 +22,7 @@
 
 import java.lang.reflect.Type;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
 import static java.lang.String.format;
@@ -75,7 +76,7 @@ public <U> Codec<U> get(final Class<U> clazz, final List<Type> typeArguments) {
                         clazz, typeArguments.size()),
                 clazz.getTypeParameters().length == typeArguments.size());
         if (hasCycles(clazz)) {
-            return new LazyCodec<U>(registry, clazz, typeArguments);
+            return new LazyCodec<>(registry, clazz, typeArguments);
         } else {
             return registry.get(new ChildCodecRegistry<>(this, clazz, typeArguments));
         }
@@ -86,9 +87,8 @@ public <U> Codec<U> get(final Class<U> clazz, final CodecRegistry registry) {
         return this.registry.get(clazz, registry);
     }
 
-    @SuppressWarnings("rawtypes")
     private <U> Boolean hasCycles(final Class<U> theClass) {
-        ChildCodecRegistry current = this;
+        ChildCodecRegistry<?> current = this;
         while (current != null) {
             if (current.codecClass.equals(theClass)) {
                 return true;
@@ -109,12 +109,12 @@ public boolean equals(final Object o) {
             return false;
         }
 
-        ChildCodecRegistry<?> that = (ChildCodecRegistry) o;
+        ChildCodecRegistry<?> that = (ChildCodecRegistry<?>) o;
 
         if (!codecClass.equals(that.codecClass)) {
             return false;
         }
-        if (parent != null ? !parent.equals(that.parent) : that.parent != null) {
+        if (!Objects.equals(parent, that.parent)) {
             return false;
         }
         if (!registry.equals(that.registry)) {

bson/src/main/org/bson/internal/ProvidersCodecRegistry.java

@@ -30,7 +30,7 @@
 import static org.bson.assertions.Assertions.isTrueArgument;
 import static org.bson.assertions.Assertions.notNull;
 
-public final class ProvidersCodecRegistry implements CodecRegistry, CycleDetectingCodecRegistry {
+public final class ProvidersCodecRegistry implements CycleDetectingCodecRegistry {
     private final List<CodecProvider> codecProviders;
     private final CodecCache codecCache = new CodecCache();
 
@@ -54,7 +54,6 @@ public <T> Codec<T> get(final Class<T> clazz, final List<Type> typeArguments) {
         return get(new ChildCodecRegistry<T>(this, clazz, typeArguments));
     }
 
-    @SuppressWarnings("rawtypes")
     public <T> Codec<T> get(final Class<T> clazz, final CodecRegistry registry) {
         for (CodecProvider provider : codecProviders) {
             Codec<T> codec = provider.get(clazz, registry);