IntelliJ automated code cleanup

* Replace explicit type arguments with <>
* Add missing <p> tags to Javadoc
* Remove redundant warning suppressions
* Replace anonymous class with lambda
* Use try-with-resources
* Collapse identical catch blocks
* Use Comparator.comparing
* Use Map.getOrDefault
* Replace lambda invocation with body
* Other miscellaneous

Author: jyemin

bson-record-codec/src/main/org/bson/codecs/record/RecordCodec.java

@@ -140,7 +140,7 @@ private static int getIndexOfTypeParameter(final String typeParameterName, final
                     return i;
                 }
             }
-            throw new CodecConfigurationException(String.format("Could not find type parameter on record %s with name %s",
+            throw new CodecConfigurationException(format("Could not find type parameter on record %s with name %s",
                     recordClass.getName(), typeParameterName));
         }
 

bson/src/main/org/bson/AbstractBsonWriter.java

@@ -35,7 +35,7 @@
  */
 public abstract class AbstractBsonWriter implements BsonWriter, Closeable {
     private final BsonWriterSettings settings;
-    private final Stack<FieldNameValidator> fieldNameValidatorStack = new Stack<FieldNameValidator>();
+    private final Stack<FieldNameValidator> fieldNameValidatorStack = new Stack<>();
     private State state;
     private Context context;
     private int serializationDepth;

bson/src/main/org/bson/BSONCallback.java

@@ -22,7 +22,7 @@
 /**
  * A callback interface for describing the structure of a BSON document. Implementations of this define how to turn BSON read from MongoDB
  * into Java objects.
- *
+ * <p>
  * See the <a href="http://bsonspec.org/spec.html">BSON Spec</a>.
  */
 public interface BSONCallback {

bson/src/main/org/bson/BasicBSONCallback.java

@@ -47,8 +47,8 @@ public class BasicBSONCallback implements BSONCallback {
      * Creates a new instance.
      */
     public BasicBSONCallback() {
-        stack = new LinkedList<BSONObject>();
-        nameStack = new LinkedList<String>();
+        stack = new LinkedList<>();
+        nameStack = new LinkedList<>();
         reset();
     }
 

bson/src/main/org/bson/BasicBSONDecoder.java

@@ -85,13 +85,10 @@ public BSONObject readObject(final InputStream in) throws IOException {
 
     @Override
     public int decode(final byte[] bytes, final BSONCallback callback) {
-        BsonBinaryReader reader = new BsonBinaryReader(new ByteBufferBsonInput(new ByteBufNIO(ByteBuffer.wrap(bytes))));
-        try {
+        try (BsonBinaryReader reader = new BsonBinaryReader(new ByteBufferBsonInput(new ByteBufNIO(ByteBuffer.wrap(bytes))))) {
             BsonWriter writer = new BSONCallbackAdapter(new BsonWriterSettings(), callback);
             writer.pipe(reader);
             return reader.getBsonInput().getPosition(); //TODO check this.
-        } finally {
-            reader.close();
         }
     }
 

bson/src/main/org/bson/BasicBSONObject.java

@@ -78,7 +78,7 @@ public BasicBSONObject(final Map map) {
      * @return the DBObject
      */
     public Map toMap() {
-        return new LinkedHashMap<String, Object>(this);
+        return new LinkedHashMap<>(this);
     }
 
     /**
@@ -98,7 +98,7 @@ public Object removeField(final String key) {
      * @return if the field exists
      */
     public boolean containsField(final String field) {
-        return super.containsKey(field);
+        return containsKey(field);
     }
 
     /**
@@ -382,8 +382,8 @@ private static Object canonicalize(final Object from) {
     }
 
     private static Map<String, Object> canonicalizeMap(final Map<String, Object> from) {
-        Map<String, Object> canonicalized = new LinkedHashMap<String, Object>(from.size());
-        TreeSet<String> keysInOrder = new TreeSet<String>(from.keySet());
+        Map<String, Object> canonicalized = new LinkedHashMap<>(from.size());
+        TreeSet<String> keysInOrder = new TreeSet<>(from.keySet());
         for (String key : keysInOrder) {
             Object val = from.get(key);
             canonicalized.put(key, canonicalize(val));
@@ -393,7 +393,7 @@ private static Map<String, Object> canonicalizeMap(final Map<String, Object> fro
 
     private static BasicBSONObject canonicalizeBSONObject(final BSONObject from) {
         BasicBSONObject canonicalized = new BasicBSONObject();
-        TreeSet<String> keysInOrder = new TreeSet<String>(from.keySet());
+        TreeSet<String> keysInOrder = new TreeSet<>(from.keySet());
         for (String key : keysInOrder) {
             Object val = from.get(key);
             canonicalized.put(key, canonicalize(val));
@@ -402,7 +402,7 @@ private static BasicBSONObject canonicalizeBSONObject(final BSONObject from) {
     }
 
     private static List canonicalizeList(final List<Object> list) {
-        List<Object> canonicalized = new ArrayList<Object>(list.size());
+        List<Object> canonicalized = new ArrayList<>(list.size());
         for (Object cur : list) {
             canonicalized.add(canonicalize(cur));
         }

bson/src/main/org/bson/Bits.java

@@ -99,7 +99,7 @@ static int readInt(final byte[] buffer) {
      */
     static int readInt(final byte[] buffer, final int offset) {
         int x = 0;
-        x |= (0xFF & buffer[offset + 0]) << 0;
+        x |= (0xFF & buffer[offset]) << 0;
         x |= (0xFF & buffer[offset + 1]) << 8;
         x |= (0xFF & buffer[offset + 2]) << 16;
         x |= (0xFF & buffer[offset + 3]) << 24;
@@ -150,7 +150,7 @@ static long readLong(final byte[] buffer) {
      */
     static long readLong(final byte[] buffer, final int offset) {
         long x = 0;
-        x |= (0xFFL & buffer[offset + 0]) << 0;
+        x |= (0xFFL & buffer[offset]) << 0;
         x |= (0xFFL & buffer[offset + 1]) << 8;
         x |= (0xFFL & buffer[offset + 2]) << 16;
         x |= (0xFFL & buffer[offset + 3]) << 24;

bson/src/main/org/bson/BsonArray.java

@@ -49,7 +49,7 @@ public BsonArray(final List<? extends BsonValue> values) {
      * Construct an empty BsonArray
      */
     public BsonArray() {
-        this(new ArrayList<BsonValue>(), false);
+        this(new ArrayList<>(), false);
     }
 
     /**
@@ -61,13 +61,13 @@ public BsonArray() {
      * @since 4.3
      */
     public BsonArray(final int initialCapacity) {
-        this(new ArrayList<BsonValue>(initialCapacity), false);
+        this(new ArrayList<>(initialCapacity), false);
     }
 
     @SuppressWarnings("unchecked")
     BsonArray(final List<? extends BsonValue> values, final boolean copy) {
         if (copy) {
-            this.values = new ArrayList<BsonValue>(values);
+            this.values = new ArrayList<>(values);
         } else {
             this.values = (List<BsonValue>) values;
         }

bson/src/main/org/bson/BsonBinary.java

@@ -137,7 +137,7 @@ public UUID asUuid() {
     public UUID asUuid(final UuidRepresentation uuidRepresentation) {
         Assertions.notNull("uuidRepresentation", uuidRepresentation);
 
-        final byte uuidType = uuidRepresentation == UuidRepresentation.STANDARD
+        byte uuidType = uuidRepresentation == UuidRepresentation.STANDARD
                 ? BsonBinarySubType.UUID_STANDARD.getValue()
                 : BsonBinarySubType.UUID_LEGACY.getValue();
 
@@ -164,7 +164,7 @@ public byte getType() {
 
     /**
      * Gets the data of this Binary.
-     *
+     * <p>
      * This method returns the internal copy of the byte array, so only modify the contents of the returned array if the intention is to
      * change the state of this instance.
      *
@@ -197,7 +197,7 @@ public boolean equals(final Object o) {
 
     @Override
     public int hashCode() {
-        int result = (int) type;
+        int result = type;
         result = 31 * result + Arrays.hashCode(data);
         return result;
     }

bson/src/main/org/bson/BsonBinaryReader.java

@@ -406,7 +406,6 @@ protected class Mark extends AbstractBsonReader.Mark {
          * Construct an instance.
          */
         protected Mark() {
-            super();
             startPosition = BsonBinaryReader.this.getContext().startPosition;
             size = BsonBinaryReader.this.getContext().size;
             bsonInputMark = BsonBinaryReader.this.bsonInput.getMark(Integer.MAX_VALUE);

bson/src/main/org/bson/BsonBinaryWriter.java

@@ -36,7 +36,7 @@ public class BsonBinaryWriter extends AbstractBsonWriter {
     private final BsonBinaryWriterSettings binaryWriterSettings;
 
     private final BsonOutput bsonOutput;
-    private final Stack<Integer> maxDocumentSizeStack = new Stack<Integer>();
+    private final Stack<Integer> maxDocumentSizeStack = new Stack<>();
     private Mark mark;
 
     /**

bson/src/main/org/bson/BsonDocument.java

@@ -97,14 +97,14 @@ public BsonDocument(final String key, final BsonValue value) {
      * @since 4.3
      */
     public BsonDocument(final int initialCapacity) {
-        map = new LinkedHashMap<String, BsonValue>(initialCapacity);
+        map = new LinkedHashMap<>(initialCapacity);
     }
 
     /**
      * Construct an empty document.
      */
     public BsonDocument() {
-         map = new LinkedHashMap<String, BsonValue>();
+         map = new LinkedHashMap<>();
     }
 
     @Override
@@ -834,7 +834,6 @@ public int hashCode() {
      * @see #toJson(JsonWriterSettings)
      * @see JsonWriterSettings
      */
-    @SuppressWarnings("deprecation")
     public String toJson() {
         return toJson(JsonWriterSettings.builder().outputMode(JsonMode.RELAXED).build());
     }

bson/src/main/org/bson/BsonDocumentReader.java

@@ -42,7 +42,6 @@ public class BsonDocumentReader extends AbstractBsonReader {
      * @param document the document to read from
      */
     public BsonDocumentReader(final BsonDocument document) {
-        super();
         setContext(new Context(null, BsonContextType.TOP_LEVEL, document));
         currentValue = document;
     }
@@ -255,7 +254,6 @@ protected class Mark extends AbstractBsonReader.Mark {
          * Construct an instance.
          */
         protected Mark() {
-            super();
             currentValue = BsonDocumentReader.this.currentValue;
             context = BsonDocumentReader.this.getContext();
             context.mark();
@@ -272,8 +270,8 @@ public void reset() {
 
     private static class BsonDocumentMarkableIterator<T> implements Iterator<T> {
 
-        private Iterator<T> baseIterator;
-        private List<T> markIterator = new ArrayList<T>();
+        private final Iterator<T> baseIterator;
+        private final List<T> markIterator = new ArrayList<>();
         private int curIndex; // index of the cursor
         private boolean marking;
 
@@ -350,7 +348,7 @@ protected class Context extends AbstractBsonReader.Context {
          */
         protected Context(final Context parentContext, final BsonContextType contextType, final BsonArray array) {
             super(parentContext, contextType);
-            arrayIterator = new BsonDocumentMarkableIterator<BsonValue>(array.iterator());
+            arrayIterator = new BsonDocumentMarkableIterator<>(array.iterator());
         }
 
         /**
@@ -362,7 +360,7 @@ protected Context(final Context parentContext, final BsonContextType contextType
          */
         protected Context(final Context parentContext, final BsonContextType contextType, final BsonDocument document) {
             super(parentContext, contextType);
-            documentIterator = new BsonDocumentMarkableIterator<Map.Entry<String, BsonValue>>(document.entrySet().iterator());
+            documentIterator = new BsonDocumentMarkableIterator<>(document.entrySet().iterator());
         }
 
         /**

bson/src/main/org/bson/Document.java

@@ -78,7 +78,7 @@ public class Document implements Map<String, Object>, Serializable, Bson {
      * Creates an empty Document instance.
      */
     public Document() {
-        documentAsMap = new LinkedHashMap<String, Object>();
+        documentAsMap = new LinkedHashMap<>();
     }
 
     /**
@@ -88,7 +88,7 @@ public Document() {
      * @param value value
      */
     public Document(final String key, final Object value) {
-        documentAsMap = new LinkedHashMap<String, Object>();
+        documentAsMap = new LinkedHashMap<>();
         documentAsMap.put(key, value);
     }
 
@@ -98,7 +98,7 @@ public Document(final String key, final Object value) {
      * @param map initial map
      */
     public Document(final Map<String, ?> map) {
-        documentAsMap = new LinkedHashMap<String, Object>(map);
+        documentAsMap = new LinkedHashMap<>(map);
     }
 
 
@@ -131,7 +131,7 @@ public static Document parse(final String json, final Decoder<Document> decoder)
 
     @Override
     public <C> BsonDocument toBsonDocument(final Class<C> documentClass, final CodecRegistry codecRegistry) {
-        return new BsonDocumentWrapper<Document>(this, codecRegistry.get(Document.class));
+        return new BsonDocumentWrapper<>(this, codecRegistry.get(Document.class));
     }
 
     /**
@@ -186,7 +186,7 @@ public <T> T get(final Object key, final T defaultValue) {
      * Gets the value in an embedded document, casting it to the given {@code Class<T>}.  The list of keys represents a path to the
      * embedded value, drilling down into an embedded document for each key. This is useful to avoid having casts in
      * client code, though the effect is the same.
-     *
+     * <p>
      * The generic type of the keys list is {@code ?} to be consistent with the corresponding {@code get} methods, but in practice
      * the actual type of the argument should be {@code List<String>}. So to get the embedded value of a key list that is of type String,
      * you would write {@code String name = doc.getEmbedded(List.of("employee", "manager", "name"), String.class)} instead of
@@ -210,7 +210,7 @@ public <T> T getEmbedded(final List<?> keys, final Class<T> clazz) {
      * Gets the value in an embedded document, casting it to the given {@code Class<T>} or returning the default value if null.
      * The list of keys represents a path to the embedded value, drilling down into an embedded document for each key.
      * This is useful to avoid having casts in client code, though the effect is the same.
-     *
+     * <p>
      * The generic type of the keys list is {@code ?} to be consistent with the corresponding {@code get} methods, but in practice
      * the actual type of the argument should be {@code List<String>}. So to get the embedded value of a key list that is of type String,
      * you would write {@code String name = doc.getEmbedded(List.of("employee", "manager", "name"), "John Smith")} instead of
@@ -414,7 +414,6 @@ private <T> List<T> constructValuesList(final Object key, final Class<T> clazz,
      * @see #toJson(JsonWriterSettings)
      * @see JsonWriterSettings
      */
-    @SuppressWarnings("deprecation")
     public String toJson() {
         return toJson(JsonWriterSettings.builder().outputMode(JsonMode.RELAXED).build());
     }
@@ -441,7 +440,6 @@ public String toJson(final JsonWriterSettings writerSettings) {
      * @return a JSON representation of this document
      * @throws org.bson.codecs.configuration.CodecConfigurationException if the registry does not contain a codec for the document values.
      */
-    @SuppressWarnings("deprecation")
     public String toJson(final Encoder<Document> encoder) {
         return toJson(JsonWriterSettings.builder().outputMode(JsonMode.RELAXED).build(), encoder);
     }

bson/src/main/org/bson/LazyBSONList.java

@@ -68,7 +68,7 @@ public Iterator iterator() {
 
     @Override
     public boolean containsAll(final Collection collection) {
-        Set<Object> values = new HashSet<Object>();
+        Set<Object> values = new HashSet<>();
         for (final Object o : this) {
             values.add(o);
         }