Merge branch 'master' into master

veqtor · web-flow · commit 32c586ee2efa · 2018-08-09T09:24:11.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
+.classpath
+.project
+.settings
 *.class
 
 target/**
diff --git a/pom.xml b/pom.xml
@@ -2,9 +2,9 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>io.ipfs</groupId>
-	<artifactId>multihash</artifactId>
-	<version>1.2.0</version>
+    <groupId>com.github.multiformats</groupId>
+    <artifactId>java-multihash</artifactId>
+	<version>v1.2.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>multihash</name>
@@ -32,8 +32,9 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<junit.version>4.12</junit.version>
-		<hamcrest.version>1.3</hamcrest.version>
+		<version.junit>4.12</version.junit>
+        <version.hamcrest>1.3</version.hamcrest>
+        <version.multibase>v1.0.0</version.multibase>
 	</properties>
 
 	<repositories>
@@ -44,23 +45,23 @@
 	</repositories>
 
 	<dependencies>
+        <dependency>
+            <groupId>com.github.multiformats</groupId>
+            <artifactId>java-multibase</artifactId>
+            <version>${version.multibase}</version>
+        </dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>${junit.version}</version>
+			<version>${version.junit}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
 			<artifactId>hamcrest-core</artifactId>
-			<version>${hamcrest.version}</version>
+			<version>${version.hamcrest}</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.github.multiformats</groupId>
-			<artifactId>java-multibase</artifactId>
-			<version>v1.0.0</version>
-		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/src/main/java/io/ipfs/multihash/Multihash.java b/src/main/java/io/ipfs/multihash/Multihash.java
@@ -1,9 +1,15 @@
 package io.ipfs.multihash;
 
-import io.ipfs.multibase.*;
+import io.ipfs.multibase.Base16;
+import io.ipfs.multibase.Base58;
 
-import java.io.*;
-import java.util.*;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.TreeMap;
 
 public class Multihash {
     public enum Type {
@@ -21,9 +27,9 @@ public enum Type {
         blake2b(0x40, 64),
         blake2s(0x41, 32);
 
-        public int index, length;
+        public final int index, length;
 
-        Type(int index, int length) {
+        Type(final int index, final int length) {
             this.index = index;
             this.length = length;
         }
@@ -39,12 +45,13 @@ public static Type lookup(int t) {
                 throw new IllegalStateException("Unknown Multihash type: "+t);
             return lookup.get(t);
         }
+
     }
 
-    public final Type type;
+    private final Type type;
     private final byte[] hash;
 
-    public Multihash(Type type, byte[] hash) {
+    public Multihash(final Type type, final byte[] hash) {
         if (hash.length > 127)
             throw new IllegalStateException("Unsupported hash size: "+hash.length);
         if (hash.length != type.length)
@@ -57,7 +64,7 @@ public Multihash(Multihash toClone) {
         this(toClone.type, toClone.hash); // N.B. despite being a byte[], hash is immutable
     }
 
-    public Multihash(byte[] multihash) {
+    public Multihash(final byte[] multihash) {
         this(Type.lookup(multihash[0] & 0xff), Arrays.copyOfRange(multihash, 2, multihash.length));
     }
 
@@ -68,10 +75,13 @@ public byte[] toBytes() {
         System.arraycopy(hash, 0, res, 2, hash.length);
         return res;
     }
+  
+    public Type getType() {
+        return type;
+    }
 
     public byte[] getHash() {
-        byte[] res = Arrays.copyOf(hash)
-        return res;
+        return Arrays.copyOf(hash, hash.length);
     }
 
     public void serialize(DataOutput dout) throws IOException {
@@ -104,17 +114,8 @@ public int hashCode() {
         return Arrays.hashCode(hash) ^ type.hashCode();
     }
 
-    final protected static char[] hexArray = "0123456789ABCDEF".toCharArray();
-
     public String toHex() {
-        byte[] bytes = toBytes();
-        char[] hexChars = new char[bytes.length * 2];
-        for ( int j = 0; j < bytes.length; j++ ) {
-            int v = bytes[j] & 0xFF;
-            hexChars[j * 2] = hexArray[v >>> 4];
-            hexChars[j * 2 + 1] = hexArray[v & 0x0F];
-        }
-        return new String(hexChars);
+        return Base16.encode(toBytes());
     }
 
     public String toBase58() {
@@ -123,11 +124,15 @@ public String toBase58() {
 
     public static Multihash fromHex(String hex) {
         if (hex.length() % 2 != 0)
-            throw new IllegalStateException("Uneven number of hex digits!");
-        ByteArrayOutputStream bout = new ByteArrayOutputStream();
-        for (int i=0; i < hex.length()-1; i+= 2)
-            bout.write(Integer.valueOf(hex.substring(i, i+2), 16));
-        return new Multihash(bout.toByteArray());
+            throw new IllegalStateException("Odd number of hex digits!");
+
+        try (ByteArrayOutputStream bout = new ByteArrayOutputStream()) {
+            for (int i = 0; i < hex.length() - 1; i += 2)
+                bout.write(Integer.valueOf(hex.substring(i, i + 2), 16));
+            return new Multihash(bout.toByteArray());
+        } catch (IOException e) {
+            throw new IllegalStateException("Unable to handle Multihash conversion to Hex properly");
+        }
     }
 
     public static Multihash fromBase58(String base58) {
diff --git a/src/test/java/io/ipfs/multihash/MultihashTest.java b/src/test/java/io/ipfs/multihash/MultihashTest.java
@@ -1,9 +1,13 @@
 package io.ipfs.multihash;
 
-import org.junit.*;
-import io.ipfs.multibase.*;
-import java.util.*;
+import io.ipfs.multibase.Base58;
+import org.junit.Test;
+
 import java.security.MessageDigest;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.Assert.*;
 
 public class MultihashTest {
 
@@ -14,8 +18,7 @@ public void base58Test() {
         for (String example: examples) {
             byte[] output = Base58.decode(example);
             String encoded = Base58.encode(output);
-            if (!encoded.equals(example))
-                throw new IllegalStateException("Incorrect base58! " + example + " => " + encoded);
+            assertEquals(example, encoded);
         }
     }
 
@@ -26,32 +29,33 @@ public void multihashTest() {
             {Multihash.Type.sha1, "SHA-1", "5drNu81uhrFLRiS4bxWgAkpydaLUPW", "hello world"},
             {Multihash.Type.sha2_256, "SHA-256", "QmaozNR7DZHQK1ZcU9p7QdrshMvXqWK6gpu5rmrkPdT3L4", "hello world"},
             {Multihash.Type.sha2_512, "SHA-512", "8Vtkv2tdQ43bNGdWN9vNx9GVS9wrbXHk4ZW8kmucPmaYJwwedXir52kti9wJhcik4HehyqgLrQ1hBuirviLhxgRBNv", "hello world"}
-// SHA3 not yet implemented in standard Java library. https://docs.oracle.com/javase/7/docs/technotes/guides/security/StandardNames.html#MessageDigest
-//            {Multihash.Type.sha3_512, "SHA3-512", "8tWhXW5oUwtPd9d3FnjuLP1NozN3vc45rmsoWEEfrZL1L6gi9dqi1YkZu5iHb2HJ8WbZaaKAyNWWRAa8yaxMkGKJmX", "hello world"}
+            // SHA3 not yet implemented in standard Java library. https://docs.oracle.com/javase/7/docs/technotes/guides/security/StandardNames.html#MessageDigest
+            // {Multihash.Type.sha3_512, "SHA3-512",  "8tWhXW5oUwtPd9d3FnjuLP1NozN3vc45rmsoWEEfrZL1L6gi9dqi1YkZu5iHb2HJ8WbZaaKAyNWWRAa8yaxMkGKJmX", "hello world"}
         };
 
         for(Object[] ex: examples) {
             Multihash m = Multihash.fromBase58((String)ex[2]);
             try {
                 MessageDigest md = MessageDigest.getInstance((String) ex[1]);
-                assert(md != null);
+                assertNotNull(md );
                 md.update(((String) ex[3]).getBytes("UTF-8"));
                 byte[] digest = md.digest();
                 // Test constructor
                 Multihash m2 = new Multihash((Multihash.Type)ex[0], digest);
                 // Test comparison
-                assert(m2.equals(m));
+                assertEquals(m, m2);
                 // Test conversions
-                assert(m.toBase58().equals(m2.toBase58()));
-                assert(m.toBase58().equals((String)ex[2]));
+                assertEquals(m.toBase58(), m2.toBase58());
+                assertEquals(m.toBase58(), ex[2]);
                 // Test fromHex and toHex
                 Multihash m3 = Multihash.fromHex(m.toHex());
-                assert(m3.equals(m));
+                assertEquals(m, m3);
             }
             catch (Exception e){
                 System.out.println(e.getMessage());
-                assert(false);
+                assertTrue(false);
             }
         }
     }
+
 }
