Tidy up SRVRecord.

Adds an AutoCloseable version of InitialDirContext.
Fixes-Issue: CLIENT-521

Change-Id: I5248d2f50ec8da01c90fd607e72c5eac66451cf3
Reviewed-on: http://gerrit.dmdirc.com/3950
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

src/com/dmdirc/parser/common/AutoCloseableInitialDirContext.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.parser.common;
+
+import java.util.Hashtable;
+import java.util.Map;
+
+import javax.naming.NamingException;
+import javax.naming.directory.InitialDirContext;
+
+/**
+ * {@link AutoCloseable} {@link InitialDirContext}.
+ */
+public class AutoCloseableInitialDirContext extends InitialDirContext implements AutoCloseable {
+
+    protected AutoCloseableInitialDirContext(final boolean lazy) throws NamingException {
+        super(lazy);
+    }
+
+    public AutoCloseableInitialDirContext() throws NamingException {
+    }
+
+    public AutoCloseableInitialDirContext(final Map<?, ?> environment) throws NamingException {
+        super(new Hashtable<>(environment)); // NOPMD - Required by InitialDirContext
+    }
+}

src/com/dmdirc/parser/common/SRVRecord.java

@@ -22,13 +22,12 @@
 package com.dmdirc.parser.common;
 
 import java.util.ArrayList;
-import java.util.Hashtable;
+import java.util.HashMap;
 import java.util.List;
 
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
-import javax.naming.directory.InitialDirContext;
 
 /**
  * Class to represent an SRV Record.
@@ -61,7 +60,7 @@ public class SRVRecord implements Comparable<SRVRecord> {
             priority = Integer.parseInt(bits[0]);
             weight = Integer.parseInt(bits[1]);
             port = Integer.parseInt(bits[2]);
-            host = (bits[3].charAt(bits[3].length() - 1) == '.') ? bits[3].substring(0, bits[3].length() - 1) : bits[3];
+            host = bits[3].charAt(bits[3].length() - 1) == '.' ? bits[3].substring(0, bits[3].length() - 1) : bits[3];
         } catch (final NumberFormatException nfe) {
             throw new NamingException("Unable to parse SRV Record parameters."); // NOPMD
         }
@@ -105,25 +104,23 @@ public class SRVRecord implements Comparable<SRVRecord> {
 
     @Override
     public String toString() {
-        return priority + " " + weight + " " + port + " " + host + ".";
+        return priority + " " + weight + ' ' + port + ' ' + host + '.';
     }
 
     @Override
     public int compareTo(final SRVRecord o) {
-        if (this.priority < o.priority) { return -1; }
-        if (this.priority > o.priority) { return 1; }
+        if (priority < o.getPriority()) { return -1; }
+        if (priority > o.getPriority()) { return 1; }
         return 0;
     }
 
     public static List<SRVRecord> getRecords(final String host) {
         final List<SRVRecord> result = new ArrayList<>();
-
-        try {
-            // Obsolete Collection. yeah yeah...
-            final Hashtable<String, String> env = new Hashtable<>(); // NOPMD - Required by InitialDirContext
-            env.put("java.naming.factory.initial", "com.sun.jndi.dns.DnsContextFactory");
-            env.put("java.naming.provider.url", "dns:");
-            final Attribute attr = new InitialDirContext(env).getAttributes(host, new String [] { "SRV" }).get("SRV");
+        final HashMap<String, String> env = new HashMap<>();
+        env.put("java.naming.factory.initial", "com.sun.jndi.dns.DnsContextFactory");
+        env.put("java.naming.provider.url", "dns:");
+        try (AutoCloseableInitialDirContext dirContext = new AutoCloseableInitialDirContext(env)) {
+            final Attribute attr = dirContext.getAttributes(host, new String [] { "SRV" }).get("SRV");
 
             if (attr != null) {
                 final NamingEnumeration<?> ne = attr.getAll();