diff --git a/applications/processor/groovy-processor/README.adoc b/applications/processor/groovy-processor/README.adoc new file mode 100644 index 00000000..05f0ff52 --- /dev/null +++ b/applications/processor/groovy-processor/README.adoc @@ -0,0 +1,13 @@ +//tag::ref-doc[] += Groovy Processor + +A Processor that applies a Groovy script against messages. + +== Options + +The **$$groovy-processor** $$processor$$ has the following options: + +//tag::configuration-properties[] +//end::configuration-properties[] + +//end::ref-doc[] diff --git a/applications/processor/groovy-transform-processor/pom.xml b/applications/processor/groovy-processor/pom.xml similarity index 93% rename from applications/processor/groovy-transform-processor/pom.xml rename to applications/processor/groovy-processor/pom.xml index 68e86116..d300339d 100644 --- a/applications/processor/groovy-transform-processor/pom.xml +++ b/applications/processor/groovy-processor/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 groovy-transform-processor - groovy-transform-processor - groovy-transform processor apps + groovy-processor + groovy processor apps 3.0.0-SNAPSHOT @@ -92,15 +92,15 @@ processor ${project.version} - org.springframework.cloud.stream.app.groovy.transform.processor.GroovyTransformProcessorConfiguration.class + org.springframework.cloud.stream.app.groovy.processor.GroovyProcessorConfiguration.class - byteArrayTextToString|groovyTransformFunction + byteArrayTextToString|groovyProcessorFunction org.springframework.cloud.stream.app - groovy-transform-processor + groovy-processor ${project.version} diff --git a/applications/processor/groovy-transform-processor/src/main/java/org/springframework/cloud/stream/app/groovy/transform/processor/GroovyTransformProcessorConfiguration.java b/applications/processor/groovy-processor/src/main/java/org/springframework/cloud/stream/app/groovy/processor/GroovyProcessorConfiguration.java similarity index 89% rename from applications/processor/groovy-transform-processor/src/main/java/org/springframework/cloud/stream/app/groovy/transform/processor/GroovyTransformProcessorConfiguration.java rename to applications/processor/groovy-processor/src/main/java/org/springframework/cloud/stream/app/groovy/processor/GroovyProcessorConfiguration.java index b77cc1dd..06f1746e 100644 --- a/applications/processor/groovy-transform-processor/src/main/java/org/springframework/cloud/stream/app/groovy/transform/processor/GroovyTransformProcessorConfiguration.java +++ b/applications/processor/groovy-processor/src/main/java/org/springframework/cloud/stream/app/groovy/processor/GroovyProcessorConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.stream.app.groovy.transform.processor; +package org.springframework.cloud.stream.app.groovy.processor; import java.io.IOException; import java.util.HashMap; @@ -45,14 +45,14 @@ import org.springframework.util.CollectionUtils; * @author Soby Chacko */ @Configuration -@EnableConfigurationProperties(GroovyTransformProcessorProperties.class) -public class GroovyTransformProcessorConfiguration { +@EnableConfigurationProperties(GroovyProcessorProperties.class) +public class GroovyProcessorConfiguration { @Autowired - private GroovyTransformProcessorProperties properties; + private GroovyProcessorProperties properties; @Bean - public Function, Object> groovyTransformFunction(ScriptVariableGenerator scriptVariableGenerator) { + public Function, Object> groovyProcessorFunction(ScriptVariableGenerator scriptVariableGenerator) { return message -> transformer(scriptVariableGenerator).processMessage(message); } diff --git a/applications/processor/groovy-transform-processor/src/main/java/org/springframework/cloud/stream/app/groovy/transform/processor/GroovyTransformProcessorProperties.java b/applications/processor/groovy-processor/src/main/java/org/springframework/cloud/stream/app/groovy/processor/GroovyProcessorProperties.java similarity index 91% rename from applications/processor/groovy-transform-processor/src/main/java/org/springframework/cloud/stream/app/groovy/transform/processor/GroovyTransformProcessorProperties.java rename to applications/processor/groovy-processor/src/main/java/org/springframework/cloud/stream/app/groovy/processor/GroovyProcessorProperties.java index dca234cc..2e469cc0 100644 --- a/applications/processor/groovy-transform-processor/src/main/java/org/springframework/cloud/stream/app/groovy/transform/processor/GroovyTransformProcessorProperties.java +++ b/applications/processor/groovy-processor/src/main/java/org/springframework/cloud/stream/app/groovy/processor/GroovyProcessorProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.stream.app.groovy.transform.processor; +package org.springframework.cloud.stream.app.groovy.processor; import java.util.Properties; @@ -29,9 +29,9 @@ import org.springframework.validation.annotation.Validated; * * @author Eric Bottard */ -@ConfigurationProperties("groovy-transformer") +@ConfigurationProperties("groovy-processor") @Validated -public class GroovyTransformProcessorProperties { +public class GroovyProcessorProperties { /** * Reference to a script used to process messages. diff --git a/applications/processor/groovy-processor/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties b/applications/processor/groovy-processor/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties new file mode 100644 index 00000000..eafc5392 --- /dev/null +++ b/applications/processor/groovy-processor/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties @@ -0,0 +1,3 @@ +configuration-properties.classes=org.springframework.cloud.stream.app.groovy.processor.GroovyProcessorProperties + + diff --git a/applications/processor/groovy-transform-processor/src/test/java/org/springframework/cloud/stream/app/groovy/transform/processor/GroovyTransformProcessorIntegrationTests.java b/applications/processor/groovy-processor/src/test/java/org/springframework/cloud/stream/app/groovy/processor/GroovyProcessorIntegrationTests.java similarity index 81% rename from applications/processor/groovy-transform-processor/src/test/java/org/springframework/cloud/stream/app/groovy/transform/processor/GroovyTransformProcessorIntegrationTests.java rename to applications/processor/groovy-processor/src/test/java/org/springframework/cloud/stream/app/groovy/processor/GroovyProcessorIntegrationTests.java index f5136fdb..b1271b15 100644 --- a/applications/processor/groovy-transform-processor/src/test/java/org/springframework/cloud/stream/app/groovy/transform/processor/GroovyTransformProcessorIntegrationTests.java +++ b/applications/processor/groovy-processor/src/test/java/org/springframework/cloud/stream/app/groovy/processor/GroovyProcessorIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.stream.app.groovy.transform.processor; +package org.springframework.cloud.stream.app.groovy.processor; import java.nio.charset.StandardCharsets; @@ -33,16 +33,16 @@ import org.springframework.messaging.support.GenericMessage; import static org.assertj.core.api.Assertions.assertThat; -public class GroovyTransformProcessorIntegrationTests { +public class GroovyProcessorIntegrationTests { @Test - public void testGroovyTransformerWithScript() { + public void testGroovyProcessorWithScript() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( - TestChannelBinderConfiguration.getCompleteConfiguration(GroovyTransformTestAppConfiguration.class)) + TestChannelBinderConfiguration.getCompleteConfiguration(GroovyProcessorTestAppConfiguration.class)) .web(WebApplicationType.NONE) - .run("--spring.cloud.function.definition=byteArrayTextToString|groovyTransformFunction", - "--groovy-transformer.script=script.groovy", - "--groovy-transformer.variables=limit=5\n foo=\\\40WORLD")) { + .run("--spring.cloud.function.definition=byteArrayTextToString|groovyProcessorFunction", + "--groovy-processor.script=script.groovy", + "--groovy-processor.variables=limit=5\n foo=\\\40WORLD")) { InputDestination processorInput = context.getBean(InputDestination.class); OutputDestination processorOutput = context.getBean(OutputDestination.class); @@ -55,12 +55,12 @@ public class GroovyTransformProcessorIntegrationTests { } @Test - public void testGroovyTransformerWithGrab() { + public void testGroovyProcessorWithGrab() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( - TestChannelBinderConfiguration.getCompleteConfiguration(GroovyTransformTestAppConfiguration.class)) + TestChannelBinderConfiguration.getCompleteConfiguration(GroovyProcessorTestAppConfiguration.class)) .web(WebApplicationType.NONE) - .run("--spring.cloud.function.definition=byteArrayTextToString|groovyTransformFunction", - "--groovy-transformer.script=script-with-grab.groovy")) { + .run("--spring.cloud.function.definition=byteArrayTextToString|groovyProcessorFunction", + "--groovy-processor.script=script-with-grab.groovy")) { InputDestination processorInput = context.getBean(InputDestination.class); OutputDestination processorOutput = context.getBean(OutputDestination.class); @@ -74,7 +74,7 @@ public class GroovyTransformProcessorIntegrationTests { @EnableAutoConfiguration - @Import({GroovyTransformProcessorConfiguration.class}) - public static class GroovyTransformTestAppConfiguration { + @Import({GroovyProcessorConfiguration.class}) + public static class GroovyProcessorTestAppConfiguration { } } diff --git a/applications/processor/groovy-transform-processor/src/test/resources/script-with-grab.groovy b/applications/processor/groovy-processor/src/test/resources/script-with-grab.groovy similarity index 100% rename from applications/processor/groovy-transform-processor/src/test/resources/script-with-grab.groovy rename to applications/processor/groovy-processor/src/test/resources/script-with-grab.groovy diff --git a/applications/processor/groovy-transform-processor/src/test/resources/script.groovy b/applications/processor/groovy-processor/src/test/resources/script.groovy similarity index 100% rename from applications/processor/groovy-transform-processor/src/test/resources/script.groovy rename to applications/processor/groovy-processor/src/test/resources/script.groovy diff --git a/applications/processor/groovy-transform-processor/README.adoc b/applications/processor/groovy-transform-processor/README.adoc deleted file mode 100644 index 9cf31b29..00000000 --- a/applications/processor/groovy-transform-processor/README.adoc +++ /dev/null @@ -1,13 +0,0 @@ -//tag::ref-doc[] -= Groovy Transform Processor - -A Processor that transforms messages using a Groovy script. - -== Options - -The **$$groovy-transform$$** $$processor$$ has the following options: - -//tag::configuration-properties[] -//end::configuration-properties[] - -//end::ref-doc[] diff --git a/applications/processor/groovy-transform-processor/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties b/applications/processor/groovy-transform-processor/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties deleted file mode 100644 index 93da2b6c..00000000 --- a/applications/processor/groovy-transform-processor/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties +++ /dev/null @@ -1,3 +0,0 @@ -configuration-properties.classes=org.springframework.cloud.stream.app.groovy.transform.processor.GroovyTransformProcessorProperties - - diff --git a/applications/processor/pom.xml b/applications/processor/pom.xml index 9c424e0e..e758b45b 100644 --- a/applications/processor/pom.xml +++ b/applications/processor/pom.xml @@ -11,7 +11,7 @@ bridge-processor - groovy-transform-processor + groovy-processor header-enricher-processor splitter-processor filter-processor