Merge branch 'vladdu/jinterface_code_cleanup/OTP-12211' into maint

* vladdu/jinterface_code_cleanup/OTP-12211:
  fix warning: Socket's InputStream not closed
  silence 'potential resource leak' warnings
  don't warn about some unused fields/variables
  handle warnings about potential null pointers
  keep all method parameters final
  renamed method parameters hiding fields
  add 'break' statements to make compiler happy
  remove warnings from OtpMD5
  rename OtpNode.flags to connFlags
  rename OtpNode.Acceptor.port to acceptorPort
  rename field 'self' to 'localNode'
  mark deprecated unused private constructor
  simplify 'if' statements
  remove warnings: @Override, switch fall-through
  make serialVersionUID fields private
  remove unnecessary syntax (casts)
  remove unused variables
  removed unnecessary semicolons, imports, labels
  remove unnecessary null pointer checks
  remove unnecessary Cloneable and Serializable

5 files changed, 48 insertions, 10 deletions

diff --git a/lib/jinterface/test/jinterface_SUITE_data/FunEquals.java b/lib/jinterface/test/jinterface_SUITE_data/FunEquals.java
index 14f884cee7..961e462cb3 100644
--- a/lib/jinterface/test/jinterface_SUITE_data/FunEquals.java
+++ b/lib/jinterface/test/jinterface_SUITE_data/FunEquals.java
@@ -17,9 +17,11 @@
  * %CopyrightEnd%
  */
 
-import java.util.Arrays;
-
-import com.ericsson.otp.erlang.*;
+import com.ericsson.otp.erlang.OtpErlangAtom;
+import com.ericsson.otp.erlang.OtpErlangFun;
+import com.ericsson.otp.erlang.OtpErlangLong;
+import com.ericsson.otp.erlang.OtpErlangObject;
+import com.ericsson.otp.erlang.OtpErlangPid;
 
 public class FunEquals {
 
diff --git a/lib/jinterface/test/jinterface_SUITE_data/GetNames.java b/lib/jinterface/test/jinterface_SUITE_data/GetNames.java
index 3d2bc4ac84..54efaad242 100644
--- a/lib/jinterface/test/jinterface_SUITE_data/GetNames.java
+++ b/lib/jinterface/test/jinterface_SUITE_data/GetNames.java
@@ -18,7 +18,9 @@
  */
 
 import java.util.ArrayList;
-import com.ericsson.otp.erlang.*;
+
+import com.ericsson.otp.erlang.OtpMbox;
+import com.ericsson.otp.erlang.OtpNode;
 
 class GetNames {
 
@@ -37,7 +39,7 @@ class GetNames {
 	    OtpMbox mbox3 = node.createMbox();
 	    node.registerName("mbox3",mbox3);
 
-	    ArrayList existing_names = new ArrayList();
+        ArrayList<String> existing_names = new ArrayList<String>();
 	    existing_names.add("mbox3");
 	    existing_names.add("mbox2");
 	    existing_names.add("mbox1");
diff --git a/lib/jinterface/test/jinterface_SUITE_data/MboxLinkUnlink.java b/lib/jinterface/test/jinterface_SUITE_data/MboxLinkUnlink.java
index 5d1d097cc8..470fdb4a14 100644
--- a/lib/jinterface/test/jinterface_SUITE_data/MboxLinkUnlink.java
+++ b/lib/jinterface/test/jinterface_SUITE_data/MboxLinkUnlink.java
@@ -17,7 +17,14 @@
  * %CopyrightEnd%
  */
 
-import com.ericsson.otp.erlang.*;
+import com.ericsson.otp.erlang.OtpErlangAtom;
+import com.ericsson.otp.erlang.OtpErlangExit;
+import com.ericsson.otp.erlang.OtpErlangLong;
+import com.ericsson.otp.erlang.OtpErlangObject;
+import com.ericsson.otp.erlang.OtpErlangPid;
+import com.ericsson.otp.erlang.OtpErlangTuple;
+import com.ericsson.otp.erlang.OtpMbox;
+import com.ericsson.otp.erlang.OtpNode;
 
 class MboxLinkUnlink {
 
@@ -66,7 +73,10 @@ class MboxLinkUnlink {
 		OtpErlangObject[] msg = {mainMbox.self(),mbox.self()};
 		mbox.send("erl_link_server", erlNode, new OtpErlangTuple(msg));
 		OtpErlangObject o = mbox.receive(1000);
-		if (o == null) System.exit(1);
+        if (o == null) {
+            System.exit(1);
+            return;
+        }
 		OtpErlangTuple tuple = (OtpErlangTuple)o;
 		int tag = (int)((OtpErlangLong)tuple.elementAt(0)).longValue();
 
@@ -91,6 +101,7 @@ class MboxLinkUnlink {
 		    expected = tuple.elementAt(2);
 		    mbox.receive(1000);
 		    System.exit(2);
+            break;
 		case erl_link_java_exit:
 		    dbg("Java got \"erl_link_java_exit\"");
 		    mbox.exit(tuple.elementAt(2));
@@ -104,6 +115,7 @@ class MboxLinkUnlink {
 		    expected = tuple.elementAt(2);
 		    mbox.receive(1000);
 		    System.exit(3);
+            break;
 		case internal_link_linking_exits:
 		    dbg("Java got \"internal_link_linking_exits\"");
 		    mbox2 = node.createMbox();
@@ -113,6 +125,7 @@ class MboxLinkUnlink {
 		    expected = tuple.elementAt(2);
 		    mbox2.receive(1000); // hanging waiting for exit
 		    System.exit(4);  // got someting other than exit
+            break;
 		case internal_link_linked_exits:
 		    dbg("Java got \"internal_link_linked_exits\"");
 		    mbox2 = node.createMbox();
@@ -122,6 +135,7 @@ class MboxLinkUnlink {
 		    expected = tuple.elementAt(2);
 		    mbox.receive(1000); // hanging waiting for exit
 		    System.exit(5);  // got someting other than exit
+            break;
 		case internal_unlink_linking_exits:
 		    dbg("Java got \"internal_unlink_linking_exits\"");
 		    mbox2 = node.createMbox();
diff --git a/lib/jinterface/test/jinterface_SUITE_data/MboxSendReceive.java b/lib/jinterface/test/jinterface_SUITE_data/MboxSendReceive.java
index 2db71bb5cd..44433aa619 100644
--- a/lib/jinterface/test/jinterface_SUITE_data/MboxSendReceive.java
+++ b/lib/jinterface/test/jinterface_SUITE_data/MboxSendReceive.java
@@ -17,7 +17,13 @@
  * %CopyrightEnd%
  */
 
-import com.ericsson.otp.erlang.*;
+import com.ericsson.otp.erlang.OtpErlangAtom;
+import com.ericsson.otp.erlang.OtpErlangLong;
+import com.ericsson.otp.erlang.OtpErlangObject;
+import com.ericsson.otp.erlang.OtpErlangPid;
+import com.ericsson.otp.erlang.OtpErlangTuple;
+import com.ericsson.otp.erlang.OtpMbox;
+import com.ericsson.otp.erlang.OtpNode;
 
 class MboxSendReceive {
 
@@ -35,6 +41,7 @@ class MboxSendReceive {
     private static final int java_internal_send_receive_different_nodes = 3;
     private static final int java_internal_send_receive_self = 4;
 
+    @SuppressWarnings("null")
     public static void main(String argv[]) {
 
 	String cookie = argv[0];
diff --git a/lib/jinterface/test/jinterface_SUITE_data/NodeStatusHandler.java b/lib/jinterface/test/jinterface_SUITE_data/NodeStatusHandler.java
index 51ea15b5ef..06ddfa2d61 100644
--- a/lib/jinterface/test/jinterface_SUITE_data/NodeStatusHandler.java
+++ b/lib/jinterface/test/jinterface_SUITE_data/NodeStatusHandler.java
@@ -17,7 +17,14 @@
  * %CopyrightEnd%
  */
 
-import com.ericsson.otp.erlang.*;
+import com.ericsson.otp.erlang.OtpErlangAtom;
+import com.ericsson.otp.erlang.OtpErlangBoolean;
+import com.ericsson.otp.erlang.OtpErlangObject;
+import com.ericsson.otp.erlang.OtpErlangString;
+import com.ericsson.otp.erlang.OtpErlangTuple;
+import com.ericsson.otp.erlang.OtpMbox;
+import com.ericsson.otp.erlang.OtpNode;
+import com.ericsson.otp.erlang.OtpNodeStatus;
 
 public class NodeStatusHandler extends OtpNodeStatus {
     /*
@@ -86,7 +93,10 @@ public class NodeStatusHandler extends OtpNodeStatus {
 	    }
 
 	    OtpErlangObject o = mbox.receive(recTime);
-	    if (o == null) System.exit(2);
+        if (o == null) {
+            System.exit(2);
+            return;
+        }
 	    if (! ((OtpErlangAtom)o).atomValue().equals("done"))
 		System.exit(3);
 
@@ -100,6 +110,7 @@ public class NodeStatusHandler extends OtpNodeStatus {
 
 
 
+  @Override
   public void remoteStatus(String node, boolean up, Object info) {
       try {
 	  dbg("Got remoteStatus: " + node + " " + up + " "  + info);
@@ -120,6 +131,7 @@ public class NodeStatusHandler extends OtpNodeStatus {
   }
 
 
+  @Override
   public void localStatus(String node, boolean up, Object info) {
       try {
 	  dbg("Got localStatus: " + node + " " + up + " "  + info);
@@ -141,6 +153,7 @@ public class NodeStatusHandler extends OtpNodeStatus {
 
 
 
+@Override
   public void connAttempt(String node, boolean incoming, Object info) {
       try {
 	  dbg("Got connAttempt: " + node + " " + incoming + " "  + info);