Missing a generic factory in NetworkProtocolProvider

fbacchella · fbacchella · commit 0ce7f90a5491 · 2025-11-21T12:53:30.000+01:00
diff --git a/jeromq-core/src/main/java/zmq/io/net/NetProtocol.java b/jeromq-core/src/main/java/zmq/io/net/NetProtocol.java
@@ -191,7 +191,7 @@ public <S extends SocketAddress> void startConnecting(Options options, IOThread
     @SuppressWarnings("unchecked")
     public <S extends SocketAddress> SocketFactory<S> factory()
     {
-        return resolve().channelFactory();
+        return (SocketFactory<S>) resolve().channelFactory();
     }
 
     @SuppressWarnings("unchecked")
diff --git a/jeromq-core/src/main/java/zmq/io/net/NetworkProtocolProvider.java b/jeromq-core/src/main/java/zmq/io/net/NetworkProtocolProvider.java
@@ -12,12 +12,12 @@
 import zmq.io.SessionBase;
 import zmq.io.net.Address.IZAddress;
 
-public interface NetworkProtocolProvider<SA extends SocketAddress>
+public interface NetworkProtocolProvider<S extends SocketAddress>
 {
     boolean handleProtocol(NetProtocol protocol);
     Listener getListener(IOThread ioThread, SocketBase socket, Options options);
-    IZAddress<SA> zresolve(String addr, boolean ipv6);
-    void startConnecting(Options options, IOThread ioThread, SessionBase session, Address<SA> addr, boolean delayedStart,
+    IZAddress<S> zresolve(String addr, boolean ipv6);
+    void startConnecting(Options options, IOThread ioThread, SessionBase session, Address<S> addr, boolean delayedStart,
             Consumer<Own> launchChild, BiConsumer<SessionBase, IEngine> sendAttach);
     default boolean isValid()
     {
@@ -27,10 +27,10 @@ default boolean handleAdress(SocketAddress socketAddress)
     {
         return false;
     }
-    default String formatSocketAddress(SA socketAddress)
+    default String formatSocketAddress(S socketAddress)
     {
         throw new IllegalArgumentException("Unhandled address protocol " + socketAddress);
     }
     boolean wantsIOThread();
-    SocketFactory channelFactory();
+    SocketFactory<S> channelFactory();
 }
diff --git a/jeromq-core/src/main/java/zmq/io/net/inproc/InprocNetworkProtocolProvider.java b/jeromq-core/src/main/java/zmq/io/net/inproc/InprocNetworkProtocolProvider.java
@@ -60,7 +60,7 @@ public boolean wantsIOThread()
     }
 
     @Override
-    public SocketFactory channelFactory() {
+    public SocketFactory<InetSocketAddress> channelFactory() {
         return null;
     }
 }
diff --git a/jeromq-core/src/main/java/zmq/io/net/ipc/IpcNetworkProtocolProvider.java b/jeromq-core/src/main/java/zmq/io/net/ipc/IpcNetworkProtocolProvider.java
@@ -21,7 +21,7 @@
 
 public class IpcNetworkProtocolProvider implements NetworkProtocolProvider<InetSocketAddress>
 {
-    private final SocketFactory factory = new TcpChannelFactory();
+    private final SocketFactory<InetSocketAddress> factory = new TcpChannelFactory();
 
     @Override
     public boolean handleProtocol(NetProtocol protocol)
@@ -77,7 +77,7 @@ public boolean wantsIOThread()
     }
 
     @Override
-    public SocketFactory channelFactory() {
+    public SocketFactory<InetSocketAddress> channelFactory() {
         return factory;
     }
 }
diff --git a/jeromq-core/src/main/java/zmq/io/net/norm/NormNetworkProtocolProvider.java b/jeromq-core/src/main/java/zmq/io/net/norm/NormNetworkProtocolProvider.java
@@ -13,32 +13,29 @@
 import zmq.io.SessionBase;
 import zmq.io.net.Address;
 import zmq.io.net.Address.IZAddress;
-import zmq.io.net.SocketFactory;
 import zmq.io.net.Listener;
 import zmq.io.net.NetProtocol;
 import zmq.io.net.NetworkProtocolProvider;
+import zmq.io.net.SocketFactory;
 
 public class NormNetworkProtocolProvider implements NetworkProtocolProvider<InetSocketAddress>
 {
     @Override
     public boolean handleProtocol(NetProtocol protocol)
     {
-        // TODO Auto-generated method stub
         return false;
     }
 
     @Override
     public Listener getListener(IOThread ioThread, SocketBase socket,
                                 Options options)
     {
-        // TODO Auto-generated method stub
         return null;
     }
 
     @Override
     public IZAddress<InetSocketAddress> zresolve(String addr, boolean ipv6)
     {
-        // TODO Auto-generated method stub
         return null;
     }
 
@@ -75,7 +72,7 @@ public boolean wantsIOThread()
     }
 
     @Override
-    public SocketFactory channelFactory() {
+    public SocketFactory<InetSocketAddress> channelFactory() {
         return null;
     }
 }
diff --git a/jeromq-core/src/main/java/zmq/io/net/pgm/PgmNetworkProtocolProvider.java b/jeromq-core/src/main/java/zmq/io/net/pgm/PgmNetworkProtocolProvider.java
@@ -82,7 +82,7 @@ public boolean wantsIOThread()
     }
 
     @Override
-    public SocketFactory channelFactory() {
+    public SocketFactory<InetSocketAddress> channelFactory() {
         return null;
     }
 }
diff --git a/jeromq-core/src/main/java/zmq/io/net/tcp/TcpNetworkProtocolProvider.java b/jeromq-core/src/main/java/zmq/io/net/tcp/TcpNetworkProtocolProvider.java
@@ -20,7 +20,7 @@
 
 public class TcpNetworkProtocolProvider implements NetworkProtocolProvider<InetSocketAddress>
 {
-    private final SocketFactory factory = new TcpChannelFactory();
+    private final SocketFactory<InetSocketAddress> factory = new TcpChannelFactory();
 
     @Override
     public boolean handleProtocol(NetProtocol protocol)
@@ -83,7 +83,7 @@ public boolean wantsIOThread()
     }
 
     @Override
-    public SocketFactory channelFactory()
+    public SocketFactory<InetSocketAddress> channelFactory()
     {
         return factory;
     }
diff --git a/jeromq-core/src/main/java/zmq/io/net/tipc/TipcNetworkProtocolProvider.java b/jeromq-core/src/main/java/zmq/io/net/tipc/TipcNetworkProtocolProvider.java
@@ -22,7 +22,6 @@ public class TipcNetworkProtocolProvider implements NetworkProtocolProvider<Inet
     @Override
     public boolean handleProtocol(NetProtocol protocol)
     {
-        // TODO Auto-generated method stub
         return false;
     }
 
@@ -36,7 +35,6 @@ public Listener getListener(IOThread ioThread, SocketBase socket,
     @Override
     public IZAddress<InetSocketAddress> zresolve(String addr, boolean ipv6)
     {
-        // TODO Auto-generated method stub
         return null;
     }
 
@@ -57,7 +55,7 @@ public boolean wantsIOThread()
     }
 
     @Override
-    public SocketFactory channelFactory()
+    public SocketFactory<InetSocketAddress> channelFactory()
     {
         return null;
     }
diff --git a/jeromq-ipcsockets/src/main/java16/zmq/io/net/ipc/IpcNetworkProtocolProvider.java b/jeromq-ipcsockets/src/main/java16/zmq/io/net/ipc/IpcNetworkProtocolProvider.java
@@ -20,7 +20,7 @@
 
 public class IpcNetworkProtocolProvider implements NetworkProtocolProvider<UnixDomainSocketAddress>
 {
-    private final SocketFactory factory = new IpcChannelFactory();
+    private final SocketFactory<UnixDomainSocketAddress> factory = new IpcChannelFactory();
     @Override
     public boolean handleAdress(SocketAddress socketAddress)
     {
@@ -75,7 +75,7 @@ public boolean wantsIOThread()
     }
 
     @Override
-    public SocketFactory channelFactory()
+    public SocketFactory<UnixDomainSocketAddress> channelFactory()
     {
         return factory;
     }

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ public <S extends SocketAddress> void startConnecting(Options options, IOThread`
`191`	`191`	`@SuppressWarnings("unchecked")`
`192`	`192`	`public <S extends SocketAddress> SocketFactory<S> factory()`
`193`	`193`	`{`
`194`		`- return resolve().channelFactory();`
	`194`	`+ return (SocketFactory<S>) resolve().channelFactory();`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`@SuppressWarnings("unchecked")`
Original file line number	Diff line number	Diff line change
`@@ -12,12 +12,12 @@`
`12`	`12`	`import zmq.io.SessionBase;`
`13`	`13`	`import zmq.io.net.Address.IZAddress;`
`14`	`14`
`15`		`-public interface NetworkProtocolProvider<SA extends SocketAddress>`
	`15`	`+public interface NetworkProtocolProvider<S extends SocketAddress>`
`16`	`16`	`{`
`17`	`17`	`boolean handleProtocol(NetProtocol protocol);`
`18`	`18`	`Listener getListener(IOThread ioThread, SocketBase socket, Options options);`
`19`		`- IZAddress<SA> zresolve(String addr, boolean ipv6);`
`20`		`- void startConnecting(Options options, IOThread ioThread, SessionBase session, Address<SA> addr, boolean delayedStart,`
	`19`	`+ IZAddress<S> zresolve(String addr, boolean ipv6);`
	`20`	`+ void startConnecting(Options options, IOThread ioThread, SessionBase session, Address<S> addr, boolean delayedStart,`
`21`	`21`	`Consumer<Own> launchChild, BiConsumer<SessionBase, IEngine> sendAttach);`
`22`	`22`	`default boolean isValid()`
`23`	`23`	`{`
`@@ -27,10 +27,10 @@ default boolean handleAdress(SocketAddress socketAddress)`
`27`	`27`	`{`
`28`	`28`	`return false;`
`29`	`29`	`}`
`30`		`- default String formatSocketAddress(SA socketAddress)`
	`30`	`+ default String formatSocketAddress(S socketAddress)`
`31`	`31`	`{`
`32`	`32`	`throw new IllegalArgumentException("Unhandled address protocol " + socketAddress);`
`33`	`33`	`}`
`34`	`34`	`boolean wantsIOThread();`
`35`		`- SocketFactory channelFactory();`
	`35`	`+ SocketFactory<S> channelFactory();`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public boolean wantsIOThread()`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`@Override`
`63`		`- public SocketFactory channelFactory() {`
	`63`	`+ public SocketFactory<InetSocketAddress> channelFactory() {`
`64`	`64`	`return null;`
`65`	`65`	`}`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`
`22`	`22`	`public class IpcNetworkProtocolProvider implements NetworkProtocolProvider<InetSocketAddress>`
`23`	`23`	`{`
`24`		`- private final SocketFactory factory = new TcpChannelFactory();`
	`24`	`+ private final SocketFactory<InetSocketAddress> factory = new TcpChannelFactory();`
`25`	`25`
`26`	`26`	`@Override`
`27`	`27`	`public boolean handleProtocol(NetProtocol protocol)`
`@@ -77,7 +77,7 @@ public boolean wantsIOThread()`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`@Override`
`80`		`- public SocketFactory channelFactory() {`
	`80`	`+ public SocketFactory<InetSocketAddress> channelFactory() {`
`81`	`81`	`return factory;`
`82`	`82`	`}`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,32 +13,29 @@`
`13`	`13`	`import zmq.io.SessionBase;`
`14`	`14`	`import zmq.io.net.Address;`
`15`	`15`	`import zmq.io.net.Address.IZAddress;`
`16`		`-import zmq.io.net.SocketFactory;`
`17`	`16`	`import zmq.io.net.Listener;`
`18`	`17`	`import zmq.io.net.NetProtocol;`
`19`	`18`	`import zmq.io.net.NetworkProtocolProvider;`
	`19`	`+import zmq.io.net.SocketFactory;`
`20`	`20`
`21`	`21`	`public class NormNetworkProtocolProvider implements NetworkProtocolProvider<InetSocketAddress>`
`22`	`22`	`{`
`23`	`23`	`@Override`
`24`	`24`	`public boolean handleProtocol(NetProtocol protocol)`
`25`	`25`	`{`
`26`		`- // TODO Auto-generated method stub`
`27`	`26`	`return false;`
`28`	`27`	`}`
`29`	`28`
`30`	`29`	`@Override`
`31`	`30`	`public Listener getListener(IOThread ioThread, SocketBase socket,`
`32`	`31`	`Options options)`
`33`	`32`	`{`
`34`		`- // TODO Auto-generated method stub`
`35`	`33`	`return null;`
`36`	`34`	`}`
`37`	`35`
`38`	`36`	`@Override`
`39`	`37`	`public IZAddress<InetSocketAddress> zresolve(String addr, boolean ipv6)`
`40`	`38`	`{`
`41`		`- // TODO Auto-generated method stub`
`42`	`39`	`return null;`
`43`	`40`	`}`
`44`	`41`
`@@ -75,7 +72,7 @@ public boolean wantsIOThread()`
`75`	`72`	`}`
`76`	`73`
`77`	`74`	`@Override`
`78`		`- public SocketFactory channelFactory() {`
	`75`	`+ public SocketFactory<InetSocketAddress> channelFactory() {`
`79`	`76`	`return null;`
`80`	`77`	`}`
`81`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public boolean wantsIOThread()`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`@Override`
`85`		`- public SocketFactory channelFactory() {`
	`85`	`+ public SocketFactory<InetSocketAddress> channelFactory() {`
`86`	`86`	`return null;`
`87`	`87`	`}`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`
`21`	`21`	`public class TcpNetworkProtocolProvider implements NetworkProtocolProvider<InetSocketAddress>`
`22`	`22`	`{`
`23`		`- private final SocketFactory factory = new TcpChannelFactory();`
	`23`	`+ private final SocketFactory<InetSocketAddress> factory = new TcpChannelFactory();`
`24`	`24`
`25`	`25`	`@Override`
`26`	`26`	`public boolean handleProtocol(NetProtocol protocol)`
`@@ -83,7 +83,7 @@ public boolean wantsIOThread()`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`@Override`
`86`		`- public SocketFactory channelFactory()`
	`86`	`+ public SocketFactory<InetSocketAddress> channelFactory()`
`87`	`87`	`{`
`88`	`88`	`return factory;`
`89`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ public class TipcNetworkProtocolProvider implements NetworkProtocolProvider<Inet`
`22`	`22`	`@Override`
`23`	`23`	`public boolean handleProtocol(NetProtocol protocol)`
`24`	`24`	`{`
`25`		`- // TODO Auto-generated method stub`
`26`	`25`	`return false;`
`27`	`26`	`}`
`28`	`27`
`@@ -36,7 +35,6 @@ public Listener getListener(IOThread ioThread, SocketBase socket,`
`36`	`35`	`@Override`
`37`	`36`	`public IZAddress<InetSocketAddress> zresolve(String addr, boolean ipv6)`
`38`	`37`	`{`
`39`		`- // TODO Auto-generated method stub`
`40`	`38`	`return null;`
`41`	`39`	`}`
`42`	`40`
`@@ -57,7 +55,7 @@ public boolean wantsIOThread()`
`57`	`55`	`}`
`58`	`56`
`59`	`57`	`@Override`
`60`		`- public SocketFactory channelFactory()`
	`58`	`+ public SocketFactory<InetSocketAddress> channelFactory()`
`61`	`59`	`{`
`62`	`60`	`return null;`
`63`	`61`	`}`