Merge pull request #9 from rspieldenner/jackson

Remove jackson dependency

Author: rspieldenner

CHANGELOG.md

@@ -1,3 +1,7 @@
+1.1.4 / 2016/03/22
+==================
+- Remove dependency on jackson libraries
+
 1.1.3 / 2016/03/21
 ==================
 - Publish nebula.resolution-rules-producer to gradle plugin portal

README.md

@@ -21,7 +21,7 @@ The [Blacklist Plugin](https://github.com/nebula-plugins/gradle-blacklist-plugin
         }
 
         dependencies {
-            classpath 'com.netflix.nebula:gradle-resolution-rules-plugin:1.1.3'
+            classpath 'com.netflix.nebula:gradle-resolution-rules-plugin:1.1.4'
         }
     }
 
@@ -32,7 +32,7 @@ Or using the Gradle plugin portal:
 
 ```groovy
     plugins {
-        id 'nebula.resolution-rules' version '1.1.3'
+        id 'nebula.resolution-rules' version '1.1.4'
     }
 ```
 
@@ -138,7 +138,7 @@ The `nebula.resolution-rules-producer` plugin is provided to facilitate creation
         }
 
         dependencies {
-            classpath 'com.netflix.nebula:gradle-resolution-rules-plugin:1.1.3'
+            classpath 'com.netflix.nebula:gradle-resolution-rules-plugin:1.1.4'
         }
     }
 
@@ -149,7 +149,7 @@ Or using the Gradle plugin portal:
 
 ```groovy
     plugins {
-        id 'nebula.resolution-rules-producer' version '1.1.3'
+        id 'nebula.resolution-rules-producer' version '1.1.4'
     }
 ```
 
@@ -176,7 +176,7 @@ Once configured, run the following:
                 "module" : "asm:asm",
                 "with" : "org.ow2.asm:asm",
                 "reason" : "The asm group id changed for 4.0 and later",
-                "author" : "Danny Thomas <dmthomas@gmail.com>",
+                "author" : "Example Person <person@example.org>",
                 "date" : "2015-10-07T20:21:20.368Z"
             }
         ],
@@ -185,29 +185,29 @@ Once configured, run the following:
                 "module" : "bouncycastle:bcprov-jdk15",
                 "with" : "org.bouncycastle:bcprov-jdk15:latest.release",
                 "reason" : "The latest version of BC is required, using the new coordinate",
-                "author" : "Danny Thomas <dmthomas@gmail.com>",
+                "author" : "Example Person <person@example.org>",
                 "date" : "2015-10-07T20:21:20.368Z"
             }
         ],
         "deny": [
             {
                 "module": "com.google.guava:guava:19.0-rc2",
                 "reason" : "Guava 19.0-rc2 is not permitted",
-                "author" : "Danny Thomas <dmthomas@gmail.com>",
+                "author" : "Example Person <person@example.org>",
                 "date" : "2015-10-07T20:21:20.368Z"
             },
             {
                 "module": "com.sun.jersey:jersey-bundle",
                 "reason" : "jersey-bundle is a fat jar that includes non-relocated (shaded) third party classes, which can cause duplicated classes on the classpath. Please specify the jersey- libraries you need directly",
-                "author" : "Danny Thomas <dmthomas@gmail.com>",
+                "author" : "Example Person <person@example.org>",
                 "date" : "2015-10-07T20:21:20.368Z"
             }
         ],
         "reject": [
             {
                 "module": "com.google.guava:guava:12.0",
                 "reason" : "Guava 12.0 significantly regressed LocalCache performance",
-                "author" : "Danny Thomas <dmthomas@gmail.com>",
+                "author" : "Example Person <person@example.org>",
                 "date" : "2015-10-07T20:21:20.368Z"
             }
         ],

build.gradle

@@ -45,24 +45,9 @@ plugins {
 }
 
 dependencies {
+    compile gradleApi()
+    compile localGroovy()
     compile 'joda-time:joda-time:2.8.2'
-    compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.6.3'
-}
-
-// Attempt to get out of Gradle dependency hell (at least somewhat reflect the runtime classloading scheme) by forcefully ordering Gradle dependencies last
-
-configurations {
-    gradleApi
-}
-
-dependencies {
-    gradleApi gradleApi()
-    gradleApi localGroovy()
-}
-
-sourceSets.each {
-    it.compileClasspath = it.compileClasspath - configurations.gradleApi + configurations.gradleApi
-    it.runtimeClasspath = it.runtimeClasspath - configurations.gradleApi + configurations.gradleApi
 }
 
 facets {

src/functionalTest/groovy/nebula/plugin/resolutionrules/AlignRulesSpec.groovy

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2016 Netflix, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package nebula.plugin.resolutionrules
 
 import nebula.test.IntegrationSpec

src/main/groovy/nebula/plugin/resolutionrules/ResolutionRulesPlugin.groovy

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2015-2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,9 @@
  * limitations under the License.
  *
  */
-
 package nebula.plugin.resolutionrules
 
-import com.fasterxml.jackson.annotation.JsonInclude
-import com.fasterxml.jackson.databind.ObjectMapper
-import com.fasterxml.jackson.databind.SerializationFeature
-import com.fasterxml.jackson.datatype.joda.JodaModule
+import groovy.json.JsonSlurper
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Configuration
@@ -44,7 +40,6 @@ class ResolutionRulesPlugin implements Plugin<Project> {
 
     private Rules rulesFromConfiguration(Configuration configuration) {
         List<Rules> rules = new ArrayList<Rules>();
-        ObjectMapper mapper = createMapper()
         Set<File> files = configuration.resolve()
         if (files.isEmpty()) {
             logger.warn("No resolution rules have been added to the '{}' configuration", configuration.name)
@@ -53,7 +48,7 @@ class ResolutionRulesPlugin implements Plugin<Project> {
             if (file.name.endsWith(".json")) {
                 ResolutionJsonValidator.validateJsonFile(file)
                 logger.info("Using $file as a dependency rules source")
-                rules.add(mapper.readValue(file, Rules))
+                rules.add(parseJsonFile(file))
             } else if (file.name.endsWith(".jar") || file.name.endsWith(".zip")) {
                 logger.info("Using $file as a dependency rules source")
                 ZipFile jar = new ZipFile(file)
@@ -63,7 +58,7 @@ class ResolutionRulesPlugin implements Plugin<Project> {
                         ZipEntry entry = entries.nextElement()
                         if (entry.name.endsWith(".json")) {
                             ResolutionJsonValidator.validateJsonStream(jar.getInputStream(entry))
-                            rules.add(mapper.readValue(jar.getInputStream(entry), Rules))
+                            rules.add(parseJsonStream(jar.getInputStream(entry)))
                         }
                     }
                 } finally {
@@ -76,6 +71,29 @@ class ResolutionRulesPlugin implements Plugin<Project> {
         return flattenRules(rules)
     }
 
+    static Rules parseJsonFile(File file) {
+        rulesFromJson(new JsonSlurper().parse(file))
+    }
+
+    static Rules parseJsonText(String json) {
+        rulesFromJson(new JsonSlurper().parseText(json))
+    }
+
+    static Rules parseJsonStream(InputStream stream) {
+        rulesFromJson(new JsonSlurper().parse(stream))
+    }
+
+    static Rules rulesFromJson(Map json) {
+        Rules rules = new Rules()
+        rules.replace = json.replace.collect { new ReplaceRule(it) }
+        rules.substitute = json.substitute.collect { new SubstituteRule(it) }
+        rules.reject = json.reject.collect { new RejectRule(it) }
+        rules.deny = json.deny.collect { new DenyRule(it) }
+        rules.align = json.align.collect { new AlignRule(it) }
+
+        rules
+    }
+
     private static Rules flattenRules(Iterable<Rules> rules) {
         List<ReplaceRule> replace = rules.collectMany { it.replace }.flatten() as List<ReplaceRule>
         List<SubstituteRule> substitute = rules.collectMany { it.substitute }.flatten() as List<SubstituteRule>
@@ -85,14 +103,6 @@ class ResolutionRulesPlugin implements Plugin<Project> {
         return new Rules(replace: replace, substitute: substitute, reject: reject, deny: deny, align: align)
     }
 
-    private static ObjectMapper createMapper() {
-        ObjectMapper mapper = new ObjectMapper()
-        mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL)
-                .configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false)
-                .registerModule(new JodaModule())
-        return mapper
-    }
-
     private void applyRules(Rules rules, Project project) {
         rules.projectRules().each { it.apply(project) }
         project.configurations.all({ configuration ->

src/main/groovy/nebula/plugin/resolutionrules/Rules.groovy

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Netflix, Inc.
+ * Copyright 2015-2016 Netflix, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,20 +12,17 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
-
 package nebula.plugin.resolutionrules
 
-import nebula.plugin.resolutionrules.ModuleIdentifier
-import nebula.plugin.resolutionrules.ModuleVersionIdentifier
 import org.gradle.api.Project
 import org.gradle.api.artifacts.*
 import org.gradle.api.artifacts.component.ComponentSelector
 import org.gradle.api.artifacts.component.ModuleComponentIdentifier
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.VersionInfo
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.DefaultVersionComparator
 import org.joda.time.DateTime
+import org.joda.time.DateTimeZone
 
 public class Rules {
     List<ReplaceRule> replace
@@ -59,13 +56,28 @@ interface ProjectConfigurationRule {
     public void apply(Project project, Configuration configuration)
 }
 
-class ReplaceRule implements ProjectRule {
-    String module
-    String with
+abstract class BaseRule {
     String reason
     String author
     DateTime date
 
+    BaseRule(Map map) {
+        reason = map.reason
+        author = map.author
+        date = new DateTime(map.date).toDateTime(DateTimeZone.UTC)
+    }
+}
+
+class ReplaceRule extends BaseRule implements ProjectRule {
+    String module
+    String with
+
+    ReplaceRule(Map map) {
+        super(map)
+        module = map.module
+        with = map.with
+    }
+
     public void apply(Project project) {
         ModuleIdentifier moduleId = ModuleIdentifier.valueOf(module)
         ModuleIdentifier withModuleId = ModuleIdentifier.valueOf(with)
@@ -76,12 +88,15 @@ class ReplaceRule implements ProjectRule {
     }
 }
 
-class SubstituteRule implements ConfigurationRule {
+class SubstituteRule extends BaseRule implements ConfigurationRule {
     String module
     String with
-    String reason
-    String author
-    DateTime date
+
+    SubstituteRule(Map map) {
+        super(map)
+        module = map.module
+        with = map.with
+    }
 
     public void apply(Configuration configuration) {
         ResolutionStrategy resolutionStrategy = configuration.resolutionStrategy
@@ -103,11 +118,13 @@ class SubstituteRule implements ConfigurationRule {
     }
 }
 
-class RejectRule implements ConfigurationRule {
+class RejectRule extends BaseRule implements ConfigurationRule {
     String module
-    String reason
-    String author
-    DateTime date
+
+    RejectRule(Map map) {
+        super(map)
+        module = map.module
+    }
 
     public void apply(Configuration configuration) {
         ModuleVersionIdentifier moduleId = ModuleVersionIdentifier.valueOf(module)
@@ -122,11 +139,13 @@ class RejectRule implements ConfigurationRule {
     }
 }
 
-class DenyRule implements ConfigurationRule {
+class DenyRule extends BaseRule implements ConfigurationRule {
     String module
-    String reason
-    String author
-    DateTime date
+
+    DenyRule(Map map) {
+        super(map)
+        module = map.module
+    }
 
     @Override
     public void apply(Configuration configuration) {
@@ -140,13 +159,17 @@ class DenyRule implements ConfigurationRule {
     }
 }
 
-class AlignRule implements ProjectConfigurationRule {
+class AlignRule extends BaseRule implements ProjectConfigurationRule {
     String group
-    Collection<String> includes = []
-    Collection<String> excludes = []
-    String reason
-    String author
-    DateTime date
+    Collection<String> includes
+    Collection<String> excludes
+
+    AlignRule(Map map) {
+        super(map)
+        group = map.group
+        includes = map.includes ?: []
+        excludes = map.excludes ?: []
+    }
 
     boolean resolvedMatches(ResolvedDependency dep) {
         ruleMatches(dep.moduleGroup, dep.moduleName)

src/test/groovy/nebula/plugin/resolutionrules/RulesTest.groovy

@@ -17,10 +17,7 @@
 
 package nebula.plugin.resolutionrules
 
-import com.fasterxml.jackson.annotation.JsonInclude
-import com.fasterxml.jackson.databind.ObjectMapper
-import com.fasterxml.jackson.databind.SerializationFeature
-import com.fasterxml.jackson.datatype.joda.JodaModule
+import groovy.json.JsonSlurper
 import spock.lang.Specification
 
 /**
@@ -44,14 +41,12 @@ class RulesTest extends Specification {
                         "deny": [],
                         "align": []
                       }"""
-        ObjectMapper mapper = new ObjectMapper()
-                .setSerializationInclusion(JsonInclude.Include.NON_NULL)
-                .configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false)
-                .registerModule(new JodaModule())
 
-        Rules rules = mapper.readValue(json, Rules)
+
+        Rules rules = ResolutionRulesPlugin.parseJsonText(json)
 
         then:
         !rules.replace.isEmpty()
+        rules.replace[0].class == ReplaceRule
     }
 }