From 2d01aa630b2b3d8b514b3e9258fd28fb699f600c Mon Sep 17 00:00:00 2001
From: Kalle Stenflo <kalle.stenflo@gmail.com>
Date: Fri, 19 Sep 2014 16:20:02 +0200
Subject: [PATCH] Fixed failing test.

---
 .../com/jayway/jsonpath/Configuration.java    |  21 +++-
 .../com/jayway/jsonpath/ObjectMapperTest.java | 107 ------------------
 2 files changed, 18 insertions(+), 110 deletions(-)
 delete mode 100644 json-path/src/test/java/com/jayway/jsonpath/ObjectMapperTest.java

diff --git a/json-path/src/main/java/com/jayway/jsonpath/Configuration.java b/json-path/src/main/java/com/jayway/jsonpath/Configuration.java
index c3205679..df353203 100644
--- a/json-path/src/main/java/com/jayway/jsonpath/Configuration.java
+++ b/json-path/src/main/java/com/jayway/jsonpath/Configuration.java
@@ -14,10 +14,10 @@
  */
 package com.jayway.jsonpath;
 
-import com.jayway.jsonpath.internal.spi.mapper.DefaultMappingProvider;
 import com.jayway.jsonpath.internal.spi.json.JsonSmartJsonProvider;
-import com.jayway.jsonpath.spi.mapper.MappingProvider;
+import com.jayway.jsonpath.internal.spi.mapper.DefaultMappingProvider;
 import com.jayway.jsonpath.spi.json.JsonProvider;
+import com.jayway.jsonpath.spi.mapper.MappingProvider;
 
 import java.util.Collections;
 import java.util.EnumSet;
@@ -47,6 +47,10 @@ public class Configuration {
         }
     };
 
+    /**
+     * Set Default configuration
+     * @param defaults default configuration settings
+     */
     public static synchronized void setDefaults(Defaults defaults){
         DEFAULTS = defaults;
     }
@@ -147,11 +151,22 @@ public class Configuration {
     }
 
     public interface Defaults {
-
+        /**
+         * Returns the default {@link com.jayway.jsonpath.spi.json.JsonProvider}
+         * @return default json provider
+         */
         JsonProvider jsonProvider();
 
+        /**
+         * Returns default options
+         * @return options
+         */
         Set<Option> options();
 
+        /**
+         *
+         * @return
+         */
         MappingProvider mappingProvider();
 
     }
diff --git a/json-path/src/test/java/com/jayway/jsonpath/ObjectMapperTest.java b/json-path/src/test/java/com/jayway/jsonpath/ObjectMapperTest.java
deleted file mode 100644
index 36edcb15..00000000
--- a/json-path/src/test/java/com/jayway/jsonpath/ObjectMapperTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.jayway.jsonpath;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import net.minidev.json.mapper.Mapper;
-import org.junit.Test;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-public class ObjectMapperTest {
-
-
-    ObjectMapper objectMapper = new ObjectMapper();
-
-    @Test
-    public void mapping() {
-
-        Map<String, Object> map = new HashMap<String, Object>();
-        map.put("foo", "MAP FOO");
-        map.put("bar", Long.MAX_VALUE);
-
-        Baz baz = new Baz();
-        baz.setFlurb("FLURB");
-
-        FooBar fooBar = new FooBar();
-        fooBar.setFoo("OBJ FOO");
-        fooBar.setBar(Long.MIN_VALUE);
-        fooBar.setBaz(baz);
-
-
-        Map mappedMap = objectMapper.convertValue(fooBar, Map.class);
-
-
-        System.out.println(mappedMap);
-        /*
-        FooBar foobar = objectMapper.convertValue(map, FooBar.class);
-
-
-        Integer integer = objectMapper.convertValue(1L, Integer.class);
-        Integer integer2 = objectMapper.convertValue(1D, Integer.class);
-        String date = objectMapper.convertValue(new Date(System.currentTimeMillis()), String.class);
-        */
-
-
-
-        Mapper mapper = new Mapper();
-
-
-        Long convert = mapper.getMapper(Long.class).convert(1D);
-
-        System.out.println(convert);
-
-    }
-
-
-    public static class FooBar {
-        private String foo;
-        private Long bar;
-
-        private Baz baz;
-
-        public FooBar() {
-        }
-
-        public Baz getBaz() {
-            return baz;
-        }
-
-        public void setBaz(Baz baz) {
-            this.baz = baz;
-        }
-
-        public String getFoo() {
-            return foo;
-        }
-
-        public void setFoo(String foo) {
-            this.foo = foo;
-        }
-
-        public Long getBar() {
-            return bar;
-        }
-
-        public void setBar(Long bar) {
-            this.bar = bar;
-        }
-    }
-
-    public static class Baz {
-        private String flurb;
-
-        public Baz() {
-        }
-
-        public String getFlurb() {
-            return flurb;
-        }
-
-        public void setFlurb(String flurb) {
-            this.flurb = flurb;
-        }
-    }
-
-
-}