Skip to content

Commit 2c4e70e

Browse files
committed
fixing codenarc violations and attempting to get travis to run
1 parent 3bcb77a commit 2c4e70e

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
lines changed

.travis.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
language: groovy
1+
language: groovy
2+
script: "./gradlew"

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,5 +115,5 @@ uploadArchives {
115115
}
116116

117117
task wrapper(type: Wrapper) {
118-
gradleVersion = '1.7'
118+
gradleVersion = '1.8'
119119
}

gradle/wrapper/gradle-wrapper.jar

4 Bytes
Binary file not shown.
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Oct 01 21:48:22 CDT 2013
1+
#Tue Oct 01 22:08:32 CDT 2013
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=http\://services.gradle.org/distributions/gradle-1.7-bin.zip
6+
distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip

src/main/groovy/com/nagternal/groovy/clojure/transform/Require.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ import java.lang.annotation.Target
1515
@Retention(RetentionPolicy.SOURCE)
1616
@Target([ElementType.FIELD])
1717
@GroovyASTTransformationClass(['com.nagternal.groovy.clojure.transform.RequireASTTransformation'])
18-
public @interface Require {
18+
@interface Require {
1919
String value()
2020
}
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
11
package com.nagternal.groovy.clojure.transform
22

33
import clojure.lang.RT
4-
import clojure.lang.Var
54
import com.nagternal.groovy.clojure.Clj
65
import org.codehaus.groovy.GroovyBugError
76
import org.codehaus.groovy.ast.*
87
import org.codehaus.groovy.ast.expr.ArgumentListExpression
9-
import org.codehaus.groovy.ast.expr.ClassExpression
108
import org.codehaus.groovy.ast.expr.ConstantExpression
11-
import org.codehaus.groovy.ast.expr.Expression
12-
import org.codehaus.groovy.ast.expr.ExpressionTransformer
13-
import org.codehaus.groovy.ast.expr.MethodCallExpression
149
import org.codehaus.groovy.ast.expr.StaticMethodCallExpression
15-
import org.codehaus.groovy.ast.expr.VariableExpression
1610
import org.codehaus.groovy.control.CompilePhase
1711
import org.codehaus.groovy.control.SourceUnit
1812
import org.codehaus.groovy.transform.ASTTransformation
@@ -32,26 +26,31 @@ class RequireASTTransformation implements ASTTransformation {
3226
if (nodes.length != 2 || !(nodes[0] instanceof AnnotationNode) || !(nodes[1] instanceof AnnotatedNode)) {
3327
throw new GroovyBugError("Internal error: expecting [AnnotationNode, AnnotatedNode] but got: ${nodes}")
3428
}
35-
AnnotatedNode targetField = nodes[1]
29+
AnnotatedNode targetField = nodes[1]
3630
AnnotationNode annotation = nodes[0]
3731
if (!(targetField instanceof FieldNode)) {
3832
throw new GroovyBugError("Field annotation ${annotation.classNode.name} not annotating Field.")
3933
}
40-
final FieldNode fieldNode = targetField
34+
FieldNode fieldNode = targetField
4135

4236
String varName = getVarName(annotation)
4337
String ns, name
4438
(ns, name) = Clj.nsname(varName)
4539

46-
if (!fieldNode.static) { fieldNode.modifiers += Opcodes.ACC_STATIC }
47-
if (!fieldNode.final) { fieldNode.modifiers += Opcodes.ACC_FINAL }
48-
fieldNode.initialValueExpression = new StaticMethodCallExpression(
49-
new ClassNode(RT), 'var', new ArgumentListExpression(new ConstantExpression(ns), new ConstantExpression(name))
50-
)
40+
if (!fieldNode.static) {
41+
fieldNode.modifiers += Opcodes.ACC_STATIC
42+
}
43+
if (!fieldNode.final) {
44+
fieldNode.modifiers += Opcodes.ACC_FINAL
45+
}
46+
fieldNode.initialValueExpression = new StaticMethodCallExpression(
47+
new ClassNode(RT), 'var',
48+
new ArgumentListExpression(new ConstantExpression(ns), new ConstantExpression(name))
49+
)
5150
}
5251

5352
String getVarName(AnnotationNode annotation) {
5453
ConstantExpression expr = annotation.getMember('value')
55-
expr.getValue()
54+
expr.value
5655
}
5756
}

0 commit comments

Comments
 (0)