code cleanup

Author: thurka

visualvm/libs.profiler/profiler.oql/src/org/graalvm/visualvm/lib/profiler/oql/engine/api/ReferenceChain.java

@@ -42,8 +42,8 @@ final public class ReferenceChain {
     private long id;
     private char type;
 
-    private static char TYPE_INSTANCE = 0;
-    private static char TYPE_CLASS = 1;
+    private static final char TYPE_INSTANCE = 0;
+    private static final char TYPE_CLASS = 1;
 
     public ReferenceChain(Heap heap, Object obj, ReferenceChain next) {
         this.obj = new WeakReference<>(obj);

visualvm/libs.profiler/profiler.oql/src/org/graalvm/visualvm/lib/profiler/oql/engine/api/impl/OQLEngineImpl.java

@@ -239,8 +239,7 @@ private void executeQuery(OQLQueryImpl q, ObjectVisitor visitor)
             Bindings bindings = engine.getBindings(ScriptContext.ENGINE_SCOPE);
 
             CompiledScript whereCs = null;
-            CompiledScript selectCs = null;
-            selectCs = ((Compilable)engine).compile(selectCode);
+            CompiledScript selectCs = ((Compilable)engine).compile(selectCode);
 
             if (q.whereExpr != null) {
                 whereCs = ((Compilable)engine).compile(q.whereExpr.replace('\n', ' ')); // NOI18N
@@ -252,9 +251,8 @@ private void executeQuery(OQLQueryImpl q, ObjectVisitor visitor)
 
                 toInspect.push(clazz);
 
-                JavaClass inspecting = null;
                 while(!toInspect.isEmpty()) {
-                    inspecting = toInspect.pop();
+                    JavaClass inspecting = toInspect.pop();
                     inspected.add(inspecting);
                     if (q.isInstanceOf) {
                         for(JavaClass subclass : inspecting.getSubClasses()) {
@@ -307,13 +305,13 @@ private boolean dispatchValue(Object jsObject, ObjectVisitor visitor) {
         }
 
         if (jsObject instanceof Iterator) {
-            Iterator iter = (Iterator) jsObject;
+            Iterator<?> iter = (Iterator) jsObject;
             while (iter.hasNext()) {
                 if (dispatchValue(iter.next(), visitor)) return true;
             }
             return false;
         } else if (jsObject instanceof Enumeration) {
-            Enumeration enm = (Enumeration) jsObject;
+            Enumeration<?> enm = (Enumeration) jsObject;
             while (enm.hasMoreElements()) {
                 Object elem = enm.nextElement();
                 if (dispatchValue(elem, visitor)) return true;
@@ -368,10 +366,7 @@ public Object unwrapJavaObject(Object object, boolean tryAssociativeArray) {
             if (isNativeJS && ret == null && tryAssociativeArray) {
                 ret = ((Invocable)engine).invokeFunction("unwrapMap", object); // NOI18N
             }
-            if (ret == null) {
-                return object;
-            }
-            return ret;
+            return ret == null ? object : ret;
         } catch (Exception ex) {
             LOGGER.log(Level.WARNING, "Error unwrapping JS object", ex); // NOI18N
         }

visualvm/libs.profiler/profiler.oql/src/org/graalvm/visualvm/lib/profiler/oql/engine/api/impl/Snapshot.java

@@ -42,15 +42,13 @@
 import org.graalvm.visualvm.lib.profiler.oql.engine.api.ReferenceChain;
 import org.openide.util.Enumerations;
 
-/**
- *
- * @author      Jaroslav Bachorik
- */
 /**
  * A helper class for OQL engine allowing easy access to the underlying
  * heapwalker model
+ * 
+ * @author      Jaroslav Bachorik
  */
-public class Snapshot {
+public final class Snapshot {
 
     private static final String BOOLEAN_CODE = "Z"; // NOI18N
     private static final String CHAR_CODE = "C"; // NOI18N

visualvm/libs.profiler/profiler.oql/test/unit/src/org/graalvm/visualvm/lib/profiler/oql/engine/api/impl/OQLEngineTest.java

@@ -576,7 +576,7 @@ public boolean visit(Object o) {
     public void testLength() throws Exception {
         System.out.println("length");
 
-        final Class[] rsltClass = new Class[1];
+        final Class<?>[] rsltClass = new Class<?>[1];
 //        final boolean sorted[] = new boolean[] {true};
 
 
@@ -595,7 +595,7 @@ public boolean visit(Object o) {
     public void testCountNoClosure() throws Exception {
         System.out.println("count - no closure");
 
-        final Class[] rsltClass = new Class[1];
+        final Class<?>[] rsltClass = new Class<?>[1];
 //        final boolean sorted[] = new boolean[] {true};
 
 
@@ -614,7 +614,7 @@ public boolean visit(Object o) {
     public void testCount() throws Exception {
         System.out.println("count");
 
-        final Class[] rsltClass = new Class[1];
+        final Class<?>[] rsltClass = new Class<?>[1];
 //        final boolean sorted[] = new boolean[] {true};
 
 
@@ -633,7 +633,7 @@ public boolean visit(Object o) {
     public void testMultivalue() throws Exception {
         System.out.println("multi-value");
 
-        final Class[] rsltClass = new Class[1];
+        final Class<?>[] rsltClass = new Class<?>[1];
 //        final boolean sorted[] = new boolean[] {true};
 
 
@@ -750,7 +750,7 @@ private String dump(Object o) {
         if (o instanceof Map) {
             List<String> els = new ArrayList<>();
             Map<?,?> m = (Map) o;
-            for (Map.Entry e : m.entrySet()) {
+            for (Map.Entry<?,?> e : m.entrySet()) {
                 els.add(e.getKey()+"="+e.getValue());
             }
             els.sort(null);

visualvm/libs.profiler/profiler.oql/test/unit/src/org/graalvm/visualvm/lib/profiler/oql/repository/api/OQLQueryRepositoryTest.java

@@ -69,7 +69,7 @@ public void tearDown() {
     public void testListAllCategories() {
         System.out.println("listAllCategories");
 
-        List result = instance.listCategories();
+        List<?> result = instance.listCategories();
         assertTrue(!result.isEmpty());
     }
 
@@ -81,7 +81,7 @@ public void testListAllCategories() {
     public void testListMatchingCategories() {
         System.out.println("listMatchingCategories");
         String pattern = "Sam.*";
-        List result = instance.listCategories(pattern);
+        List<?> result = instance.listCategories(pattern);
         assertEquals(1, result.size());
     }
 
@@ -93,7 +93,7 @@ public void testListMatchingCategories() {
     public void testListNonMatchingCategories() {
         System.out.println("listNonMatchingCategories");
         String pattern = "[0-9]+";
-        List result = instance.listCategories(pattern);
+        List<?> result = instance.listCategories(pattern);
         assertEquals(0, result.size());
     }
 
@@ -104,7 +104,7 @@ public void testListNonMatchingCategories() {
     @Test
     public void testListAllQueries() {
         System.out.println("listAllQueries");
-        List result = instance.listQueries();
+        List<?> result = instance.listQueries();
         assertEquals(11, result.size());
     }
 
@@ -116,7 +116,7 @@ public void testListAllQueries() {
     public void testListAllCategoryQueries() {
         System.out.println("listAllCategoryQueries");
         OQLQueryCategory category = instance.listCategories().get(0);
-        List result = instance.listQueries(category);
+        List<?> result = instance.listQueries(category);
         assertEquals(4, result.size());
     }
 
@@ -127,7 +127,7 @@ public void testListAllCategoryQueries() {
     @Test
     public void testListAllMatchingQueries() {
         System.out.println("listAllMatchingQueries");
-        List result = instance.listQueries(".+?allocated.*");
+        List<?> result = instance.listQueries(".+?allocated.*");
         assertEquals(2, result.size());
     }
 
@@ -139,7 +139,7 @@ public void testListAllMatchingQueries() {
     public void testListMatchingCategoryQueries() {
         System.out.println("listMatchingCategoryQueries");
         OQLQueryCategory category = instance.listCategories().get(0);
-        List result = instance.listQueries(category, ".+?allocated.*");
+        List<?> result = instance.listQueries(category, ".+?allocated.*");
         assertEquals(2, result.size());
     }
 }