Merge pull request #31 from kenta-shimizu/v6

v6 SecsMessageSendable BugFix.

Author: kenta-shimizu

src/main/java/com/shimizukenta/secs/SecsCommunicatableStateChangeBiListener.java

@@ -5,10 +5,6 @@
 /**
  * SECS-Communicate-State Change Listener.
  * 
- * <p>
- * This interface is called in {@link SecsCommunicator#addSecsCommunicatableStateChangeBiListener(SecsCommunicatableStateChangeBiListener)}<br />
- * </p>
- * 
  * @author kenta-shimizu
  *
  */
@@ -23,8 +19,8 @@ public interface SecsCommunicatableStateChangeBiListener extends EventListener {
 	 * </p>
 	 * 
 	 * @param communicatable true if state is communicatable
-	 * @param communicator the SecsCommunicator
+	 * @param communicator the GemAccessor
 	 */
-	public void changed(boolean communicatable, SecsCommunicator communicator);
+	public void changed(boolean communicatable, GemAccessor communicator);
 
 }

src/main/java/com/shimizukenta/secs/SecsCommunicatableStateChangeListener.java

@@ -5,10 +5,6 @@
 /**
  * SECS-Communicate-State Change Listener.
  * 
- * <p>
- * This interface is called in {@link SecsCommunicator#addSecsCommunicatableStateChangeListener(SecsCommunicatableStateChangeListener)}<br />
- * </p>
- * 
  * @author kenta-shimizu
  *
  */

src/main/java/com/shimizukenta/secs/SecsCommunicator.java

@@ -47,7 +47,7 @@
  * @author kenta-shimizu
  *
  */
-public interface SecsCommunicator extends OpenAndCloseable, GemAccessor, SecsMessageListenable, SecsCommunicateStateDetectable {
+public interface SecsCommunicator extends OpenAndCloseable, GemAccessor, SecsMessageObservable, SecsCommunicateStateDetectable {
 
 	/**
 	 * Open and wait until communicatable.
@@ -81,30 +81,6 @@ public interface SecsCommunicator extends OpenAndCloseable, GemAccessor, SecsMes
 	public void openAndWaitUntilCommunicatable(long timeout, TimeUnit unit) throws IOException, InterruptedException, TimeoutException;
 
 
-	/* Secs-Message Receive Listener */
-	
-	/**
-	 * Add Listener to receive Primary-Message.
-	 * 
-	 * <p>
-	 * This Listener not receive Reply-Message.<br />
-	 * </p>
-	 * 
-	 * @param listener Not accept {@code null}
-	 * @return {@code true} if add success
-	 */
-	public boolean addSecsMessageReceiveListener(SecsMessageReceiveListener listener);
-	
-	/**
-	 * Remove Listener.
-	 * 
-	 * @param listener Not accept {@code null}
-	 * @return {@code true} if remove success
-	 */
-	public boolean removeSecsMessageReceiveListener(SecsMessageReceiveListener listener);
-	
-	
-	
 	/* Secs-Log Receive Listener */
 
 	/**

src/main/java/com/shimizukenta/secs/SecsMessageListenable.java renamed to src/main/java/com/shimizukenta/secs/SecsMessageObservable.java

@@ -1,12 +1,32 @@
 package com.shimizukenta.secs;
 
 /**
- * SecsMessage Listenable.
+ * SecsMessage Observer methods.
  * 
  * @author kenta-shimizu
  *
  */
-public interface SecsMessageListenable {
+public interface SecsMessageObservable {
+	
+	/**
+	 * Add Listener to receive Primary-Message.
+	 * 
+	 * <p>
+	 * This Listener not receive Reply-Message.<br />
+	 * </p>
+	 * 
+	 * @param listener Not accept {@code null}
+	 * @return {@code true} if add success
+	 */
+	public boolean addSecsMessageReceiveListener(SecsMessageReceiveListener listener);
+	
+	/**
+	 * Remove Listener.
+	 * 
+	 * @param listener Not accept {@code null}
+	 * @return {@code true} if remove success
+	 */
+	public boolean removeSecsMessageReceiveListener(SecsMessageReceiveListener listener);
 
 	/**
 	 * Add Listener to receive Primary-Message.
@@ -29,9 +49,6 @@ public interface SecsMessageListenable {
 	public boolean removeSecsMessageReceiveBiListener(SecsMessageReceiveBiListener biListener);
 
 
-	
-	/* Try-Send Secs-Message Pass-through Listener */
-	
 	/**
 	 * Add Listener to get SecsMesssage before sending.
 	 * 
@@ -63,9 +80,7 @@ public interface SecsMessageListenable {
 	 * @return {@code true} if remove success
 	 */
 	public boolean removeTrySendSecsMessagePassThroughBiListener(SecsMessagePassThroughBiListener biListener);	
-
 
-	/* Sended Secs-Message Pass-through Listener */
 
 	/**
 	 * Add Listener to get sended SecsMesssage.
@@ -98,9 +113,7 @@ public interface SecsMessageListenable {
 	 * @return {@code true} if remove success
 	 */
 	public boolean removeSendedSecsMessagePassThroughBiListener(SecsMessagePassThroughBiListener biListener);	
-
 
-	/* Receive Secs-Message Pass-through Listener */
 
 	/**
 	 * Add Listener to receive both Primary and Reply Message.

src/main/java/com/shimizukenta/secs/SecsMessagePassThroughBiListener.java

@@ -14,8 +14,8 @@ public interface SecsMessagePassThroughBiListener extends EventListener {
 	 * Pass-through SECS-Message and SecsCommunicator Listener.
 	 * 
 	 * @param message the SecsMessage
-	 * @param communicator the SecsCommunicator
+	 * @param communicator the GemAccessor
 	 */
-	public void passThrough(SecsMessage message, SecsCommunicator communicator);
+	public void passThrough(SecsMessage message, GemAccessor communicator);
 
 }

src/main/java/com/shimizukenta/secs/SecsMessageReceiveBiListener.java

@@ -6,7 +6,6 @@
  * SecsMessage receive Listener.
  * 
  * <p>
- * This interface is used in {@link SecsCommunicator#addSecsMessageReceiveBiListener(SecsMessageReceiveBiListener)}<br />
  * Receive-Message is only Primary-SecsMessage.<br />
  * </p>
  * 
@@ -15,11 +14,11 @@
 public interface SecsMessageReceiveBiListener extends EventListener {
 
 	/**
-	 * Putter Received Primary-SecsMessage and SecsCommunicator.
+	 * Putter Received Primary-SecsMessage and GemAccessor.
 	 * 
 	 * @param message only Primary-SecsMessage
-	 * @param communicator the SecsCommunicator
+	 * @param communicator the GemAccessor
 	 */
-	public void received(SecsMessage message, SecsCommunicator communicator);
+	public void received(SecsMessage message, GemAccessor communicator);
 
 }

src/main/java/com/shimizukenta/secs/SecsMessageReceiveListener.java

@@ -6,7 +6,6 @@
  * SecsMessage receive Listener.
  * 
  * <p>
- * This interface is used in {@link SecsCommunicator#addSecsMessageReceiveListener(SecsMessageReceiveListener)}<br />
  * Receive-Message is only Primary-SecsMessage.<br />
  * </p>
  * 

src/main/java/com/shimizukenta/secs/SecsMessageSendable.java

@@ -151,7 +151,7 @@ default public Optional<SecsMessage> send(SmlMessage sml)
 			SecsException,
 			InterruptedException {
 
-		return this.send(sml.getStream(), sml.getFunction(), sml.wbit(), Secs2.empty());
+		return this.send(sml.getStream(), sml.getFunction(), sml.wbit(), sml.secs2());
 	}
 
 	/**
@@ -176,7 +176,7 @@ default public Optional<SecsMessage> send(SecsMessage primaryMsg, SmlMessage sml
 			SecsException,
 			InterruptedException {
 
-		return this.send(primaryMsg, sml.getStream(), sml.getFunction(), sml.wbit(), Secs2.empty());
+		return this.send(primaryMsg, sml.getStream(), sml.getFunction(), sml.wbit(), sml.secs2());
 	}
 
 }

src/main/java/com/shimizukenta/secs/hsms/impl/AbstractHsmsSession.java

@@ -37,12 +37,12 @@ public abstract class AbstractHsmsSession extends AbstractHsmsCommunicator imple
 	public AbstractHsmsSession(AbstractHsmsCommunicatorConfig config) {
 		super(config);
 
-		this.hsmsSessionMsgRecvQueueBiObserver = new HsmsSessionMessageReceiveQueueBiObserver(this);
+		this.hsmsSessionMsgRecvQueueBiObserver = new HsmsSessionMessageReceiveQueueBiObserver(this.executorService(), this);
 		this.hsmsStatePropBiObserver = new HsmsSessionCommunicateStatePropertyBiObserver(this, this.getHsmsCommunicateState());
 
-		this.trySendHsmsMsgPassThroughQueueBiObserver = new HsmsSessionMessagePassThroughQueueBiObserver(this);
-		this.sendedHsmsMsgPassThroughQueueBiObserver = new HsmsSessionMessagePassThroughQueueBiObserver(this);
-		this.recvHsmsMsgPassThroughQueueBiObserver = new HsmsSessionMessagePassThroughQueueBiObserver(this);
+		this.trySendHsmsMsgPassThroughQueueBiObserver = new HsmsSessionMessagePassThroughQueueBiObserver(this.executorService(), this);
+		this.sendedHsmsMsgPassThroughQueueBiObserver = new HsmsSessionMessagePassThroughQueueBiObserver(this.executorService(), this);
+		this.recvHsmsMsgPassThroughQueueBiObserver = new HsmsSessionMessagePassThroughQueueBiObserver(this.executorService(), this);
 	}
 
 	private final ObjectProperty<AbstractHsmsAsyncSocketChannel> channel = ObjectProperty.newInstance(null);

src/main/java/com/shimizukenta/secs/hsms/impl/HsmsMessagePassThroughQueueObserver.java

@@ -1,14 +1,15 @@
 package com.shimizukenta.secs.hsms.impl;
 
+import java.util.concurrent.Executor;
+
 import com.shimizukenta.secs.hsms.HsmsMessage;
 import com.shimizukenta.secs.hsms.HsmsMessagePassThroughListener;
-import com.shimizukenta.secs.impl.AbstractBaseCommunicator;
 import com.shimizukenta.secs.impl.AbstractQueueObserver;
 
 public class HsmsMessagePassThroughQueueObserver extends AbstractQueueObserver<HsmsMessagePassThroughListener, HsmsMessage> {
 
-	public HsmsMessagePassThroughQueueObserver(AbstractBaseCommunicator comm) {
-		super(comm);
+	public HsmsMessagePassThroughQueueObserver(Executor executor) {
+		super(executor);
 	}
 
 	@Override

src/main/java/com/shimizukenta/secs/hsms/impl/HsmsSessionMessagePassThroughQueueBiObserver.java

@@ -1,14 +1,16 @@
 package com.shimizukenta.secs.hsms.impl;
 
+import java.util.concurrent.Executor;
+
 import com.shimizukenta.secs.hsms.HsmsMessage;
 import com.shimizukenta.secs.hsms.HsmsMessagePassThroughListener;
 import com.shimizukenta.secs.hsms.HsmsSessionMessagePassThroughBiListener;
 import com.shimizukenta.secs.impl.AbstractQueueBiObserver;
 
 public class HsmsSessionMessagePassThroughQueueBiObserver extends AbstractQueueBiObserver<AbstractHsmsSession, HsmsMessagePassThroughListener, HsmsSessionMessagePassThroughBiListener, HsmsMessage> {
 
-	public HsmsSessionMessagePassThroughQueueBiObserver(AbstractHsmsSession comm) {
-		super(comm);
+	public HsmsSessionMessagePassThroughQueueBiObserver(Executor executor, AbstractHsmsSession comm) {
+		super(executor, comm);
 	}
 
 	@Override

src/main/java/com/shimizukenta/secs/hsms/impl/HsmsSessionMessageReceiveQueueBiObserver.java

@@ -1,14 +1,16 @@
 package com.shimizukenta.secs.hsms.impl;
 
+import java.util.concurrent.Executor;
+
 import com.shimizukenta.secs.hsms.HsmsMessage;
 import com.shimizukenta.secs.hsms.HsmsMessageReceiveListener;
 import com.shimizukenta.secs.hsms.HsmsSessionMessageReceiveBiListener;
 import com.shimizukenta.secs.impl.AbstractQueueBiObserver;
 
 public class HsmsSessionMessageReceiveQueueBiObserver extends AbstractQueueBiObserver<AbstractHsmsSession, HsmsMessageReceiveListener, HsmsSessionMessageReceiveBiListener, HsmsMessage> {
 
-	public HsmsSessionMessageReceiveQueueBiObserver(AbstractHsmsSession comm) {
-		super(comm);
+	public HsmsSessionMessageReceiveQueueBiObserver(Executor executor, AbstractHsmsSession comm) {
+		super(executor, comm);
 	}
 
 	@Override

src/main/java/com/shimizukenta/secs/hsmsgs/impl/AbstractHsmsGsCommunicator.java

@@ -80,15 +80,15 @@ public AbstractHsmsGsCommunicator(HsmsGsCommunicatorConfig config) {
 		this.secsCommStatableObserver = new HsmsGsSecsCommunicatableBiObserver();
 		this.hsmsCommStateObserver = new HsmsGsHsmsCommunicateStateBiObserver();
 
-		this.trySendHsmsMsgPassThroughQueueObserver = new HsmsMessagePassThroughQueueObserver(this);
-		this.sendedHsmsMsgPassThroughQueueObserver = new HsmsMessagePassThroughQueueObserver(this);
-		this.recvHsmsMsgPassThroughQueueObserver = new HsmsMessagePassThroughQueueObserver(this);
+		this.trySendHsmsMsgPassThroughQueueObserver = new HsmsMessagePassThroughQueueObserver(this.executorService());
+		this.sendedHsmsMsgPassThroughQueueObserver = new HsmsMessagePassThroughQueueObserver(this.executorService());
+		this.recvHsmsMsgPassThroughQueueObserver = new HsmsMessagePassThroughQueueObserver(this.executorService());
 
 		this.trySendHsmsMsgPassThroughBiObserver = new HsmsGsMessagePassThroughBiObserver();
 		this.sendedHsmsMsgPassThroughBiObserver = new HsmsGsMessagePassThroughBiObserver();
 		this.recvHsmsMsgPassThroughBiObserver = new HsmsGsMessagePassThroughBiObserver();
 
-		this.logQueueObserver = new SecsLogQueueObserver(this);
+		this.logQueueObserver = new SecsLogQueueObserver(this.executorService());
 
 		for (HsmsSession s : this.sessions) {
 

src/main/java/com/shimizukenta/secs/hsmsgs/impl/HsmsGsSecsCommunicatableBiObserver.java

@@ -3,8 +3,8 @@
 import java.util.Collection;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import com.shimizukenta.secs.GemAccessor;
 import com.shimizukenta.secs.SecsCommunicatableStateChangeBiListener;
-import com.shimizukenta.secs.SecsCommunicator;
 
 public class HsmsGsSecsCommunicatableBiObserver implements SecsCommunicatableStateChangeBiListener {
 
@@ -39,7 +39,7 @@ public boolean removeListener(SecsCommunicatableStateChangeBiListener biListener
 	}
 
 	@Override
-	public void changed(boolean communicatable, SecsCommunicator communicator) {
+	public void changed(boolean communicatable, GemAccessor communicator) {
 
 		for ( SecsCommunicatableStateChangeBiListener l : this.biListener ) {
 			l.changed(communicatable, communicator);

src/main/java/com/shimizukenta/secs/hsmsss/impl/AbstractHsmsSsCommunicator.java

@@ -53,12 +53,12 @@ public AbstractHsmsSsCommunicator(HsmsSsCommunicatorConfig config) {
 
 		this.session = new AbstractHsmsSsSession(config) {};
 
-		this.hsmsSsMsgRecvQueueBiObserver = new HsmsSsMessageReceiveQueueBiObserver(this);
+		this.hsmsSsMsgRecvQueueBiObserver = new HsmsSsMessageReceiveQueueBiObserver(this.executorService(), this);
 		this.hsmsStatePropBiObserver = new HsmsSsCommunicateStatePropertyBiObserver(this, this.getHsmsCommunicateState());
 
-		this.trySendHsmsSsMsgPassThroughQueueBiObserver = new HsmsSsMessagePassThroughQueueBiObserver(this);
-		this.sendedHsmsSsMsgPassThroughQueueBiObserver = new HsmsSsMessagePassThroughQueueBiObserver(this);
-		this.recvHsmsSsMsgPassThroughQueueBiObserver = new HsmsSsMessagePassThroughQueueBiObserver(this);
+		this.trySendHsmsSsMsgPassThroughQueueBiObserver = new HsmsSsMessagePassThroughQueueBiObserver(this.executorService(), this);
+		this.sendedHsmsSsMsgPassThroughQueueBiObserver = new HsmsSsMessagePassThroughQueueBiObserver(this.executorService(), this);
+		this.recvHsmsSsMsgPassThroughQueueBiObserver = new HsmsSsMessagePassThroughQueueBiObserver(this.executorService(), this);
 	}
 
 	@Override

src/main/java/com/shimizukenta/secs/hsmsss/impl/HsmsSsMessagePassThroughQueueBiObserver.java

@@ -1,14 +1,16 @@
 package com.shimizukenta.secs.hsmsss.impl;
 
+import java.util.concurrent.Executor;
+
 import com.shimizukenta.secs.hsms.HsmsMessage;
 import com.shimizukenta.secs.hsms.HsmsMessagePassThroughListener;
 import com.shimizukenta.secs.hsmsss.HsmsSsMessagePassThroughBiListener;
 import com.shimizukenta.secs.impl.AbstractQueueBiObserver;
 
 public class HsmsSsMessagePassThroughQueueBiObserver extends AbstractQueueBiObserver<AbstractHsmsSsCommunicator, HsmsMessagePassThroughListener, HsmsSsMessagePassThroughBiListener, HsmsMessage> {
 
-	public HsmsSsMessagePassThroughQueueBiObserver(AbstractHsmsSsCommunicator communicator) {
-		super(communicator);
+	public HsmsSsMessagePassThroughQueueBiObserver(Executor executor, AbstractHsmsSsCommunicator communicator) {
+		super(executor, communicator);
 	}
 
 	@Override

src/main/java/com/shimizukenta/secs/hsmsss/impl/HsmsSsMessageReceiveQueueBiObserver.java

@@ -1,14 +1,16 @@
 package com.shimizukenta.secs.hsmsss.impl;
 
+import java.util.concurrent.Executor;
+
 import com.shimizukenta.secs.hsms.HsmsMessage;
 import com.shimizukenta.secs.hsms.HsmsMessageReceiveListener;
 import com.shimizukenta.secs.hsmsss.HsmsSsMessageReceiveBiListener;
 import com.shimizukenta.secs.impl.AbstractQueueBiObserver;
 
 public class HsmsSsMessageReceiveQueueBiObserver extends AbstractQueueBiObserver<AbstractHsmsSsCommunicator, HsmsMessageReceiveListener, HsmsSsMessageReceiveBiListener, HsmsMessage> {
 
-	public HsmsSsMessageReceiveQueueBiObserver(AbstractHsmsSsCommunicator comm) {
-		super(comm);
+	public HsmsSsMessageReceiveQueueBiObserver(Executor executor, AbstractHsmsSsCommunicator comm) {
+		super(executor, comm);
 	}
 
 	@Override

src/main/java/com/shimizukenta/secs/impl/AbstractPropertyBiObserver.java

@@ -4,9 +4,10 @@
 import java.util.Collection;
 import java.util.Objects;
 
+import com.shimizukenta.secs.GemAccessor;
 import com.shimizukenta.secs.local.property.Observable;
 
-public abstract class AbstractPropertyBiObserver<C extends AbstractSecsCommunicator,V, M, B> {
+public abstract class AbstractPropertyBiObserver<C extends GemAccessor,V, M, B> {
 
 	private final Collection<M> listeners = new ArrayList<>();
 	private final Collection<B> biListeners = new ArrayList<>();