[253054] [POLISH] Pass protocol and signalID in Signal constructor

https://bugs.eclipse.org/bugs/show_bug.cgi?id=253054

13 files changed, 38 insertions, 94 deletions

diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSAcknowledgeIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSAcknowledgeIndication.java
index 4b2a1d30bd..d7dc87193c 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSAcknowledgeIndication.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSAcknowledgeIndication.java
@@ -24,14 +24,9 @@ import java.io.IOException;
  */
 public class JMSAcknowledgeIndication extends Indication
 {
-  public JMSAcknowledgeIndication()
+  public JMSAcknowledgeIndication(JMSServerProtocol protocol)
   {
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return JMSProtocolConstants.SIGNAL_ACKNOWLEDGE;
+    super(protocol, JMSProtocolConstants.SIGNAL_ACKNOWLEDGE);
   }
 
   @Override
@@ -40,7 +35,7 @@ public class JMSAcknowledgeIndication extends Indication
     int sessionID = in.readInt();
 
     JMSServerProtocol protocol = (JMSServerProtocol)getProtocol();
-    ServerConnection connection = (ServerConnection)protocol.getInfraStructure();
+    ServerConnection connection = protocol.getInfraStructure();
     ServerSession session = connection.getSession(sessionID);
     if (session == null)
     {
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSClientMessageIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSClientMessageIndication.java
index 0ce93b1cde..ecd3d39ec2 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSClientMessageIndication.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSClientMessageIndication.java
@@ -28,14 +28,9 @@ public class JMSClientMessageIndication extends IndicationWithResponse
 {
   private String messageID;
 
-  public JMSClientMessageIndication()
+  public JMSClientMessageIndication(JMSServerProtocol protocol)
   {
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return JMSProtocolConstants.SIGNAL_CLIENT_MESSAGE;
+    super(protocol, JMSProtocolConstants.SIGNAL_CLIENT_MESSAGE);
   }
 
   @Override
@@ -43,7 +38,7 @@ public class JMSClientMessageIndication extends IndicationWithResponse
   {
     MessageImpl[] messages = { MessageUtil.read(in) };
     JMSServerProtocol protocol = (JMSServerProtocol)getProtocol();
-    ServerConnection connection = (ServerConnection)protocol.getInfraStructure();
+    ServerConnection connection = protocol.getInfraStructure();
     Server server = connection.getServer();
     String[] ids = server.handleClientMessages(messages);
     if (ids != null && ids.length != 0)
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSCommitIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSCommitIndication.java
index 364c3dd35a..c1cc1600d4 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSCommitIndication.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSCommitIndication.java
@@ -29,14 +29,9 @@ public class JMSCommitIndication extends IndicationWithResponse
 {
   private String[] messageIDs;
 
-  public JMSCommitIndication()
+  public JMSCommitIndication(JMSServerProtocol protocol)
   {
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return JMSProtocolConstants.SIGNAL_COMMIT;
+    super(protocol, JMSProtocolConstants.SIGNAL_COMMIT);
   }
 
   @Override
@@ -51,7 +46,7 @@ public class JMSCommitIndication extends IndicationWithResponse
     }
 
     JMSServerProtocol protocol = (JMSServerProtocol)getProtocol();
-    ServerConnection connection = (ServerConnection)protocol.getInfraStructure();
+    ServerConnection connection = protocol.getInfraStructure();
     ServerSession session = connection.getSession(sessionID);
     if (session == null)
     {
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSLogonIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSLogonIndication.java
index 639928f44e..28d4ea64ca 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSLogonIndication.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSLogonIndication.java
@@ -27,14 +27,9 @@ public class JMSLogonIndication extends IndicationWithResponse
 {
   private boolean ok;
 
-  public JMSLogonIndication()
+  public JMSLogonIndication(JMSServerProtocol protocol)
   {
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return JMSProtocolConstants.SIGNAL_LOGON;
+    super(protocol, JMSProtocolConstants.SIGNAL_LOGON);
   }
 
   @Override
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSOpenSessionIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSOpenSessionIndication.java
index c8c611bce3..11f0306aa5 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSOpenSessionIndication.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSOpenSessionIndication.java
@@ -26,14 +26,9 @@ public class JMSOpenSessionIndication extends IndicationWithResponse
 {
   private boolean ok;
 
-  public JMSOpenSessionIndication()
+  public JMSOpenSessionIndication(JMSServerProtocol protocol)
   {
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return JMSProtocolConstants.SIGNAL_OPEN_SESSION;
+    super(protocol, JMSProtocolConstants.SIGNAL_OPEN_SESSION);
   }
 
   @Override
@@ -41,7 +36,7 @@ public class JMSOpenSessionIndication extends IndicationWithResponse
   {
     int sessionID = in.readInt();
     JMSServerProtocol protocol = (JMSServerProtocol)getProtocol();
-    ServerConnection connection = (ServerConnection)protocol.getInfraStructure();
+    ServerConnection connection = protocol.getInfraStructure();
     ServerSession session = connection.openSession(sessionID);
     if (session != null)
     {
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRecoverIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRecoverIndication.java
index f97ad56012..9ce454e50a 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRecoverIndication.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRecoverIndication.java
@@ -25,14 +25,9 @@ import java.io.IOException;
  */
 public class JMSRecoverIndication extends IndicationWithResponse
 {
-  public JMSRecoverIndication()
+  public JMSRecoverIndication(JMSServerProtocol protocol)
   {
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return JMSProtocolConstants.SIGNAL_RECOVER;
+    super(protocol, JMSProtocolConstants.SIGNAL_RECOVER);
   }
 
   @Override
@@ -40,7 +35,7 @@ public class JMSRecoverIndication extends IndicationWithResponse
   {
     int sessionID = in.readInt();
     JMSServerProtocol protocol = (JMSServerProtocol)getProtocol();
-    ServerConnection connection = (ServerConnection)protocol.getInfraStructure();
+    ServerConnection connection = protocol.getInfraStructure();
     ServerSession session = connection.getSession(sessionID);
     if (session == null)
     {
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRegisterConsumerIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRegisterConsumerIndication.java
index 3678914912..9cafe5259a 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRegisterConsumerIndication.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRegisterConsumerIndication.java
@@ -28,14 +28,9 @@ public class JMSRegisterConsumerIndication extends IndicationWithResponse
 {
   private long consumerID;
 
-  public JMSRegisterConsumerIndication()
+  public JMSRegisterConsumerIndication(JMSServerProtocol protocol)
   {
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return JMSProtocolConstants.SIGNAL_REGISTER_CONSUMER;
+    super(protocol, JMSProtocolConstants.SIGNAL_REGISTER_CONSUMER);
   }
 
   @Override
@@ -47,7 +42,7 @@ public class JMSRegisterConsumerIndication extends IndicationWithResponse
     boolean noLocal = in.readBoolean();
     boolean durable = in.readBoolean();
     JMSServerProtocol protocol = (JMSServerProtocol)getProtocol();
-    ServerConnection connection = (ServerConnection)protocol.getInfraStructure();
+    ServerConnection connection = protocol.getInfraStructure();
     ServerSession session = connection.getSession(sessionID);
     consumerID = session.registerConsumer(destination, messageSelector, noLocal, durable);
   }
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRollbackIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRollbackIndication.java
index adf7d2408f..6ba0c220e2 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRollbackIndication.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSRollbackIndication.java
@@ -25,14 +25,9 @@ import java.io.IOException;
  */
 public class JMSRollbackIndication extends IndicationWithResponse
 {
-  public JMSRollbackIndication()
+  public JMSRollbackIndication(JMSServerProtocol protocol)
   {
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return JMSProtocolConstants.SIGNAL_ROLLBACK;
+    super(protocol, JMSProtocolConstants.SIGNAL_ROLLBACK);
   }
 
   @Override
@@ -40,7 +35,7 @@ public class JMSRollbackIndication extends IndicationWithResponse
   {
     int sessionID = in.readInt();
     JMSServerProtocol protocol = (JMSServerProtocol)getProtocol();
-    ServerConnection connection = (ServerConnection)protocol.getInfraStructure();
+    ServerConnection connection = protocol.getInfraStructure();
     ServerSession session = connection.getSession(sessionID);
     if (session == null)
     {
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerMessageRequest.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerMessageRequest.java
index 4cc8a2b1ca..aae3168f88 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerMessageRequest.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerMessageRequest.java
@@ -31,19 +31,13 @@ public class JMSServerMessageRequest extends Request
 
   public JMSServerMessageRequest(JMSServerProtocol protocol, int sessionID, long consumerID, MessageImpl message)
   {
-    super(protocol);
+    super(protocol, JMSProtocolConstants.SIGNAL_SERVER_MESSAGE);
     this.sessionID = sessionID;
     this.consumerID = consumerID;
     this.message = message;
   }
 
   @Override
-  protected short getSignalID()
-  {
-    return JMSProtocolConstants.SIGNAL_SERVER_MESSAGE;
-  }
-
-  @Override
   protected void requesting(ExtendedDataOutputStream out) throws IOException
   {
     out.writeInt(sessionID);
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocol.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocol.java
index 529ca03d03..a70af82676 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocol.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSServerProtocol.java
@@ -35,31 +35,31 @@ public class JMSServerProtocol extends SignalProtocol<ServerConnection>
     switch (signalID)
     {
     case JMSProtocolConstants.SIGNAL_SYNC:
-      return new JMSSyncIndication();
+      return new JMSSyncIndication(this);
 
     case JMSProtocolConstants.SIGNAL_LOGON:
-      return new JMSLogonIndication();
+      return new JMSLogonIndication(this);
 
     case JMSProtocolConstants.SIGNAL_OPEN_SESSION:
-      return new JMSOpenSessionIndication();
+      return new JMSOpenSessionIndication(this);
 
     case JMSProtocolConstants.SIGNAL_REGISTER_CONSUMER:
-      return new JMSRegisterConsumerIndication();
+      return new JMSRegisterConsumerIndication(this);
 
     case JMSProtocolConstants.SIGNAL_CLIENT_MESSAGE:
-      return new JMSClientMessageIndication();
+      return new JMSClientMessageIndication(this);
 
     case JMSProtocolConstants.SIGNAL_ACKNOWLEDGE:
-      return new JMSAcknowledgeIndication();
+      return new JMSAcknowledgeIndication(this);
 
     case JMSProtocolConstants.SIGNAL_RECOVER:
-      return new JMSRecoverIndication();
+      return new JMSRecoverIndication(this);
 
     case JMSProtocolConstants.SIGNAL_COMMIT:
-      return new JMSCommitIndication();
+      return new JMSCommitIndication(this);
 
     case JMSProtocolConstants.SIGNAL_ROLLBACK:
-      return new JMSRollbackIndication();
+      return new JMSRollbackIndication(this);
 
     default:
       return null;
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSSyncIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSSyncIndication.java
index 01577a56cf..1a5d3b942f 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSSyncIndication.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/JMSSyncIndication.java
@@ -22,14 +22,9 @@ import java.io.IOException;
  */
 public class JMSSyncIndication extends IndicationWithResponse
 {
-  public JMSSyncIndication()
+  public JMSSyncIndication(JMSServerProtocol protocol)
   {
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return JMSProtocolConstants.SIGNAL_SYNC;
+    super(protocol, JMSProtocolConstants.SIGNAL_SYNC);
   }
 
   @Override
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSAdminServerProtocol.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSAdminServerProtocol.java
index 3977d972d5..77133205f8 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSAdminServerProtocol.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSAdminServerProtocol.java
@@ -35,7 +35,7 @@ public class JMSAdminServerProtocol extends SignalProtocol<Object>
     switch (signalID)
     {
     case JMSAdminProtocolConstants.SIGNAL_CREATE_DESTINATION:
-      return new JMSCreateDestinationIndication();
+      return new JMSCreateDestinationIndication(this);
 
     default:
       return null;
diff --git a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSCreateDestinationIndication.java b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSCreateDestinationIndication.java
index 3649a2149a..9044e998af 100644
--- a/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSCreateDestinationIndication.java
+++ b/plugins/org.eclipse.net4j.jms.server/src/org/eclipse/net4j/jms/internal/server/protocol/admin/JMSCreateDestinationIndication.java
@@ -27,14 +27,9 @@ public class JMSCreateDestinationIndication extends IndicationWithResponse
 {
   private boolean ok;
 
-  public JMSCreateDestinationIndication()
+  public JMSCreateDestinationIndication(JMSAdminServerProtocol protocol)
   {
-  }
-
-  @Override
-  protected short getSignalID()
-  {
-    return JMSAdminProtocolConstants.SIGNAL_CREATE_DESTINATION;
+    super(protocol, JMSAdminProtocolConstants.SIGNAL_CREATE_DESTINATION);
   }
 
   @Override