Added favored port option

README.md

@@ -1,19 +1,15 @@
 # Net Helper
 
-[![Release](https://jitpack.io/v/xorith/nethelper.svg)](https://jitpack.io/#xorith/nethelper)
 [![Build Status](https://travis-ci.org/xorith/nethelper.svg?branch=master)](https://travis-ci.org/xorith/nethelper)
 
 Net Helper is a small library that provides helper methods to make networking in Java easier.
 
+## 1.1.1 Changes ##
+Added a favored port setting on ports. The helper will attempt to use this port first if possible before falling back on the other possible ports allowed for a given port object.
 
-Add the dependency:
-```xml
-<dependency>
-  <groupId>coffee.wantsmore</groupId>
-  <artifactId>nethelper</artifactId>
-  <version>1.0</version>
-</dependency>
-```
+## Usage ##
+
+To use, follow the instructions under Set Me Up! on [Bintray](https://bintray.com/xorith/coffee/NetHelper#)
 
 Example:
 ```java

pom.xml

@@ -8,7 +8,7 @@
     <description>A suite of helpful network tools, including upnp port mapping</description>
     <url>https://www.github.com/xorith/nethelper</url>
     <packaging>jar</packaging>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
 
     <licenses>
         <license>

src/main/java/coffee/keenan/network/helpers/port/Port.java

@@ -12,6 +12,7 @@
 public class Port extends ErrorTracking
 {
     private final List<Integer> ports = new ArrayList<>();
+    private Integer favortedPort;
     private final Protocol protocols;
     private final InetAddress address;
     private final Set<IPortValidator> validators = new HashSet<>();
@@ -39,6 +40,17 @@ public Port(final InetAddress address, final Protocol protocol)
         }
     }
 
+    public Port setFavoredPort(final int port)
+    {
+        this.favortedPort = port;
+        return this;
+    }
+
+    public Integer getFavoredPort()
+    {
+        return this.favortedPort;
+    }
+
     public Port addPort(final int port)
     {
         this.ports.add(port);

src/main/java/coffee/keenan/network/helpers/port/PortHelper.java

@@ -32,10 +32,21 @@ public static Port assignPort(@NotNull final Port port)
         return assignPort(port, new DefaultConfiguration());
     }
 
+    public Port assignFavoredPort(@NotNull final Port port)
+    {
+        final Integer p = port.getFavoredPort();
+        if (p != null && validatePort(port.getAddress(), p, port.getValidators()))        
+            port.setAssignedPort(p);
+        return port;
+    }
+
     @SuppressWarnings("WeakerAccess")
     public static Port assignPort(@NotNull final Port port, @NotNull final IConfiguration configuration)
     {
         final PortHelper portHelper = new PortHelper(configuration);
+        portHelper.assignFavoredPort(port);
+        if (port.getAssignedPort() != 0) return port;
+
         for (final int p : port.getPorts())
         {
             if (portHelper.validatePort(port.getAddress(), p, port.getValidators()))

src/test/java/coffee/keenan/network/helpers/port/PortHelperTest.java

@@ -77,4 +77,39 @@ public Exception getException()
         assertEquals(o, p);
         assertEquals(0, p.getAssignedPort());
     }
+
+    @Test
+    public void assignFavoredPort()
+    {
+        Port o = new Port(InetAddress.getLoopbackAddress(), Protocol.TCP)
+                .setDescription("Test")
+                .addPortRange(1000, 1200)
+                .setFavoredPort(1234)
+                .toMap();
+        Port p = PortHelper.assignPort(o);
+        assertEquals(o, p);
+        assertEquals(1234, p.getAssignedPort());
+        o = new Port(InetAddress.getLoopbackAddress(), Protocol.TCP)
+                .setDescription("Test")
+                .addPortRange(1000, 1200)
+                .setFavoredPort(1234)
+                .toMap()
+                .addValidators(new IPortValidator()
+                {
+                    @Override
+                    public boolean validate(InetAddress address, IConfiguration configuration, int port)
+                    {
+                        return false;
+                    }
+
+                    @Override
+                    public Exception getException()
+                    {
+                        return new Exception("failure");
+                    }
+                });
+        p = PortHelper.assignPort(o);
+        assertEquals(o, p);
+        assertEquals(0, p.getAssignedPort());
+    }
 }

src/test/java/coffee/keenan/network/helpers/port/PortTest.java

@@ -13,6 +13,15 @@
 
 public class PortTest
 {
+    @Test
+    public void addFavoredPort()
+    {
+        Port p = new Port(InetAddress.getLoopbackAddress(), Protocol.TCP);
+        assertNull(p.getFavoredPort());
+        p.setFavoredPort(1234);
+        assertNotNull(p.getFavoredPort());
+        assertEquals(1234, p.getFavoredPort().intValue());
+    }
 
     @Test
     public void addPort()