No new exceptions throw; testing

Author: adamdickmeiss

src/main/java/org/z3950/zing/cql/CQLGenerator.java

@@ -95,12 +95,7 @@ public CQLGenerator(Properties params) {
         this.params = params;
         String seed = params.getProperty("seed");
         if (seed != null) {
-            try {
-                rnd = new Random(Long.parseLong(seed));
-            } catch (NumberFormatException e) {
-                throw new NumberFormatException(
-                        "Bad seed value '" + seed + "'");
-            }
+            rnd = new Random(Long.parseLong(seed));
         } else {
             rnd = new Random();
     }

src/main/java/org/z3950/zing/cql/CQLNode.java

@@ -263,76 +263,65 @@ protected static final byte[] makeOID(String oid) {
         if (o != null) {
             return o;
         }
-        try {
-            o = parseOID(oid);
-        } catch (NumberFormatException e) {
-            throw new NumberFormatException("Bad OID string: '" + oid + "'");
+        o = parseOID(oid);
+        if (o == null) {
+            return null;
         }
         madeOIDs.put(oid, o);
         return o;
     }
 
     private static final byte[] parseOID(String oid) {
-        byte[] o = (byte[]) madeOIDs.get(oid);
-        if (o != null) {
-            return o;
-        }
-        int dot, offset = 0, oidOffset = 0, value;
-        o = new byte[100];
+        int offset = 0, oidOffset = 0;
+        byte [] o = new byte[100];
         // Isn't this kind of thing excruciating in Java?
         while (oidOffset < oid.length() &&
                 Character.isDigit(oid.charAt(oidOffset)) == true) {
-            if (offset > 90) // too large
+            if (offset > 90) { // too large
                 return null;
-
-            dot = oid.indexOf('.', oidOffset);
-            if (dot == -1)
+            }
+            int dot = oid.indexOf('.', oidOffset);
+            if (dot == -1) {
+                if (offset == 0) {
+                    return null;
+                }
                 dot = oid.length();
-
-            value = Integer.parseInt(oid.substring(oidOffset, dot));
-
+            }
+            int value = Integer.parseInt(oid.substring(oidOffset, dot));
             if (offset == 0) { // 1st two are special
-                if (dot == -1) // ### can't happen: -1 is reassigned above
-                    return null; // can't be this short
                 oidOffset = dot + 1; // skip past '.'
-
                 dot = oid.indexOf('.', oidOffset);
-                if (dot == -1)
+                if (dot == -1) {
                     dot = oid.length();
-
-                // ### Eh?!
+                }
                 value = value * 40 +
                         Integer.parseInt(oid.substring(oidOffset, dot));
             }
-
             if (value < 0x80) {
                 o[offset++] = (byte) value;
             } else {
                 int count = 0;
                 byte bits[] = new byte[12]; // save a 84 (12*7) bit number
-
                 while (value != 0) {
                     bits[count++] = (byte) (value & 0x7f);
                     value >>= 7;
                 }
-
                 // Now place in the correct order
-                while (--count > 0)
+                while (--count > 0) {
                     o[offset++] = (byte) (bits[count] | 0x80);
-
+                }
                 o[offset++] = bits[count];
             }
 
             dot = oid.indexOf('.', oidOffset);
-            if (dot == -1)
-                break;
-
+            if (dot == -1) {
+                byte[] ptr = new byte[offset];
+                System.arraycopy(o, 0, ptr, 0, offset);
+                return ptr;
+            }
             oidOffset = dot + 1;
         }
-
-        byte[] ptr = new byte[offset];
-        System.arraycopy(o, 0, ptr, 0, offset);
-        return ptr;
+        return null;
     }
 
     public static final byte[] makeQuery(CQLNode root, Properties properties)

src/main/java/org/z3950/zing/cql/CQLProxNode.java

@@ -89,11 +89,7 @@ byte[] opType1() {
         offset = putNum(value, op, offset);
 
         offset = putTag(CONTEXT, 2, PRIMITIVE, op, offset); // distance
-        try {
-            value = Integer.parseInt(ms.modifier("distance"));
-        } catch (NumberFormatException e) {
-            throw new NumberFormatException("Bad distance modifier: " + ms.modifier("distance"));
-        }
+        value = Integer.parseInt(ms.modifier("distance"));
         offset = putLen(numLen(value), op, offset);
         offset = putNum(value, op, offset);
 

src/test/java/org/z3950/zing/cql/CQLParserTest.java

@@ -193,4 +193,38 @@ public static String[] getResourceListing(Class clazz, String path) throws IOExc
         throw new UnsupportedOperationException("Cannot list files for URL "
                 + dirURL);
     }
+
+    @Test
+    public void testMakeOID() {
+        String[] oids = {
+            "1.2",
+            "1.2.840.10003.5.109.10",
+            "2.16.840",
+        };
+        int [][] expected = {
+            {42},
+            {42, 134, 72, 206, 19, 5, 109, 10},
+            {96, 134, 72},
+        };
+        int i = 0;
+        for (String oid : oids) {
+            out.println("Testing OID: " + oid);
+            byte[] encoded = CQLNode.makeOID(oid);
+            for (int j = 0; j < expected[i].length && j < encoded.length; j++) {
+                assertEquals("Byte " + j + " of OID " + oid, expected[i][j], encoded[j] & 0xff);
+            }
+            assertEquals("Length of OID " + oid, expected[i].length, encoded.length);
+            i++;
+        }
+        // not very consistent below, but this is how it is implemented
+        assertNull(CQLNode.makeOID(""));
+        assertNull(CQLNode.makeOID("1"));
+        assertNull(CQLNode.makeOID("b"));
+        assertThrows(NumberFormatException.class, () -> {
+            CQLNode.makeOID("1a.");
+        });
+        assertThrows(NumberFormatException.class, () -> {
+            CQLNode.makeOID("1.b");
+        });
+    }
 }