Replace deprecated Mockito matcher import

Author: 8Keep

jme3-core/src/main/java/com/jme3/renderer/RenderContext.java

@@ -35,19 +35,19 @@
 import com.jme3.math.ColorRGBA;
 import com.jme3.scene.VertexBuffer;
 import com.jme3.shader.Shader;
+import com.jme3.shader.bufferobject.BufferObject;
 import com.jme3.texture.FrameBuffer;
 import com.jme3.texture.Image;
 import java.lang.ref.WeakReference;
-import com.jme3.shader.bufferobject.BufferObject;
 
 /**
  * Represents the current state of the graphics library. This class is used
  * internally to reduce state changes. NOTE: This class is specific to OpenGL.
  */
 public class RenderContext {
+    @SuppressWarnings("unchecked")
     private static <T> WeakReference<T>[] newWeakReferenceArray(int size) {
-        WeakReference<T>[] refs = (WeakReference<T>[]) new WeakReference<?>[size];
-        return refs;
+        return (WeakReference<T>[]) new WeakReference<?>[size];
     }
 
     /**
@@ -269,7 +269,7 @@ private static <T> WeakReference<T>[] newWeakReferenceArray(int size) {
      *
      * @see Renderer#setTexture(int, com.jme3.texture.Texture)
      */
-    public final WeakReference<Image> boundTextures[]
+    public final WeakReference<Image>[] boundTextures
             = newWeakReferenceArray(maxTextureUnits);
 
 

jme3-core/src/main/java/com/jme3/renderer/RenderManager.java

@@ -31,13 +31,9 @@
  */
 package com.jme3.renderer;
 
-import com.jme3.renderer.pipeline.ForwardPipeline;
-import com.jme3.renderer.pipeline.DefaultPipelineContext;
-import com.jme3.renderer.pipeline.RenderPipeline;
-import com.jme3.renderer.pipeline.PipelineContext;
-import com.jme3.light.DefaultLightFilter;
-import com.jme3.light.LightFilter;
-import com.jme3.light.LightList;
+import com.jme3.light.DefaultLightFilter;
+import com.jme3.light.LightFilter;
+import com.jme3.light.LightList;
 import com.jme3.material.MatParamOverride;
 import com.jme3.material.Material;
 import com.jme3.material.MaterialDef;
@@ -46,11 +42,15 @@
 import com.jme3.material.TechniqueDef;
 import com.jme3.math.FastMath;
 import com.jme3.math.Matrix4f;
-import com.jme3.post.SceneProcessor;
-import com.jme3.profile.AppProfiler;
-import com.jme3.profile.AppStep;
-import com.jme3.profile.VpStep;
-import com.jme3.renderer.queue.GeometryList;
+import com.jme3.post.SceneProcessor;
+import com.jme3.profile.AppProfiler;
+import com.jme3.profile.AppStep;
+import com.jme3.profile.VpStep;
+import com.jme3.renderer.pipeline.DefaultPipelineContext;
+import com.jme3.renderer.pipeline.ForwardPipeline;
+import com.jme3.renderer.pipeline.PipelineContext;
+import com.jme3.renderer.pipeline.RenderPipeline;
+import com.jme3.renderer.queue.GeometryList;
 import com.jme3.renderer.queue.RenderQueue;
 import com.jme3.renderer.queue.RenderQueue.Bucket;
 import com.jme3.renderer.queue.RenderQueue.ShadowMode;

jme3-core/src/main/java/com/jme3/renderer/ViewPort.java

@@ -31,10 +31,10 @@
  */
 package com.jme3.renderer;
 
-import com.jme3.renderer.pipeline.RenderPipeline;
-import com.jme3.renderer.pipeline.PipelineContext;
 import com.jme3.math.ColorRGBA;
 import com.jme3.post.SceneProcessor;
+import com.jme3.renderer.pipeline.PipelineContext;
+import com.jme3.renderer.pipeline.RenderPipeline;
 import com.jme3.renderer.queue.RenderQueue;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Spatial;

jme3-core/src/main/java/com/jme3/util/IntMap.java

@@ -84,7 +84,7 @@ public IntMap(int initialCapacity, float loadFactor) {
     public IntMap<T> clone(){
         try {
             IntMap<T> clone = (IntMap<T>) super.clone();
-            Entry[] newTable = new Entry[table.length];
+            Entry<T>[] newTable = newTable(table.length);
             for (int i = table.length - 1; i >= 0; i--){
                 if (table[i] != null)
                     newTable[i] = table[i].clone();
@@ -138,7 +138,6 @@ public boolean containsKey(int key) {
         return false;
     }
 
-    @SuppressWarnings("unchecked")
     public T get(int key) {
         int index = key & mask;
         for (Entry<T> e = table[index]; e != null; e = e.next){
@@ -149,7 +148,6 @@ public T get(int key) {
         return null;
     }
 
-    @SuppressWarnings("unchecked")
     public T put(int key, T value) {
         int index = key & mask;
         // Check if key already exists.
@@ -161,7 +159,7 @@ public T put(int key, T value) {
             e.value = value;
             return oldValue;
         }
-        table[index] = new Entry(key, value, table[index]);
+        table[index] = new Entry<>(key, value, table[index]);
         if (size++ >= threshold){
             // Rehash.
             int newCapacity = 2 * capacity;
@@ -189,7 +187,6 @@ public T put(int key, T value) {
         return null;
     }
 
-    @SuppressWarnings("unchecked")
     public T remove(int key) {
         int index = key & mask;
         Entry<T> prev = table[index];
@@ -297,9 +294,9 @@ public void remove() {
         }
     }
 
+    @SuppressWarnings("unchecked")
     private static <T> Entry<T>[] newTable(int size) {
-        Entry<T>[] table = (Entry<T>[]) new Entry<?>[size];
-        return table;
+        return (Entry<T>[]) new Entry<?>[size];
     }
 
     public static final class Entry<T> implements Cloneable, JmeCloneable {

jme3-core/src/main/java/com/jme3/util/NativeObject.java

@@ -245,6 +245,7 @@ public void dispose() {
      * @param <T> the type
      * @return a weak reference (possibly a pre-existing one)
      */
+    @SuppressWarnings("unchecked")
     public <T> WeakReference<T> getWeakRef() {
         if (weakRef == null) {
             weakRef = new WeakReference<>(this);

jme3-core/src/test/java/com/jme3/material/plugins/J3MLoaderTest.java

@@ -21,8 +21,8 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 /**
  * @author Daniel Johansson

jme3-plugins-json-gson/src/main/java/com/jme3/plugins/gson/GsonObject.java

@@ -78,6 +78,7 @@ public JsonElement get(String string) {
     @Override
     public Entry<String, JsonElement>[] entrySet() {
         Set<Entry<String, com.google.gson.JsonElement>> entrySet = obj().entrySet();
+        @SuppressWarnings("unchecked")
         Entry<String, JsonElement>[] entries = (Entry<String, JsonElement>[]) new Entry<?, ?>[entrySet.size()];
         int i = 0;
         for (Entry<String, com.google.gson.JsonElement> entry : entrySet) {

jme3-plugins/src/gltf/java/com/jme3/scene/plugins/gltf/TextureTransformExtensionLoader.java

@@ -91,12 +91,17 @@ private void uvTransform(Mesh mesh, Matrix3f transform, VertexBuffer.Type verTyp
                 fb.put(v.getX()).put(v.getY());
             }
             fb.clear();
-            tc.updateData(fb);   
-        }
-    }
-    
-    // The algorithm relies on the fact that the GltfLoader.class object 
-    // loads all textures of a given mesh before doing so for the next mesh.    
+            tc.updateData(fb);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private Map<Integer, Matrix3f> fetchTransformMap(GltfLoader loader) {
+        return loader.fetchFromCache("textureTransformData", 1, HashMap.class);
+    }
+
+    // The algorithm relies on the fact that the GltfLoader.class object
+    // loads all textures of a given mesh before doing so for the next mesh.
     @Override
     public Object handleExtension(GltfLoader loader, String parentName, JsonElement parent, JsonElement extension, Object input) throws IOException {
         if (!(input instanceof Texture2D)) {
@@ -132,7 +137,7 @@ public Object handleExtension(GltfLoader loader, String parentName, JsonElement
             }
             Matrix3f transform = translation.mult(rotation).mult(scale);
             Mesh meshLast = loader.fetchFromCache("textureTransformData", 0, Mesh.class);
-            Map<Integer, Matrix3f> transformMap = loader.fetchFromCache("textureTransformData", 1, HashMap.class);
+            Map<Integer, Matrix3f> transformMap = fetchTransformMap(loader);
             if (mesh != meshLast || (transformMap != null && transformMap.get(texCoord) == null)) {
                 // at this point, we're processing a new mesh or the same mesh as before but for a different UV set
                 if (mesh != meshLast) { // it's a new mesh

jme3-plugins/src/test/java/com/jme3/export/JmeExporterTest.java

@@ -42,6 +42,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.stream.Stream;
 
@@ -227,26 +228,27 @@ public InputStream openStream() {
         }
 
         // compare
-        Map<String, Object> userData[] = new Map[nodes.length];
+        List<Map<String, Object>> userData = new ArrayList<>(nodes.length);
         for (int i = 0; i < nodes.length; i++) {
             Node n = nodes[i];
-            userData[i] = new HashMap<String, Object>();
+            Map<String, Object> data = new HashMap<>();
             for (String k : n.getUserDataKeys()) {
-                userData[i].put(k, n.getUserData(k));
+                data.put(k, n.getUserData(k));
             }
+            userData.add(data);
         }
         compareMaps(userData);
     }
 
-    private static final void compareMaps(Map<String, Object>[] maps) {
-        String[] keys = maps[0].keySet().toArray(new String[0]);
+    private static final void compareMaps(List<Map<String, Object>> maps) {
+        String[] keys = maps.get(0).keySet().toArray(new String[0]);
         // check if all maps have the same keys and values for those keys
-        for (int i = 1; i < maps.length; i++) {
-            Map<String, Object> map = maps[i];
+        for (int i = 1; i < maps.size(); i++) {
+            Map<String, Object> map = maps.get(i);
             assertEquals(keys.length, map.size(), "Map " + i + " keys do not match");
             for (String key : keys) {
                 assertTrue(map.containsKey(key), "Missing key " + key + " in map " + i);
-                Object v1 = maps[0].get(key);
+                Object v1 = maps.get(0).get(key);
                 Object v2 = map.get(key);
                 if (v1.getClass().isArray()) {
                     boolean c = Arrays.equals((Object[]) v1, (Object[]) v2);