Moved some things around

Author: pschichtel

src/main/java/tel/schich/javacan/CanChannels.java

@@ -23,9 +23,8 @@
 package tel.schich.javacan;
 
 import java.io.IOException;
-import java.nio.channels.spi.SelectorProvider;
 
-import tel.schich.javacan.select.ExtensibleSelectorProvider;
+import static tel.schich.javacan.linux.epoll.EPollSelector.PROVIDER;
 
 /**
  * This utility class provides helper methods to easily create new channels similar to those in
@@ -38,12 +37,6 @@
  */
 public class CanChannels {
 
-    /**
-     * A {@link java.nio.channels.spi.SelectorProvider} implementation that supports custom
-     * {@link java.nio.channels.Channel} implementations just like this one.
-     */
-    public static final SelectorProvider PROVIDER = new ExtensibleSelectorProvider();
-
     private CanChannels() {
     }
 

src/main/java/tel/schich/javacan/linux/epoll/EPollSelector.java

@@ -24,6 +24,7 @@
 
 import tel.schich.javacan.linux.LinuxNativeOperationException;
 import tel.schich.javacan.linux.UnixFileDescriptor;
+import tel.schich.javacan.select.ExtensibleSelectorProvider;
 import tel.schich.javacan.select.NativeChannel;
 import tel.schich.javacan.select.NativeHandle;
 import tel.schich.javacan.util.UngrowableSet;
@@ -54,6 +55,12 @@
  */
 public class EPollSelector extends AbstractSelector {
 
+    /**
+     * A {@link java.nio.channels.spi.SelectorProvider} implementation that supports custom
+     * {@link java.nio.channels.Channel} implementations just like this one.
+     */
+    public static final SelectorProvider PROVIDER = new ExtensibleSelectorProvider();
+
     private static final long SELECT_NO_BLOCKING = 0;
     private static final long SELECT_BLOCK_INDEFINITELY = -1;
 
@@ -292,4 +299,12 @@ public Selector wakeup() {
         }
         return this;
     }
+
+    public static EPollSelector open() throws IOException {
+        return new EPollSelector(PROVIDER);
+    }
+
+    public static EPollSelector open(int maxEvents) throws IOException {
+        return new EPollSelector(PROVIDER, maxEvents);
+    }
 }

src/main/java/tel/schich/javacan/util/CanBroker.java

@@ -43,9 +43,9 @@
 import tel.schich.javacan.RawCanChannel;
 
 import static java.time.Duration.ofMinutes;
-import static tel.schich.javacan.CanChannels.PROVIDER;
 import static tel.schich.javacan.CanSocketOptions.FILTER;
 import static tel.schich.javacan.CanSocketOptions.LOOPBACK;
+import static tel.schich.javacan.linux.epoll.EPollSelector.PROVIDER;
 
 /**
  * This class implements an event driven interface over several CAN interface to send and receive

src/test/java/tel/schich/javacan/test/select/EPollSelectorTest.java

@@ -28,17 +28,18 @@
 import tel.schich.javacan.CanFrame;
 import tel.schich.javacan.CanSocketOptions;
 import tel.schich.javacan.RawCanChannel;
+import tel.schich.javacan.linux.epoll.EPollSelector;
 import tel.schich.javacan.select.ExtensibleSelectorProvider;
 import tel.schich.javacan.test.CanTestHelper;
 
 import java.io.IOException;
 import java.nio.channels.SelectionKey;
+import java.nio.channels.Selector;
 import java.nio.channels.spi.AbstractSelector;
 import java.util.Set;
 
 import static java.time.Duration.ofMillis;
 import static org.junit.jupiter.api.Assertions.*;
-import static tel.schich.javacan.CanChannels.PROVIDER;
 import static tel.schich.javacan.CanFrame.FD_NO_FLAGS;
 import static tel.schich.javacan.CanSocketOptions.RECV_OWN_MSGS;
 import static tel.schich.javacan.test.CanTestHelper.CAN_INTERFACE;
@@ -55,7 +56,7 @@ public void testOpenClose() throws IOException {
     @Test
     public void testWriteRead() throws IOException {
         try (RawCanChannel ch = CanChannels.newRawChannel()) {
-            try (AbstractSelector selector = ch.provider().openSelector()) {
+            try (Selector selector = EPollSelector.open()) {
                 ch.setOption(RECV_OWN_MSGS, true);
                 ch.configureBlocking(false);
                 ch.bind(CAN_INTERFACE);
@@ -79,8 +80,7 @@ public void testWriteRead() throws IOException {
 
     @Test
     public void testWakeup() throws IOException {
-        ExtensibleSelectorProvider provider = new ExtensibleSelectorProvider();
-        try (AbstractSelector selector = provider.openSelector()) {
+        try (AbstractSelector selector = EPollSelector.open()) {
             runDelayed(ofMillis(100), selector::wakeup);
             assertTimeoutPreemptively(ofMillis(200), (Executable) selector::select);
         }
@@ -89,7 +89,7 @@ public void testWakeup() throws IOException {
     @Test
     public void testPollWithClosedChannel() throws IOException {
 
-        try (final AbstractSelector selector = PROVIDER.openSelector()) {
+        try (final Selector selector = EPollSelector.open()) {
 
             RawCanChannel firstChannel = configureAndRegisterChannel(selector);
             firstChannel.close();
@@ -102,7 +102,7 @@ public void testPollWithClosedChannel() throws IOException {
     @Test
     public void testEPollFdReuse() throws IOException, InterruptedException {
 
-        try (final AbstractSelector selector = PROVIDER.openSelector()) {
+        try (final AbstractSelector selector = EPollSelector.open()) {
 
             try (RawCanChannel firstChannel = configureAndRegisterChannel(selector)) {
                 CanTestHelper.sendFrameViaUtils(CAN_INTERFACE, CanFrame.create(0x3, CanFrame.FD_NO_FLAGS, new byte[] {1}));
@@ -122,7 +122,7 @@ public void testEPollFdReuse() throws IOException, InterruptedException {
         }
     }
 
-    private static RawCanChannel configureAndRegisterChannel(AbstractSelector selector) throws IOException {
+    private static RawCanChannel configureAndRegisterChannel(Selector selector) throws IOException {
         final RawCanChannel ch = CanChannels.newRawChannel(CAN_INTERFACE);
         System.out.println("Created channel: " + ch);