Merge pull request #24 from 4finance/tech/compileStatic

Enable static compilation [#DO_RELEASE]
4finance · Feb 6, 2017 · b32eff8 · b32eff8
2 parents c66e385 + b1aed51
commit b32eff8
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 3 deletions.
diff --git a/src/main/groovy/com/ofg/pipeline/core/JenkinsVariables.groovy b/src/main/groovy/com/ofg/pipeline/core/JenkinsVariables.groovy
@@ -1,8 +1,10 @@
 package com.ofg.pipeline.core
 
-import static java.lang.Integer.valueOf
+import groovy.transform.CompileStatic
 
+import static java.lang.Integer.valueOf
 
+@CompileStatic
 class JenkinsVariables {
     static JenkinsVariables from(Script script) {
         from(script.binding.variables)

diff --git a/src/main/groovy/com/ofg/pipeline/core/JobBuilder.groovy b/src/main/groovy/com/ofg/pipeline/core/JobBuilder.groovy
@@ -1,8 +1,10 @@
 package com.ofg.pipeline.core
 
+import groovy.transform.CompileStatic
 import javaposse.jobdsl.dsl.DslFactory
 import javaposse.jobdsl.dsl.Job
 
+@CompileStatic
 class JobBuilder<P extends Project> {
 
     private final Map<JobType, JobDefinition> jobs = [:]

diff --git a/src/main/groovy/com/ofg/pipeline/core/JobChain.groovy b/src/main/groovy/com/ofg/pipeline/core/JobChain.groovy
@@ -2,10 +2,12 @@ package com.ofg.pipeline.core
 
 import com.ofg.pipeline.core.link.AutoLink
 import com.ofg.pipeline.core.link.JobChainLink
+import groovy.transform.CompileStatic
 import javaposse.jobdsl.dsl.Job
 
 import java.util.function.Consumer
 
+@CompileStatic
 class JobChain<P extends Project> {
 
     static <P extends Project> JobChain<P> of(JobRef<P> startJob) {

diff --git a/src/main/groovy/com/ofg/pipeline/core/JobDefinition.groovy b/src/main/groovy/com/ofg/pipeline/core/JobDefinition.groovy
@@ -1,11 +1,13 @@
 package com.ofg.pipeline.core
 
 import com.google.common.base.CaseFormat
+import groovy.transform.CompileStatic
 import javaposse.jobdsl.dsl.Job
 
+@CompileStatic
 abstract class JobDefinition<T extends Job, P extends Project> implements JobRef<P> {
 
-    private static final JOB_TYPE_FRAGMENT_SEPARATOR = '-'
+    private static final String JOB_TYPE_FRAGMENT_SEPARATOR = '-'
 
     abstract Class<T> getJobClass()
 

diff --git a/src/main/groovy/com/ofg/pipeline/core/JobFactory.groovy b/src/main/groovy/com/ofg/pipeline/core/JobFactory.groovy
@@ -1,5 +1,6 @@
 package com.ofg.pipeline.core
 
+import groovy.transform.CompileStatic
 import javaposse.jobdsl.dsl.DslFactory
 import javaposse.jobdsl.dsl.Job
 import javaposse.jobdsl.dsl.jobs.BuildFlowJob
@@ -10,6 +11,7 @@ import javaposse.jobdsl.dsl.jobs.WorkflowJob
 
 import static com.google.common.base.Preconditions.checkNotNull
 
+@CompileStatic
 class JobFactory {
 
     private final DslFactory dslFactory

diff --git a/src/main/groovy/com/ofg/pipeline/core/JobRef.groovy b/src/main/groovy/com/ofg/pipeline/core/JobRef.groovy
@@ -1,6 +1,6 @@
 package com.ofg.pipeline.core
 
-public interface JobRef<P extends Project> {
+interface JobRef<P extends Project> {
     JobType getJobType()
     String getJobName(P project)
 }
diff --git a/src/main/groovy/com/ofg/pipeline/core/JobType.groovy b/src/main/groovy/com/ofg/pipeline/core/JobType.groovy
@@ -1,8 +1,10 @@
 package com.ofg.pipeline.core
 
+import groovy.transform.CompileStatic
 import groovy.transform.Immutable
 
 @Immutable
+@CompileStatic
 class JobType {
     String name
 }
diff --git a/src/main/groovy/com/ofg/pipeline/core/PipelineBuilder.groovy b/src/main/groovy/com/ofg/pipeline/core/PipelineBuilder.groovy
@@ -1,5 +1,6 @@
 package com.ofg.pipeline.core
 
+import groovy.transform.CompileStatic
 import javaposse.jobdsl.dsl.DslFactory
 import javaposse.jobdsl.dsl.Job
 

diff --git a/src/main/groovy/com/ofg/pipeline/core/PipelineTemplateBuilder.groovy b/src/main/groovy/com/ofg/pipeline/core/PipelineTemplateBuilder.groovy
@@ -1,9 +1,11 @@
 package com.ofg.pipeline.core
 
+import groovy.transform.CompileStatic
 import javaposse.jobdsl.dsl.DslFactory
 
 import static com.google.common.base.Preconditions.checkNotNull
 
+@CompileStatic
 class PipelineTemplateBuilder {
 
     private final DslFactory dslFactory

diff --git a/src/main/groovy/com/ofg/pipeline/core/link/AbstractPublishersFocusedJobChainLink.groovy b/src/main/groovy/com/ofg/pipeline/core/link/AbstractPublishersFocusedJobChainLink.groovy
@@ -3,11 +3,13 @@ package com.ofg.pipeline.core.link
 import com.ofg.pipeline.core.JobRef
 import com.ofg.pipeline.core.Project
 import com.ofg.pipeline.core.Variable
+import groovy.transform.CompileStatic
 import javaposse.jobdsl.dsl.Job
 import javaposse.jobdsl.dsl.helpers.common.DownstreamTriggerParameterContext
 
 import static com.google.common.base.Preconditions.checkNotNull
 
+@CompileStatic
 abstract class AbstractPublishersFocusedJobChainLink<P extends Project> implements JobChainLink<P> {
 
     protected final static boolean ON_SAME_NODE_DISABLED = false

diff --git a/src/main/groovy/com/ofg/pipeline/core/link/AutoLink.groovy b/src/main/groovy/com/ofg/pipeline/core/link/AutoLink.groovy
@@ -3,8 +3,10 @@ package com.ofg.pipeline.core.link
 import com.ofg.pipeline.core.JobRef
 import com.ofg.pipeline.core.Project
 import com.ofg.pipeline.core.TriggerCondition
+import groovy.transform.CompileStatic
 import javaposse.jobdsl.dsl.helpers.publisher.PublisherContext
 
+@CompileStatic
 class AutoLink<P extends Project> extends AbstractPublishersFocusedJobChainLink<P> {
 
     private final TriggerCondition triggerCondition

diff --git a/src/main/groovy/com/ofg/pipeline/core/link/CombinedJobChainLink.groovy b/src/main/groovy/com/ofg/pipeline/core/link/CombinedJobChainLink.groovy
@@ -2,8 +2,10 @@ package com.ofg.pipeline.core.link
 
 import com.ofg.pipeline.core.JobRef
 import com.ofg.pipeline.core.Project
+import groovy.transform.CompileStatic
 import javaposse.jobdsl.dsl.Job
 
+@CompileStatic
 class CombinedJobChainLink<P extends Project> implements JobChainLink<P> {
 
     static <P extends Project> CombinedJobChainLink<P> of(JobChainLink<P>... links) {

diff --git a/src/main/groovy/com/ofg/pipeline/core/link/ManualLink.groovy b/src/main/groovy/com/ofg/pipeline/core/link/ManualLink.groovy
@@ -2,8 +2,10 @@ package com.ofg.pipeline.core.link
 
 import com.ofg.pipeline.core.JobRef
 import com.ofg.pipeline.core.Project
+import groovy.transform.CompileStatic
 import javaposse.jobdsl.dsl.helpers.publisher.PublisherContext
 
+@CompileStatic
 class ManualLink<P extends Project> extends AbstractPublishersFocusedJobChainLink<P> {
 
     static <P extends Project> ManualLink<P> manual(JobRef<P> to) {