Adding TypeChecked where possible and CompileStatic where possible. CompileStatic was removed from AbstractClientExtensions due to the sketchy way that the compiler was allowing it to continue use DefaultGroovyMethods.with, which is an extension method.

Author: pickypg

src/main/groovy/org/elasticsearch/groovy/ClosureExtensions.groovy

@@ -18,10 +18,15 @@
  */
 package org.elasticsearch.groovy
 
+import groovy.transform.CompileStatic
+import groovy.transform.TypeChecked
+
 /**
  * {@code ClosureExtensions} adds convenient behaviors to Groovy's {@link Closure} class, such as the ability to convert
  * a {@code Closure} into a {@link Map} with {@link String} keys and {@link Object} values.
  */
+@CompileStatic
+@TypeChecked
 class ClosureExtensions {
     /**
      * Convert the self-referenced {@link Closure} into a {@link Map} with {@link String} keys as {@link Object} values.

src/main/groovy/org/elasticsearch/groovy/client/AbstractClientExtensions.groovy

@@ -18,7 +18,6 @@
  */
 package org.elasticsearch.groovy.client
 
-import groovy.transform.CompileStatic
 import groovy.transform.TypeChecked
 
 import org.elasticsearch.action.ActionRequest
@@ -30,7 +29,6 @@ import org.elasticsearch.client.ElasticsearchClient
  * {@code AbstractClientExtensions} provides convenience operations for {@link org.elasticsearch.client.Client}
  * extensions.
  */
-@CompileStatic
 @TypeChecked
 abstract class AbstractClientExtensions {
     /**

src/main/groovy/org/elasticsearch/groovy/common/settings/SettingsStaticExtensions.groovy

@@ -18,6 +18,8 @@
  */
 package org.elasticsearch.groovy.common.settings
 
+import groovy.transform.TypeChecked
+
 import org.elasticsearch.ElasticsearchGenerationException
 import org.elasticsearch.common.settings.Settings
 
@@ -27,6 +29,7 @@ import org.elasticsearch.common.settings.Settings
  * In particular, this adds the ability to specify settings in the form of a {@link Closure} when creating a
  * new {@link Settings#settingsBuilder() Builder}.
  */
+@TypeChecked
 class SettingsStaticExtensions {
     /**
      * Explicit settings to set.

src/main/groovy/org/elasticsearch/groovy/node/NodeBuilderExtensions.groovy

@@ -18,6 +18,8 @@
  */
 package org.elasticsearch.groovy.node
 
+import groovy.transform.TypeChecked
+
 import org.elasticsearch.ElasticsearchGenerationException
 import org.elasticsearch.common.settings.Settings
 import org.elasticsearch.node.NodeBuilder
@@ -26,6 +28,7 @@ import org.elasticsearch.node.NodeBuilder
  * {@code NodeBuilderExtensions} provides convenience methods to standard Elasticsearch {@link NodeBuilder}s to make
  * them more Groovy friendly.
  */
+@TypeChecked
 class NodeBuilderExtensions {
     /**
      * Set any addition settings by working directly against the internally used settings builder.

src/main/groovy/org/elasticsearch/groovy/node/NodeExtensions.groovy

@@ -18,6 +18,9 @@
  */
 package org.elasticsearch.groovy.node
 
+import groovy.transform.CompileStatic
+import groovy.transform.TypeChecked
+
 import org.elasticsearch.client.Client
 import org.elasticsearch.common.settings.Settings
 import org.elasticsearch.node.Node
@@ -26,6 +29,8 @@ import org.elasticsearch.node.Node
  * {@code NodeExtensions} provides convenience methods to standard Elasticsearch {@link Node}s to make them more Groovy
  * friendly.
  */
+@CompileStatic
+@TypeChecked
 class NodeExtensions {
     /**
      * Get the {@link Settings} used to create the {@link Node}.