More work on build to JARJAR ASM

Author: graemerocher

.gitignore

@@ -5,4 +5,5 @@ build/
 classes/
 out/
 *.db
-*.log
+*.log
+*.iml

aop/build.gradle

@@ -1,9 +1,9 @@
 import org.anarres.gradle.plugin.jarjar.JarjarTask
-
 dependencies {
     compile project(":inject")
 }
 
+
 def targetDir = new File(project.buildDir, "jarjar")
 def targetFile = new File(targetDir, "asm.jar")
 def jarjarTask = task("jarjarTask", type: JarjarTask) {
@@ -12,24 +12,16 @@ def jarjarTask = task("jarjarTask", type: JarjarTask) {
     destinationDir = targetDir
     destinationName = targetFile.name
 }
-jarjarTask.inputs.files(jar.outputs)
-jarjarTask.outputs.files(targetFile)
 
 def jarjarOutputs = task("jarjarOutputs").doLast {
-    def jar = jar.outputs.files.first()
-
     copy {
-        from(targetFile).into(jar.parentFile)
-        rename { String fileName ->
-            jar.name
-        }
+        from zipTree(jarjarTask.outputs.files.first())
+        into(targetDir)
     }
-    delete(targetDir)
+    delete(jarjarTask.outputs.files)
 }
 jarjarOutputs.dependsOn(jarjarTask)
-jarjarOutputs.inputs.files(targetFile)
-jarjarOutputs.outputs.files(jar.outputs)
-
-tasks.withType(AbstractPublishToMaven) {
-    it.finalizedBy(jarjarOutputs)
-}
+task("rejar", type:Jar, dependsOn: jarjarOutputs) {
+    from(targetDir)
+    archiveName = "rejar.jar"
+}

ast/build.gradle

@@ -2,8 +2,11 @@ configurations.all {
     it.exclude(group:"org.slf4j",module:"jcl-over-slf4j")
 }
 dependencies {
-    compile project(":inject")
+    compile project(":core")
+    compile group: 'javax.inject', name: 'javax.inject', version: '1'
 
+    compile project(":inject")
+    compile "org.codehaus.groovy:groovy:$groovyVersion"
     compileOnly project(":aop")
     compileOnly "org.ow2.asm:asm:$asmVersion"
     compileOnly "org.ow2.asm:asm-commons:$asmVersion"

build.gradle

@@ -29,6 +29,7 @@ subprojects { subproject ->
     version project.projectVersion
 
     ext {
+        includePublication = true
         userOrg = "grails"
         isGrailsPlugin = false
         isConfiguration = subproject.name.startsWith('configurations')
@@ -52,11 +53,12 @@ subprojects { subproject ->
         // apply plugin:"org.grails.grails-web"
     }
     else {
-        apply from:"${commonBuild}/common-project-nogroovydoc.gradle"
+        apply plugin:"groovy"
+        apply plugin:"java"
         sourceCompatibility = '1.8'
         targetCompatibility = '1.8'
         if(!subproject.name.contains('test-suite')) {
-            apply from:"${commonBuild}/common-publishing.gradle"
+            apply from:"${rootProject.rootDir}/gradle/publishing.gradle"
         }
     }
 
@@ -67,36 +69,35 @@ subprojects { subproject ->
         }
     }
 
+    configurations {
+        documentation
+        all {
+            resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+                String group = details.requested.group
+                if(group == 'org.codehaus.groovy') {
+                    details.useVersion(groovyVersion)
+                }
+            }
+        }
+    }
+
     dependencies {
+        compile "org.slf4j:slf4j-api:$slf4jVersion"
+        testCompile "org.codehaus.groovy:groovy:$groovyVersion"
+        testCompile("org.spockframework:spock-core:${spockVersion}") {
+            exclude module:'groovy-all'
+        }
+        testCompile "cglib:cglib-nodep:2.2.2"
+        testCompile "org.objenesis:objenesis:1.4"
+
         testRuntime "ch.qos.logback:logback-classic:1.2.3"
         compileOnly 'org.ow2.asm:asm:5.2'
         compileOnly 'org.ow2.asm:asm-commons:5.2'
 
         testCompile "org.ow2.asm:asm:$asmVersion"
         testCompile "org.ow2.asm:asm-commons:$asmVersion"
-
     }
 }
 
 apply from:"${commonBuild}/common-docs.gradle"
 
-// IDEA 2017.2 made a breaking change with IDE build output vs gradle build output
-// [see https://youtrack.jetbrains.com/issue/IDEA-175172]
-// the problem here is the gradle build uses <module-dir>/build/classes/main
-// while IDEA uses <module-dir>/out/production/..
-// As a result, compiling ast or java-inject module and using the IDEA test runner fails because the
-// generated bean classes for injection are in <module-dir>/build, not <module-dir>/out
-allprojects {
-    apply plugin: 'idea'
-    idea {
-        module {
-            outputDir file('build/classes/main')
-            testOutputDir file('build/classes/test')
-        }
-    }
-    if(project.convention.findPlugin(JavaPluginConvention)) {
-        // Change the output directory for the main and test source sets back to the old path
-        sourceSets.main.output.classesDir = new File(buildDir, "classes/main")
-        sourceSets.test.output.classesDir = new File(buildDir, "classes/test")
-    }
-}

configurations/hibernate-gorm/build.gradle

@@ -1,4 +1,5 @@
 dependencies {
+    compile "org.codehaus.groovy:groovy:$groovyVersion"
     compileOnly project(":ast")
     compile project(":inject")
     compile project(":spring")

configurations/hibernate-validator/build.gradle

@@ -1,4 +1,5 @@
 dependencies {
+    compile "org.codehaus.groovy:groovy:$groovyVersion"
     compile project(":ast")
     compile 'org.hibernate:hibernate-validator:5.4.1.Final'
     compileOnly 'org.glassfish.web:el-impl:2.2.1-b05'

configurations/jackson/src/main/groovy/org/particleframework/configuration/jackson/JacksonConfiguration.java configurations/jackson/src/main/java/org/particleframework/configuration/jackson/JacksonConfiguration.java

@@ -18,26 +18,47 @@ def asmjar = project.fileTree('src/jarjar')
 
 def targetDir = new File(project.buildDir, "jarjar")
 def targetFile = new File(targetDir, "asm.jar")
-def jarjarTask = task("jarjarTask", type: JarjarTask) {
+def asmjarjarTask = task("asmjarjarTask", type: JarjarTask) {
     from(asmjar)
     classRename "org.objectweb.asm.**", "org.particleframework.asm.@1"
     destinationDir = targetDir
     destinationName = targetFile.name
 }
-jarjarTask.inputs.files(asmjar)
-jarjarTask.outputs.files(targetDir)
+asmjarjarTask.inputs.files(asmjar)
+asmjarjarTask.outputs.files(targetDir)
 
-def jarjarOutput = task("jarjarOutput")
+def jarjarOutput = task("asmjarjarOutput")
 jarjarOutput.doLast {
     copy {
         from(zipTree(targetFile)) {
             include "org/particleframework/asm/**"
         }
-        into(new File(project.buildDir, "classes/main"))
+        into(new File(project.buildDir, "classes/java/main"))
     }
 }
-jarjarOutput.dependsOn(jarjarTask)
+jarjarOutput.dependsOn(asmjarjarTask)
 classes {
     dependsOn(jarjarOutput)
 }
 
+
+def jarjarTask = task("jarjarTask", type: JarjarTask) {
+    from(project.files(jar.archivePath))
+    classRename "org.objectweb.asm.**", "org.particleframework.asm.@1"
+    destinationDir = targetDir
+    destinationName = targetFile.name
+}
+jarjarTask.dependsOn(jar)
+
+def jarjarOutputs = task("jarjarOutputs").doLast {
+    copy {
+        from zipTree(jarjarTask.destinationPath)
+        into(targetDir)
+    }
+    delete(jarjarTask.destinationPath)
+}
+jarjarOutputs.dependsOn(jarjarTask)
+task("rejar", type:Jar, dependsOn: jarjarOutputs) {
+    from(targetDir)
+    archiveName = "rejar.jar"
+}

configurations/jackson/src/main/groovy/org/particleframework/configuration/jackson/ObjectMapperFactory.java configurations/jackson/src/main/java/org/particleframework/configuration/jackson/ObjectMapperFactory.java

@@ -15,10 +15,10 @@
  */
 package org.particleframework.core.io.scan;
 
-import groovyjarjarasm.asm.AnnotationVisitor;
-import groovyjarjarasm.asm.ClassVisitor;
-import groovyjarjarasm.asm.Opcodes;
-import groovyjarjarasm.asm.Type;
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
 import org.particleframework.core.annotation.AnnotatedTypeInfo;
 import org.particleframework.core.reflect.ClassUtils;
 

configurations/jackson/src/main/groovy/org/particleframework/configuration/jackson/convert/ArrayNodeToArrayConverter.java configurations/jackson/src/main/java/org/particleframework/configuration/jackson/convert/ArrayNodeToArrayConverter.java

@@ -29,9 +29,10 @@
  */
 package org.particleframework.core.io.scan;
 
+import org.objectweb.asm.*;
+
 import java.io.IOException;
 import java.io.InputStream;
-import groovyjarjarasm.asm.*;
 
 /**
  * A limited class parser that parses the class-level annotations for each class only.

configurations/jackson/src/main/groovy/org/particleframework/configuration/jackson/convert/ArrayNodeToIterableConverter.java configurations/jackson/src/main/java/org/particleframework/configuration/jackson/convert/ArrayNodeToIterableConverter.java

@@ -29,7 +29,8 @@
  */
 package org.particleframework.core.io.scan;
 
-import groovyjarjarasm.asm.*;
+
+import org.objectweb.asm.*;
 
 /**
  * A non standard class, field, method or code attribute.

configurations/jackson/src/main/groovy/org/particleframework/configuration/jackson/convert/JsonNodeToObjectConverter.java configurations/jackson/src/main/java/org/particleframework/configuration/jackson/convert/JsonNodeToObjectConverter.java

@@ -30,9 +30,8 @@
 
 package org.particleframework.core.io.scan;
 
-import groovyjarjarasm.asm.*;
 /**
- * Information about a class being parsed in a {@link ClassReader}.
+ * Information about a class being parsed in a {@link org.objectweb.asm.ClassReader}.
  *
  * @author Eric Bruneton
  */
@@ -44,7 +43,7 @@ class Context {
     Attribute[] attrs;
 
     /**
-     * The {@link ClassReader} option flags for the parsing of this class.
+     * The {@link org.objectweb.asm.ClassReader} option flags for the parsing of this class.
      */
     int flags;
 

configurations/jackson/src/main/groovy/org/particleframework/configuration/jackson/package-info.java configurations/jackson/src/main/java/org/particleframework/configuration/jackson/package-info.java

@@ -15,10 +15,9 @@
  */
 package org.particleframework.core.naming;
 
-import org.codehaus.groovy.runtime.MetaClassHelper;
-
 import java.beans.Introspector;
 import java.util.Arrays;
+import java.util.Locale;
 import java.util.stream.Collectors;
 
 /**
@@ -76,7 +75,14 @@ public static String trimSuffix(String string, String... suffixes) {
      * @return The class name
      */
     public static String capitalize(String name) {
-        return MetaClassHelper.capitalize(name);
+        final String rest = name.substring(1);
+
+        // Funky rule so that names like 'pNAME' will still work.
+        if (Character.isLowerCase(name.charAt(0)) && (rest.length() > 0) && Character.isUpperCase(rest.charAt(0))) {
+            return name;
+        }
+
+        return name.substring(0, 1).toUpperCase(Locale.ENGLISH) + rest;
     }
 
 

configurations/jackson/src/main/groovy/org/particleframework/configuration/jackson/parser/JacksonProcessor.java configurations/jackson/src/main/java/org/particleframework/configuration/jackson/parser/JacksonProcessor.java

@@ -39,7 +39,7 @@ public enum TypeConvention {
     }
 
     /**
-     * <p>Returns the property name equivalent for this convention for the given class. Eg. BookController -> book</p>
+     * <p>Returns the property name equivalent for this convention for the given class. Eg. BookController -&gt; book</p>
      * @param type The type
      * @return The property name equivalent
      */
@@ -48,7 +48,7 @@ public String asPropertyName(Class type) {
     }
 
     /**
-     * <p>Returns the hyphenated equivalent for this convention for the given class. Eg. BookShopController -> book-shop</p>
+     * <p>Returns the hyphenated equivalent for this convention for the given class. Eg. BookShopController -&gt; book-shop</p>
      * @param type The type
      * @return The property name equivalent
      */

configurations/jackson/src/main/groovy/org/particleframework/configuration/jackson/server/http/JsonContentSubscriber.java configurations/jackson/src/main/java/org/particleframework/configuration/jackson/server/http/JsonContentSubscriber.java

@@ -0,0 +1,16 @@
+apply plugin:"groovy"
+apply plugin: 'application'
+mainClassName = "example.Application"
+applicationDefaultJvmArgs = ["-verbose"]
+repositories {
+    mavenLocal()
+    mavenCentral()
+}
+dependencies {
+    Properties props = new Properties()
+    new File("../../gradle.properties").withReader { props.load(it) }
+    compileOnly "org.particleframework:ast:${props.projectVersion}"
+    compile "org.codehaus.groovy:groovy:$props.groovyVersion"
+    compile "org.particleframework:runtime-netty:${props.projectVersion}"
+    runtime "ch.qos.logback:logback-classic:1.2.3"
+}