make container visible

README.md

@@ -277,6 +277,35 @@ public class Main{
 
 ```
 
+- decode use Container
+
+```java
+
+public class Main{
+
+    public static void main(String[] args){
+        List<Set<byte[]>> list = new ArrayList<>();
+        list.add(new ByteArraySet());
+        list.get(0).add("1".getBytes());
+        Container container = CollectionContainer.builder()
+                .collectionType(ArrayList.class)
+                .contentType(
+                        CollectionContainer.builder()
+                        .collectionType(ByteArraySet.class)
+                        .contentType(new Raw(byte[].class))
+                        .build()
+                )
+                .build();
+        List<Set<byte[]>> decoded = (List<Set<byte[]>>) RLPCodec.decodeContainer(
+                RLPCodec.encode(list),
+                container
+        );
+        assert decoded.get(0).contains("1".getBytes());
+    }
+}
+
+```        
+
 Benchmark compare to EthereumJ:
 
 decoding list 10000000 times: 

build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 group 'org.tdf'
-version '1.1.8'
+version '1.1.9'
 
 sourceCompatibility = 1.8
 

src/main/java/org/tdf/rlp/CollectionContainer.java

@@ -2,21 +2,23 @@
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.NoArgsConstructor;
 
 import java.util.Collection;
 import java.util.Map;
 
 @NoArgsConstructor(access = AccessLevel.PACKAGE)
 @AllArgsConstructor(access = AccessLevel.PACKAGE)
-class CollectionContainer<C extends Collection<T>, T> implements Container<T> {
-    Class<C> collectionType;
+@Builder
+public class CollectionContainer<C extends Collection<T>, T> implements Container<T> {
+    Class collectionType;
 
     public ContainerType getType() {
         return ContainerType.COLLECTION;
     }
 
-    Container<T> contentType;
+    Container contentType;
 
     @Override
     public Class<T> asRaw() {

src/main/java/org/tdf/rlp/MapContainer.java

@@ -2,22 +2,24 @@
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.NoArgsConstructor;
 
 import java.util.Collection;
 import java.util.Map;
 
 @NoArgsConstructor(access = AccessLevel.PACKAGE)
 @AllArgsConstructor(access = AccessLevel.PACKAGE)
-class MapContainer<M extends Map<K, V>, K, V> implements Container<V> {
-    Class<M> mapType;
+@Builder
+public class MapContainer<M extends Map<K, V>, K, V> implements Container<V> {
+    Class mapType;
 
     public ContainerType getType() {
         return ContainerType.MAP;
     }
 
-    Container<K> keyType;
-    Container<V> valueType;
+    Container keyType;
+    Container valueType;
 
     @Override
     public Class<V> asRaw() {

src/main/java/org/tdf/rlp/RLPCodec.java

@@ -294,7 +294,11 @@ static RLPElement encodeMap(Map m, Comparator keyOrdering) {
                 CollectionContainer.fromTypes(collectionType, elementType));
     }
 
-    static Object decodeContainer(RLPElement element, Container container) {
+    public static Object decodeContainer(byte[] encoded, Container container){
+        return decodeContainer(RLPElement.fromEncoded(encoded), container);
+    }
+
+    public static Object decodeContainer(RLPElement element, Container container) {
         switch (container.getType()) {
             case RAW:
                 return decode(element, container.asRaw());

src/main/java/org/tdf/rlp/Raw.java

@@ -1,9 +1,12 @@
 package org.tdf.rlp;
 
+import lombok.Builder;
+
 import java.util.Collection;
 import java.util.Map;
 
-class Raw<V> implements Container<V> {
+@Builder
+public class Raw<V> implements Container<V> {
     Class<V> rawType;
 
     public ContainerType getType() {
@@ -28,7 +31,7 @@ public CollectionContainer<? extends Collection<V>, V> asCollection() {
     Raw() {
     }
 
-    Raw(Class<V> rawType) {
+    public Raw(Class<V> rawType) {
         this.rawType = rawType;
     }
 }

src/test/java/org/tdf/rlp/RLPTest.java

@@ -1492,17 +1492,17 @@ public void testByteArraySet() {
     }
 
     @Test
-    public void testMapContainer(){
+    public void testMapContainer() {
         Map<String, String> map = new HashMap<>();
         map.put("key", "value");
         byte[] encoded = RLPCodec.encode(map);
         TreeMap<String, String> m2 = RLPCodec.decodeMap(encoded,
-               TreeMap.class, String.class, String.class);
+                TreeMap.class, String.class, String.class);
         assert m2.get("key").equals("value");
     }
 
     @Test
-    public void testCollectionContainer(){
+    public void testCollectionContainer() {
         Set<byte[]> set = new HashSet<>();
         set.add("1".getBytes());
         set.add("2".getBytes());
@@ -1513,4 +1513,27 @@ public void testCollectionContainer(){
         assert set.contains("1".getBytes());
         assert set.contains("2".getBytes());
     }
+
+    @Test
+    public void test3() {
+        List<Set<byte[]>> list = new ArrayList<>();
+        list.add(new ByteArraySet());
+        list.get(0).add("1".getBytes());
+        Container container = CollectionContainer.builder()
+                .collectionType(ArrayList.class)
+                .contentType(
+                        CollectionContainer.builder()
+                        .collectionType(ByteArraySet.class)
+                        .contentType(new Raw(byte[].class))
+                        .build()
+                )
+                .build();
+        List<Set<byte[]>> decoded = (List<Set<byte[]>>) RLPCodec.decodeContainer(
+                RLPCodec.encode(list),
+                container
+        );
+
+        assert decoded.get(0).contains("1".getBytes());
+    }
+
 }