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) {