Removed Jackson dependencies

mrFatDZ · Feb 11, 2015 · 8b360c1 · 8b360c1
1 parent 7020e78
commit 8b360c1
Show file tree

Hide file tree

Showing 59 changed files with 718 additions and 488 deletions.
diff --git a/core/build.gradle b/core/build.gradle
@@ -16,13 +16,8 @@ dependencies {
 
     compile project(':serenity-report-resources')
 
-//    compile "com.fasterxml.jackson.core:jackson-core:2.4.3"
-//    compile "com.fasterxml.jackson.core:jackson-annotations:2.4.3"
-//    compile "com.fasterxml.jackson.core:jackson-databind:2.4.3"
-//    compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.4.3"
-//    compile ("com.fasterxml.jackson.datatype:jackson-datatype-guava:2.4.3") {
-//        exclude group: 'com.google.guava', module: 'guava'
-//    }
+    compile 'com.google.code.gson:gson:2.3.1'
+    compile 'com.fatboyindustrial.gson-javatime-serialisers:gson-javatime-serialisers:1.1.1'
 
     compile ("cglib:cglib:2.2.2") {
         exclude group: 'asm', module: 'asm'
@@ -94,7 +89,7 @@ dependencies {
     }
     compile "com.jhlabs:filters:2.0.235"
     compile "org.asciidoctor:asciidoctor-java-integration:0.1.3"
-    compile "com.google.code.gson:gson:2.2.4"
+
     compile "junit:junit:4.11"
     compile "javax.validation:validation-api:1.1.0.Final"
     compile "org.hibernate:hibernate-validator:5.1.1.Final"

diff --git a/core/src/main/java/net/thucydides/core/annotations/locators/SmartAjaxElementLocator.java b/core/src/main/java/net/thucydides/core/annotations/locators/SmartAjaxElementLocator.java
@@ -59,7 +59,7 @@ private boolean shouldFindElementImmediately() {
 
 	private boolean calledFromAQuickMethod() {
         for (StackTraceElement elt : Thread.currentThread().getStackTrace()) {
-            //if (QUICK_METHODS.contains(elt.getMethodName())
+            //if (QUICK_METHODS.contains(elt.getName())
             if (elt.getMethodName().contains("Currently")) {
                 return true;
             }

diff --git a/core/src/main/java/net/thucydides/core/guice/ThucydidesModule.java b/core/src/main/java/net/thucydides/core/guice/ThucydidesModule.java
@@ -14,7 +14,7 @@
 import net.thucydides.core.pages.InternalSystemClock;
 import net.thucydides.core.pages.SystemClock;
 import net.thucydides.core.reports.json.JSONConverter;
-import net.thucydides.core.reports.json.jackson.JacksonJSONConverter;
+import net.thucydides.core.reports.json.gson.GsonJSONConverter;
 import net.thucydides.core.reports.renderer.Asciidoc;
 import net.thucydides.core.reports.renderer.AsciidocMarkupRenderer;
 import net.thucydides.core.reports.renderer.MarkupRenderer;
@@ -50,9 +50,9 @@ protected void configure() {
         bind(IssueTracking.class).to(SystemPropertiesIssueTracking.class).in(Singleton.class);
         bind(WebdriverManager.class).to(ThucydidesWebdriverManager.class).in(Singleton.class);
         bind(BatchManager.class).toProvider(BatchManagerProvider.class).in(Singleton.class);
-        bind(LinkGenerator.class).to(SaucelabsLinkGenerator.class);
+        bind(LinkGenerator.class).to(SaucelabsLinkGenerator.class).in(Singleton.class);;
         bind(ScreenshotProcessor.class).to(SingleThreadScreenshotProcessor.class).in(Singleton.class);
-        bind(JSONConverter.class).to(JacksonJSONConverter.class).in(Singleton.class);
+        bind(JSONConverter.class).to(GsonJSONConverter.class).in(Singleton.class);
 
         bind(TagProviderService.class).to(ClasspathTagProviderService.class).in(Singleton.class);
         bind(RequirementsProviderService.class).to(ClasspathRequirementsProviderService.class).in(Singleton.class);

diff --git a/core/src/main/java/net/thucydides/core/model/ReportNamer.java b/core/src/main/java/net/thucydides/core/model/ReportNamer.java
@@ -55,7 +55,7 @@ public String getSimpleTestNameFor(final TestOutcome testOutcome) {
         if (testOutcome.getUserStory() != null) {
             testName = NameConverter.underscore(testOutcome.getUserStory().getName());
         }
-        String scenarioName = NameConverter.underscore(testOutcome.getMethodName());
+        String scenarioName = NameConverter.underscore(testOutcome.getName());
         testName = pathFrom(testOutcome) + withNoIssueNumbers(withNoArguments(appendToIfNotNull(testName, scenarioName)));
         return appendSuffixTo(Digest.ofTextValue(testName));
     }