Merge pull request #178 from jsonld-java/perf

Add performance tests for toRDF and expand and pretty printing

.travis.yml

@@ -1,6 +1,5 @@
 language: java
 jdk:
-  - oraclejdk7
   - oraclejdk8
 notifications:
   email:

README.md

@@ -207,6 +207,7 @@ For Developers
 
 `jsonld-java` uses maven to compile. From the base `jsonld-java` module run `mvn clean install` to install the jar into your local maven repository.
 
+The tests require Java-8 to compile, while the rest of the codebase is still compatible and built using the Java-6 APIs.
 
 ### Running tests
 

core/src/main/java/com/github/jsonldjava/core/JsonLdUtils.java

@@ -118,6 +118,23 @@ static void mergeValue(Map<String, Object> obj, String key, Object value) {
         }
     }
 
+    static void laxMergeValue(Map<String, Object> obj, String key, Object value) {
+        if (obj == null) {
+            return;
+        }
+        List<Object> values = (List<Object>) obj.get(key);
+        if (values == null) {
+            values = new ArrayList<Object>();
+            obj.put(key, values);
+        }
+        //if ("@list".equals(key)
+        //        || (value instanceof Map && ((Map<String, Object>) value).containsKey("@list"))
+                //|| !deepContains(values, value)
+        //        ) {
+            values.add(value);
+        //}
+    }
+
     static void mergeCompactedValue(Map<String, Object> obj, String key, Object value) {
         if (obj == null) {
             return;

core/src/main/java/com/github/jsonldjava/utils/Obj.java

@@ -11,7 +11,7 @@ public class Obj {
      * @return A new {@link Map} instance.
      */
     public static Map<String, Object> newMap() {
-        return new LinkedHashMap<String, Object>(2, 0.75f);
+        return new LinkedHashMap<String, Object>(4, 0.75f);
     }
 
     /**