diff --git a/README.adoc b/README.adoc index de3e69f6..3a8daba0 100644 --- a/README.adoc +++ b/README.adoc @@ -15,84 +15,84 @@ This functions catalog is also a foundation for https://spring.io/projects/sprin |=== | `java.util.Supplier` | `java.util.Function` | `java.util.Consumer` -|link:supplier/debezium-supplier/README.adoc[Debezium supplier] -|link:function/aggregator-function/README.adoc[Aggregator] -|link:consumer/analytics-consumer/README.adoc[Analytics] +|link:supplier/spring-debezium-supplier/README.adoc[Debezium supplier] +|link:function/spring-aggregator-function/README.adoc[Aggregator] +|link:consumer/spring-analytics-consumer/README.adoc[Analytics] -|link:supplier/file-supplier/README.adoc[File] -|link:function/filter-function/README.adoc[Filter] -|link:consumer/cassandra-consumer/README.adoc[Cassandra] +|link:supplier/spring-file-supplier/README.adoc[File] +|link:function/spring-filter-function/README.adoc[Filter] +|link:consumer/spring-cassandra-consumer/README.adoc[Cassandra] -|link:supplier/ftp-supplier/README.adoc[FTP] -|link:function/header-enricher-function/README.adoc[Header-Enricher] -|link:consumer/elasticsearch-consumer/README.adoc[Elasticsearch] +|link:supplier/spring-ftp-supplier/README.adoc[FTP] +|link:function/spring-header-enricher-function/README.adoc[Header-Enricher] +|link:consumer/spring-elasticsearch-consumer/README.adoc[Elasticsearch] | -|link:function/header-filter-function/README.adoc[Header-Filter] -|link:consumer/file-consumer/README.adoc[File] +|link:function/spring-header-filter-function/README.adoc[Header-Filter] +|link:consumer/spring-file-consumer/README.adoc[File] -|link:supplier/http-supplier/README.adoc[HTTP] -|link:function/http-request-function/README.adoc[HTTP Request] -|link:consumer/ftp-consumer/README.adoc[FTP] +|link:supplier/spring-http-supplier/README.adoc[HTTP] +|link:function/spring-http-request-function/README.adoc[HTTP Request] +|link:consumer/spring-ftp-consumer/README.adoc[FTP] -|link:supplier/jdbc-supplier/README.adoc[JDBC] -|link:function/image-recognition-function/README.adoc[Image Recognition(Tensorflow)] +|link:supplier/spring-jdbc-supplier/README.adoc[JDBC] +|link:function/spring-image-recognition-function/README.adoc[Image Recognition(Tensorflow)] | -|link:supplier/jms-supplier/README.adoc[JMS] +|link:supplier/spring-jms-supplier/README.adoc[JMS] -|link:function/object-detection-function/README.adoc[Object Detection(Tensorflow)] -|link:consumer/jdbc-consumer/README.adoc[JDBC] +|link:function/spring-object-detection-function/README.adoc[Object Detection(Tensorflow)] +|link:consumer/spring-jdbc-consumer/README.adoc[JDBC] -|link:supplier/mail-supplier/README.adoc[Mail] +|link:supplier/spring-mail-supplier/README.adoc[Mail] -|link:function/semantic-segmentation-function/README.adoc[Semantic Segmentation(Tensorflow)] -|link:consumer/log-consumer/README.adoc[Log] +|link:function/spring-semantic-segmentation-function/README.adoc[Semantic Segmentation(Tensorflow)] +|link:consumer/spring-log-consumer/README.adoc[Log] -|link:supplier/mongodb-supplier/README.adoc[MongoDB] +|link:supplier/spring-mongodb-supplier/README.adoc[MongoDB] -|link:function/spel-function/README.adoc[SpEL] -|link:consumer/mongodb-consumer/README.adoc[MongoDB] +|link:function/spring-spel-function/README.adoc[SpEL] +|link:consumer/spring-mongodb-consumer/README.adoc[MongoDB] -|link:supplier/mqtt-supplier/README.adoc[MQTT] +|link:supplier/spring-mqtt-supplier/README.adoc[MQTT] -|link:function/splitter-function/README.adoc[Splitter] -|link:consumer/mqtt-consumer/README.adoc[MQTT] +|link:function/spring-splitter-function/README.adoc[Splitter] +|link:consumer/spring-mqtt-consumer/README.adoc[MQTT] -|link:supplier/rabbit-supplier/README.adoc[RabbitMQ] -|link:function/task-launch-request-function/README.adoc[Task Launch Request] -|link:consumer/rabbit-consumer/README.adoc[RabbitMQ] +|link:supplier/spring-rabbit-supplier/README.adoc[RabbitMQ] +|link:function/spring-task-launch-request-function/README.adoc[Task Launch Request] +|link:consumer/spring-rabbit-consumer/README.adoc[RabbitMQ] -|link:supplier/s3-supplier/README.adoc[AWS S3] +|link:supplier/spring-s3-supplier/README.adoc[AWS S3] | -|link:consumer/redis-consumer/README.adoc[Redis] +|link:consumer/spring-redis-consumer/README.adoc[Redis] -|link:supplier/sftp-supplier/README.adoc[SFTP] +|link:supplier/spring-sftp-supplier/README.adoc[SFTP] | -|link:consumer/rsocket-consumer/README.adoc[RSocket] +|link:consumer/spring-rsocket-consumer/README.adoc[RSocket] -|link:supplier/syslog-supplier/README.adoc[Syslog] +|link:supplier/spring-syslog-supplier/README.adoc[Syslog] | -|link:consumer/s3-consumer/README.adoc[AWS S3] +|link:consumer/spring-s3-consumer/README.adoc[AWS S3] -|link:supplier/tcp-supplier/README.adoc[TCP] +|link:supplier/spring-tcp-supplier/README.adoc[TCP] | -|link:consumer/sftp-consumer/README.adoc[SFTP] +|link:consumer/spring-sftp-consumer/README.adoc[SFTP] -|link:supplier/time-supplier/README.adoc[Time] +|link:supplier/spring-time-supplier/README.adoc[Time] | -|link:consumer/tcp-consumer/README.adoc[TCP] +|link:consumer/spring-tcp-consumer/README.adoc[TCP] -|link:supplier/twitter-supplier/README.adoc[Twitter] -|link:function/twitter-function/README.adoc[Twitter] -|link:consumer/twitter-consumer/README.adoc[Twitter] +|link:supplier/spring-twitter-supplier/README.adoc[Twitter] +|link:function/spring-twitter-function/README.adoc[Twitter] +|link:consumer/spring-twitter-consumer/README.adoc[Twitter] -|link:supplier/websocket-supplier/README.adoc[Websocket] +|link:supplier/spring-websocket-supplier/README.adoc[Websocket] | -|link:consumer/websocket-consumer/README.adoc[Websocket] +|link:consumer/spring-websocket-consumer/README.adoc[Websocket] | | -|link:consumer/wavefront-consumer/README.adoc[Wavefront] -|link:supplier/xmpp-supplier/README.adoc[XMPP] +|link:consumer/spring-wavefront-consumer/README.adoc[Wavefront] +|link:supplier/spring-xmpp-supplier/README.adoc[XMPP] | -|link:consumer/xmpp-consumer/README.adoc[XMPP] +|link:consumer/spring-xmpp-consumer/README.adoc[XMPP] |=== diff --git a/build.gradle b/build.gradle index 11156ae3..e286cdf7 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ plugins { description = 'Spring Functions Catlog' ext { - javaProjects = subprojects - project(':function-dependencies') + javaProjects = subprojects - project(':spring-function-dependencies') } apply from: 'dependencies.gradle' @@ -109,8 +109,8 @@ configure(javaProjects) { subproject -> dependencies { annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor' - if (subproject.name != 'config-common') { - api project(':config-common') + if (subproject.name != 'spring-config-common') { + api project(':spring-config-common') } api 'org.springframework.boot:spring-boot-starter-validation' @@ -172,4 +172,4 @@ configure(javaProjects) { subproject -> } } -} \ No newline at end of file +} diff --git a/common/aws-s3-common/build.gradle b/common/spring-aws-s3-common/build.gradle similarity index 100% rename from common/aws-s3-common/build.gradle rename to common/spring-aws-s3-common/build.gradle diff --git a/common/aws-s3-common/src/main/java/org/springframework/cloud/fn/common/aws/s3/AmazonS3Configuration.java b/common/spring-aws-s3-common/src/main/java/org/springframework/cloud/fn/common/aws/s3/AmazonS3Configuration.java similarity index 100% rename from common/aws-s3-common/src/main/java/org/springframework/cloud/fn/common/aws/s3/AmazonS3Configuration.java rename to common/spring-aws-s3-common/src/main/java/org/springframework/cloud/fn/common/aws/s3/AmazonS3Configuration.java diff --git a/common/aws-s3-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/common/spring-aws-s3-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from common/aws-s3-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to common/spring-aws-s3-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/common/aws-s3-common/src/test/java/org/springframework/cloud/fn/common/aws/s3/AmazonS3ConfigurationTests.java b/common/spring-aws-s3-common/src/test/java/org/springframework/cloud/fn/common/aws/s3/AmazonS3ConfigurationTests.java similarity index 100% rename from common/aws-s3-common/src/test/java/org/springframework/cloud/fn/common/aws/s3/AmazonS3ConfigurationTests.java rename to common/spring-aws-s3-common/src/test/java/org/springframework/cloud/fn/common/aws/s3/AmazonS3ConfigurationTests.java diff --git a/common/config-common/src/main/java/org/springframework/cloud/fn/common/config/ComponentCustomizer.java b/common/spring-config-common/src/main/java/org/springframework/cloud/fn/common/config/ComponentCustomizer.java similarity index 100% rename from common/config-common/src/main/java/org/springframework/cloud/fn/common/config/ComponentCustomizer.java rename to common/spring-config-common/src/main/java/org/springframework/cloud/fn/common/config/ComponentCustomizer.java diff --git a/common/config-common/src/main/java/org/springframework/cloud/fn/common/config/SpelExpressionConverterConfiguration.java b/common/spring-config-common/src/main/java/org/springframework/cloud/fn/common/config/SpelExpressionConverterConfiguration.java similarity index 100% rename from common/config-common/src/main/java/org/springframework/cloud/fn/common/config/SpelExpressionConverterConfiguration.java rename to common/spring-config-common/src/main/java/org/springframework/cloud/fn/common/config/SpelExpressionConverterConfiguration.java diff --git a/common/config-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/common/spring-config-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from common/config-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to common/spring-config-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/common/debezium-autoconfigure/README.adoc b/common/spring-debezium-autoconfigure/README.adoc similarity index 100% rename from common/debezium-autoconfigure/README.adoc rename to common/spring-debezium-autoconfigure/README.adoc diff --git a/common/debezium-autoconfigure/build.gradle b/common/spring-debezium-autoconfigure/build.gradle similarity index 100% rename from common/debezium-autoconfigure/build.gradle rename to common/spring-debezium-autoconfigure/build.gradle diff --git a/common/debezium-autoconfigure/src/main/java/org/springframework/cloud/fn/common/debezium/DebeziumEngineBuilderAutoConfiguration.java b/common/spring-debezium-autoconfigure/src/main/java/org/springframework/cloud/fn/common/debezium/DebeziumEngineBuilderAutoConfiguration.java similarity index 100% rename from common/debezium-autoconfigure/src/main/java/org/springframework/cloud/fn/common/debezium/DebeziumEngineBuilderAutoConfiguration.java rename to common/spring-debezium-autoconfigure/src/main/java/org/springframework/cloud/fn/common/debezium/DebeziumEngineBuilderAutoConfiguration.java diff --git a/common/debezium-autoconfigure/src/main/java/org/springframework/cloud/fn/common/debezium/DebeziumProperties.java b/common/spring-debezium-autoconfigure/src/main/java/org/springframework/cloud/fn/common/debezium/DebeziumProperties.java similarity index 100% rename from common/debezium-autoconfigure/src/main/java/org/springframework/cloud/fn/common/debezium/DebeziumProperties.java rename to common/spring-debezium-autoconfigure/src/main/java/org/springframework/cloud/fn/common/debezium/DebeziumProperties.java diff --git a/common/debezium-autoconfigure/src/main/java/org/springframework/cloud/fn/common/debezium/EmbeddedEngineExecutorService.java b/common/spring-debezium-autoconfigure/src/main/java/org/springframework/cloud/fn/common/debezium/EmbeddedEngineExecutorService.java similarity index 100% rename from common/debezium-autoconfigure/src/main/java/org/springframework/cloud/fn/common/debezium/EmbeddedEngineExecutorService.java rename to common/spring-debezium-autoconfigure/src/main/java/org/springframework/cloud/fn/common/debezium/EmbeddedEngineExecutorService.java diff --git a/common/debezium-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/common/spring-debezium-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from common/debezium-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to common/spring-debezium-autoconfigure/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/common/debezium-autoconfigure/src/test/java/org/springframework/cloud/fn/common/debezium/DebeziumEngineBuilderAutoConfigurationIntegrationTest.java b/common/spring-debezium-autoconfigure/src/test/java/org/springframework/cloud/fn/common/debezium/DebeziumEngineBuilderAutoConfigurationIntegrationTest.java similarity index 100% rename from common/debezium-autoconfigure/src/test/java/org/springframework/cloud/fn/common/debezium/DebeziumEngineBuilderAutoConfigurationIntegrationTest.java rename to common/spring-debezium-autoconfigure/src/test/java/org/springframework/cloud/fn/common/debezium/DebeziumEngineBuilderAutoConfigurationIntegrationTest.java diff --git a/common/debezium-autoconfigure/src/test/java/org/springframework/cloud/fn/common/debezium/DebeziumEngineBuilderAutoConfigurationTests.java b/common/spring-debezium-autoconfigure/src/test/java/org/springframework/cloud/fn/common/debezium/DebeziumEngineBuilderAutoConfigurationTests.java similarity index 100% rename from common/debezium-autoconfigure/src/test/java/org/springframework/cloud/fn/common/debezium/DebeziumEngineBuilderAutoConfigurationTests.java rename to common/spring-debezium-autoconfigure/src/test/java/org/springframework/cloud/fn/common/debezium/DebeziumEngineBuilderAutoConfigurationTests.java diff --git a/common/debezium-autoconfigure/src/test/java/org/springframework/cloud/fn/common/debezium/DebeziumPropertiesTests.java b/common/spring-debezium-autoconfigure/src/test/java/org/springframework/cloud/fn/common/debezium/DebeziumPropertiesTests.java similarity index 100% rename from common/debezium-autoconfigure/src/test/java/org/springframework/cloud/fn/common/debezium/DebeziumPropertiesTests.java rename to common/spring-debezium-autoconfigure/src/test/java/org/springframework/cloud/fn/common/debezium/DebeziumPropertiesTests.java diff --git a/common/file-common/build.gradle b/common/spring-file-common/build.gradle similarity index 100% rename from common/file-common/build.gradle rename to common/spring-file-common/build.gradle diff --git a/common/file-common/src/main/java/org/springframework/cloud/fn/common/file/FileConsumerProperties.java b/common/spring-file-common/src/main/java/org/springframework/cloud/fn/common/file/FileConsumerProperties.java similarity index 100% rename from common/file-common/src/main/java/org/springframework/cloud/fn/common/file/FileConsumerProperties.java rename to common/spring-file-common/src/main/java/org/springframework/cloud/fn/common/file/FileConsumerProperties.java diff --git a/common/file-common/src/main/java/org/springframework/cloud/fn/common/file/FileReadingMode.java b/common/spring-file-common/src/main/java/org/springframework/cloud/fn/common/file/FileReadingMode.java similarity index 100% rename from common/file-common/src/main/java/org/springframework/cloud/fn/common/file/FileReadingMode.java rename to common/spring-file-common/src/main/java/org/springframework/cloud/fn/common/file/FileReadingMode.java diff --git a/common/file-common/src/main/java/org/springframework/cloud/fn/common/file/FileUtils.java b/common/spring-file-common/src/main/java/org/springframework/cloud/fn/common/file/FileUtils.java similarity index 100% rename from common/file-common/src/main/java/org/springframework/cloud/fn/common/file/FileUtils.java rename to common/spring-file-common/src/main/java/org/springframework/cloud/fn/common/file/FileUtils.java diff --git a/common/file-common/src/main/java/org/springframework/cloud/fn/common/file/remote/RemoteFileDeletingAdvice.java b/common/spring-file-common/src/main/java/org/springframework/cloud/fn/common/file/remote/RemoteFileDeletingAdvice.java similarity index 100% rename from common/file-common/src/main/java/org/springframework/cloud/fn/common/file/remote/RemoteFileDeletingAdvice.java rename to common/spring-file-common/src/main/java/org/springframework/cloud/fn/common/file/remote/RemoteFileDeletingAdvice.java diff --git a/common/file-common/src/main/java/org/springframework/cloud/fn/common/file/remote/RemoteFileRenamingAdvice.java b/common/spring-file-common/src/main/java/org/springframework/cloud/fn/common/file/remote/RemoteFileRenamingAdvice.java similarity index 100% rename from common/file-common/src/main/java/org/springframework/cloud/fn/common/file/remote/RemoteFileRenamingAdvice.java rename to common/spring-file-common/src/main/java/org/springframework/cloud/fn/common/file/remote/RemoteFileRenamingAdvice.java diff --git a/common/ftp-common/build.gradle b/common/spring-ftp-common/build.gradle similarity index 100% rename from common/ftp-common/build.gradle rename to common/spring-ftp-common/build.gradle diff --git a/common/ftp-common/src/main/java/org/springframework/cloud/fn/common/ftp/FtpSessionFactoryConfiguration.java b/common/spring-ftp-common/src/main/java/org/springframework/cloud/fn/common/ftp/FtpSessionFactoryConfiguration.java similarity index 100% rename from common/ftp-common/src/main/java/org/springframework/cloud/fn/common/ftp/FtpSessionFactoryConfiguration.java rename to common/spring-ftp-common/src/main/java/org/springframework/cloud/fn/common/ftp/FtpSessionFactoryConfiguration.java diff --git a/common/ftp-common/src/main/java/org/springframework/cloud/fn/common/ftp/FtpSessionFactoryProperties.java b/common/spring-ftp-common/src/main/java/org/springframework/cloud/fn/common/ftp/FtpSessionFactoryProperties.java similarity index 100% rename from common/ftp-common/src/main/java/org/springframework/cloud/fn/common/ftp/FtpSessionFactoryProperties.java rename to common/spring-ftp-common/src/main/java/org/springframework/cloud/fn/common/ftp/FtpSessionFactoryProperties.java diff --git a/common/function-test-support/build.gradle b/common/spring-function-test-support/build.gradle similarity index 100% rename from common/function-test-support/build.gradle rename to common/spring-function-test-support/build.gradle diff --git a/common/function-test-support/src/main/java/org/springframework/cloud/fn/test/support/file/remote/RemoteFileTestSupport.java b/common/spring-function-test-support/src/main/java/org/springframework/cloud/fn/test/support/file/remote/RemoteFileTestSupport.java similarity index 100% rename from common/function-test-support/src/main/java/org/springframework/cloud/fn/test/support/file/remote/RemoteFileTestSupport.java rename to common/spring-function-test-support/src/main/java/org/springframework/cloud/fn/test/support/file/remote/RemoteFileTestSupport.java diff --git a/common/function-test-support/src/main/java/org/springframework/cloud/fn/test/support/ftp/FtpTestSupport.java b/common/spring-function-test-support/src/main/java/org/springframework/cloud/fn/test/support/ftp/FtpTestSupport.java similarity index 100% rename from common/function-test-support/src/main/java/org/springframework/cloud/fn/test/support/ftp/FtpTestSupport.java rename to common/spring-function-test-support/src/main/java/org/springframework/cloud/fn/test/support/ftp/FtpTestSupport.java diff --git a/common/function-test-support/src/main/java/org/springframework/cloud/fn/test/support/sftp/SftpTestSupport.java b/common/spring-function-test-support/src/main/java/org/springframework/cloud/fn/test/support/sftp/SftpTestSupport.java similarity index 100% rename from common/function-test-support/src/main/java/org/springframework/cloud/fn/test/support/sftp/SftpTestSupport.java rename to common/spring-function-test-support/src/main/java/org/springframework/cloud/fn/test/support/sftp/SftpTestSupport.java diff --git a/common/function-test-support/src/main/java/org/springframework/cloud/fn/test/support/websocket/WebsocketConsumerClientHandler.java b/common/spring-function-test-support/src/main/java/org/springframework/cloud/fn/test/support/websocket/WebsocketConsumerClientHandler.java similarity index 100% rename from common/function-test-support/src/main/java/org/springframework/cloud/fn/test/support/websocket/WebsocketConsumerClientHandler.java rename to common/spring-function-test-support/src/main/java/org/springframework/cloud/fn/test/support/websocket/WebsocketConsumerClientHandler.java diff --git a/common/function-test-support/src/main/java/org/springframework/cloud/fn/test/support/xmpp/XmppTestContainerSupport.java b/common/spring-function-test-support/src/main/java/org/springframework/cloud/fn/test/support/xmpp/XmppTestContainerSupport.java similarity index 100% rename from common/function-test-support/src/main/java/org/springframework/cloud/fn/test/support/xmpp/XmppTestContainerSupport.java rename to common/spring-function-test-support/src/main/java/org/springframework/cloud/fn/test/support/xmpp/XmppTestContainerSupport.java diff --git a/common/function-test-support/src/main/resources/id_rsa_pp b/common/spring-function-test-support/src/main/resources/id_rsa_pp similarity index 100% rename from common/function-test-support/src/main/resources/id_rsa_pp rename to common/spring-function-test-support/src/main/resources/id_rsa_pp diff --git a/common/function-test-support/src/main/resources/id_rsa_pp.pub b/common/spring-function-test-support/src/main/resources/id_rsa_pp.pub similarity index 100% rename from common/function-test-support/src/main/resources/id_rsa_pp.pub rename to common/spring-function-test-support/src/main/resources/id_rsa_pp.pub diff --git a/common/function-test-support/src/main/resources/logback-test.xml b/common/spring-function-test-support/src/main/resources/logback-test.xml similarity index 100% rename from common/function-test-support/src/main/resources/logback-test.xml rename to common/spring-function-test-support/src/main/resources/logback-test.xml diff --git a/common/function-test-support/src/main/resources/xmpp/conf/available-plugins.xml b/common/spring-function-test-support/src/main/resources/xmpp/conf/available-plugins.xml similarity index 100% rename from common/function-test-support/src/main/resources/xmpp/conf/available-plugins.xml rename to common/spring-function-test-support/src/main/resources/xmpp/conf/available-plugins.xml diff --git a/common/function-test-support/src/main/resources/xmpp/conf/crowd.properties b/common/spring-function-test-support/src/main/resources/xmpp/conf/crowd.properties similarity index 100% rename from common/function-test-support/src/main/resources/xmpp/conf/crowd.properties rename to common/spring-function-test-support/src/main/resources/xmpp/conf/crowd.properties diff --git a/common/function-test-support/src/main/resources/xmpp/conf/openfire-demoboot.xml b/common/spring-function-test-support/src/main/resources/xmpp/conf/openfire-demoboot.xml similarity index 100% rename from common/function-test-support/src/main/resources/xmpp/conf/openfire-demoboot.xml rename to common/spring-function-test-support/src/main/resources/xmpp/conf/openfire-demoboot.xml diff --git a/common/function-test-support/src/main/resources/xmpp/conf/openfire.xml b/common/spring-function-test-support/src/main/resources/xmpp/conf/openfire.xml similarity index 100% rename from common/function-test-support/src/main/resources/xmpp/conf/openfire.xml rename to common/spring-function-test-support/src/main/resources/xmpp/conf/openfire.xml diff --git a/common/function-test-support/src/main/resources/xmpp/conf/security.xml b/common/spring-function-test-support/src/main/resources/xmpp/conf/security.xml similarity index 100% rename from common/function-test-support/src/main/resources/xmpp/conf/security.xml rename to common/spring-function-test-support/src/main/resources/xmpp/conf/security.xml diff --git a/common/function-test-support/src/main/resources/xmpp/conf/security/archive/readme.txt b/common/spring-function-test-support/src/main/resources/xmpp/conf/security/archive/readme.txt similarity index 100% rename from common/function-test-support/src/main/resources/xmpp/conf/security/archive/readme.txt rename to common/spring-function-test-support/src/main/resources/xmpp/conf/security/archive/readme.txt diff --git a/common/function-test-support/src/main/resources/xmpp/conf/security/client.truststore b/common/spring-function-test-support/src/main/resources/xmpp/conf/security/client.truststore similarity index 100% rename from common/function-test-support/src/main/resources/xmpp/conf/security/client.truststore rename to common/spring-function-test-support/src/main/resources/xmpp/conf/security/client.truststore diff --git a/common/function-test-support/src/main/resources/xmpp/conf/security/keystore b/common/spring-function-test-support/src/main/resources/xmpp/conf/security/keystore similarity index 100% rename from common/function-test-support/src/main/resources/xmpp/conf/security/keystore rename to common/spring-function-test-support/src/main/resources/xmpp/conf/security/keystore diff --git a/common/function-test-support/src/main/resources/xmpp/conf/security/truststore b/common/spring-function-test-support/src/main/resources/xmpp/conf/security/truststore similarity index 100% rename from common/function-test-support/src/main/resources/xmpp/conf/security/truststore rename to common/spring-function-test-support/src/main/resources/xmpp/conf/security/truststore diff --git a/common/function-test-support/src/main/resources/xmpp/conf/server-update.xml b/common/spring-function-test-support/src/main/resources/xmpp/conf/server-update.xml similarity index 100% rename from common/function-test-support/src/main/resources/xmpp/conf/server-update.xml rename to common/spring-function-test-support/src/main/resources/xmpp/conf/server-update.xml diff --git a/common/metadata-store-common/README.adoc b/common/spring-metadata-store-common/README.adoc similarity index 100% rename from common/metadata-store-common/README.adoc rename to common/spring-metadata-store-common/README.adoc diff --git a/common/metadata-store-common/build.gradle b/common/spring-metadata-store-common/build.gradle similarity index 100% rename from common/metadata-store-common/build.gradle rename to common/spring-metadata-store-common/build.gradle diff --git a/common/metadata-store-common/src/main/java/org/springframework/cloud/fn/common/metadata/store/MetadataStoreAutoConfiguration.java b/common/spring-metadata-store-common/src/main/java/org/springframework/cloud/fn/common/metadata/store/MetadataStoreAutoConfiguration.java similarity index 100% rename from common/metadata-store-common/src/main/java/org/springframework/cloud/fn/common/metadata/store/MetadataStoreAutoConfiguration.java rename to common/spring-metadata-store-common/src/main/java/org/springframework/cloud/fn/common/metadata/store/MetadataStoreAutoConfiguration.java diff --git a/common/metadata-store-common/src/main/java/org/springframework/cloud/fn/common/metadata/store/MetadataStoreProperties.java b/common/spring-metadata-store-common/src/main/java/org/springframework/cloud/fn/common/metadata/store/MetadataStoreProperties.java similarity index 100% rename from common/metadata-store-common/src/main/java/org/springframework/cloud/fn/common/metadata/store/MetadataStoreProperties.java rename to common/spring-metadata-store-common/src/main/java/org/springframework/cloud/fn/common/metadata/store/MetadataStoreProperties.java diff --git a/common/metadata-store-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/common/spring-metadata-store-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from common/metadata-store-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to common/spring-metadata-store-common/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/common/metadata-store-common/src/test/java/org/springframework/cloud/fn/common/metadata/store/MetadataStoreAutoConfigurationTests.java b/common/spring-metadata-store-common/src/test/java/org/springframework/cloud/fn/common/metadata/store/MetadataStoreAutoConfigurationTests.java similarity index 100% rename from common/metadata-store-common/src/test/java/org/springframework/cloud/fn/common/metadata/store/MetadataStoreAutoConfigurationTests.java rename to common/spring-metadata-store-common/src/test/java/org/springframework/cloud/fn/common/metadata/store/MetadataStoreAutoConfigurationTests.java diff --git a/common/mqtt-common/build.gradle b/common/spring-mqtt-common/build.gradle similarity index 100% rename from common/mqtt-common/build.gradle rename to common/spring-mqtt-common/build.gradle diff --git a/common/mqtt-common/src/main/java/org/springframework/cloud/fn/common/mqtt/MqttConfiguration.java b/common/spring-mqtt-common/src/main/java/org/springframework/cloud/fn/common/mqtt/MqttConfiguration.java similarity index 100% rename from common/mqtt-common/src/main/java/org/springframework/cloud/fn/common/mqtt/MqttConfiguration.java rename to common/spring-mqtt-common/src/main/java/org/springframework/cloud/fn/common/mqtt/MqttConfiguration.java diff --git a/common/mqtt-common/src/main/java/org/springframework/cloud/fn/common/mqtt/MqttProperties.java b/common/spring-mqtt-common/src/main/java/org/springframework/cloud/fn/common/mqtt/MqttProperties.java similarity index 100% rename from common/mqtt-common/src/main/java/org/springframework/cloud/fn/common/mqtt/MqttProperties.java rename to common/spring-mqtt-common/src/main/java/org/springframework/cloud/fn/common/mqtt/MqttProperties.java diff --git a/common/tcp-common/build.gradle b/common/spring-tcp-common/build.gradle similarity index 100% rename from common/tcp-common/build.gradle rename to common/spring-tcp-common/build.gradle diff --git a/common/tcp-common/src/main/java/org/springframework/cloud/fn/common/tcp/EncoderDecoderFactoryBean.java b/common/spring-tcp-common/src/main/java/org/springframework/cloud/fn/common/tcp/EncoderDecoderFactoryBean.java similarity index 100% rename from common/tcp-common/src/main/java/org/springframework/cloud/fn/common/tcp/EncoderDecoderFactoryBean.java rename to common/spring-tcp-common/src/main/java/org/springframework/cloud/fn/common/tcp/EncoderDecoderFactoryBean.java diff --git a/common/tcp-common/src/main/java/org/springframework/cloud/fn/common/tcp/Encoding.java b/common/spring-tcp-common/src/main/java/org/springframework/cloud/fn/common/tcp/Encoding.java similarity index 100% rename from common/tcp-common/src/main/java/org/springframework/cloud/fn/common/tcp/Encoding.java rename to common/spring-tcp-common/src/main/java/org/springframework/cloud/fn/common/tcp/Encoding.java diff --git a/common/tcp-common/src/main/java/org/springframework/cloud/fn/common/tcp/TcpConnectionFactoryProperties.java b/common/spring-tcp-common/src/main/java/org/springframework/cloud/fn/common/tcp/TcpConnectionFactoryProperties.java similarity index 100% rename from common/tcp-common/src/main/java/org/springframework/cloud/fn/common/tcp/TcpConnectionFactoryProperties.java rename to common/spring-tcp-common/src/main/java/org/springframework/cloud/fn/common/tcp/TcpConnectionFactoryProperties.java diff --git a/common/tensorflow-common/README.adoc b/common/spring-tensorflow-common/README.adoc similarity index 100% rename from common/tensorflow-common/README.adoc rename to common/spring-tensorflow-common/README.adoc diff --git a/common/tensorflow-common/build.gradle b/common/spring-tensorflow-common/build.gradle similarity index 100% rename from common/tensorflow-common/build.gradle rename to common/spring-tensorflow-common/build.gradle diff --git a/common/tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/AbstractGraphRunner.java b/common/spring-tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/AbstractGraphRunner.java similarity index 100% rename from common/tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/AbstractGraphRunner.java rename to common/spring-tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/AbstractGraphRunner.java diff --git a/common/tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/AutoCloseableSession.java b/common/spring-tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/AutoCloseableSession.java similarity index 100% rename from common/tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/AutoCloseableSession.java rename to common/spring-tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/AutoCloseableSession.java diff --git a/common/tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/Functions.java b/common/spring-tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/Functions.java similarity index 100% rename from common/tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/Functions.java rename to common/spring-tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/Functions.java diff --git a/common/tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/GraphDefinition.java b/common/spring-tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/GraphDefinition.java similarity index 100% rename from common/tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/GraphDefinition.java rename to common/spring-tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/GraphDefinition.java diff --git a/common/tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/GraphRunner.java b/common/spring-tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/GraphRunner.java similarity index 100% rename from common/tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/GraphRunner.java rename to common/spring-tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/GraphRunner.java diff --git a/common/tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/GraphRunnerMemory.java b/common/spring-tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/GraphRunnerMemory.java similarity index 100% rename from common/tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/GraphRunnerMemory.java rename to common/spring-tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/GraphRunnerMemory.java diff --git a/common/tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/ProtoBufGraphDefinition.java b/common/spring-tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/ProtoBufGraphDefinition.java similarity index 100% rename from common/tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/ProtoBufGraphDefinition.java rename to common/spring-tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/ProtoBufGraphDefinition.java diff --git a/common/tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/deprecated/GraphicsUtils.java b/common/spring-tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/deprecated/GraphicsUtils.java similarity index 100% rename from common/tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/deprecated/GraphicsUtils.java rename to common/spring-tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/deprecated/GraphicsUtils.java diff --git a/common/tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/deprecated/JsonMapperFunction.java b/common/spring-tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/deprecated/JsonMapperFunction.java similarity index 100% rename from common/tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/deprecated/JsonMapperFunction.java rename to common/spring-tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/deprecated/JsonMapperFunction.java diff --git a/common/tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/deprecated/TensorFlowService.java b/common/spring-tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/deprecated/TensorFlowService.java similarity index 100% rename from common/tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/deprecated/TensorFlowService.java rename to common/spring-tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/deprecated/TensorFlowService.java diff --git a/common/tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/util/AutoCloseables.java b/common/spring-tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/util/AutoCloseables.java similarity index 100% rename from common/tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/util/AutoCloseables.java rename to common/spring-tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/util/AutoCloseables.java diff --git a/common/tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/util/CachedModelExtractor.java b/common/spring-tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/util/CachedModelExtractor.java similarity index 100% rename from common/tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/util/CachedModelExtractor.java rename to common/spring-tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/util/CachedModelExtractor.java diff --git a/common/tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/util/ModelExtractor.java b/common/spring-tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/util/ModelExtractor.java similarity index 100% rename from common/tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/util/ModelExtractor.java rename to common/spring-tensorflow-common/src/main/java/org/springframework/cloud/fn/common/tensorflow/util/ModelExtractor.java diff --git a/common/tensorflow-common/src/main/resources/images/programming_model.png b/common/spring-tensorflow-common/src/main/resources/images/programming_model.png similarity index 100% rename from common/tensorflow-common/src/main/resources/images/programming_model.png rename to common/spring-tensorflow-common/src/main/resources/images/programming_model.png diff --git a/common/tensorflow-common/src/main/resources/images/tf_pipeline.png b/common/spring-tensorflow-common/src/main/resources/images/tf_pipeline.png similarity index 100% rename from common/tensorflow-common/src/main/resources/images/tf_pipeline.png rename to common/spring-tensorflow-common/src/main/resources/images/tf_pipeline.png diff --git a/common/tensorflow-common/src/test/java/org/springframework/cloud/fn/common/tensorflow/EnrichFromMemory.java b/common/spring-tensorflow-common/src/test/java/org/springframework/cloud/fn/common/tensorflow/EnrichFromMemory.java similarity index 100% rename from common/tensorflow-common/src/test/java/org/springframework/cloud/fn/common/tensorflow/EnrichFromMemory.java rename to common/spring-tensorflow-common/src/test/java/org/springframework/cloud/fn/common/tensorflow/EnrichFromMemory.java diff --git a/common/tensorflow-common/src/test/java/org/springframework/cloud/fn/common/tensorflow/FunctionComposition.java b/common/spring-tensorflow-common/src/test/java/org/springframework/cloud/fn/common/tensorflow/FunctionComposition.java similarity index 100% rename from common/tensorflow-common/src/test/java/org/springframework/cloud/fn/common/tensorflow/FunctionComposition.java rename to common/spring-tensorflow-common/src/test/java/org/springframework/cloud/fn/common/tensorflow/FunctionComposition.java diff --git a/common/tensorflow-common/src/test/java/org/springframework/cloud/fn/common/tensorflow/FunctionCompositionMultipleInputsOutputs.java b/common/spring-tensorflow-common/src/test/java/org/springframework/cloud/fn/common/tensorflow/FunctionCompositionMultipleInputsOutputs.java similarity index 100% rename from common/tensorflow-common/src/test/java/org/springframework/cloud/fn/common/tensorflow/FunctionCompositionMultipleInputsOutputs.java rename to common/spring-tensorflow-common/src/test/java/org/springframework/cloud/fn/common/tensorflow/FunctionCompositionMultipleInputsOutputs.java diff --git a/common/tensorflow-common/src/test/java/org/springframework/cloud/fn/common/tensorflow/ReleaseTensorParameters.java b/common/spring-tensorflow-common/src/test/java/org/springframework/cloud/fn/common/tensorflow/ReleaseTensorParameters.java similarity index 100% rename from common/tensorflow-common/src/test/java/org/springframework/cloud/fn/common/tensorflow/ReleaseTensorParameters.java rename to common/spring-tensorflow-common/src/test/java/org/springframework/cloud/fn/common/tensorflow/ReleaseTensorParameters.java diff --git a/common/twitter-common/build.gradle b/common/spring-twitter-common/build.gradle similarity index 100% rename from common/twitter-common/build.gradle rename to common/spring-twitter-common/build.gradle diff --git a/common/twitter-common/src/main/java/org/springframework/cloud/fn/common/twitter/Cursor.java b/common/spring-twitter-common/src/main/java/org/springframework/cloud/fn/common/twitter/Cursor.java similarity index 100% rename from common/twitter-common/src/main/java/org/springframework/cloud/fn/common/twitter/Cursor.java rename to common/spring-twitter-common/src/main/java/org/springframework/cloud/fn/common/twitter/Cursor.java diff --git a/common/twitter-common/src/main/java/org/springframework/cloud/fn/common/twitter/TwitterConnectionConfiguration.java b/common/spring-twitter-common/src/main/java/org/springframework/cloud/fn/common/twitter/TwitterConnectionConfiguration.java similarity index 100% rename from common/twitter-common/src/main/java/org/springframework/cloud/fn/common/twitter/TwitterConnectionConfiguration.java rename to common/spring-twitter-common/src/main/java/org/springframework/cloud/fn/common/twitter/TwitterConnectionConfiguration.java diff --git a/common/twitter-common/src/main/java/org/springframework/cloud/fn/common/twitter/TwitterConnectionProperties.java b/common/spring-twitter-common/src/main/java/org/springframework/cloud/fn/common/twitter/TwitterConnectionProperties.java similarity index 100% rename from common/twitter-common/src/main/java/org/springframework/cloud/fn/common/twitter/TwitterConnectionProperties.java rename to common/spring-twitter-common/src/main/java/org/springframework/cloud/fn/common/twitter/TwitterConnectionProperties.java diff --git a/common/twitter-common/src/main/java/org/springframework/cloud/fn/common/twitter/util/TwitterTestUtils.java b/common/spring-twitter-common/src/main/java/org/springframework/cloud/fn/common/twitter/util/TwitterTestUtils.java similarity index 100% rename from common/twitter-common/src/main/java/org/springframework/cloud/fn/common/twitter/util/TwitterTestUtils.java rename to common/spring-twitter-common/src/main/java/org/springframework/cloud/fn/common/twitter/util/TwitterTestUtils.java diff --git a/common/xmpp-common/build.gradle b/common/spring-xmpp-common/build.gradle similarity index 100% rename from common/xmpp-common/build.gradle rename to common/spring-xmpp-common/build.gradle diff --git a/common/xmpp-common/src/main/java/org/springframework/cloud/fn/common/xmpp/XmppConnectionFactoryConfiguration.java b/common/spring-xmpp-common/src/main/java/org/springframework/cloud/fn/common/xmpp/XmppConnectionFactoryConfiguration.java similarity index 100% rename from common/xmpp-common/src/main/java/org/springframework/cloud/fn/common/xmpp/XmppConnectionFactoryConfiguration.java rename to common/spring-xmpp-common/src/main/java/org/springframework/cloud/fn/common/xmpp/XmppConnectionFactoryConfiguration.java diff --git a/common/xmpp-common/src/main/java/org/springframework/cloud/fn/common/xmpp/XmppConnectionFactoryProperties.java b/common/spring-xmpp-common/src/main/java/org/springframework/cloud/fn/common/xmpp/XmppConnectionFactoryProperties.java similarity index 100% rename from common/xmpp-common/src/main/java/org/springframework/cloud/fn/common/xmpp/XmppConnectionFactoryProperties.java rename to common/spring-xmpp-common/src/main/java/org/springframework/cloud/fn/common/xmpp/XmppConnectionFactoryProperties.java diff --git a/consumer/ftp-consumer/build.gradle b/consumer/ftp-consumer/build.gradle deleted file mode 100644 index fbfc323d..00000000 --- a/consumer/ftp-consumer/build.gradle +++ /dev/null @@ -1,6 +0,0 @@ -dependencies { - api project(':ftp-common') - - testImplementation project(':function-test-support') - testImplementation ftpserverCore -} diff --git a/consumer/mqtt-consumer/build.gradle b/consumer/mqtt-consumer/build.gradle deleted file mode 100644 index 44adc921..00000000 --- a/consumer/mqtt-consumer/build.gradle +++ /dev/null @@ -1,3 +0,0 @@ -dependencies { - api project(':mqtt-common') -} diff --git a/consumer/analytics-consumer/README.adoc b/consumer/spring-analytics-consumer/README.adoc similarity index 100% rename from consumer/analytics-consumer/README.adoc rename to consumer/spring-analytics-consumer/README.adoc diff --git a/consumer/analytics-consumer/build.gradle b/consumer/spring-analytics-consumer/build.gradle similarity index 79% rename from consumer/analytics-consumer/build.gradle rename to consumer/spring-analytics-consumer/build.gradle index c0feb350..cd4fa6d5 100644 --- a/consumer/analytics-consumer/build.gradle +++ b/consumer/spring-analytics-consumer/build.gradle @@ -1,5 +1,5 @@ dependencies { - api project(':payload-converter-function') + api project(':spring-payload-converter-function') api 'io.micrometer:micrometer-core' testImplementation 'org.springframework.boot:spring-boot-starter-actuator' diff --git a/consumer/analytics-consumer/src/main/java/org/springframework/cloud/fn/consumer/analytics/AnalyticsConsumerConfiguration.java b/consumer/spring-analytics-consumer/src/main/java/org/springframework/cloud/fn/consumer/analytics/AnalyticsConsumerConfiguration.java similarity index 100% rename from consumer/analytics-consumer/src/main/java/org/springframework/cloud/fn/consumer/analytics/AnalyticsConsumerConfiguration.java rename to consumer/spring-analytics-consumer/src/main/java/org/springframework/cloud/fn/consumer/analytics/AnalyticsConsumerConfiguration.java diff --git a/consumer/analytics-consumer/src/main/java/org/springframework/cloud/fn/consumer/analytics/AnalyticsConsumerProperties.java b/consumer/spring-analytics-consumer/src/main/java/org/springframework/cloud/fn/consumer/analytics/AnalyticsConsumerProperties.java similarity index 100% rename from consumer/analytics-consumer/src/main/java/org/springframework/cloud/fn/consumer/analytics/AnalyticsConsumerProperties.java rename to consumer/spring-analytics-consumer/src/main/java/org/springframework/cloud/fn/consumer/analytics/AnalyticsConsumerProperties.java diff --git a/consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/AnalyticsConsumerParentTest.java b/consumer/spring-analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/AnalyticsConsumerParentTest.java similarity index 100% rename from consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/AnalyticsConsumerParentTest.java rename to consumer/spring-analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/AnalyticsConsumerParentTest.java diff --git a/consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/CountWithAmountTest.java b/consumer/spring-analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/CountWithAmountTest.java similarity index 100% rename from consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/CountWithAmountTest.java rename to consumer/spring-analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/CountWithAmountTest.java diff --git a/consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/EmptyTagsTests.java b/consumer/spring-analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/EmptyTagsTests.java similarity index 100% rename from consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/EmptyTagsTests.java rename to consumer/spring-analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/EmptyTagsTests.java diff --git a/consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/ExpressionCounterNameTests.java b/consumer/spring-analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/ExpressionCounterNameTests.java similarity index 100% rename from consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/ExpressionCounterNameTests.java rename to consumer/spring-analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/ExpressionCounterNameTests.java diff --git a/consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/FixedTagsTests.java b/consumer/spring-analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/FixedTagsTests.java similarity index 100% rename from consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/FixedTagsTests.java rename to consumer/spring-analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/FixedTagsTests.java diff --git a/consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/GaugeWithAmountTest.java b/consumer/spring-analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/GaugeWithAmountTest.java similarity index 100% rename from consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/GaugeWithAmountTest.java rename to consumer/spring-analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/GaugeWithAmountTest.java diff --git a/consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/LiteralTagExpressionsTests.java b/consumer/spring-analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/LiteralTagExpressionsTests.java similarity index 100% rename from consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/LiteralTagExpressionsTests.java rename to consumer/spring-analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/LiteralTagExpressionsTests.java diff --git a/consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/NullTagsTests.java b/consumer/spring-analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/NullTagsTests.java similarity index 100% rename from consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/NullTagsTests.java rename to consumer/spring-analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/NullTagsTests.java diff --git a/consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/StockExchangeAnalyticsTests.java b/consumer/spring-analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/StockExchangeAnalyticsTests.java similarity index 100% rename from consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/StockExchangeAnalyticsTests.java rename to consumer/spring-analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/StockExchangeAnalyticsTests.java diff --git a/consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/demo/StockExchangeAnalyticsExample.java b/consumer/spring-analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/demo/StockExchangeAnalyticsExample.java similarity index 100% rename from consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/demo/StockExchangeAnalyticsExample.java rename to consumer/spring-analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/demo/StockExchangeAnalyticsExample.java diff --git a/consumer/analytics-consumer/src/test/resources/data/stock_appl.json b/consumer/spring-analytics-consumer/src/test/resources/data/stock_appl.json similarity index 100% rename from consumer/analytics-consumer/src/test/resources/data/stock_appl.json rename to consumer/spring-analytics-consumer/src/test/resources/data/stock_appl.json diff --git a/consumer/analytics-consumer/src/test/resources/data/stock_vmw.json b/consumer/spring-analytics-consumer/src/test/resources/data/stock_vmw.json similarity index 100% rename from consumer/analytics-consumer/src/test/resources/data/stock_vmw.json rename to consumer/spring-analytics-consumer/src/test/resources/data/stock_vmw.json diff --git a/consumer/cassandra-consumer/README.adoc b/consumer/spring-cassandra-consumer/README.adoc similarity index 100% rename from consumer/cassandra-consumer/README.adoc rename to consumer/spring-cassandra-consumer/README.adoc diff --git a/consumer/cassandra-consumer/build.gradle b/consumer/spring-cassandra-consumer/build.gradle similarity index 100% rename from consumer/cassandra-consumer/build.gradle rename to consumer/spring-cassandra-consumer/build.gradle diff --git a/consumer/cassandra-consumer/src/main/java/org/springframework/cloud/fn/consumer/cassandra/CassandraConsumerConfiguration.java b/consumer/spring-cassandra-consumer/src/main/java/org/springframework/cloud/fn/consumer/cassandra/CassandraConsumerConfiguration.java similarity index 100% rename from consumer/cassandra-consumer/src/main/java/org/springframework/cloud/fn/consumer/cassandra/CassandraConsumerConfiguration.java rename to consumer/spring-cassandra-consumer/src/main/java/org/springframework/cloud/fn/consumer/cassandra/CassandraConsumerConfiguration.java diff --git a/consumer/cassandra-consumer/src/main/java/org/springframework/cloud/fn/consumer/cassandra/CassandraConsumerProperties.java b/consumer/spring-cassandra-consumer/src/main/java/org/springframework/cloud/fn/consumer/cassandra/CassandraConsumerProperties.java similarity index 100% rename from consumer/cassandra-consumer/src/main/java/org/springframework/cloud/fn/consumer/cassandra/CassandraConsumerProperties.java rename to consumer/spring-cassandra-consumer/src/main/java/org/springframework/cloud/fn/consumer/cassandra/CassandraConsumerProperties.java diff --git a/consumer/cassandra-consumer/src/main/java/org/springframework/cloud/fn/consumer/cassandra/cluster/CassandraAppClusterConfiguration.java b/consumer/spring-cassandra-consumer/src/main/java/org/springframework/cloud/fn/consumer/cassandra/cluster/CassandraAppClusterConfiguration.java similarity index 100% rename from consumer/cassandra-consumer/src/main/java/org/springframework/cloud/fn/consumer/cassandra/cluster/CassandraAppClusterConfiguration.java rename to consumer/spring-cassandra-consumer/src/main/java/org/springframework/cloud/fn/consumer/cassandra/cluster/CassandraAppClusterConfiguration.java diff --git a/consumer/cassandra-consumer/src/main/java/org/springframework/cloud/fn/consumer/cassandra/cluster/CassandraClusterProperties.java b/consumer/spring-cassandra-consumer/src/main/java/org/springframework/cloud/fn/consumer/cassandra/cluster/CassandraClusterProperties.java similarity index 100% rename from consumer/cassandra-consumer/src/main/java/org/springframework/cloud/fn/consumer/cassandra/cluster/CassandraClusterProperties.java rename to consumer/spring-cassandra-consumer/src/main/java/org/springframework/cloud/fn/consumer/cassandra/cluster/CassandraClusterProperties.java diff --git a/consumer/cassandra-consumer/src/main/java/org/springframework/cloud/fn/consumer/cassandra/cluster/TrustAllSSLContextFactory.java b/consumer/spring-cassandra-consumer/src/main/java/org/springframework/cloud/fn/consumer/cassandra/cluster/TrustAllSSLContextFactory.java similarity index 100% rename from consumer/cassandra-consumer/src/main/java/org/springframework/cloud/fn/consumer/cassandra/cluster/TrustAllSSLContextFactory.java rename to consumer/spring-cassandra-consumer/src/main/java/org/springframework/cloud/fn/consumer/cassandra/cluster/TrustAllSSLContextFactory.java diff --git a/consumer/cassandra-consumer/src/main/java/org/springframework/cloud/fn/consumer/cassandra/query/ColumnNameExtractor.java b/consumer/spring-cassandra-consumer/src/main/java/org/springframework/cloud/fn/consumer/cassandra/query/ColumnNameExtractor.java similarity index 100% rename from consumer/cassandra-consumer/src/main/java/org/springframework/cloud/fn/consumer/cassandra/query/ColumnNameExtractor.java rename to consumer/spring-cassandra-consumer/src/main/java/org/springframework/cloud/fn/consumer/cassandra/query/ColumnNameExtractor.java diff --git a/consumer/cassandra-consumer/src/main/java/org/springframework/cloud/fn/consumer/cassandra/query/InsertQueryColumnNameExtractor.java b/consumer/spring-cassandra-consumer/src/main/java/org/springframework/cloud/fn/consumer/cassandra/query/InsertQueryColumnNameExtractor.java similarity index 100% rename from consumer/cassandra-consumer/src/main/java/org/springframework/cloud/fn/consumer/cassandra/query/InsertQueryColumnNameExtractor.java rename to consumer/spring-cassandra-consumer/src/main/java/org/springframework/cloud/fn/consumer/cassandra/query/InsertQueryColumnNameExtractor.java diff --git a/consumer/cassandra-consumer/src/main/java/org/springframework/cloud/fn/consumer/cassandra/query/UpdateQueryColumnNameExtractor.java b/consumer/spring-cassandra-consumer/src/main/java/org/springframework/cloud/fn/consumer/cassandra/query/UpdateQueryColumnNameExtractor.java similarity index 100% rename from consumer/cassandra-consumer/src/main/java/org/springframework/cloud/fn/consumer/cassandra/query/UpdateQueryColumnNameExtractor.java rename to consumer/spring-cassandra-consumer/src/main/java/org/springframework/cloud/fn/consumer/cassandra/query/UpdateQueryColumnNameExtractor.java diff --git a/consumer/cassandra-consumer/src/main/resources/application.properties b/consumer/spring-cassandra-consumer/src/main/resources/application.properties similarity index 100% rename from consumer/cassandra-consumer/src/main/resources/application.properties rename to consumer/spring-cassandra-consumer/src/main/resources/application.properties diff --git a/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraConsumerApplicationTests.java b/consumer/spring-cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraConsumerApplicationTests.java similarity index 100% rename from consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraConsumerApplicationTests.java rename to consumer/spring-cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraConsumerApplicationTests.java diff --git a/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraContainerTest.java b/consumer/spring-cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraContainerTest.java similarity index 100% rename from consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraContainerTest.java rename to consumer/spring-cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraContainerTest.java diff --git a/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraEntityInsertTests.java b/consumer/spring-cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraEntityInsertTests.java similarity index 100% rename from consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraEntityInsertTests.java rename to consumer/spring-cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraEntityInsertTests.java diff --git a/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraIngestInsertTests.java b/consumer/spring-cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraIngestInsertTests.java similarity index 100% rename from consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraIngestInsertTests.java rename to consumer/spring-cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraIngestInsertTests.java diff --git a/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraIngestNamedParamsTests.java b/consumer/spring-cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraIngestNamedParamsTests.java similarity index 100% rename from consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraIngestNamedParamsTests.java rename to consumer/spring-cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraIngestNamedParamsTests.java diff --git a/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraIngestUpdateTests.java b/consumer/spring-cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraIngestUpdateTests.java similarity index 100% rename from consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraIngestUpdateTests.java rename to consumer/spring-cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/CassandraIngestUpdateTests.java diff --git a/consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/domain/Book.java b/consumer/spring-cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/domain/Book.java similarity index 100% rename from consumer/cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/domain/Book.java rename to consumer/spring-cassandra-consumer/src/test/java/org/springframework/cloud/fn/consumer/cassandra/domain/Book.java diff --git a/consumer/cassandra-consumer/src/test/resources/init-db.cql b/consumer/spring-cassandra-consumer/src/test/resources/init-db.cql similarity index 100% rename from consumer/cassandra-consumer/src/test/resources/init-db.cql rename to consumer/spring-cassandra-consumer/src/test/resources/init-db.cql diff --git a/consumer/elasticsearch-consumer/README.adoc b/consumer/spring-elasticsearch-consumer/README.adoc similarity index 100% rename from consumer/elasticsearch-consumer/README.adoc rename to consumer/spring-elasticsearch-consumer/README.adoc diff --git a/consumer/elasticsearch-consumer/build.gradle b/consumer/spring-elasticsearch-consumer/build.gradle similarity index 73% rename from consumer/elasticsearch-consumer/build.gradle rename to consumer/spring-elasticsearch-consumer/build.gradle index 55fe5937..22b9a86d 100644 --- a/consumer/elasticsearch-consumer/build.gradle +++ b/consumer/spring-elasticsearch-consumer/build.gradle @@ -1,5 +1,5 @@ dependencies { - api project(':payload-converter-function') + api project(':spring-payload-converter-function') api 'org.springframework.boot:spring-boot-starter-data-elasticsearch' testImplementation 'org.testcontainers:elasticsearch' diff --git a/consumer/elasticsearch-consumer/src/main/java/org/springframework/cloud/fn/consumer/elasticsearch/ElasticsearchConsumerConfiguration.java b/consumer/spring-elasticsearch-consumer/src/main/java/org/springframework/cloud/fn/consumer/elasticsearch/ElasticsearchConsumerConfiguration.java similarity index 100% rename from consumer/elasticsearch-consumer/src/main/java/org/springframework/cloud/fn/consumer/elasticsearch/ElasticsearchConsumerConfiguration.java rename to consumer/spring-elasticsearch-consumer/src/main/java/org/springframework/cloud/fn/consumer/elasticsearch/ElasticsearchConsumerConfiguration.java diff --git a/consumer/elasticsearch-consumer/src/main/java/org/springframework/cloud/fn/consumer/elasticsearch/ElasticsearchConsumerProperties.java b/consumer/spring-elasticsearch-consumer/src/main/java/org/springframework/cloud/fn/consumer/elasticsearch/ElasticsearchConsumerProperties.java similarity index 100% rename from consumer/elasticsearch-consumer/src/main/java/org/springframework/cloud/fn/consumer/elasticsearch/ElasticsearchConsumerProperties.java rename to consumer/spring-elasticsearch-consumer/src/main/java/org/springframework/cloud/fn/consumer/elasticsearch/ElasticsearchConsumerProperties.java diff --git a/consumer/elasticsearch-consumer/src/test/java/org/springframework/cloud/fn/consumer/elasticsearch/ElasticsearchConsumerApplicationTests.java b/consumer/spring-elasticsearch-consumer/src/test/java/org/springframework/cloud/fn/consumer/elasticsearch/ElasticsearchConsumerApplicationTests.java similarity index 100% rename from consumer/elasticsearch-consumer/src/test/java/org/springframework/cloud/fn/consumer/elasticsearch/ElasticsearchConsumerApplicationTests.java rename to consumer/spring-elasticsearch-consumer/src/test/java/org/springframework/cloud/fn/consumer/elasticsearch/ElasticsearchConsumerApplicationTests.java diff --git a/consumer/elasticsearch-consumer/src/test/resources/logback.xml b/consumer/spring-elasticsearch-consumer/src/test/resources/logback.xml similarity index 100% rename from consumer/elasticsearch-consumer/src/test/resources/logback.xml rename to consumer/spring-elasticsearch-consumer/src/test/resources/logback.xml diff --git a/consumer/file-consumer/README.adoc b/consumer/spring-file-consumer/README.adoc similarity index 100% rename from consumer/file-consumer/README.adoc rename to consumer/spring-file-consumer/README.adoc diff --git a/consumer/file-consumer/build.gradle b/consumer/spring-file-consumer/build.gradle similarity index 100% rename from consumer/file-consumer/build.gradle rename to consumer/spring-file-consumer/build.gradle diff --git a/consumer/file-consumer/src/main/java/org/springframework/cloud/fn/consumer/file/FileConsumerConfiguration.java b/consumer/spring-file-consumer/src/main/java/org/springframework/cloud/fn/consumer/file/FileConsumerConfiguration.java similarity index 100% rename from consumer/file-consumer/src/main/java/org/springframework/cloud/fn/consumer/file/FileConsumerConfiguration.java rename to consumer/spring-file-consumer/src/main/java/org/springframework/cloud/fn/consumer/file/FileConsumerConfiguration.java diff --git a/consumer/file-consumer/src/main/java/org/springframework/cloud/fn/consumer/file/FileConsumerProperties.java b/consumer/spring-file-consumer/src/main/java/org/springframework/cloud/fn/consumer/file/FileConsumerProperties.java similarity index 100% rename from consumer/file-consumer/src/main/java/org/springframework/cloud/fn/consumer/file/FileConsumerProperties.java rename to consumer/spring-file-consumer/src/main/java/org/springframework/cloud/fn/consumer/file/FileConsumerProperties.java diff --git a/consumer/file-consumer/src/test/java/org/springframework/cloud/fn/consumer/file/AbstractFileConsumerTests.java b/consumer/spring-file-consumer/src/test/java/org/springframework/cloud/fn/consumer/file/AbstractFileConsumerTests.java similarity index 100% rename from consumer/file-consumer/src/test/java/org/springframework/cloud/fn/consumer/file/AbstractFileConsumerTests.java rename to consumer/spring-file-consumer/src/test/java/org/springframework/cloud/fn/consumer/file/AbstractFileConsumerTests.java diff --git a/consumer/file-consumer/src/test/java/org/springframework/cloud/fn/consumer/file/BinaryFileTests.java b/consumer/spring-file-consumer/src/test/java/org/springframework/cloud/fn/consumer/file/BinaryFileTests.java similarity index 100% rename from consumer/file-consumer/src/test/java/org/springframework/cloud/fn/consumer/file/BinaryFileTests.java rename to consumer/spring-file-consumer/src/test/java/org/springframework/cloud/fn/consumer/file/BinaryFileTests.java diff --git a/consumer/file-consumer/src/test/java/org/springframework/cloud/fn/consumer/file/ExpressionTests.java b/consumer/spring-file-consumer/src/test/java/org/springframework/cloud/fn/consumer/file/ExpressionTests.java similarity index 100% rename from consumer/file-consumer/src/test/java/org/springframework/cloud/fn/consumer/file/ExpressionTests.java rename to consumer/spring-file-consumer/src/test/java/org/springframework/cloud/fn/consumer/file/ExpressionTests.java diff --git a/consumer/file-consumer/src/test/java/org/springframework/cloud/fn/consumer/file/TextFileTests.java b/consumer/spring-file-consumer/src/test/java/org/springframework/cloud/fn/consumer/file/TextFileTests.java similarity index 100% rename from consumer/file-consumer/src/test/java/org/springframework/cloud/fn/consumer/file/TextFileTests.java rename to consumer/spring-file-consumer/src/test/java/org/springframework/cloud/fn/consumer/file/TextFileTests.java diff --git a/consumer/ftp-consumer/README.adoc b/consumer/spring-ftp-consumer/README.adoc similarity index 100% rename from consumer/ftp-consumer/README.adoc rename to consumer/spring-ftp-consumer/README.adoc diff --git a/consumer/spring-ftp-consumer/build.gradle b/consumer/spring-ftp-consumer/build.gradle new file mode 100644 index 00000000..56e4dde3 --- /dev/null +++ b/consumer/spring-ftp-consumer/build.gradle @@ -0,0 +1,6 @@ +dependencies { + api project(':spring-ftp-common') + + testImplementation project(':spring-function-test-support') + testImplementation ftpserverCore +} diff --git a/consumer/ftp-consumer/src/main/java/org/springframework/cloud/fn/consumer/ftp/FtpConsumerConfiguration.java b/consumer/spring-ftp-consumer/src/main/java/org/springframework/cloud/fn/consumer/ftp/FtpConsumerConfiguration.java similarity index 100% rename from consumer/ftp-consumer/src/main/java/org/springframework/cloud/fn/consumer/ftp/FtpConsumerConfiguration.java rename to consumer/spring-ftp-consumer/src/main/java/org/springframework/cloud/fn/consumer/ftp/FtpConsumerConfiguration.java diff --git a/consumer/ftp-consumer/src/main/java/org/springframework/cloud/fn/consumer/ftp/FtpConsumerProperties.java b/consumer/spring-ftp-consumer/src/main/java/org/springframework/cloud/fn/consumer/ftp/FtpConsumerProperties.java similarity index 100% rename from consumer/ftp-consumer/src/main/java/org/springframework/cloud/fn/consumer/ftp/FtpConsumerProperties.java rename to consumer/spring-ftp-consumer/src/main/java/org/springframework/cloud/fn/consumer/ftp/FtpConsumerProperties.java diff --git a/consumer/ftp-consumer/src/test/java/org/springframework/cloud/fn/consumer/ftp/FtpConsumerPropertiesTests.java b/consumer/spring-ftp-consumer/src/test/java/org/springframework/cloud/fn/consumer/ftp/FtpConsumerPropertiesTests.java similarity index 100% rename from consumer/ftp-consumer/src/test/java/org/springframework/cloud/fn/consumer/ftp/FtpConsumerPropertiesTests.java rename to consumer/spring-ftp-consumer/src/test/java/org/springframework/cloud/fn/consumer/ftp/FtpConsumerPropertiesTests.java diff --git a/consumer/ftp-consumer/src/test/java/org/springframework/cloud/fn/consumer/ftp/FtpConsumerTests.java b/consumer/spring-ftp-consumer/src/test/java/org/springframework/cloud/fn/consumer/ftp/FtpConsumerTests.java similarity index 100% rename from consumer/ftp-consumer/src/test/java/org/springframework/cloud/fn/consumer/ftp/FtpConsumerTests.java rename to consumer/spring-ftp-consumer/src/test/java/org/springframework/cloud/fn/consumer/ftp/FtpConsumerTests.java diff --git a/consumer/jdbc-consumer/README.adoc b/consumer/spring-jdbc-consumer/README.adoc similarity index 100% rename from consumer/jdbc-consumer/README.adoc rename to consumer/spring-jdbc-consumer/README.adoc diff --git a/consumer/jdbc-consumer/build.gradle b/consumer/spring-jdbc-consumer/build.gradle similarity index 100% rename from consumer/jdbc-consumer/build.gradle rename to consumer/spring-jdbc-consumer/build.gradle diff --git a/consumer/jdbc-consumer/src/main/java/org/springframework/cloud/fn/consumer/jdbc/DefaultInitializationScriptResource.java b/consumer/spring-jdbc-consumer/src/main/java/org/springframework/cloud/fn/consumer/jdbc/DefaultInitializationScriptResource.java similarity index 100% rename from consumer/jdbc-consumer/src/main/java/org/springframework/cloud/fn/consumer/jdbc/DefaultInitializationScriptResource.java rename to consumer/spring-jdbc-consumer/src/main/java/org/springframework/cloud/fn/consumer/jdbc/DefaultInitializationScriptResource.java diff --git a/consumer/jdbc-consumer/src/main/java/org/springframework/cloud/fn/consumer/jdbc/JdbcConsumerConfiguration.java b/consumer/spring-jdbc-consumer/src/main/java/org/springframework/cloud/fn/consumer/jdbc/JdbcConsumerConfiguration.java similarity index 100% rename from consumer/jdbc-consumer/src/main/java/org/springframework/cloud/fn/consumer/jdbc/JdbcConsumerConfiguration.java rename to consumer/spring-jdbc-consumer/src/main/java/org/springframework/cloud/fn/consumer/jdbc/JdbcConsumerConfiguration.java diff --git a/consumer/jdbc-consumer/src/main/java/org/springframework/cloud/fn/consumer/jdbc/JdbcConsumerProperties.java b/consumer/spring-jdbc-consumer/src/main/java/org/springframework/cloud/fn/consumer/jdbc/JdbcConsumerProperties.java similarity index 100% rename from consumer/jdbc-consumer/src/main/java/org/springframework/cloud/fn/consumer/jdbc/JdbcConsumerProperties.java rename to consumer/spring-jdbc-consumer/src/main/java/org/springframework/cloud/fn/consumer/jdbc/JdbcConsumerProperties.java diff --git a/consumer/jdbc-consumer/src/main/java/org/springframework/cloud/fn/consumer/jdbc/ShorthandMapConverter.java b/consumer/spring-jdbc-consumer/src/main/java/org/springframework/cloud/fn/consumer/jdbc/ShorthandMapConverter.java similarity index 100% rename from consumer/jdbc-consumer/src/main/java/org/springframework/cloud/fn/consumer/jdbc/ShorthandMapConverter.java rename to consumer/spring-jdbc-consumer/src/main/java/org/springframework/cloud/fn/consumer/jdbc/ShorthandMapConverter.java diff --git a/consumer/jdbc-consumer/src/main/resources/application.properties b/consumer/spring-jdbc-consumer/src/main/resources/application.properties similarity index 100% rename from consumer/jdbc-consumer/src/main/resources/application.properties rename to consumer/spring-jdbc-consumer/src/main/resources/application.properties diff --git a/consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/BatchInsertTimeoutTests.java b/consumer/spring-jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/BatchInsertTimeoutTests.java similarity index 100% rename from consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/BatchInsertTimeoutTests.java rename to consumer/spring-jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/BatchInsertTimeoutTests.java diff --git a/consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/DataReceivedAsByteArrayTests.java b/consumer/spring-jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/DataReceivedAsByteArrayTests.java similarity index 100% rename from consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/DataReceivedAsByteArrayTests.java rename to consumer/spring-jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/DataReceivedAsByteArrayTests.java diff --git a/consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/ExplicitTableCreationTests.java b/consumer/spring-jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/ExplicitTableCreationTests.java similarity index 100% rename from consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/ExplicitTableCreationTests.java rename to consumer/spring-jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/ExplicitTableCreationTests.java diff --git a/consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/HeaderInsertTests.java b/consumer/spring-jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/HeaderInsertTests.java similarity index 100% rename from consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/HeaderInsertTests.java rename to consumer/spring-jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/HeaderInsertTests.java diff --git a/consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/ImplicitTableCreationTests.java b/consumer/spring-jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/ImplicitTableCreationTests.java similarity index 100% rename from consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/ImplicitTableCreationTests.java rename to consumer/spring-jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/ImplicitTableCreationTests.java diff --git a/consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/JdbcConsumerApplicationTests.java b/consumer/spring-jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/JdbcConsumerApplicationTests.java similarity index 100% rename from consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/JdbcConsumerApplicationTests.java rename to consumer/spring-jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/JdbcConsumerApplicationTests.java diff --git a/consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/JsonStringPayloadInsertTests.java b/consumer/spring-jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/JsonStringPayloadInsertTests.java similarity index 100% rename from consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/JsonStringPayloadInsertTests.java rename to consumer/spring-jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/JsonStringPayloadInsertTests.java diff --git a/consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/MapPayloadInsertTests.java b/consumer/spring-jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/MapPayloadInsertTests.java similarity index 100% rename from consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/MapPayloadInsertTests.java rename to consumer/spring-jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/MapPayloadInsertTests.java diff --git a/consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/SimpleBatchInsertTests.java b/consumer/spring-jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/SimpleBatchInsertTests.java similarity index 100% rename from consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/SimpleBatchInsertTests.java rename to consumer/spring-jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/SimpleBatchInsertTests.java diff --git a/consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/SimpleInsertTests.java b/consumer/spring-jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/SimpleInsertTests.java similarity index 100% rename from consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/SimpleInsertTests.java rename to consumer/spring-jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/SimpleInsertTests.java diff --git a/consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/SimpleMappingTests.java b/consumer/spring-jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/SimpleMappingTests.java similarity index 100% rename from consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/SimpleMappingTests.java rename to consumer/spring-jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/SimpleMappingTests.java diff --git a/consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/SpELTests.java b/consumer/spring-jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/SpELTests.java similarity index 100% rename from consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/SpELTests.java rename to consumer/spring-jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/SpELTests.java diff --git a/consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/UnqualifiableColumnExpressionTests.java b/consumer/spring-jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/UnqualifiableColumnExpressionTests.java similarity index 100% rename from consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/UnqualifiableColumnExpressionTests.java rename to consumer/spring-jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/UnqualifiableColumnExpressionTests.java diff --git a/consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/VaryingInsertTests.java b/consumer/spring-jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/VaryingInsertTests.java similarity index 100% rename from consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/VaryingInsertTests.java rename to consumer/spring-jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/VaryingInsertTests.java diff --git a/consumer/jdbc-consumer/src/test/resources/explicit-script.sql b/consumer/spring-jdbc-consumer/src/test/resources/explicit-script.sql similarity index 100% rename from consumer/jdbc-consumer/src/test/resources/explicit-script.sql rename to consumer/spring-jdbc-consumer/src/test/resources/explicit-script.sql diff --git a/consumer/jdbc-consumer/src/test/resources/schema.sql b/consumer/spring-jdbc-consumer/src/test/resources/schema.sql similarity index 100% rename from consumer/jdbc-consumer/src/test/resources/schema.sql rename to consumer/spring-jdbc-consumer/src/test/resources/schema.sql diff --git a/consumer/kafka-publisher/README.adoc b/consumer/spring-kafka-publisher/README.adoc similarity index 100% rename from consumer/kafka-publisher/README.adoc rename to consumer/spring-kafka-publisher/README.adoc diff --git a/consumer/kafka-publisher/build.gradle b/consumer/spring-kafka-publisher/build.gradle similarity index 100% rename from consumer/kafka-publisher/build.gradle rename to consumer/spring-kafka-publisher/build.gradle diff --git a/consumer/kafka-publisher/src/main/java/org/springframework/cloud/fn/consumer/kafka/KafkaPublisherConfiguration.java b/consumer/spring-kafka-publisher/src/main/java/org/springframework/cloud/fn/consumer/kafka/KafkaPublisherConfiguration.java similarity index 100% rename from consumer/kafka-publisher/src/main/java/org/springframework/cloud/fn/consumer/kafka/KafkaPublisherConfiguration.java rename to consumer/spring-kafka-publisher/src/main/java/org/springframework/cloud/fn/consumer/kafka/KafkaPublisherConfiguration.java diff --git a/consumer/kafka-publisher/src/main/java/org/springframework/cloud/fn/consumer/kafka/KafkaPublisherProperties.java b/consumer/spring-kafka-publisher/src/main/java/org/springframework/cloud/fn/consumer/kafka/KafkaPublisherProperties.java similarity index 100% rename from consumer/kafka-publisher/src/main/java/org/springframework/cloud/fn/consumer/kafka/KafkaPublisherProperties.java rename to consumer/spring-kafka-publisher/src/main/java/org/springframework/cloud/fn/consumer/kafka/KafkaPublisherProperties.java diff --git a/consumer/kafka-publisher/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/consumer/spring-kafka-publisher/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from consumer/kafka-publisher/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to consumer/spring-kafka-publisher/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/consumer/kafka-publisher/src/test/java/org/springframework/cloud/fn/consumer/kafka/KafkaPublisherConfigurationTests.java b/consumer/spring-kafka-publisher/src/test/java/org/springframework/cloud/fn/consumer/kafka/KafkaPublisherConfigurationTests.java similarity index 100% rename from consumer/kafka-publisher/src/test/java/org/springframework/cloud/fn/consumer/kafka/KafkaPublisherConfigurationTests.java rename to consumer/spring-kafka-publisher/src/test/java/org/springframework/cloud/fn/consumer/kafka/KafkaPublisherConfigurationTests.java diff --git a/consumer/log-consumer/README.adoc b/consumer/spring-log-consumer/README.adoc similarity index 100% rename from consumer/log-consumer/README.adoc rename to consumer/spring-log-consumer/README.adoc diff --git a/consumer/log-consumer/build.gradle b/consumer/spring-log-consumer/build.gradle similarity index 59% rename from consumer/log-consumer/build.gradle rename to consumer/spring-log-consumer/build.gradle index 5053202b..1a781289 100644 --- a/consumer/log-consumer/build.gradle +++ b/consumer/spring-log-consumer/build.gradle @@ -1,5 +1,5 @@ dependencies { - api project(':payload-converter-function') + api project(':spring-payload-converter-function') optionalApi 'org.hibernate.validator:hibernate-validator' } diff --git a/consumer/log-consumer/src/main/java/org/springframework/cloud/fn/consumer/log/LogConsumerConfiguration.java b/consumer/spring-log-consumer/src/main/java/org/springframework/cloud/fn/consumer/log/LogConsumerConfiguration.java similarity index 100% rename from consumer/log-consumer/src/main/java/org/springframework/cloud/fn/consumer/log/LogConsumerConfiguration.java rename to consumer/spring-log-consumer/src/main/java/org/springframework/cloud/fn/consumer/log/LogConsumerConfiguration.java diff --git a/consumer/log-consumer/src/main/java/org/springframework/cloud/fn/consumer/log/LogConsumerProperties.java b/consumer/spring-log-consumer/src/main/java/org/springframework/cloud/fn/consumer/log/LogConsumerProperties.java similarity index 100% rename from consumer/log-consumer/src/main/java/org/springframework/cloud/fn/consumer/log/LogConsumerProperties.java rename to consumer/spring-log-consumer/src/main/java/org/springframework/cloud/fn/consumer/log/LogConsumerProperties.java diff --git a/consumer/log-consumer/src/test/java/org/springframework/cloud/fn/consumer/log/LogConsumerApplicationTests.java b/consumer/spring-log-consumer/src/test/java/org/springframework/cloud/fn/consumer/log/LogConsumerApplicationTests.java similarity index 100% rename from consumer/log-consumer/src/test/java/org/springframework/cloud/fn/consumer/log/LogConsumerApplicationTests.java rename to consumer/spring-log-consumer/src/test/java/org/springframework/cloud/fn/consumer/log/LogConsumerApplicationTests.java diff --git a/consumer/mongodb-consumer/README.adoc b/consumer/spring-mongodb-consumer/README.adoc similarity index 100% rename from consumer/mongodb-consumer/README.adoc rename to consumer/spring-mongodb-consumer/README.adoc diff --git a/consumer/mongodb-consumer/build.gradle b/consumer/spring-mongodb-consumer/build.gradle similarity index 100% rename from consumer/mongodb-consumer/build.gradle rename to consumer/spring-mongodb-consumer/build.gradle diff --git a/consumer/mongodb-consumer/src/main/java/org/springframework/cloud/fn/consumer/mongo/MongoDbConsumerConfiguration.java b/consumer/spring-mongodb-consumer/src/main/java/org/springframework/cloud/fn/consumer/mongo/MongoDbConsumerConfiguration.java similarity index 100% rename from consumer/mongodb-consumer/src/main/java/org/springframework/cloud/fn/consumer/mongo/MongoDbConsumerConfiguration.java rename to consumer/spring-mongodb-consumer/src/main/java/org/springframework/cloud/fn/consumer/mongo/MongoDbConsumerConfiguration.java diff --git a/consumer/mongodb-consumer/src/main/java/org/springframework/cloud/fn/consumer/mongo/MongoDbConsumerProperties.java b/consumer/spring-mongodb-consumer/src/main/java/org/springframework/cloud/fn/consumer/mongo/MongoDbConsumerProperties.java similarity index 100% rename from consumer/mongodb-consumer/src/main/java/org/springframework/cloud/fn/consumer/mongo/MongoDbConsumerProperties.java rename to consumer/spring-mongodb-consumer/src/main/java/org/springframework/cloud/fn/consumer/mongo/MongoDbConsumerProperties.java diff --git a/consumer/mongodb-consumer/src/test/java/org/springframework/cloud/fn/consumer/mongo/MongoDbConsumerApplicationTests.java b/consumer/spring-mongodb-consumer/src/test/java/org/springframework/cloud/fn/consumer/mongo/MongoDbConsumerApplicationTests.java similarity index 100% rename from consumer/mongodb-consumer/src/test/java/org/springframework/cloud/fn/consumer/mongo/MongoDbConsumerApplicationTests.java rename to consumer/spring-mongodb-consumer/src/test/java/org/springframework/cloud/fn/consumer/mongo/MongoDbConsumerApplicationTests.java diff --git a/consumer/mongodb-consumer/src/test/java/org/springframework/cloud/fn/consumer/mongo/MongoDbTestContainerSupport.java b/consumer/spring-mongodb-consumer/src/test/java/org/springframework/cloud/fn/consumer/mongo/MongoDbTestContainerSupport.java similarity index 100% rename from consumer/mongodb-consumer/src/test/java/org/springframework/cloud/fn/consumer/mongo/MongoDbTestContainerSupport.java rename to consumer/spring-mongodb-consumer/src/test/java/org/springframework/cloud/fn/consumer/mongo/MongoDbTestContainerSupport.java diff --git a/consumer/mongodb-consumer/src/test/resources/logback-test.xml b/consumer/spring-mongodb-consumer/src/test/resources/logback-test.xml similarity index 100% rename from consumer/mongodb-consumer/src/test/resources/logback-test.xml rename to consumer/spring-mongodb-consumer/src/test/resources/logback-test.xml diff --git a/consumer/mqtt-consumer/README.adoc b/consumer/spring-mqtt-consumer/README.adoc similarity index 100% rename from consumer/mqtt-consumer/README.adoc rename to consumer/spring-mqtt-consumer/README.adoc diff --git a/consumer/spring-mqtt-consumer/build.gradle b/consumer/spring-mqtt-consumer/build.gradle new file mode 100644 index 00000000..65cad74e --- /dev/null +++ b/consumer/spring-mqtt-consumer/build.gradle @@ -0,0 +1,3 @@ +dependencies { + api project(':spring-mqtt-common') +} diff --git a/consumer/mqtt-consumer/src/main/java/org/springframework/cloud/fn/consumer/mqtt/MqttConsumerConfiguration.java b/consumer/spring-mqtt-consumer/src/main/java/org/springframework/cloud/fn/consumer/mqtt/MqttConsumerConfiguration.java similarity index 100% rename from consumer/mqtt-consumer/src/main/java/org/springframework/cloud/fn/consumer/mqtt/MqttConsumerConfiguration.java rename to consumer/spring-mqtt-consumer/src/main/java/org/springframework/cloud/fn/consumer/mqtt/MqttConsumerConfiguration.java diff --git a/consumer/mqtt-consumer/src/main/java/org/springframework/cloud/fn/consumer/mqtt/MqttConsumerProperties.java b/consumer/spring-mqtt-consumer/src/main/java/org/springframework/cloud/fn/consumer/mqtt/MqttConsumerProperties.java similarity index 100% rename from consumer/mqtt-consumer/src/main/java/org/springframework/cloud/fn/consumer/mqtt/MqttConsumerProperties.java rename to consumer/spring-mqtt-consumer/src/main/java/org/springframework/cloud/fn/consumer/mqtt/MqttConsumerProperties.java diff --git a/consumer/mqtt-consumer/src/test/java/org/springframework/cloud/fn/consumer/mqtt/MqttConsumerTests.java b/consumer/spring-mqtt-consumer/src/test/java/org/springframework/cloud/fn/consumer/mqtt/MqttConsumerTests.java similarity index 100% rename from consumer/mqtt-consumer/src/test/java/org/springframework/cloud/fn/consumer/mqtt/MqttConsumerTests.java rename to consumer/spring-mqtt-consumer/src/test/java/org/springframework/cloud/fn/consumer/mqtt/MqttConsumerTests.java diff --git a/consumer/mqtt-consumer/src/test/resources/logback.xml b/consumer/spring-mqtt-consumer/src/test/resources/logback.xml similarity index 100% rename from consumer/mqtt-consumer/src/test/resources/logback.xml rename to consumer/spring-mqtt-consumer/src/test/resources/logback.xml diff --git a/consumer/rabbit-consumer/README.adoc b/consumer/spring-rabbit-consumer/README.adoc similarity index 100% rename from consumer/rabbit-consumer/README.adoc rename to consumer/spring-rabbit-consumer/README.adoc diff --git a/consumer/rabbit-consumer/build.gradle b/consumer/spring-rabbit-consumer/build.gradle similarity index 100% rename from consumer/rabbit-consumer/build.gradle rename to consumer/spring-rabbit-consumer/build.gradle diff --git a/consumer/rabbit-consumer/src/main/java/org/springframework/cloud/fn/consumer/rabbit/RabbitConsumerConfiguration.java b/consumer/spring-rabbit-consumer/src/main/java/org/springframework/cloud/fn/consumer/rabbit/RabbitConsumerConfiguration.java similarity index 100% rename from consumer/rabbit-consumer/src/main/java/org/springframework/cloud/fn/consumer/rabbit/RabbitConsumerConfiguration.java rename to consumer/spring-rabbit-consumer/src/main/java/org/springframework/cloud/fn/consumer/rabbit/RabbitConsumerConfiguration.java diff --git a/consumer/rabbit-consumer/src/main/java/org/springframework/cloud/fn/consumer/rabbit/RabbitConsumerProperties.java b/consumer/spring-rabbit-consumer/src/main/java/org/springframework/cloud/fn/consumer/rabbit/RabbitConsumerProperties.java similarity index 100% rename from consumer/rabbit-consumer/src/main/java/org/springframework/cloud/fn/consumer/rabbit/RabbitConsumerProperties.java rename to consumer/spring-rabbit-consumer/src/main/java/org/springframework/cloud/fn/consumer/rabbit/RabbitConsumerProperties.java diff --git a/consumer/redis-consumer/README.adoc b/consumer/spring-redis-consumer/README.adoc similarity index 100% rename from consumer/redis-consumer/README.adoc rename to consumer/spring-redis-consumer/README.adoc diff --git a/consumer/redis-consumer/build.gradle b/consumer/spring-redis-consumer/build.gradle similarity index 100% rename from consumer/redis-consumer/build.gradle rename to consumer/spring-redis-consumer/build.gradle diff --git a/consumer/redis-consumer/src/main/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerConfiguration.java b/consumer/spring-redis-consumer/src/main/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerConfiguration.java similarity index 100% rename from consumer/redis-consumer/src/main/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerConfiguration.java rename to consumer/spring-redis-consumer/src/main/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerConfiguration.java diff --git a/consumer/redis-consumer/src/main/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerProperties.java b/consumer/spring-redis-consumer/src/main/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerProperties.java similarity index 100% rename from consumer/redis-consumer/src/main/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerProperties.java rename to consumer/spring-redis-consumer/src/main/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerProperties.java diff --git a/consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/AbstractRedisConsumerTests.java b/consumer/spring-redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/AbstractRedisConsumerTests.java similarity index 100% rename from consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/AbstractRedisConsumerTests.java rename to consumer/spring-redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/AbstractRedisConsumerTests.java diff --git a/consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerKeyTests.java b/consumer/spring-redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerKeyTests.java similarity index 100% rename from consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerKeyTests.java rename to consumer/spring-redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerKeyTests.java diff --git a/consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerQueueTests.java b/consumer/spring-redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerQueueTests.java similarity index 100% rename from consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerQueueTests.java rename to consumer/spring-redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerQueueTests.java diff --git a/consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerTopicTests.java b/consumer/spring-redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerTopicTests.java similarity index 100% rename from consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerTopicTests.java rename to consumer/spring-redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerTopicTests.java diff --git a/consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/RedisTestContainerSupport.java b/consumer/spring-redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/RedisTestContainerSupport.java similarity index 100% rename from consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/RedisTestContainerSupport.java rename to consumer/spring-redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/RedisTestContainerSupport.java diff --git a/consumer/redis-consumer/src/test/resources/application.properties b/consumer/spring-redis-consumer/src/test/resources/application.properties similarity index 100% rename from consumer/redis-consumer/src/test/resources/application.properties rename to consumer/spring-redis-consumer/src/test/resources/application.properties diff --git a/consumer/rsocket-consumer/README.adoc b/consumer/spring-rsocket-consumer/README.adoc similarity index 100% rename from consumer/rsocket-consumer/README.adoc rename to consumer/spring-rsocket-consumer/README.adoc diff --git a/consumer/rsocket-consumer/build.gradle b/consumer/spring-rsocket-consumer/build.gradle similarity index 100% rename from consumer/rsocket-consumer/build.gradle rename to consumer/spring-rsocket-consumer/build.gradle diff --git a/consumer/rsocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/rsocket/RsocketConsumerConfiguration.java b/consumer/spring-rsocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/rsocket/RsocketConsumerConfiguration.java similarity index 100% rename from consumer/rsocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/rsocket/RsocketConsumerConfiguration.java rename to consumer/spring-rsocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/rsocket/RsocketConsumerConfiguration.java diff --git a/consumer/rsocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/rsocket/RsocketConsumerProperties.java b/consumer/spring-rsocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/rsocket/RsocketConsumerProperties.java similarity index 100% rename from consumer/rsocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/rsocket/RsocketConsumerProperties.java rename to consumer/spring-rsocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/rsocket/RsocketConsumerProperties.java diff --git a/consumer/rsocket-consumer/src/test/java/org/springframework/cloud/fn/consumer/rsocket/RsocketConsumerTests.java b/consumer/spring-rsocket-consumer/src/test/java/org/springframework/cloud/fn/consumer/rsocket/RsocketConsumerTests.java similarity index 100% rename from consumer/rsocket-consumer/src/test/java/org/springframework/cloud/fn/consumer/rsocket/RsocketConsumerTests.java rename to consumer/spring-rsocket-consumer/src/test/java/org/springframework/cloud/fn/consumer/rsocket/RsocketConsumerTests.java diff --git a/consumer/s3-consumer/README.adoc b/consumer/spring-s3-consumer/README.adoc similarity index 100% rename from consumer/s3-consumer/README.adoc rename to consumer/spring-s3-consumer/README.adoc diff --git a/consumer/s3-consumer/build.gradle b/consumer/spring-s3-consumer/build.gradle similarity index 73% rename from consumer/s3-consumer/build.gradle rename to consumer/spring-s3-consumer/build.gradle index 0ea0e824..552cc7ae 100644 --- a/consumer/s3-consumer/build.gradle +++ b/consumer/spring-s3-consumer/build.gradle @@ -1,6 +1,6 @@ dependencies { - api project(':aws-s3-common') - api project(':file-common') + api project(':spring-aws-s3-common') + api project(':spring-file-common') api 'software.amazon.awssdk:s3-transfer-manager' testImplementation 'org.springframework:spring-web' @@ -8,4 +8,4 @@ dependencies { tasks.withType(JavaForkOptions) { jvmArgs '--add-opens', 'java.base/java.nio=ALL-UNNAMED' -} \ No newline at end of file +} diff --git a/consumer/s3-consumer/src/main/java/org/springframework/cloud/fn/consumer/s3/AwsS3ConsumerConfiguration.java b/consumer/spring-s3-consumer/src/main/java/org/springframework/cloud/fn/consumer/s3/AwsS3ConsumerConfiguration.java similarity index 100% rename from consumer/s3-consumer/src/main/java/org/springframework/cloud/fn/consumer/s3/AwsS3ConsumerConfiguration.java rename to consumer/spring-s3-consumer/src/main/java/org/springframework/cloud/fn/consumer/s3/AwsS3ConsumerConfiguration.java diff --git a/consumer/s3-consumer/src/main/java/org/springframework/cloud/fn/consumer/s3/AwsS3ConsumerProperties.java b/consumer/spring-s3-consumer/src/main/java/org/springframework/cloud/fn/consumer/s3/AwsS3ConsumerProperties.java similarity index 100% rename from consumer/s3-consumer/src/main/java/org/springframework/cloud/fn/consumer/s3/AwsS3ConsumerProperties.java rename to consumer/spring-s3-consumer/src/main/java/org/springframework/cloud/fn/consumer/s3/AwsS3ConsumerProperties.java diff --git a/consumer/s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AbstractAwsS3ConsumerMockTests.java b/consumer/spring-s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AbstractAwsS3ConsumerMockTests.java similarity index 100% rename from consumer/s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AbstractAwsS3ConsumerMockTests.java rename to consumer/spring-s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AbstractAwsS3ConsumerMockTests.java diff --git a/consumer/s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AmazonS3UploadFileTests.java b/consumer/spring-s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AmazonS3UploadFileTests.java similarity index 100% rename from consumer/s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AmazonS3UploadFileTests.java rename to consumer/spring-s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AmazonS3UploadFileTests.java diff --git a/consumer/s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AmazonS3UploadInputStreamTests.java b/consumer/spring-s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AmazonS3UploadInputStreamTests.java similarity index 100% rename from consumer/s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AmazonS3UploadInputStreamTests.java rename to consumer/spring-s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AmazonS3UploadInputStreamTests.java diff --git a/consumer/sftp-consumer/README.adoc b/consumer/spring-sftp-consumer/README.adoc similarity index 100% rename from consumer/sftp-consumer/README.adoc rename to consumer/spring-sftp-consumer/README.adoc diff --git a/consumer/sftp-consumer/build.gradle b/consumer/spring-sftp-consumer/build.gradle similarity index 56% rename from consumer/sftp-consumer/build.gradle rename to consumer/spring-sftp-consumer/build.gradle index b56532dd..21caff07 100644 --- a/consumer/sftp-consumer/build.gradle +++ b/consumer/spring-sftp-consumer/build.gradle @@ -1,5 +1,5 @@ dependencies { api 'org.springframework.integration:spring-integration-sftp' - testImplementation project(':function-test-support') + testImplementation project(':spring-function-test-support') } diff --git a/consumer/sftp-consumer/src/main/java/org/springframework/cloud/fn/consumer/sftp/SftpConsumerConfiguration.java b/consumer/spring-sftp-consumer/src/main/java/org/springframework/cloud/fn/consumer/sftp/SftpConsumerConfiguration.java similarity index 100% rename from consumer/sftp-consumer/src/main/java/org/springframework/cloud/fn/consumer/sftp/SftpConsumerConfiguration.java rename to consumer/spring-sftp-consumer/src/main/java/org/springframework/cloud/fn/consumer/sftp/SftpConsumerConfiguration.java diff --git a/consumer/sftp-consumer/src/main/java/org/springframework/cloud/fn/consumer/sftp/SftpConsumerProperties.java b/consumer/spring-sftp-consumer/src/main/java/org/springframework/cloud/fn/consumer/sftp/SftpConsumerProperties.java similarity index 100% rename from consumer/sftp-consumer/src/main/java/org/springframework/cloud/fn/consumer/sftp/SftpConsumerProperties.java rename to consumer/spring-sftp-consumer/src/main/java/org/springframework/cloud/fn/consumer/sftp/SftpConsumerProperties.java diff --git a/consumer/sftp-consumer/src/main/java/org/springframework/cloud/fn/consumer/sftp/SftpConsumerSessionFactoryConfiguration.java b/consumer/spring-sftp-consumer/src/main/java/org/springframework/cloud/fn/consumer/sftp/SftpConsumerSessionFactoryConfiguration.java similarity index 100% rename from consumer/sftp-consumer/src/main/java/org/springframework/cloud/fn/consumer/sftp/SftpConsumerSessionFactoryConfiguration.java rename to consumer/spring-sftp-consumer/src/main/java/org/springframework/cloud/fn/consumer/sftp/SftpConsumerSessionFactoryConfiguration.java diff --git a/consumer/sftp-consumer/src/test/java/org/springframework/cloud/fn/consumer/sftp/SftpConsumerPropertiesTests.java b/consumer/spring-sftp-consumer/src/test/java/org/springframework/cloud/fn/consumer/sftp/SftpConsumerPropertiesTests.java similarity index 100% rename from consumer/sftp-consumer/src/test/java/org/springframework/cloud/fn/consumer/sftp/SftpConsumerPropertiesTests.java rename to consumer/spring-sftp-consumer/src/test/java/org/springframework/cloud/fn/consumer/sftp/SftpConsumerPropertiesTests.java diff --git a/consumer/sftp-consumer/src/test/java/org/springframework/cloud/fn/consumer/sftp/SftpConsumerTests.java b/consumer/spring-sftp-consumer/src/test/java/org/springframework/cloud/fn/consumer/sftp/SftpConsumerTests.java similarity index 100% rename from consumer/sftp-consumer/src/test/java/org/springframework/cloud/fn/consumer/sftp/SftpConsumerTests.java rename to consumer/spring-sftp-consumer/src/test/java/org/springframework/cloud/fn/consumer/sftp/SftpConsumerTests.java diff --git a/consumer/tcp-consumer/README.adoc b/consumer/spring-tcp-consumer/README.adoc similarity index 100% rename from consumer/tcp-consumer/README.adoc rename to consumer/spring-tcp-consumer/README.adoc diff --git a/consumer/spring-tcp-consumer/build.gradle b/consumer/spring-tcp-consumer/build.gradle new file mode 100644 index 00000000..bb8d13d8 --- /dev/null +++ b/consumer/spring-tcp-consumer/build.gradle @@ -0,0 +1,3 @@ +dependencies { + api project(':spring-tcp-common') +} diff --git a/consumer/tcp-consumer/src/main/java/org/springframework/cloud/fn/consumer/tcp/TcpConsumerConfiguration.java b/consumer/spring-tcp-consumer/src/main/java/org/springframework/cloud/fn/consumer/tcp/TcpConsumerConfiguration.java similarity index 100% rename from consumer/tcp-consumer/src/main/java/org/springframework/cloud/fn/consumer/tcp/TcpConsumerConfiguration.java rename to consumer/spring-tcp-consumer/src/main/java/org/springframework/cloud/fn/consumer/tcp/TcpConsumerConfiguration.java diff --git a/consumer/tcp-consumer/src/main/java/org/springframework/cloud/fn/consumer/tcp/TcpConsumerProperties.java b/consumer/spring-tcp-consumer/src/main/java/org/springframework/cloud/fn/consumer/tcp/TcpConsumerProperties.java similarity index 100% rename from consumer/tcp-consumer/src/main/java/org/springframework/cloud/fn/consumer/tcp/TcpConsumerProperties.java rename to consumer/spring-tcp-consumer/src/main/java/org/springframework/cloud/fn/consumer/tcp/TcpConsumerProperties.java diff --git a/consumer/tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/AbstractTcpConsumerTests.java b/consumer/spring-tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/AbstractTcpConsumerTests.java similarity index 100% rename from consumer/tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/AbstractTcpConsumerTests.java rename to consumer/spring-tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/AbstractTcpConsumerTests.java diff --git a/consumer/tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/CRLFTests.java b/consumer/spring-tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/CRLFTests.java similarity index 100% rename from consumer/tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/CRLFTests.java rename to consumer/spring-tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/CRLFTests.java diff --git a/consumer/tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/L1Tests.java b/consumer/spring-tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/L1Tests.java similarity index 100% rename from consumer/tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/L1Tests.java rename to consumer/spring-tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/L1Tests.java diff --git a/consumer/tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/L2Tests.java b/consumer/spring-tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/L2Tests.java similarity index 100% rename from consumer/tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/L2Tests.java rename to consumer/spring-tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/L2Tests.java diff --git a/consumer/tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/L4Tests.java b/consumer/spring-tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/L4Tests.java similarity index 100% rename from consumer/tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/L4Tests.java rename to consumer/spring-tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/L4Tests.java diff --git a/consumer/tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/LFTests.java b/consumer/spring-tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/LFTests.java similarity index 100% rename from consumer/tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/LFTests.java rename to consumer/spring-tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/LFTests.java diff --git a/consumer/tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/NULLTests.java b/consumer/spring-tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/NULLTests.java similarity index 100% rename from consumer/tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/NULLTests.java rename to consumer/spring-tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/NULLTests.java diff --git a/consumer/tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/NotNioTests.java b/consumer/spring-tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/NotNioTests.java similarity index 100% rename from consumer/tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/NotNioTests.java rename to consumer/spring-tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/NotNioTests.java diff --git a/consumer/tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/PropertiesPopulatedTests.java b/consumer/spring-tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/PropertiesPopulatedTests.java similarity index 100% rename from consumer/tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/PropertiesPopulatedTests.java rename to consumer/spring-tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/PropertiesPopulatedTests.java diff --git a/consumer/tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/RAWTests.java b/consumer/spring-tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/RAWTests.java similarity index 100% rename from consumer/tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/RAWTests.java rename to consumer/spring-tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/RAWTests.java diff --git a/consumer/tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/STXETXTests.java b/consumer/spring-tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/STXETXTests.java similarity index 100% rename from consumer/tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/STXETXTests.java rename to consumer/spring-tcp-consumer/src/test/java/org/springframework/cloud/fn/consumer/tcp/STXETXTests.java diff --git a/consumer/twitter-consumer/README.adoc b/consumer/spring-twitter-consumer/README.adoc similarity index 100% rename from consumer/twitter-consumer/README.adoc rename to consumer/spring-twitter-consumer/README.adoc diff --git a/consumer/spring-twitter-consumer/build.gradle b/consumer/spring-twitter-consumer/build.gradle new file mode 100644 index 00000000..a740510c --- /dev/null +++ b/consumer/spring-twitter-consumer/build.gradle @@ -0,0 +1,4 @@ +dependencies { + api project(':spring-twitter-common') + api project(':spring-payload-converter-function') +} diff --git a/consumer/twitter-consumer/src/main/java/org/springframework/cloud/fn/consumer/twitter/friendship/TwitterFriendshipsConsumerConfiguration.java b/consumer/spring-twitter-consumer/src/main/java/org/springframework/cloud/fn/consumer/twitter/friendship/TwitterFriendshipsConsumerConfiguration.java similarity index 100% rename from consumer/twitter-consumer/src/main/java/org/springframework/cloud/fn/consumer/twitter/friendship/TwitterFriendshipsConsumerConfiguration.java rename to consumer/spring-twitter-consumer/src/main/java/org/springframework/cloud/fn/consumer/twitter/friendship/TwitterFriendshipsConsumerConfiguration.java diff --git a/consumer/twitter-consumer/src/main/java/org/springframework/cloud/fn/consumer/twitter/friendship/TwitterFriendshipsConsumerProperties.java b/consumer/spring-twitter-consumer/src/main/java/org/springframework/cloud/fn/consumer/twitter/friendship/TwitterFriendshipsConsumerProperties.java similarity index 100% rename from consumer/twitter-consumer/src/main/java/org/springframework/cloud/fn/consumer/twitter/friendship/TwitterFriendshipsConsumerProperties.java rename to consumer/spring-twitter-consumer/src/main/java/org/springframework/cloud/fn/consumer/twitter/friendship/TwitterFriendshipsConsumerProperties.java diff --git a/consumer/twitter-consumer/src/main/java/org/springframework/cloud/fn/consumer/twitter/message/TwitterMessageConsumerConfiguration.java b/consumer/spring-twitter-consumer/src/main/java/org/springframework/cloud/fn/consumer/twitter/message/TwitterMessageConsumerConfiguration.java similarity index 100% rename from consumer/twitter-consumer/src/main/java/org/springframework/cloud/fn/consumer/twitter/message/TwitterMessageConsumerConfiguration.java rename to consumer/spring-twitter-consumer/src/main/java/org/springframework/cloud/fn/consumer/twitter/message/TwitterMessageConsumerConfiguration.java diff --git a/consumer/twitter-consumer/src/main/java/org/springframework/cloud/fn/consumer/twitter/message/TwitterMessageConsumerProperties.java b/consumer/spring-twitter-consumer/src/main/java/org/springframework/cloud/fn/consumer/twitter/message/TwitterMessageConsumerProperties.java similarity index 100% rename from consumer/twitter-consumer/src/main/java/org/springframework/cloud/fn/consumer/twitter/message/TwitterMessageConsumerProperties.java rename to consumer/spring-twitter-consumer/src/main/java/org/springframework/cloud/fn/consumer/twitter/message/TwitterMessageConsumerProperties.java diff --git a/consumer/twitter-consumer/src/main/java/org/springframework/cloud/fn/consumer/twitter/status/update/TwitterUpdateConsumerConfiguration.java b/consumer/spring-twitter-consumer/src/main/java/org/springframework/cloud/fn/consumer/twitter/status/update/TwitterUpdateConsumerConfiguration.java similarity index 100% rename from consumer/twitter-consumer/src/main/java/org/springframework/cloud/fn/consumer/twitter/status/update/TwitterUpdateConsumerConfiguration.java rename to consumer/spring-twitter-consumer/src/main/java/org/springframework/cloud/fn/consumer/twitter/status/update/TwitterUpdateConsumerConfiguration.java diff --git a/consumer/twitter-consumer/src/main/java/org/springframework/cloud/fn/consumer/twitter/status/update/TwitterUpdateConsumerProperties.java b/consumer/spring-twitter-consumer/src/main/java/org/springframework/cloud/fn/consumer/twitter/status/update/TwitterUpdateConsumerProperties.java similarity index 100% rename from consumer/twitter-consumer/src/main/java/org/springframework/cloud/fn/consumer/twitter/status/update/TwitterUpdateConsumerProperties.java rename to consumer/spring-twitter-consumer/src/main/java/org/springframework/cloud/fn/consumer/twitter/status/update/TwitterUpdateConsumerProperties.java diff --git a/consumer/twitter-consumer/src/test/java/org/springframework/cloud/fn/consumer/twitter/status/update/TwitterUpdateSinkFunctionConfigurationTests.java b/consumer/spring-twitter-consumer/src/test/java/org/springframework/cloud/fn/consumer/twitter/status/update/TwitterUpdateSinkFunctionConfigurationTests.java similarity index 100% rename from consumer/twitter-consumer/src/test/java/org/springframework/cloud/fn/consumer/twitter/status/update/TwitterUpdateSinkFunctionConfigurationTests.java rename to consumer/spring-twitter-consumer/src/test/java/org/springframework/cloud/fn/consumer/twitter/status/update/TwitterUpdateSinkFunctionConfigurationTests.java diff --git a/consumer/wavefront-consumer/README.adoc b/consumer/spring-wavefront-consumer/README.adoc similarity index 100% rename from consumer/wavefront-consumer/README.adoc rename to consumer/spring-wavefront-consumer/README.adoc diff --git a/consumer/wavefront-consumer/build.gradle b/consumer/spring-wavefront-consumer/build.gradle similarity index 100% rename from consumer/wavefront-consumer/build.gradle rename to consumer/spring-wavefront-consumer/build.gradle diff --git a/consumer/wavefront-consumer/src/main/java/org/springframework/cloud/fn/consumer/wavefront/WavefrontConsumerConfiguration.java b/consumer/spring-wavefront-consumer/src/main/java/org/springframework/cloud/fn/consumer/wavefront/WavefrontConsumerConfiguration.java similarity index 100% rename from consumer/wavefront-consumer/src/main/java/org/springframework/cloud/fn/consumer/wavefront/WavefrontConsumerConfiguration.java rename to consumer/spring-wavefront-consumer/src/main/java/org/springframework/cloud/fn/consumer/wavefront/WavefrontConsumerConfiguration.java diff --git a/consumer/wavefront-consumer/src/main/java/org/springframework/cloud/fn/consumer/wavefront/WavefrontConsumerProperties.java b/consumer/spring-wavefront-consumer/src/main/java/org/springframework/cloud/fn/consumer/wavefront/WavefrontConsumerProperties.java similarity index 100% rename from consumer/wavefront-consumer/src/main/java/org/springframework/cloud/fn/consumer/wavefront/WavefrontConsumerProperties.java rename to consumer/spring-wavefront-consumer/src/main/java/org/springframework/cloud/fn/consumer/wavefront/WavefrontConsumerProperties.java diff --git a/consumer/wavefront-consumer/src/main/java/org/springframework/cloud/fn/consumer/wavefront/WavefrontFormat.java b/consumer/spring-wavefront-consumer/src/main/java/org/springframework/cloud/fn/consumer/wavefront/WavefrontFormat.java similarity index 100% rename from consumer/wavefront-consumer/src/main/java/org/springframework/cloud/fn/consumer/wavefront/WavefrontFormat.java rename to consumer/spring-wavefront-consumer/src/main/java/org/springframework/cloud/fn/consumer/wavefront/WavefrontFormat.java diff --git a/consumer/wavefront-consumer/src/main/java/org/springframework/cloud/fn/consumer/wavefront/service/DirectConnectionWavefrontService.java b/consumer/spring-wavefront-consumer/src/main/java/org/springframework/cloud/fn/consumer/wavefront/service/DirectConnectionWavefrontService.java similarity index 100% rename from consumer/wavefront-consumer/src/main/java/org/springframework/cloud/fn/consumer/wavefront/service/DirectConnectionWavefrontService.java rename to consumer/spring-wavefront-consumer/src/main/java/org/springframework/cloud/fn/consumer/wavefront/service/DirectConnectionWavefrontService.java diff --git a/consumer/wavefront-consumer/src/main/java/org/springframework/cloud/fn/consumer/wavefront/service/ProxyConnectionWavefrontService.java b/consumer/spring-wavefront-consumer/src/main/java/org/springframework/cloud/fn/consumer/wavefront/service/ProxyConnectionWavefrontService.java similarity index 100% rename from consumer/wavefront-consumer/src/main/java/org/springframework/cloud/fn/consumer/wavefront/service/ProxyConnectionWavefrontService.java rename to consumer/spring-wavefront-consumer/src/main/java/org/springframework/cloud/fn/consumer/wavefront/service/ProxyConnectionWavefrontService.java diff --git a/consumer/wavefront-consumer/src/main/java/org/springframework/cloud/fn/consumer/wavefront/service/WavefrontService.java b/consumer/spring-wavefront-consumer/src/main/java/org/springframework/cloud/fn/consumer/wavefront/service/WavefrontService.java similarity index 100% rename from consumer/wavefront-consumer/src/main/java/org/springframework/cloud/fn/consumer/wavefront/service/WavefrontService.java rename to consumer/spring-wavefront-consumer/src/main/java/org/springframework/cloud/fn/consumer/wavefront/service/WavefrontService.java diff --git a/consumer/wavefront-consumer/src/test/java/org/springframework/cloud/fn/consumer/wavefront/WavefrontConsumerConfigurationTest.java b/consumer/spring-wavefront-consumer/src/test/java/org/springframework/cloud/fn/consumer/wavefront/WavefrontConsumerConfigurationTest.java similarity index 100% rename from consumer/wavefront-consumer/src/test/java/org/springframework/cloud/fn/consumer/wavefront/WavefrontConsumerConfigurationTest.java rename to consumer/spring-wavefront-consumer/src/test/java/org/springframework/cloud/fn/consumer/wavefront/WavefrontConsumerConfigurationTest.java diff --git a/consumer/wavefront-consumer/src/test/java/org/springframework/cloud/fn/consumer/wavefront/WavefrontConsumerPropertiesTest.java b/consumer/spring-wavefront-consumer/src/test/java/org/springframework/cloud/fn/consumer/wavefront/WavefrontConsumerPropertiesTest.java similarity index 100% rename from consumer/wavefront-consumer/src/test/java/org/springframework/cloud/fn/consumer/wavefront/WavefrontConsumerPropertiesTest.java rename to consumer/spring-wavefront-consumer/src/test/java/org/springframework/cloud/fn/consumer/wavefront/WavefrontConsumerPropertiesTest.java diff --git a/consumer/wavefront-consumer/src/test/java/org/springframework/cloud/fn/consumer/wavefront/WavefrontFormatTest.java b/consumer/spring-wavefront-consumer/src/test/java/org/springframework/cloud/fn/consumer/wavefront/WavefrontFormatTest.java similarity index 100% rename from consumer/wavefront-consumer/src/test/java/org/springframework/cloud/fn/consumer/wavefront/WavefrontFormatTest.java rename to consumer/spring-wavefront-consumer/src/test/java/org/springframework/cloud/fn/consumer/wavefront/WavefrontFormatTest.java diff --git a/consumer/wavefront-consumer/src/test/java/org/springframework/cloud/fn/consumer/wavefront/service/DirectConnectionWavefrontServiceTest.java b/consumer/spring-wavefront-consumer/src/test/java/org/springframework/cloud/fn/consumer/wavefront/service/DirectConnectionWavefrontServiceTest.java similarity index 100% rename from consumer/wavefront-consumer/src/test/java/org/springframework/cloud/fn/consumer/wavefront/service/DirectConnectionWavefrontServiceTest.java rename to consumer/spring-wavefront-consumer/src/test/java/org/springframework/cloud/fn/consumer/wavefront/service/DirectConnectionWavefrontServiceTest.java diff --git a/consumer/wavefront-consumer/src/test/java/org/springframework/cloud/fn/consumer/wavefront/service/ProxyConnectionWavefrontServiceTest.java b/consumer/spring-wavefront-consumer/src/test/java/org/springframework/cloud/fn/consumer/wavefront/service/ProxyConnectionWavefrontServiceTest.java similarity index 100% rename from consumer/wavefront-consumer/src/test/java/org/springframework/cloud/fn/consumer/wavefront/service/ProxyConnectionWavefrontServiceTest.java rename to consumer/spring-wavefront-consumer/src/test/java/org/springframework/cloud/fn/consumer/wavefront/service/ProxyConnectionWavefrontServiceTest.java diff --git a/consumer/wavefront-consumer/src/test/java/org/springframework/cloud/fn/consumer/wavefront/service/WavefrontServiceConditionTest.java b/consumer/spring-wavefront-consumer/src/test/java/org/springframework/cloud/fn/consumer/wavefront/service/WavefrontServiceConditionTest.java similarity index 100% rename from consumer/wavefront-consumer/src/test/java/org/springframework/cloud/fn/consumer/wavefront/service/WavefrontServiceConditionTest.java rename to consumer/spring-wavefront-consumer/src/test/java/org/springframework/cloud/fn/consumer/wavefront/service/WavefrontServiceConditionTest.java diff --git a/consumer/websocket-consumer/README.adoc b/consumer/spring-websocket-consumer/README.adoc similarity index 100% rename from consumer/websocket-consumer/README.adoc rename to consumer/spring-websocket-consumer/README.adoc diff --git a/consumer/websocket-consumer/build.gradle b/consumer/spring-websocket-consumer/build.gradle similarity index 78% rename from consumer/websocket-consumer/build.gradle rename to consumer/spring-websocket-consumer/build.gradle index 4997937f..2dd6744a 100644 --- a/consumer/websocket-consumer/build.gradle +++ b/consumer/spring-websocket-consumer/build.gradle @@ -4,5 +4,5 @@ dependencies { api 'io.netty:netty-all' testImplementation 'org.springframework.boot:spring-boot-starter-web' - testImplementation project(':function-test-support') + testImplementation project(':spring-function-test-support') } diff --git a/consumer/websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/WebsocketConsumerConfiguration.java b/consumer/spring-websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/WebsocketConsumerConfiguration.java similarity index 100% rename from consumer/websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/WebsocketConsumerConfiguration.java rename to consumer/spring-websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/WebsocketConsumerConfiguration.java diff --git a/consumer/websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/WebsocketConsumerProperties.java b/consumer/spring-websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/WebsocketConsumerProperties.java similarity index 100% rename from consumer/websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/WebsocketConsumerProperties.java rename to consumer/spring-websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/WebsocketConsumerProperties.java diff --git a/consumer/websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/WebsocketConsumerServer.java b/consumer/spring-websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/WebsocketConsumerServer.java similarity index 100% rename from consumer/websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/WebsocketConsumerServer.java rename to consumer/spring-websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/WebsocketConsumerServer.java diff --git a/consumer/websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/WebsocketConsumerServerHandler.java b/consumer/spring-websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/WebsocketConsumerServerHandler.java similarity index 100% rename from consumer/websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/WebsocketConsumerServerHandler.java rename to consumer/spring-websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/WebsocketConsumerServerHandler.java diff --git a/consumer/websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/WebsocketConsumerServerInitializer.java b/consumer/spring-websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/WebsocketConsumerServerInitializer.java similarity index 100% rename from consumer/websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/WebsocketConsumerServerInitializer.java rename to consumer/spring-websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/WebsocketConsumerServerInitializer.java diff --git a/consumer/websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/actuator/WebsocketConsumerTraceEndpoint.java b/consumer/spring-websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/actuator/WebsocketConsumerTraceEndpoint.java similarity index 100% rename from consumer/websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/actuator/WebsocketConsumerTraceEndpoint.java rename to consumer/spring-websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/actuator/WebsocketConsumerTraceEndpoint.java diff --git a/consumer/websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/trace/InMemoryTraceRepository.java b/consumer/spring-websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/trace/InMemoryTraceRepository.java similarity index 100% rename from consumer/websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/trace/InMemoryTraceRepository.java rename to consumer/spring-websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/trace/InMemoryTraceRepository.java diff --git a/consumer/websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/trace/Trace.java b/consumer/spring-websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/trace/Trace.java similarity index 100% rename from consumer/websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/trace/Trace.java rename to consumer/spring-websocket-consumer/src/main/java/org/springframework/cloud/fn/consumer/websocket/trace/Trace.java diff --git a/consumer/websocket-consumer/src/test/java/org/springframework/cloud/fn/consumer/websocket/WebsocketConsumerTests.java b/consumer/spring-websocket-consumer/src/test/java/org/springframework/cloud/fn/consumer/websocket/WebsocketConsumerTests.java similarity index 100% rename from consumer/websocket-consumer/src/test/java/org/springframework/cloud/fn/consumer/websocket/WebsocketConsumerTests.java rename to consumer/spring-websocket-consumer/src/test/java/org/springframework/cloud/fn/consumer/websocket/WebsocketConsumerTests.java diff --git a/consumer/xmpp-consumer/README.adoc b/consumer/spring-xmpp-consumer/README.adoc similarity index 100% rename from consumer/xmpp-consumer/README.adoc rename to consumer/spring-xmpp-consumer/README.adoc diff --git a/consumer/spring-xmpp-consumer/build.gradle b/consumer/spring-xmpp-consumer/build.gradle new file mode 100644 index 00000000..f6b868a7 --- /dev/null +++ b/consumer/spring-xmpp-consumer/build.gradle @@ -0,0 +1,5 @@ +dependencies { + api project(':spring-xmpp-common') + + testImplementation project(':spring-function-test-support') +} diff --git a/consumer/xmpp-consumer/src/main/java/org/springframework/cloud/fn/consumer/xmpp/XmppConsumerConfiguration.java b/consumer/spring-xmpp-consumer/src/main/java/org/springframework/cloud/fn/consumer/xmpp/XmppConsumerConfiguration.java similarity index 100% rename from consumer/xmpp-consumer/src/main/java/org/springframework/cloud/fn/consumer/xmpp/XmppConsumerConfiguration.java rename to consumer/spring-xmpp-consumer/src/main/java/org/springframework/cloud/fn/consumer/xmpp/XmppConsumerConfiguration.java diff --git a/consumer/xmpp-consumer/src/main/java/org/springframework/cloud/fn/consumer/xmpp/XmppConsumerProperties.java b/consumer/spring-xmpp-consumer/src/main/java/org/springframework/cloud/fn/consumer/xmpp/XmppConsumerProperties.java similarity index 100% rename from consumer/xmpp-consumer/src/main/java/org/springframework/cloud/fn/consumer/xmpp/XmppConsumerProperties.java rename to consumer/spring-xmpp-consumer/src/main/java/org/springframework/cloud/fn/consumer/xmpp/XmppConsumerProperties.java diff --git a/consumer/xmpp-consumer/src/test/java/org/springframework/cloud/fn/consumer/xmpp/XmppConsumerConfigurationTests.java b/consumer/spring-xmpp-consumer/src/test/java/org/springframework/cloud/fn/consumer/xmpp/XmppConsumerConfigurationTests.java similarity index 100% rename from consumer/xmpp-consumer/src/test/java/org/springframework/cloud/fn/consumer/xmpp/XmppConsumerConfigurationTests.java rename to consumer/spring-xmpp-consumer/src/test/java/org/springframework/cloud/fn/consumer/xmpp/XmppConsumerConfigurationTests.java diff --git a/consumer/zeromq-consumer/README.adoc b/consumer/spring-zeromq-consumer/README.adoc similarity index 100% rename from consumer/zeromq-consumer/README.adoc rename to consumer/spring-zeromq-consumer/README.adoc diff --git a/consumer/zeromq-consumer/build.gradle b/consumer/spring-zeromq-consumer/build.gradle similarity index 100% rename from consumer/zeromq-consumer/build.gradle rename to consumer/spring-zeromq-consumer/build.gradle diff --git a/consumer/zeromq-consumer/src/main/java/org/springframework/cloud/fn/consumer/zeromq/ZeroMqConsumerConfiguration.java b/consumer/spring-zeromq-consumer/src/main/java/org/springframework/cloud/fn/consumer/zeromq/ZeroMqConsumerConfiguration.java similarity index 100% rename from consumer/zeromq-consumer/src/main/java/org/springframework/cloud/fn/consumer/zeromq/ZeroMqConsumerConfiguration.java rename to consumer/spring-zeromq-consumer/src/main/java/org/springframework/cloud/fn/consumer/zeromq/ZeroMqConsumerConfiguration.java diff --git a/consumer/zeromq-consumer/src/main/java/org/springframework/cloud/fn/consumer/zeromq/ZeroMqConsumerProperties.java b/consumer/spring-zeromq-consumer/src/main/java/org/springframework/cloud/fn/consumer/zeromq/ZeroMqConsumerProperties.java similarity index 100% rename from consumer/zeromq-consumer/src/main/java/org/springframework/cloud/fn/consumer/zeromq/ZeroMqConsumerProperties.java rename to consumer/spring-zeromq-consumer/src/main/java/org/springframework/cloud/fn/consumer/zeromq/ZeroMqConsumerProperties.java diff --git a/consumer/zeromq-consumer/src/test/java/org/springframework/cloud/fn/consumer/zeromq/ZeroMqConsumerConfigurationTests.java b/consumer/spring-zeromq-consumer/src/test/java/org/springframework/cloud/fn/consumer/zeromq/ZeroMqConsumerConfigurationTests.java similarity index 100% rename from consumer/zeromq-consumer/src/test/java/org/springframework/cloud/fn/consumer/zeromq/ZeroMqConsumerConfigurationTests.java rename to consumer/spring-zeromq-consumer/src/test/java/org/springframework/cloud/fn/consumer/zeromq/ZeroMqConsumerConfigurationTests.java diff --git a/consumer/tcp-consumer/build.gradle b/consumer/tcp-consumer/build.gradle deleted file mode 100644 index 39f81c78..00000000 --- a/consumer/tcp-consumer/build.gradle +++ /dev/null @@ -1,3 +0,0 @@ -dependencies { - api project(':tcp-common') -} diff --git a/consumer/twitter-consumer/build.gradle b/consumer/twitter-consumer/build.gradle deleted file mode 100644 index d4eed9fd..00000000 --- a/consumer/twitter-consumer/build.gradle +++ /dev/null @@ -1,4 +0,0 @@ -dependencies { - api project(':twitter-common') - api project(':payload-converter-function') -} diff --git a/consumer/xmpp-consumer/build.gradle b/consumer/xmpp-consumer/build.gradle deleted file mode 100644 index 40ccc9f9..00000000 --- a/consumer/xmpp-consumer/build.gradle +++ /dev/null @@ -1,5 +0,0 @@ -dependencies { - api project(':xmpp-common') - - testImplementation project(':function-test-support') -} diff --git a/function/filter-function/build.gradle b/function/filter-function/build.gradle deleted file mode 100644 index 52c7b046..00000000 --- a/function/filter-function/build.gradle +++ /dev/null @@ -1,3 +0,0 @@ -dependencies { - api project(':payload-converter-function') -} diff --git a/function/header-enricher-function/build.gradle b/function/header-enricher-function/build.gradle deleted file mode 100644 index 52c7b046..00000000 --- a/function/header-enricher-function/build.gradle +++ /dev/null @@ -1,3 +0,0 @@ -dependencies { - api project(':payload-converter-function') -} diff --git a/function/header-filter-function/build.gradle b/function/header-filter-function/build.gradle deleted file mode 100644 index 52c7b046..00000000 --- a/function/header-filter-function/build.gradle +++ /dev/null @@ -1,3 +0,0 @@ -dependencies { - api project(':payload-converter-function') -} diff --git a/function/image-recognition-function/build.gradle b/function/image-recognition-function/build.gradle deleted file mode 100644 index e68b45cd..00000000 --- a/function/image-recognition-function/build.gradle +++ /dev/null @@ -1,3 +0,0 @@ -dependencies { - api project(':tensorflow-common') -} diff --git a/function/semantic-segmentation-function/build.gradle b/function/semantic-segmentation-function/build.gradle deleted file mode 100644 index e68b45cd..00000000 --- a/function/semantic-segmentation-function/build.gradle +++ /dev/null @@ -1,3 +0,0 @@ -dependencies { - api project(':tensorflow-common') -} diff --git a/function/spel-function/build.gradle b/function/spel-function/build.gradle deleted file mode 100644 index 52c7b046..00000000 --- a/function/spel-function/build.gradle +++ /dev/null @@ -1,3 +0,0 @@ -dependencies { - api project(':payload-converter-function') -} diff --git a/function/aggregator-function/README.adoc b/function/spring-aggregator-function/README.adoc similarity index 100% rename from function/aggregator-function/README.adoc rename to function/spring-aggregator-function/README.adoc diff --git a/function/aggregator-function/build.gradle b/function/spring-aggregator-function/build.gradle similarity index 75% rename from function/aggregator-function/build.gradle rename to function/spring-aggregator-function/build.gradle index 05d0414e..56099d5b 100644 --- a/function/aggregator-function/build.gradle +++ b/function/spring-aggregator-function/build.gradle @@ -1,5 +1,5 @@ dependencies { - api project(':payload-converter-function') + api project(':spring-payload-converter-function') api 'org.springframework.integration:spring-integration-mongodb' api 'org.springframework.integration:spring-integration-redis' api 'org.springframework.integration:spring-integration-jdbc' @@ -13,6 +13,6 @@ dependencies { runtimeOnly 'org.postgresql:postgresql' testImplementation 'org.testcontainers:mongodb' - testImplementation project(':mongodb-consumer').sourceSets.test.output - testImplementation project(':redis-consumer').sourceSets.test.output + testImplementation project(':spring-mongodb-consumer').sourceSets.test.output + testImplementation project(':spring-redis-consumer').sourceSets.test.output } diff --git a/function/aggregator-function/src/main/java/org/springframework/cloud/fn/aggregator/AggregatorFunctionConfiguration.java b/function/spring-aggregator-function/src/main/java/org/springframework/cloud/fn/aggregator/AggregatorFunctionConfiguration.java similarity index 100% rename from function/aggregator-function/src/main/java/org/springframework/cloud/fn/aggregator/AggregatorFunctionConfiguration.java rename to function/spring-aggregator-function/src/main/java/org/springframework/cloud/fn/aggregator/AggregatorFunctionConfiguration.java diff --git a/function/aggregator-function/src/main/java/org/springframework/cloud/fn/aggregator/AggregatorFunctionProperties.java b/function/spring-aggregator-function/src/main/java/org/springframework/cloud/fn/aggregator/AggregatorFunctionProperties.java similarity index 100% rename from function/aggregator-function/src/main/java/org/springframework/cloud/fn/aggregator/AggregatorFunctionProperties.java rename to function/spring-aggregator-function/src/main/java/org/springframework/cloud/fn/aggregator/AggregatorFunctionProperties.java diff --git a/function/aggregator-function/src/main/java/org/springframework/cloud/fn/aggregator/ExcludeStoresAutoConfigurationEnvironmentPostProcessor.java b/function/spring-aggregator-function/src/main/java/org/springframework/cloud/fn/aggregator/ExcludeStoresAutoConfigurationEnvironmentPostProcessor.java similarity index 100% rename from function/aggregator-function/src/main/java/org/springframework/cloud/fn/aggregator/ExcludeStoresAutoConfigurationEnvironmentPostProcessor.java rename to function/spring-aggregator-function/src/main/java/org/springframework/cloud/fn/aggregator/ExcludeStoresAutoConfigurationEnvironmentPostProcessor.java diff --git a/function/aggregator-function/src/main/java/org/springframework/cloud/fn/aggregator/MessageStoreConfiguration.java b/function/spring-aggregator-function/src/main/java/org/springframework/cloud/fn/aggregator/MessageStoreConfiguration.java similarity index 100% rename from function/aggregator-function/src/main/java/org/springframework/cloud/fn/aggregator/MessageStoreConfiguration.java rename to function/spring-aggregator-function/src/main/java/org/springframework/cloud/fn/aggregator/MessageStoreConfiguration.java diff --git a/function/aggregator-function/src/main/resources/META-INF/spring.factories b/function/spring-aggregator-function/src/main/resources/META-INF/spring.factories similarity index 100% rename from function/aggregator-function/src/main/resources/META-INF/spring.factories rename to function/spring-aggregator-function/src/main/resources/META-INF/spring.factories diff --git a/function/aggregator-function/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/function/spring-aggregator-function/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from function/aggregator-function/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to function/spring-aggregator-function/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/function/aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/AbstractAggregatorFunctionTests.java b/function/spring-aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/AbstractAggregatorFunctionTests.java similarity index 100% rename from function/aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/AbstractAggregatorFunctionTests.java rename to function/spring-aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/AbstractAggregatorFunctionTests.java diff --git a/function/aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/CustomPropsAndMongoMessageStoreAggregatorTests.java b/function/spring-aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/CustomPropsAndMongoMessageStoreAggregatorTests.java similarity index 100% rename from function/aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/CustomPropsAndMongoMessageStoreAggregatorTests.java rename to function/spring-aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/CustomPropsAndMongoMessageStoreAggregatorTests.java diff --git a/function/aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/DefaultAggregatorTests.java b/function/spring-aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/DefaultAggregatorTests.java similarity index 100% rename from function/aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/DefaultAggregatorTests.java rename to function/spring-aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/DefaultAggregatorTests.java diff --git a/function/aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/JdbcMessageStoreAggregatorTests.java b/function/spring-aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/JdbcMessageStoreAggregatorTests.java similarity index 100% rename from function/aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/JdbcMessageStoreAggregatorTests.java rename to function/spring-aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/JdbcMessageStoreAggregatorTests.java diff --git a/function/aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/RedisMessageStoreAggregatorTests.java b/function/spring-aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/RedisMessageStoreAggregatorTests.java similarity index 100% rename from function/aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/RedisMessageStoreAggregatorTests.java rename to function/spring-aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/RedisMessageStoreAggregatorTests.java diff --git a/function/filter-function/README.adoc b/function/spring-filter-function/README.adoc similarity index 100% rename from function/filter-function/README.adoc rename to function/spring-filter-function/README.adoc diff --git a/function/spring-filter-function/build.gradle b/function/spring-filter-function/build.gradle new file mode 100644 index 00000000..c9759380 --- /dev/null +++ b/function/spring-filter-function/build.gradle @@ -0,0 +1,3 @@ +dependencies { + api project(':spring-payload-converter-function') +} diff --git a/function/filter-function/src/main/java/org/springframework/cloud/fn/filter/FilterFunctionConfiguration.java b/function/spring-filter-function/src/main/java/org/springframework/cloud/fn/filter/FilterFunctionConfiguration.java similarity index 100% rename from function/filter-function/src/main/java/org/springframework/cloud/fn/filter/FilterFunctionConfiguration.java rename to function/spring-filter-function/src/main/java/org/springframework/cloud/fn/filter/FilterFunctionConfiguration.java diff --git a/function/filter-function/src/main/java/org/springframework/cloud/fn/filter/FilterFunctionProperties.java b/function/spring-filter-function/src/main/java/org/springframework/cloud/fn/filter/FilterFunctionProperties.java similarity index 100% rename from function/filter-function/src/main/java/org/springframework/cloud/fn/filter/FilterFunctionProperties.java rename to function/spring-filter-function/src/main/java/org/springframework/cloud/fn/filter/FilterFunctionProperties.java diff --git a/function/filter-function/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/function/spring-filter-function/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from function/filter-function/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to function/spring-filter-function/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/function/filter-function/src/test/java/org/springframework/cloud/fn/filter/FilterFunctionApplicationTests.java b/function/spring-filter-function/src/test/java/org/springframework/cloud/fn/filter/FilterFunctionApplicationTests.java similarity index 100% rename from function/filter-function/src/test/java/org/springframework/cloud/fn/filter/FilterFunctionApplicationTests.java rename to function/spring-filter-function/src/test/java/org/springframework/cloud/fn/filter/FilterFunctionApplicationTests.java diff --git a/function/header-enricher-function/README.adoc b/function/spring-header-enricher-function/README.adoc similarity index 100% rename from function/header-enricher-function/README.adoc rename to function/spring-header-enricher-function/README.adoc diff --git a/function/spring-header-enricher-function/build.gradle b/function/spring-header-enricher-function/build.gradle new file mode 100644 index 00000000..c9759380 --- /dev/null +++ b/function/spring-header-enricher-function/build.gradle @@ -0,0 +1,3 @@ +dependencies { + api project(':spring-payload-converter-function') +} diff --git a/function/header-enricher-function/src/main/java/org/springframework/cloud/fn/header/enricher/HeaderEnricherFunctionConfiguration.java b/function/spring-header-enricher-function/src/main/java/org/springframework/cloud/fn/header/enricher/HeaderEnricherFunctionConfiguration.java similarity index 100% rename from function/header-enricher-function/src/main/java/org/springframework/cloud/fn/header/enricher/HeaderEnricherFunctionConfiguration.java rename to function/spring-header-enricher-function/src/main/java/org/springframework/cloud/fn/header/enricher/HeaderEnricherFunctionConfiguration.java diff --git a/function/header-enricher-function/src/main/java/org/springframework/cloud/fn/header/enricher/HeaderEnricherFunctionProperties.java b/function/spring-header-enricher-function/src/main/java/org/springframework/cloud/fn/header/enricher/HeaderEnricherFunctionProperties.java similarity index 100% rename from function/header-enricher-function/src/main/java/org/springframework/cloud/fn/header/enricher/HeaderEnricherFunctionProperties.java rename to function/spring-header-enricher-function/src/main/java/org/springframework/cloud/fn/header/enricher/HeaderEnricherFunctionProperties.java diff --git a/function/header-enricher-function/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/function/spring-header-enricher-function/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from function/header-enricher-function/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to function/spring-header-enricher-function/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/function/header-enricher-function/src/test/java/org/springframework/cloud/fn/header/enricher/HeaderEnricherFunctionApplicationTests.java b/function/spring-header-enricher-function/src/test/java/org/springframework/cloud/fn/header/enricher/HeaderEnricherFunctionApplicationTests.java similarity index 100% rename from function/header-enricher-function/src/test/java/org/springframework/cloud/fn/header/enricher/HeaderEnricherFunctionApplicationTests.java rename to function/spring-header-enricher-function/src/test/java/org/springframework/cloud/fn/header/enricher/HeaderEnricherFunctionApplicationTests.java diff --git a/function/header-filter-function/README.adoc b/function/spring-header-filter-function/README.adoc similarity index 100% rename from function/header-filter-function/README.adoc rename to function/spring-header-filter-function/README.adoc diff --git a/function/spring-header-filter-function/build.gradle b/function/spring-header-filter-function/build.gradle new file mode 100644 index 00000000..c9759380 --- /dev/null +++ b/function/spring-header-filter-function/build.gradle @@ -0,0 +1,3 @@ +dependencies { + api project(':spring-payload-converter-function') +} diff --git a/function/header-filter-function/src/main/java/org/springframework/cloud/fn/header/filter/HeaderFilterFunctionConfiguration.java b/function/spring-header-filter-function/src/main/java/org/springframework/cloud/fn/header/filter/HeaderFilterFunctionConfiguration.java similarity index 100% rename from function/header-filter-function/src/main/java/org/springframework/cloud/fn/header/filter/HeaderFilterFunctionConfiguration.java rename to function/spring-header-filter-function/src/main/java/org/springframework/cloud/fn/header/filter/HeaderFilterFunctionConfiguration.java diff --git a/function/header-filter-function/src/main/java/org/springframework/cloud/fn/header/filter/HeaderFilterFunctionProperties.java b/function/spring-header-filter-function/src/main/java/org/springframework/cloud/fn/header/filter/HeaderFilterFunctionProperties.java similarity index 100% rename from function/header-filter-function/src/main/java/org/springframework/cloud/fn/header/filter/HeaderFilterFunctionProperties.java rename to function/spring-header-filter-function/src/main/java/org/springframework/cloud/fn/header/filter/HeaderFilterFunctionProperties.java diff --git a/function/header-filter-function/src/test/java/org/springframework/cloud/fn/header/filter/HeaderFilterFunctionApplicationDeleteAllTests.java b/function/spring-header-filter-function/src/test/java/org/springframework/cloud/fn/header/filter/HeaderFilterFunctionApplicationDeleteAllTests.java similarity index 100% rename from function/header-filter-function/src/test/java/org/springframework/cloud/fn/header/filter/HeaderFilterFunctionApplicationDeleteAllTests.java rename to function/spring-header-filter-function/src/test/java/org/springframework/cloud/fn/header/filter/HeaderFilterFunctionApplicationDeleteAllTests.java diff --git a/function/header-filter-function/src/test/java/org/springframework/cloud/fn/header/filter/HeaderFilterFunctionApplicationTests.java b/function/spring-header-filter-function/src/test/java/org/springframework/cloud/fn/header/filter/HeaderFilterFunctionApplicationTests.java similarity index 100% rename from function/header-filter-function/src/test/java/org/springframework/cloud/fn/header/filter/HeaderFilterFunctionApplicationTests.java rename to function/spring-header-filter-function/src/test/java/org/springframework/cloud/fn/header/filter/HeaderFilterFunctionApplicationTests.java diff --git a/function/header-filter-function/src/test/java/org/springframework/cloud/fn/header/filter/HeaderUtils.java b/function/spring-header-filter-function/src/test/java/org/springframework/cloud/fn/header/filter/HeaderUtils.java similarity index 100% rename from function/header-filter-function/src/test/java/org/springframework/cloud/fn/header/filter/HeaderUtils.java rename to function/spring-header-filter-function/src/test/java/org/springframework/cloud/fn/header/filter/HeaderUtils.java diff --git a/function/header-filter-function/src/test/resources/test.properties b/function/spring-header-filter-function/src/test/resources/test.properties similarity index 100% rename from function/header-filter-function/src/test/resources/test.properties rename to function/spring-header-filter-function/src/test/resources/test.properties diff --git a/function/http-request-function/README.adoc b/function/spring-http-request-function/README.adoc similarity index 100% rename from function/http-request-function/README.adoc rename to function/spring-http-request-function/README.adoc diff --git a/function/http-request-function/build.gradle b/function/spring-http-request-function/build.gradle similarity index 100% rename from function/http-request-function/build.gradle rename to function/spring-http-request-function/build.gradle diff --git a/function/http-request-function/src/main/java/org/springframework/cloud/fn/http/request/HttpRequestFunctionConfiguration.java b/function/spring-http-request-function/src/main/java/org/springframework/cloud/fn/http/request/HttpRequestFunctionConfiguration.java similarity index 100% rename from function/http-request-function/src/main/java/org/springframework/cloud/fn/http/request/HttpRequestFunctionConfiguration.java rename to function/spring-http-request-function/src/main/java/org/springframework/cloud/fn/http/request/HttpRequestFunctionConfiguration.java diff --git a/function/http-request-function/src/main/java/org/springframework/cloud/fn/http/request/HttpRequestFunctionProperties.java b/function/spring-http-request-function/src/main/java/org/springframework/cloud/fn/http/request/HttpRequestFunctionProperties.java similarity index 100% rename from function/http-request-function/src/main/java/org/springframework/cloud/fn/http/request/HttpRequestFunctionProperties.java rename to function/spring-http-request-function/src/main/java/org/springframework/cloud/fn/http/request/HttpRequestFunctionProperties.java diff --git a/function/http-request-function/src/test/java/org/springframework/cloud/fn/http/request/HttpRequestFunctionTestApplicationTests.java b/function/spring-http-request-function/src/test/java/org/springframework/cloud/fn/http/request/HttpRequestFunctionTestApplicationTests.java similarity index 100% rename from function/http-request-function/src/test/java/org/springframework/cloud/fn/http/request/HttpRequestFunctionTestApplicationTests.java rename to function/spring-http-request-function/src/test/java/org/springframework/cloud/fn/http/request/HttpRequestFunctionTestApplicationTests.java diff --git a/function/image-recognition-function/README.adoc b/function/spring-image-recognition-function/README.adoc similarity index 100% rename from function/image-recognition-function/README.adoc rename to function/spring-image-recognition-function/README.adoc diff --git a/function/spring-image-recognition-function/build.gradle b/function/spring-image-recognition-function/build.gradle new file mode 100644 index 00000000..498498ef --- /dev/null +++ b/function/spring-image-recognition-function/build.gradle @@ -0,0 +1,3 @@ +dependencies { + api project(':spring-tensorflow-common') +} diff --git a/function/image-recognition-function/src/main/java/org/springframework/cloud/fn/image/recognition/ImageRecognition.java b/function/spring-image-recognition-function/src/main/java/org/springframework/cloud/fn/image/recognition/ImageRecognition.java similarity index 100% rename from function/image-recognition-function/src/main/java/org/springframework/cloud/fn/image/recognition/ImageRecognition.java rename to function/spring-image-recognition-function/src/main/java/org/springframework/cloud/fn/image/recognition/ImageRecognition.java diff --git a/function/image-recognition-function/src/main/java/org/springframework/cloud/fn/image/recognition/ImageRecognitionAugmenter.java b/function/spring-image-recognition-function/src/main/java/org/springframework/cloud/fn/image/recognition/ImageRecognitionAugmenter.java similarity index 100% rename from function/image-recognition-function/src/main/java/org/springframework/cloud/fn/image/recognition/ImageRecognitionAugmenter.java rename to function/spring-image-recognition-function/src/main/java/org/springframework/cloud/fn/image/recognition/ImageRecognitionAugmenter.java diff --git a/function/image-recognition-function/src/main/java/org/springframework/cloud/fn/image/recognition/RecognitionResponse.java b/function/spring-image-recognition-function/src/main/java/org/springframework/cloud/fn/image/recognition/RecognitionResponse.java similarity index 100% rename from function/image-recognition-function/src/main/java/org/springframework/cloud/fn/image/recognition/RecognitionResponse.java rename to function/spring-image-recognition-function/src/main/java/org/springframework/cloud/fn/image/recognition/RecognitionResponse.java diff --git a/function/image-recognition-function/src/main/java/org/springframework/cloud/fn/image/recognition/util/ImageNetReadableNamesWriter.java b/function/spring-image-recognition-function/src/main/java/org/springframework/cloud/fn/image/recognition/util/ImageNetReadableNamesWriter.java similarity index 100% rename from function/image-recognition-function/src/main/java/org/springframework/cloud/fn/image/recognition/util/ImageNetReadableNamesWriter.java rename to function/spring-image-recognition-function/src/main/java/org/springframework/cloud/fn/image/recognition/util/ImageNetReadableNamesWriter.java diff --git a/function/image-recognition-function/src/main/resources/images/image-augmented.jpg b/function/spring-image-recognition-function/src/main/resources/images/image-augmented.jpg similarity index 100% rename from function/image-recognition-function/src/main/resources/images/image-augmented.jpg rename to function/spring-image-recognition-function/src/main/resources/images/image-augmented.jpg diff --git a/function/image-recognition-function/src/main/resources/images/image-recognition-panda-augmented.jpg b/function/spring-image-recognition-function/src/main/resources/images/image-recognition-panda-augmented.jpg similarity index 100% rename from function/image-recognition-function/src/main/resources/images/image-recognition-panda-augmented.jpg rename to function/spring-image-recognition-function/src/main/resources/images/image-recognition-panda-augmented.jpg diff --git a/function/image-recognition-function/src/main/resources/labels/inception_labels.txt b/function/spring-image-recognition-function/src/main/resources/labels/inception_labels.txt similarity index 100% rename from function/image-recognition-function/src/main/resources/labels/inception_labels.txt rename to function/spring-image-recognition-function/src/main/resources/labels/inception_labels.txt diff --git a/function/image-recognition-function/src/main/resources/labels/mobilenet_labels.txt b/function/spring-image-recognition-function/src/main/resources/labels/mobilenet_labels.txt similarity index 100% rename from function/image-recognition-function/src/main/resources/labels/mobilenet_labels.txt rename to function/spring-image-recognition-function/src/main/resources/labels/mobilenet_labels.txt diff --git a/function/image-recognition-function/src/test/java/org/springframework/cloud/fn/image/recognition/ImageRecognitionExample.java b/function/spring-image-recognition-function/src/test/java/org/springframework/cloud/fn/image/recognition/ImageRecognitionExample.java similarity index 100% rename from function/image-recognition-function/src/test/java/org/springframework/cloud/fn/image/recognition/ImageRecognitionExample.java rename to function/spring-image-recognition-function/src/test/java/org/springframework/cloud/fn/image/recognition/ImageRecognitionExample.java diff --git a/function/image-recognition-function/src/test/java/org/springframework/cloud/fn/image/recognition/ImageRecognitionExample2.java b/function/spring-image-recognition-function/src/test/java/org/springframework/cloud/fn/image/recognition/ImageRecognitionExample2.java similarity index 100% rename from function/image-recognition-function/src/test/java/org/springframework/cloud/fn/image/recognition/ImageRecognitionExample2.java rename to function/spring-image-recognition-function/src/test/java/org/springframework/cloud/fn/image/recognition/ImageRecognitionExample2.java diff --git a/function/image-recognition-function/src/test/java/org/springframework/cloud/fn/image/recognition/SavedModelTest.java b/function/spring-image-recognition-function/src/test/java/org/springframework/cloud/fn/image/recognition/SavedModelTest.java similarity index 100% rename from function/image-recognition-function/src/test/java/org/springframework/cloud/fn/image/recognition/SavedModelTest.java rename to function/spring-image-recognition-function/src/test/java/org/springframework/cloud/fn/image/recognition/SavedModelTest.java diff --git a/function/image-recognition-function/src/test/resources/images/giant_panda_in_beijing_zoo_1.jpg b/function/spring-image-recognition-function/src/test/resources/images/giant_panda_in_beijing_zoo_1.jpg similarity index 100% rename from function/image-recognition-function/src/test/resources/images/giant_panda_in_beijing_zoo_1.jpg rename to function/spring-image-recognition-function/src/test/resources/images/giant_panda_in_beijing_zoo_1.jpg diff --git a/function/image-recognition-function/src/test/resources/images/panda.jpeg b/function/spring-image-recognition-function/src/test/resources/images/panda.jpeg similarity index 100% rename from function/image-recognition-function/src/test/resources/images/panda.jpeg rename to function/spring-image-recognition-function/src/test/resources/images/panda.jpeg diff --git a/function/object-detection-function/README.adoc b/function/spring-object-detection-function/README.adoc similarity index 100% rename from function/object-detection-function/README.adoc rename to function/spring-object-detection-function/README.adoc diff --git a/function/object-detection-function/build.gradle b/function/spring-object-detection-function/build.gradle similarity index 78% rename from function/object-detection-function/build.gradle rename to function/spring-object-detection-function/build.gradle index 59ab3a93..a8b8d3b6 100644 --- a/function/object-detection-function/build.gradle +++ b/function/spring-object-detection-function/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.google.protobuf' dependencies { - api project(':tensorflow-common') + api project(':spring-tensorflow-common') api protobufJava } @@ -9,4 +9,4 @@ protobuf { protoc { artifact = "com.google.protobuf:protoc:$protobufVersion" } -} \ No newline at end of file +} diff --git a/function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionImageAugmenter.java b/function/spring-object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionImageAugmenter.java similarity index 100% rename from function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionImageAugmenter.java rename to function/spring-object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionImageAugmenter.java diff --git a/function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionInputAdapter.java b/function/spring-object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionInputAdapter.java similarity index 100% rename from function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionInputAdapter.java rename to function/spring-object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionInputAdapter.java diff --git a/function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionInputConverter.java b/function/spring-object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionInputConverter.java similarity index 100% rename from function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionInputConverter.java rename to function/spring-object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionInputConverter.java diff --git a/function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionOutputConverter.java b/function/spring-object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionOutputConverter.java similarity index 100% rename from function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionOutputConverter.java rename to function/spring-object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionOutputConverter.java diff --git a/function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionService.java b/function/spring-object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionService.java similarity index 100% rename from function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionService.java rename to function/spring-object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionService.java diff --git a/function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionService2.java b/function/spring-object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionService2.java similarity index 100% rename from function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionService2.java rename to function/spring-object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionService2.java diff --git a/function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/domain/ObjectDetection.java b/function/spring-object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/domain/ObjectDetection.java similarity index 100% rename from function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/domain/ObjectDetection.java rename to function/spring-object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/domain/ObjectDetection.java diff --git a/function/object-detection-function/src/main/proto/example.proto__ b/function/spring-object-detection-function/src/main/proto/example.proto__ similarity index 100% rename from function/object-detection-function/src/main/proto/example.proto__ rename to function/spring-object-detection-function/src/main/proto/example.proto__ diff --git a/function/object-detection-function/src/main/proto/feature.proto__ b/function/spring-object-detection-function/src/main/proto/feature.proto__ similarity index 100% rename from function/object-detection-function/src/main/proto/feature.proto__ rename to function/spring-object-detection-function/src/main/proto/feature.proto__ diff --git a/function/object-detection-function/src/main/proto/string_int_label_map.proto b/function/spring-object-detection-function/src/main/proto/string_int_label_map.proto similarity index 100% rename from function/object-detection-function/src/main/proto/string_int_label_map.proto rename to function/spring-object-detection-function/src/main/proto/string_int_label_map.proto diff --git a/function/object-detection-function/src/main/resources/images/object-detection-augmented.jpg b/function/spring-object-detection-function/src/main/resources/images/object-detection-augmented.jpg similarity index 100% rename from function/object-detection-function/src/main/resources/images/object-detection-augmented.jpg rename to function/spring-object-detection-function/src/main/resources/images/object-detection-augmented.jpg diff --git a/function/object-detection-function/src/main/resources/images/object-detection-segmentation-augmented.jpg b/function/spring-object-detection-function/src/main/resources/images/object-detection-segmentation-augmented.jpg similarity index 100% rename from function/object-detection-function/src/main/resources/images/object-detection-segmentation-augmented.jpg rename to function/spring-object-detection-function/src/main/resources/images/object-detection-segmentation-augmented.jpg diff --git a/function/object-detection-function/src/main/resources/images/object-detection.jpg b/function/spring-object-detection-function/src/main/resources/images/object-detection.jpg similarity index 100% rename from function/object-detection-function/src/main/resources/images/object-detection.jpg rename to function/spring-object-detection-function/src/main/resources/images/object-detection.jpg diff --git a/function/object-detection-function/src/main/resources/images/object_detection_1.jpg b/function/spring-object-detection-function/src/main/resources/images/object_detection_1.jpg similarity index 100% rename from function/object-detection-function/src/main/resources/images/object_detection_1.jpg rename to function/spring-object-detection-function/src/main/resources/images/object_detection_1.jpg diff --git a/function/object-detection-function/src/test/java/org/springframework/cloud/fn/object/detection/examples/ExampleInstanceSegmentation.java b/function/spring-object-detection-function/src/test/java/org/springframework/cloud/fn/object/detection/examples/ExampleInstanceSegmentation.java similarity index 100% rename from function/object-detection-function/src/test/java/org/springframework/cloud/fn/object/detection/examples/ExampleInstanceSegmentation.java rename to function/spring-object-detection-function/src/test/java/org/springframework/cloud/fn/object/detection/examples/ExampleInstanceSegmentation.java diff --git a/function/object-detection-function/src/test/java/org/springframework/cloud/fn/object/detection/examples/ExampleObjectDetection.java b/function/spring-object-detection-function/src/test/java/org/springframework/cloud/fn/object/detection/examples/ExampleObjectDetection.java similarity index 100% rename from function/object-detection-function/src/test/java/org/springframework/cloud/fn/object/detection/examples/ExampleObjectDetection.java rename to function/spring-object-detection-function/src/test/java/org/springframework/cloud/fn/object/detection/examples/ExampleObjectDetection.java diff --git a/function/object-detection-function/src/test/java/org/springframework/cloud/fn/object/detection/examples/SimpleExample.java b/function/spring-object-detection-function/src/test/java/org/springframework/cloud/fn/object/detection/examples/SimpleExample.java similarity index 100% rename from function/object-detection-function/src/test/java/org/springframework/cloud/fn/object/detection/examples/SimpleExample.java rename to function/spring-object-detection-function/src/test/java/org/springframework/cloud/fn/object/detection/examples/SimpleExample.java diff --git a/function/payload-converter-function/src/main/java/functions/ByteArrayTextToString.java b/function/spring-payload-converter-function/src/main/java/functions/ByteArrayTextToString.java similarity index 100% rename from function/payload-converter-function/src/main/java/functions/ByteArrayTextToString.java rename to function/spring-payload-converter-function/src/main/java/functions/ByteArrayTextToString.java diff --git a/function/payload-converter-function/src/main/java/functions/JsonBytesToMap.java b/function/spring-payload-converter-function/src/main/java/functions/JsonBytesToMap.java similarity index 100% rename from function/payload-converter-function/src/main/java/functions/JsonBytesToMap.java rename to function/spring-payload-converter-function/src/main/java/functions/JsonBytesToMap.java diff --git a/function/payload-converter-function/src/test/java/functions/ByteArrayTextToStringTests.java b/function/spring-payload-converter-function/src/test/java/functions/ByteArrayTextToStringTests.java similarity index 100% rename from function/payload-converter-function/src/test/java/functions/ByteArrayTextToStringTests.java rename to function/spring-payload-converter-function/src/test/java/functions/ByteArrayTextToStringTests.java diff --git a/function/semantic-segmentation-function/README.adoc b/function/spring-semantic-segmentation-function/README.adoc similarity index 100% rename from function/semantic-segmentation-function/README.adoc rename to function/spring-semantic-segmentation-function/README.adoc diff --git a/function/spring-semantic-segmentation-function/build.gradle b/function/spring-semantic-segmentation-function/build.gradle new file mode 100644 index 00000000..498498ef --- /dev/null +++ b/function/spring-semantic-segmentation-function/build.gradle @@ -0,0 +1,3 @@ +dependencies { + api project(':spring-tensorflow-common') +} diff --git a/function/semantic-segmentation-function/src/main/java/org/springframework/cloud/fn/semantic/segmentation/NativeImageUtils.java b/function/spring-semantic-segmentation-function/src/main/java/org/springframework/cloud/fn/semantic/segmentation/NativeImageUtils.java similarity index 100% rename from function/semantic-segmentation-function/src/main/java/org/springframework/cloud/fn/semantic/segmentation/NativeImageUtils.java rename to function/spring-semantic-segmentation-function/src/main/java/org/springframework/cloud/fn/semantic/segmentation/NativeImageUtils.java diff --git a/function/semantic-segmentation-function/src/main/java/org/springframework/cloud/fn/semantic/segmentation/SegmentationColorMap.java b/function/spring-semantic-segmentation-function/src/main/java/org/springframework/cloud/fn/semantic/segmentation/SegmentationColorMap.java similarity index 100% rename from function/semantic-segmentation-function/src/main/java/org/springframework/cloud/fn/semantic/segmentation/SegmentationColorMap.java rename to function/spring-semantic-segmentation-function/src/main/java/org/springframework/cloud/fn/semantic/segmentation/SegmentationColorMap.java diff --git a/function/semantic-segmentation-function/src/main/java/org/springframework/cloud/fn/semantic/segmentation/SemanticSegmentation.java b/function/spring-semantic-segmentation-function/src/main/java/org/springframework/cloud/fn/semantic/segmentation/SemanticSegmentation.java similarity index 100% rename from function/semantic-segmentation-function/src/main/java/org/springframework/cloud/fn/semantic/segmentation/SemanticSegmentation.java rename to function/spring-semantic-segmentation-function/src/main/java/org/springframework/cloud/fn/semantic/segmentation/SemanticSegmentation.java diff --git a/function/semantic-segmentation-function/src/main/java/org/springframework/cloud/fn/semantic/segmentation/attic/SemanticSegmentationUtils.java b/function/spring-semantic-segmentation-function/src/main/java/org/springframework/cloud/fn/semantic/segmentation/attic/SemanticSegmentationUtils.java similarity index 100% rename from function/semantic-segmentation-function/src/main/java/org/springframework/cloud/fn/semantic/segmentation/attic/SemanticSegmentationUtils.java rename to function/spring-semantic-segmentation-function/src/main/java/org/springframework/cloud/fn/semantic/segmentation/attic/SemanticSegmentationUtils.java diff --git a/function/semantic-segmentation-function/src/main/resources/colormap/ade20k_colormap.json b/function/spring-semantic-segmentation-function/src/main/resources/colormap/ade20k_colormap.json similarity index 100% rename from function/semantic-segmentation-function/src/main/resources/colormap/ade20k_colormap.json rename to function/spring-semantic-segmentation-function/src/main/resources/colormap/ade20k_colormap.json diff --git a/function/semantic-segmentation-function/src/main/resources/colormap/black_white_colormap.json b/function/spring-semantic-segmentation-function/src/main/resources/colormap/black_white_colormap.json similarity index 100% rename from function/semantic-segmentation-function/src/main/resources/colormap/black_white_colormap.json rename to function/spring-semantic-segmentation-function/src/main/resources/colormap/black_white_colormap.json diff --git a/function/semantic-segmentation-function/src/main/resources/colormap/citymap_colormap.json b/function/spring-semantic-segmentation-function/src/main/resources/colormap/citymap_colormap.json similarity index 100% rename from function/semantic-segmentation-function/src/main/resources/colormap/citymap_colormap.json rename to function/spring-semantic-segmentation-function/src/main/resources/colormap/citymap_colormap.json diff --git a/function/semantic-segmentation-function/src/main/resources/colormap/mapillary_colormap.json b/function/spring-semantic-segmentation-function/src/main/resources/colormap/mapillary_colormap.json similarity index 100% rename from function/semantic-segmentation-function/src/main/resources/colormap/mapillary_colormap.json rename to function/spring-semantic-segmentation-function/src/main/resources/colormap/mapillary_colormap.json diff --git a/function/semantic-segmentation-function/src/main/resources/images/ADE20K-all-small.png b/function/spring-semantic-segmentation-function/src/main/resources/images/ADE20K-all-small.png similarity index 100% rename from function/semantic-segmentation-function/src/main/resources/images/ADE20K-all-small.png rename to function/spring-semantic-segmentation-function/src/main/resources/images/ADE20K-all-small.png diff --git a/function/semantic-segmentation-function/src/main/resources/images/VikiMaxiAdi-all.png b/function/spring-semantic-segmentation-function/src/main/resources/images/VikiMaxiAdi-all.png similarity index 100% rename from function/semantic-segmentation-function/src/main/resources/images/VikiMaxiAdi-all.png rename to function/spring-semantic-segmentation-function/src/main/resources/images/VikiMaxiAdi-all.png diff --git a/function/semantic-segmentation-function/src/main/resources/images/VikiMaxiAdi.jpg b/function/spring-semantic-segmentation-function/src/main/resources/images/VikiMaxiAdi.jpg similarity index 100% rename from function/semantic-segmentation-function/src/main/resources/images/VikiMaxiAdi.jpg rename to function/spring-semantic-segmentation-function/src/main/resources/images/VikiMaxiAdi.jpg diff --git a/function/semantic-segmentation-function/src/main/resources/images/amsterdam-cityscape1.jpg b/function/spring-semantic-segmentation-function/src/main/resources/images/amsterdam-cityscape1.jpg similarity index 100% rename from function/semantic-segmentation-function/src/main/resources/images/amsterdam-cityscape1.jpg rename to function/spring-semantic-segmentation-function/src/main/resources/images/amsterdam-cityscape1.jpg diff --git a/function/semantic-segmentation-function/src/main/resources/images/cityscape-all-small.png b/function/spring-semantic-segmentation-function/src/main/resources/images/cityscape-all-small.png similarity index 100% rename from function/semantic-segmentation-function/src/main/resources/images/cityscape-all-small.png rename to function/spring-semantic-segmentation-function/src/main/resources/images/cityscape-all-small.png diff --git a/function/semantic-segmentation-function/src/main/resources/images/giant_panda_in_beijing_zoo_1.jpg b/function/spring-semantic-segmentation-function/src/main/resources/images/giant_panda_in_beijing_zoo_1.jpg similarity index 100% rename from function/semantic-segmentation-function/src/main/resources/images/giant_panda_in_beijing_zoo_1.jpg rename to function/spring-semantic-segmentation-function/src/main/resources/images/giant_panda_in_beijing_zoo_1.jpg diff --git a/function/semantic-segmentation-function/src/main/resources/images/interior.jpg b/function/spring-semantic-segmentation-function/src/main/resources/images/interior.jpg similarity index 100% rename from function/semantic-segmentation-function/src/main/resources/images/interior.jpg rename to function/spring-semantic-segmentation-function/src/main/resources/images/interior.jpg diff --git a/function/spel-function/README.adoc b/function/spring-spel-function/README.adoc similarity index 100% rename from function/spel-function/README.adoc rename to function/spring-spel-function/README.adoc diff --git a/function/spring-spel-function/build.gradle b/function/spring-spel-function/build.gradle new file mode 100644 index 00000000..c9759380 --- /dev/null +++ b/function/spring-spel-function/build.gradle @@ -0,0 +1,3 @@ +dependencies { + api project(':spring-payload-converter-function') +} diff --git a/function/spel-function/src/main/java/org/springframework/cloud/fn/spel/SpelFunctionConfiguration.java b/function/spring-spel-function/src/main/java/org/springframework/cloud/fn/spel/SpelFunctionConfiguration.java similarity index 100% rename from function/spel-function/src/main/java/org/springframework/cloud/fn/spel/SpelFunctionConfiguration.java rename to function/spring-spel-function/src/main/java/org/springframework/cloud/fn/spel/SpelFunctionConfiguration.java diff --git a/function/spel-function/src/main/java/org/springframework/cloud/fn/spel/SpelFunctionProperties.java b/function/spring-spel-function/src/main/java/org/springframework/cloud/fn/spel/SpelFunctionProperties.java similarity index 100% rename from function/spel-function/src/main/java/org/springframework/cloud/fn/spel/SpelFunctionProperties.java rename to function/spring-spel-function/src/main/java/org/springframework/cloud/fn/spel/SpelFunctionProperties.java diff --git a/function/spel-function/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/function/spring-spel-function/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from function/spel-function/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to function/spring-spel-function/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/function/spel-function/src/test/java/org/springframework/cloud/fn/spel/SpelFunctionApplicationTests.java b/function/spring-spel-function/src/test/java/org/springframework/cloud/fn/spel/SpelFunctionApplicationTests.java similarity index 100% rename from function/spel-function/src/test/java/org/springframework/cloud/fn/spel/SpelFunctionApplicationTests.java rename to function/spring-spel-function/src/test/java/org/springframework/cloud/fn/spel/SpelFunctionApplicationTests.java diff --git a/function/splitter-function/README.adoc b/function/spring-splitter-function/README.adoc similarity index 100% rename from function/splitter-function/README.adoc rename to function/spring-splitter-function/README.adoc diff --git a/function/splitter-function/build.gradle b/function/spring-splitter-function/build.gradle similarity index 100% rename from function/splitter-function/build.gradle rename to function/spring-splitter-function/build.gradle diff --git a/function/splitter-function/src/main/java/org/springframework/cloud/fn/splitter/SplitterFunctionConfiguration.java b/function/spring-splitter-function/src/main/java/org/springframework/cloud/fn/splitter/SplitterFunctionConfiguration.java similarity index 100% rename from function/splitter-function/src/main/java/org/springframework/cloud/fn/splitter/SplitterFunctionConfiguration.java rename to function/spring-splitter-function/src/main/java/org/springframework/cloud/fn/splitter/SplitterFunctionConfiguration.java diff --git a/function/splitter-function/src/main/java/org/springframework/cloud/fn/splitter/SplitterFunctionProperties.java b/function/spring-splitter-function/src/main/java/org/springframework/cloud/fn/splitter/SplitterFunctionProperties.java similarity index 100% rename from function/splitter-function/src/main/java/org/springframework/cloud/fn/splitter/SplitterFunctionProperties.java rename to function/spring-splitter-function/src/main/java/org/springframework/cloud/fn/splitter/SplitterFunctionProperties.java diff --git a/function/splitter-function/src/test/java/org/springframework/cloud/fn/splitter/SplitterFunctionApplicationTests.java b/function/spring-splitter-function/src/test/java/org/springframework/cloud/fn/splitter/SplitterFunctionApplicationTests.java similarity index 100% rename from function/splitter-function/src/test/java/org/springframework/cloud/fn/splitter/SplitterFunctionApplicationTests.java rename to function/spring-splitter-function/src/test/java/org/springframework/cloud/fn/splitter/SplitterFunctionApplicationTests.java diff --git a/function/task-launch-request-function/README.adoc b/function/spring-task-launch-request-function/README.adoc similarity index 100% rename from function/task-launch-request-function/README.adoc rename to function/spring-task-launch-request-function/README.adoc diff --git a/function/task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/CommandLineArgumentsMessageMapper.java b/function/spring-task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/CommandLineArgumentsMessageMapper.java similarity index 100% rename from function/task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/CommandLineArgumentsMessageMapper.java rename to function/spring-task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/CommandLineArgumentsMessageMapper.java diff --git a/function/task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/KeyValueListParser.java b/function/spring-task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/KeyValueListParser.java similarity index 100% rename from function/task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/KeyValueListParser.java rename to function/spring-task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/KeyValueListParser.java diff --git a/function/task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequest.java b/function/spring-task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequest.java similarity index 100% rename from function/task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequest.java rename to function/spring-task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequest.java diff --git a/function/task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestFunction.java b/function/spring-task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestFunction.java similarity index 100% rename from function/task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestFunction.java rename to function/spring-task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestFunction.java diff --git a/function/task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestFunctionConfiguration.java b/function/spring-task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestFunctionConfiguration.java similarity index 100% rename from function/task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestFunctionConfiguration.java rename to function/spring-task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestFunctionConfiguration.java diff --git a/function/task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestFunctionProperties.java b/function/spring-task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestFunctionProperties.java similarity index 100% rename from function/task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestFunctionProperties.java rename to function/spring-task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestFunctionProperties.java diff --git a/function/task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestMessageProcessor.java b/function/spring-task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestMessageProcessor.java similarity index 100% rename from function/task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestMessageProcessor.java rename to function/spring-task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestMessageProcessor.java diff --git a/function/task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestSupplier.java b/function/spring-task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestSupplier.java similarity index 100% rename from function/task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestSupplier.java rename to function/spring-task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestSupplier.java diff --git a/function/task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/TaskNameMessageMapper.java b/function/spring-task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/TaskNameMessageMapper.java similarity index 100% rename from function/task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/TaskNameMessageMapper.java rename to function/spring-task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/TaskNameMessageMapper.java diff --git a/function/task-launch-request-function/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/function/spring-task-launch-request-function/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from function/task-launch-request-function/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to function/spring-task-launch-request-function/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/function/task-launch-request-function/src/test/java/org/springframework/cloud/fn/task/launch/request/KeyValueListParserTests.java b/function/spring-task-launch-request-function/src/test/java/org/springframework/cloud/fn/task/launch/request/KeyValueListParserTests.java similarity index 100% rename from function/task-launch-request-function/src/test/java/org/springframework/cloud/fn/task/launch/request/KeyValueListParserTests.java rename to function/spring-task-launch-request-function/src/test/java/org/springframework/cloud/fn/task/launch/request/KeyValueListParserTests.java diff --git a/function/task-launch-request-function/src/test/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestFunctionApplicationTests.java b/function/spring-task-launch-request-function/src/test/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestFunctionApplicationTests.java similarity index 100% rename from function/task-launch-request-function/src/test/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestFunctionApplicationTests.java rename to function/spring-task-launch-request-function/src/test/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestFunctionApplicationTests.java diff --git a/function/task-launch-request-function/src/test/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestFunctionPropertiesTests.java b/function/spring-task-launch-request-function/src/test/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestFunctionPropertiesTests.java similarity index 100% rename from function/task-launch-request-function/src/test/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestFunctionPropertiesTests.java rename to function/spring-task-launch-request-function/src/test/java/org/springframework/cloud/fn/task/launch/request/TaskLaunchRequestFunctionPropertiesTests.java diff --git a/function/twitter-function/README.adoc b/function/spring-twitter-function/README.adoc similarity index 100% rename from function/twitter-function/README.adoc rename to function/spring-twitter-function/README.adoc diff --git a/function/twitter-function/build.gradle b/function/spring-twitter-function/build.gradle similarity index 57% rename from function/twitter-function/build.gradle rename to function/spring-twitter-function/build.gradle index d1c92347..cf11976d 100644 --- a/function/twitter-function/build.gradle +++ b/function/spring-twitter-function/build.gradle @@ -1,5 +1,5 @@ dependencies { - api project(':twitter-common') + api project(':spring-twitter-common') testImplementation mockserverNetty } diff --git a/function/twitter-function/src/main/java/org/springframework/cloud/fn/twitter/geo/TwitterGeoFunctionConfiguration.java b/function/spring-twitter-function/src/main/java/org/springframework/cloud/fn/twitter/geo/TwitterGeoFunctionConfiguration.java similarity index 100% rename from function/twitter-function/src/main/java/org/springframework/cloud/fn/twitter/geo/TwitterGeoFunctionConfiguration.java rename to function/spring-twitter-function/src/main/java/org/springframework/cloud/fn/twitter/geo/TwitterGeoFunctionConfiguration.java diff --git a/function/twitter-function/src/main/java/org/springframework/cloud/fn/twitter/geo/TwitterGeoFunctionProperties.java b/function/spring-twitter-function/src/main/java/org/springframework/cloud/fn/twitter/geo/TwitterGeoFunctionProperties.java similarity index 100% rename from function/twitter-function/src/main/java/org/springframework/cloud/fn/twitter/geo/TwitterGeoFunctionProperties.java rename to function/spring-twitter-function/src/main/java/org/springframework/cloud/fn/twitter/geo/TwitterGeoFunctionProperties.java diff --git a/function/twitter-function/src/main/java/org/springframework/cloud/fn/twitter/trend/TwitterTrendFunctionConfiguration.java b/function/spring-twitter-function/src/main/java/org/springframework/cloud/fn/twitter/trend/TwitterTrendFunctionConfiguration.java similarity index 100% rename from function/twitter-function/src/main/java/org/springframework/cloud/fn/twitter/trend/TwitterTrendFunctionConfiguration.java rename to function/spring-twitter-function/src/main/java/org/springframework/cloud/fn/twitter/trend/TwitterTrendFunctionConfiguration.java diff --git a/function/twitter-function/src/main/java/org/springframework/cloud/fn/twitter/trend/TwitterTrendFunctionProperties.java b/function/spring-twitter-function/src/main/java/org/springframework/cloud/fn/twitter/trend/TwitterTrendFunctionProperties.java similarity index 100% rename from function/twitter-function/src/main/java/org/springframework/cloud/fn/twitter/trend/TwitterTrendFunctionProperties.java rename to function/spring-twitter-function/src/main/java/org/springframework/cloud/fn/twitter/trend/TwitterTrendFunctionProperties.java diff --git a/function/twitter-function/src/main/java/org/springframework/cloud/fn/twitter/users/TwitterUsersFunctionConfiguration.java b/function/spring-twitter-function/src/main/java/org/springframework/cloud/fn/twitter/users/TwitterUsersFunctionConfiguration.java similarity index 100% rename from function/twitter-function/src/main/java/org/springframework/cloud/fn/twitter/users/TwitterUsersFunctionConfiguration.java rename to function/spring-twitter-function/src/main/java/org/springframework/cloud/fn/twitter/users/TwitterUsersFunctionConfiguration.java diff --git a/function/twitter-function/src/main/java/org/springframework/cloud/fn/twitter/users/TwitterUsersFunctionProperties.java b/function/spring-twitter-function/src/main/java/org/springframework/cloud/fn/twitter/users/TwitterUsersFunctionProperties.java similarity index 100% rename from function/twitter-function/src/main/java/org/springframework/cloud/fn/twitter/users/TwitterUsersFunctionProperties.java rename to function/spring-twitter-function/src/main/java/org/springframework/cloud/fn/twitter/users/TwitterUsersFunctionProperties.java diff --git a/function/twitter-function/src/test/java/org/springframework/cloud/fn/twitter/geo/TwitterGeoFunctionTest.java b/function/spring-twitter-function/src/test/java/org/springframework/cloud/fn/twitter/geo/TwitterGeoFunctionTest.java similarity index 100% rename from function/twitter-function/src/test/java/org/springframework/cloud/fn/twitter/geo/TwitterGeoFunctionTest.java rename to function/spring-twitter-function/src/test/java/org/springframework/cloud/fn/twitter/geo/TwitterGeoFunctionTest.java diff --git a/function/twitter-function/src/test/java/org/springframework/cloud/fn/twitter/trend/TwitterTrendFunctionTests.java b/function/spring-twitter-function/src/test/java/org/springframework/cloud/fn/twitter/trend/TwitterTrendFunctionTests.java similarity index 100% rename from function/twitter-function/src/test/java/org/springframework/cloud/fn/twitter/trend/TwitterTrendFunctionTests.java rename to function/spring-twitter-function/src/test/java/org/springframework/cloud/fn/twitter/trend/TwitterTrendFunctionTests.java diff --git a/function/twitter-function/src/test/java/org/springframework/cloud/fn/twitter/users/TwitterUsersFunctionTests.java b/function/spring-twitter-function/src/test/java/org/springframework/cloud/fn/twitter/users/TwitterUsersFunctionTests.java similarity index 100% rename from function/twitter-function/src/test/java/org/springframework/cloud/fn/twitter/users/TwitterUsersFunctionTests.java rename to function/spring-twitter-function/src/test/java/org/springframework/cloud/fn/twitter/users/TwitterUsersFunctionTests.java diff --git a/function/twitter-function/src/test/resources/logback.xml b/function/spring-twitter-function/src/test/resources/logback.xml similarity index 100% rename from function/twitter-function/src/test/resources/logback.xml rename to function/spring-twitter-function/src/test/resources/logback.xml diff --git a/function/twitter-function/src/test/resources/response/lookup_users_id.json b/function/spring-twitter-function/src/test/resources/response/lookup_users_id.json similarity index 100% rename from function/twitter-function/src/test/resources/response/lookup_users_id.json rename to function/spring-twitter-function/src/test/resources/response/lookup_users_id.json diff --git a/function/twitter-function/src/test/resources/response/search_places_amsterdam.json b/function/spring-twitter-function/src/test/resources/response/search_places_amsterdam.json similarity index 100% rename from function/twitter-function/src/test/resources/response/search_places_amsterdam.json rename to function/spring-twitter-function/src/test/resources/response/search_places_amsterdam.json diff --git a/function/twitter-function/src/test/resources/response/search_users.json b/function/spring-twitter-function/src/test/resources/response/search_users.json similarity index 100% rename from function/twitter-function/src/test/resources/response/search_users.json rename to function/spring-twitter-function/src/test/resources/response/search_users.json diff --git a/function/twitter-function/src/test/resources/response/trends.json b/function/spring-twitter-function/src/test/resources/response/trends.json similarity index 100% rename from function/twitter-function/src/test/resources/response/trends.json rename to function/spring-twitter-function/src/test/resources/response/trends.json diff --git a/settings.gradle b/settings.gradle index 9c8d19dc..0f0082ad 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,7 +5,7 @@ plugins { rootProject.name = 'spring-functions-catalog' -include 'function-dependencies' +include 'spring-function-dependencies' ['common', 'consumer', 'function', 'supplier'].each { group -> def groupDir = file(group) @@ -14,4 +14,3 @@ include 'function-dependencies' project(":${subProject.name}").projectDir = new File(groupDir.absolutePath, subProject.name) } } - diff --git a/function-dependencies/build.gradle b/spring-function-dependencies/build.gradle similarity index 100% rename from function-dependencies/build.gradle rename to spring-function-dependencies/build.gradle diff --git a/supplier/ftp-supplier/build.gradle b/supplier/ftp-supplier/build.gradle deleted file mode 100644 index d280a87e..00000000 --- a/supplier/ftp-supplier/build.gradle +++ /dev/null @@ -1,8 +0,0 @@ -dependencies { - api project(':ftp-common') - api project(':file-common') - api project(':metadata-store-common') - - testImplementation project(':function-test-support') - testImplementation ftpserverCore -} diff --git a/supplier/mqtt-supplier/build.gradle b/supplier/mqtt-supplier/build.gradle deleted file mode 100644 index 44adc921..00000000 --- a/supplier/mqtt-supplier/build.gradle +++ /dev/null @@ -1,3 +0,0 @@ -dependencies { - api project(':mqtt-common') -} diff --git a/supplier/s3-supplier/build.gradle b/supplier/s3-supplier/build.gradle deleted file mode 100644 index 517d3c95..00000000 --- a/supplier/s3-supplier/build.gradle +++ /dev/null @@ -1,5 +0,0 @@ -dependencies { - api project(':aws-s3-common') - api project(':file-common') - api project(':metadata-store-common') -} diff --git a/supplier/sftp-supplier/build.gradle b/supplier/sftp-supplier/build.gradle deleted file mode 100644 index 90adb7af..00000000 --- a/supplier/sftp-supplier/build.gradle +++ /dev/null @@ -1,7 +0,0 @@ -dependencies { - api 'org.springframework.integration:spring-integration-sftp' - api project(':file-common') - api project(':metadata-store-common') - - testImplementation project(':function-test-support') -} diff --git a/supplier/debezium-supplier/build.gradle b/supplier/spring-debezium-supplier/build.gradle similarity index 92% rename from supplier/debezium-supplier/build.gradle rename to supplier/spring-debezium-supplier/build.gradle index 536cfe28..e8dc4b47 100644 --- a/supplier/debezium-supplier/build.gradle +++ b/supplier/spring-debezium-supplier/build.gradle @@ -3,7 +3,7 @@ repositories { } dependencies { - api project(':debezium-autoconfigure') + api project(':spring-debezium-autoconfigure') api 'io.debezium:debezium-connector-mysql' api 'io.debezium:debezium-connector-mongodb' api 'io.debezium:debezium-connector-postgres' diff --git a/supplier/debezium-supplier/src/main/java/org/springframework/cloud/fn/supplier/debezium/DebeziumReactiveConsumerConfiguration.java b/supplier/spring-debezium-supplier/src/main/java/org/springframework/cloud/fn/supplier/debezium/DebeziumReactiveConsumerConfiguration.java similarity index 100% rename from supplier/debezium-supplier/src/main/java/org/springframework/cloud/fn/supplier/debezium/DebeziumReactiveConsumerConfiguration.java rename to supplier/spring-debezium-supplier/src/main/java/org/springframework/cloud/fn/supplier/debezium/DebeziumReactiveConsumerConfiguration.java diff --git a/supplier/debezium-supplier/src/main/java/org/springframework/cloud/fn/supplier/debezium/DebeziumSupplierProperties.java b/supplier/spring-debezium-supplier/src/main/java/org/springframework/cloud/fn/supplier/debezium/DebeziumSupplierProperties.java similarity index 100% rename from supplier/debezium-supplier/src/main/java/org/springframework/cloud/fn/supplier/debezium/DebeziumSupplierProperties.java rename to supplier/spring-debezium-supplier/src/main/java/org/springframework/cloud/fn/supplier/debezium/DebeziumSupplierProperties.java diff --git a/supplier/debezium-supplier/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/supplier/spring-debezium-supplier/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from supplier/debezium-supplier/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to supplier/spring-debezium-supplier/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/supplier/debezium-supplier/src/test/java/org/springframework/cloud/fn/supplier/debezium/it/supplier/DebeziumReactiveConsumerConfigurationTests.java b/supplier/spring-debezium-supplier/src/test/java/org/springframework/cloud/fn/supplier/debezium/it/supplier/DebeziumReactiveConsumerConfigurationTests.java similarity index 100% rename from supplier/debezium-supplier/src/test/java/org/springframework/cloud/fn/supplier/debezium/it/supplier/DebeziumReactiveConsumerConfigurationTests.java rename to supplier/spring-debezium-supplier/src/test/java/org/springframework/cloud/fn/supplier/debezium/it/supplier/DebeziumReactiveConsumerConfigurationTests.java diff --git a/supplier/debezium-supplier/src/test/java/org/springframework/cloud/fn/supplier/debezium/it/supplier/DebeziumSupplierIntegrationTest.java b/supplier/spring-debezium-supplier/src/test/java/org/springframework/cloud/fn/supplier/debezium/it/supplier/DebeziumSupplierIntegrationTest.java similarity index 100% rename from supplier/debezium-supplier/src/test/java/org/springframework/cloud/fn/supplier/debezium/it/supplier/DebeziumSupplierIntegrationTest.java rename to supplier/spring-debezium-supplier/src/test/java/org/springframework/cloud/fn/supplier/debezium/it/supplier/DebeziumSupplierIntegrationTest.java diff --git a/supplier/debezium-supplier/src/test/java/org/springframework/cloud/fn/supplier/debezium/it/supplier/TestJdbcTemplateConfiguration.java b/supplier/spring-debezium-supplier/src/test/java/org/springframework/cloud/fn/supplier/debezium/it/supplier/TestJdbcTemplateConfiguration.java similarity index 100% rename from supplier/debezium-supplier/src/test/java/org/springframework/cloud/fn/supplier/debezium/it/supplier/TestJdbcTemplateConfiguration.java rename to supplier/spring-debezium-supplier/src/test/java/org/springframework/cloud/fn/supplier/debezium/it/supplier/TestJdbcTemplateConfiguration.java diff --git a/supplier/debezium-supplier/src/test/resources/logback-test.xml b/supplier/spring-debezium-supplier/src/test/resources/logback-test.xml similarity index 100% rename from supplier/debezium-supplier/src/test/resources/logback-test.xml rename to supplier/spring-debezium-supplier/src/test/resources/logback-test.xml diff --git a/supplier/file-supplier/README.adoc b/supplier/spring-file-supplier/README.adoc similarity index 100% rename from supplier/file-supplier/README.adoc rename to supplier/spring-file-supplier/README.adoc diff --git a/supplier/file-supplier/build.gradle b/supplier/spring-file-supplier/build.gradle similarity index 71% rename from supplier/file-supplier/build.gradle rename to supplier/spring-file-supplier/build.gradle index 2b78b520..4d3ba2b2 100644 --- a/supplier/file-supplier/build.gradle +++ b/supplier/spring-file-supplier/build.gradle @@ -1,6 +1,6 @@ dependencies { - api project(':file-common') - api project(':metadata-store-common') + api project(':spring-file-common') + api project(':spring-metadata-store-common') testImplementation 'org.springframework.integration:spring-integration-jdbc' testImplementation 'org.springframework.boot:spring-boot-starter-jdbc' diff --git a/supplier/file-supplier/src/main/java/org/springframework/cloud/fn/supplier/file/FileSupplierConfiguration.java b/supplier/spring-file-supplier/src/main/java/org/springframework/cloud/fn/supplier/file/FileSupplierConfiguration.java similarity index 100% rename from supplier/file-supplier/src/main/java/org/springframework/cloud/fn/supplier/file/FileSupplierConfiguration.java rename to supplier/spring-file-supplier/src/main/java/org/springframework/cloud/fn/supplier/file/FileSupplierConfiguration.java diff --git a/supplier/file-supplier/src/main/java/org/springframework/cloud/fn/supplier/file/FileSupplierProperties.java b/supplier/spring-file-supplier/src/main/java/org/springframework/cloud/fn/supplier/file/FileSupplierProperties.java similarity index 100% rename from supplier/file-supplier/src/main/java/org/springframework/cloud/fn/supplier/file/FileSupplierProperties.java rename to supplier/spring-file-supplier/src/main/java/org/springframework/cloud/fn/supplier/file/FileSupplierProperties.java diff --git a/supplier/file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/AbstractFileSupplierTests.java b/supplier/spring-file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/AbstractFileSupplierTests.java similarity index 100% rename from supplier/file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/AbstractFileSupplierTests.java rename to supplier/spring-file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/AbstractFileSupplierTests.java diff --git a/supplier/file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/DefaultFileSupplierTests.java b/supplier/spring-file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/DefaultFileSupplierTests.java similarity index 100% rename from supplier/file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/DefaultFileSupplierTests.java rename to supplier/spring-file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/DefaultFileSupplierTests.java diff --git a/supplier/file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/FileModeRefTests.java b/supplier/spring-file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/FileModeRefTests.java similarity index 100% rename from supplier/file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/FileModeRefTests.java rename to supplier/spring-file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/FileModeRefTests.java diff --git a/supplier/file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/FilePayloadWithPatternTests.java b/supplier/spring-file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/FilePayloadWithPatternTests.java similarity index 100% rename from supplier/file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/FilePayloadWithPatternTests.java rename to supplier/spring-file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/FilePayloadWithPatternTests.java diff --git a/supplier/file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/FilePayloadWithRegexTests.java b/supplier/spring-file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/FilePayloadWithRegexTests.java similarity index 100% rename from supplier/file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/FilePayloadWithRegexTests.java rename to supplier/spring-file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/FilePayloadWithRegexTests.java diff --git a/supplier/file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/LinesAndMarkersAsJsonPayloadTests.java b/supplier/spring-file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/LinesAndMarkersAsJsonPayloadTests.java similarity index 100% rename from supplier/file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/LinesAndMarkersAsJsonPayloadTests.java rename to supplier/spring-file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/LinesAndMarkersAsJsonPayloadTests.java diff --git a/supplier/file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/LinesPayloadTests.java b/supplier/spring-file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/LinesPayloadTests.java similarity index 100% rename from supplier/file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/LinesPayloadTests.java rename to supplier/spring-file-supplier/src/test/java/org/springframework/cloud/fn/supplier/file/LinesPayloadTests.java diff --git a/supplier/ftp-supplier/README.adoc b/supplier/spring-ftp-supplier/README.adoc similarity index 100% rename from supplier/ftp-supplier/README.adoc rename to supplier/spring-ftp-supplier/README.adoc diff --git a/supplier/spring-ftp-supplier/build.gradle b/supplier/spring-ftp-supplier/build.gradle new file mode 100644 index 00000000..f2511987 --- /dev/null +++ b/supplier/spring-ftp-supplier/build.gradle @@ -0,0 +1,8 @@ +dependencies { + api project(':spring-ftp-common') + api project(':spring-file-common') + api project(':spring-metadata-store-common') + + testImplementation project(':spring-function-test-support') + testImplementation ftpserverCore +} diff --git a/supplier/ftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/ftp/FtpSupplierConfiguration.java b/supplier/spring-ftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/ftp/FtpSupplierConfiguration.java similarity index 100% rename from supplier/ftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/ftp/FtpSupplierConfiguration.java rename to supplier/spring-ftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/ftp/FtpSupplierConfiguration.java diff --git a/supplier/ftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/ftp/FtpSupplierProperties.java b/supplier/spring-ftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/ftp/FtpSupplierProperties.java similarity index 100% rename from supplier/ftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/ftp/FtpSupplierProperties.java rename to supplier/spring-ftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/ftp/FtpSupplierProperties.java diff --git a/supplier/ftp-supplier/src/test/java/org/springframework/cloud/fn/supplier/ftp/FtpSupplierPropertiesTests.java b/supplier/spring-ftp-supplier/src/test/java/org/springframework/cloud/fn/supplier/ftp/FtpSupplierPropertiesTests.java similarity index 100% rename from supplier/ftp-supplier/src/test/java/org/springframework/cloud/fn/supplier/ftp/FtpSupplierPropertiesTests.java rename to supplier/spring-ftp-supplier/src/test/java/org/springframework/cloud/fn/supplier/ftp/FtpSupplierPropertiesTests.java diff --git a/supplier/ftp-supplier/src/test/java/org/springframework/cloud/fn/supplier/ftp/FtpSupplierTests.java b/supplier/spring-ftp-supplier/src/test/java/org/springframework/cloud/fn/supplier/ftp/FtpSupplierTests.java similarity index 100% rename from supplier/ftp-supplier/src/test/java/org/springframework/cloud/fn/supplier/ftp/FtpSupplierTests.java rename to supplier/spring-ftp-supplier/src/test/java/org/springframework/cloud/fn/supplier/ftp/FtpSupplierTests.java diff --git a/supplier/http-supplier/README.adoc b/supplier/spring-http-supplier/README.adoc similarity index 100% rename from supplier/http-supplier/README.adoc rename to supplier/spring-http-supplier/README.adoc diff --git a/supplier/http-supplier/build.gradle b/supplier/spring-http-supplier/build.gradle similarity index 100% rename from supplier/http-supplier/build.gradle rename to supplier/spring-http-supplier/build.gradle diff --git a/supplier/http-supplier/src/main/java/org/springframework/cloud/fn/supplier/http/HttpSupplierConfiguration.java b/supplier/spring-http-supplier/src/main/java/org/springframework/cloud/fn/supplier/http/HttpSupplierConfiguration.java similarity index 100% rename from supplier/http-supplier/src/main/java/org/springframework/cloud/fn/supplier/http/HttpSupplierConfiguration.java rename to supplier/spring-http-supplier/src/main/java/org/springframework/cloud/fn/supplier/http/HttpSupplierConfiguration.java diff --git a/supplier/http-supplier/src/main/java/org/springframework/cloud/fn/supplier/http/HttpSupplierProperties.java b/supplier/spring-http-supplier/src/main/java/org/springframework/cloud/fn/supplier/http/HttpSupplierProperties.java similarity index 100% rename from supplier/http-supplier/src/main/java/org/springframework/cloud/fn/supplier/http/HttpSupplierProperties.java rename to supplier/spring-http-supplier/src/main/java/org/springframework/cloud/fn/supplier/http/HttpSupplierProperties.java diff --git a/supplier/http-supplier/src/main/resources/application.properties b/supplier/spring-http-supplier/src/main/resources/application.properties similarity index 100% rename from supplier/http-supplier/src/main/resources/application.properties rename to supplier/spring-http-supplier/src/main/resources/application.properties diff --git a/supplier/http-supplier/src/test/java/org/springframework/cloud/fn/supplier/http/HttpSupplierApplicationTests.java b/supplier/spring-http-supplier/src/test/java/org/springframework/cloud/fn/supplier/http/HttpSupplierApplicationTests.java similarity index 100% rename from supplier/http-supplier/src/test/java/org/springframework/cloud/fn/supplier/http/HttpSupplierApplicationTests.java rename to supplier/spring-http-supplier/src/test/java/org/springframework/cloud/fn/supplier/http/HttpSupplierApplicationTests.java diff --git a/supplier/http-supplier/src/test/resources/test.jks b/supplier/spring-http-supplier/src/test/resources/test.jks similarity index 100% rename from supplier/http-supplier/src/test/resources/test.jks rename to supplier/spring-http-supplier/src/test/resources/test.jks diff --git a/supplier/jdbc-supplier/README.adoc b/supplier/spring-jdbc-supplier/README.adoc similarity index 100% rename from supplier/jdbc-supplier/README.adoc rename to supplier/spring-jdbc-supplier/README.adoc diff --git a/supplier/jdbc-supplier/build.gradle b/supplier/spring-jdbc-supplier/build.gradle similarity index 90% rename from supplier/jdbc-supplier/build.gradle rename to supplier/spring-jdbc-supplier/build.gradle index 532e3b5c..cc54e02b 100644 --- a/supplier/jdbc-supplier/build.gradle +++ b/supplier/spring-jdbc-supplier/build.gradle @@ -1,5 +1,5 @@ dependencies { - api project(':splitter-function') + api project(':spring-splitter-function') api 'org.springframework.integration:spring-integration-jdbc' api 'org.springframework.boot:spring-boot-starter-jdbc' api 'org.springframework.cloud:spring-cloud-function-context' diff --git a/supplier/jdbc-supplier/src/main/java/org/springframework/cloud/fn/supplier/jdbc/JdbcSupplierConfiguration.java b/supplier/spring-jdbc-supplier/src/main/java/org/springframework/cloud/fn/supplier/jdbc/JdbcSupplierConfiguration.java similarity index 100% rename from supplier/jdbc-supplier/src/main/java/org/springframework/cloud/fn/supplier/jdbc/JdbcSupplierConfiguration.java rename to supplier/spring-jdbc-supplier/src/main/java/org/springframework/cloud/fn/supplier/jdbc/JdbcSupplierConfiguration.java diff --git a/supplier/jdbc-supplier/src/main/java/org/springframework/cloud/fn/supplier/jdbc/JdbcSupplierProperties.java b/supplier/spring-jdbc-supplier/src/main/java/org/springframework/cloud/fn/supplier/jdbc/JdbcSupplierProperties.java similarity index 100% rename from supplier/jdbc-supplier/src/main/java/org/springframework/cloud/fn/supplier/jdbc/JdbcSupplierProperties.java rename to supplier/spring-jdbc-supplier/src/main/java/org/springframework/cloud/fn/supplier/jdbc/JdbcSupplierProperties.java diff --git a/supplier/jdbc-supplier/src/main/resources/application.properties b/supplier/spring-jdbc-supplier/src/main/resources/application.properties similarity index 100% rename from supplier/jdbc-supplier/src/main/resources/application.properties rename to supplier/spring-jdbc-supplier/src/main/resources/application.properties diff --git a/supplier/jdbc-supplier/src/test/java/org/springframework/cloud/fn/supplier/jdbc/DefaultJdbcSupplierTests.java b/supplier/spring-jdbc-supplier/src/test/java/org/springframework/cloud/fn/supplier/jdbc/DefaultJdbcSupplierTests.java similarity index 100% rename from supplier/jdbc-supplier/src/test/java/org/springframework/cloud/fn/supplier/jdbc/DefaultJdbcSupplierTests.java rename to supplier/spring-jdbc-supplier/src/test/java/org/springframework/cloud/fn/supplier/jdbc/DefaultJdbcSupplierTests.java diff --git a/supplier/jdbc-supplier/src/test/java/org/springframework/cloud/fn/supplier/jdbc/NonSplitJdbcSupplierTests.java b/supplier/spring-jdbc-supplier/src/test/java/org/springframework/cloud/fn/supplier/jdbc/NonSplitJdbcSupplierTests.java similarity index 100% rename from supplier/jdbc-supplier/src/test/java/org/springframework/cloud/fn/supplier/jdbc/NonSplitJdbcSupplierTests.java rename to supplier/spring-jdbc-supplier/src/test/java/org/springframework/cloud/fn/supplier/jdbc/NonSplitJdbcSupplierTests.java diff --git a/supplier/jdbc-supplier/src/test/resources/schema.sql b/supplier/spring-jdbc-supplier/src/test/resources/schema.sql similarity index 100% rename from supplier/jdbc-supplier/src/test/resources/schema.sql rename to supplier/spring-jdbc-supplier/src/test/resources/schema.sql diff --git a/supplier/jms-supplier/README.adoc b/supplier/spring-jms-supplier/README.adoc similarity index 100% rename from supplier/jms-supplier/README.adoc rename to supplier/spring-jms-supplier/README.adoc diff --git a/supplier/jms-supplier/build.gradle b/supplier/spring-jms-supplier/build.gradle similarity index 100% rename from supplier/jms-supplier/build.gradle rename to supplier/spring-jms-supplier/build.gradle diff --git a/supplier/jms-supplier/src/main/java/org/springframework/cloud/fn/supplier/jms/JmsSupplierConfiguration.java b/supplier/spring-jms-supplier/src/main/java/org/springframework/cloud/fn/supplier/jms/JmsSupplierConfiguration.java similarity index 100% rename from supplier/jms-supplier/src/main/java/org/springframework/cloud/fn/supplier/jms/JmsSupplierConfiguration.java rename to supplier/spring-jms-supplier/src/main/java/org/springframework/cloud/fn/supplier/jms/JmsSupplierConfiguration.java diff --git a/supplier/jms-supplier/src/main/java/org/springframework/cloud/fn/supplier/jms/JmsSupplierProperties.java b/supplier/spring-jms-supplier/src/main/java/org/springframework/cloud/fn/supplier/jms/JmsSupplierProperties.java similarity index 100% rename from supplier/jms-supplier/src/main/java/org/springframework/cloud/fn/supplier/jms/JmsSupplierProperties.java rename to supplier/spring-jms-supplier/src/main/java/org/springframework/cloud/fn/supplier/jms/JmsSupplierProperties.java diff --git a/supplier/jms-supplier/src/test/java/org/springframework/cloud/fn/supplier/jms/AbstractJmsSupplierTests.java b/supplier/spring-jms-supplier/src/test/java/org/springframework/cloud/fn/supplier/jms/AbstractJmsSupplierTests.java similarity index 100% rename from supplier/jms-supplier/src/test/java/org/springframework/cloud/fn/supplier/jms/AbstractJmsSupplierTests.java rename to supplier/spring-jms-supplier/src/test/java/org/springframework/cloud/fn/supplier/jms/AbstractJmsSupplierTests.java diff --git a/supplier/jms-supplier/src/test/java/org/springframework/cloud/fn/supplier/jms/PropertiesPopulated1Tests.java b/supplier/spring-jms-supplier/src/test/java/org/springframework/cloud/fn/supplier/jms/PropertiesPopulated1Tests.java similarity index 100% rename from supplier/jms-supplier/src/test/java/org/springframework/cloud/fn/supplier/jms/PropertiesPopulated1Tests.java rename to supplier/spring-jms-supplier/src/test/java/org/springframework/cloud/fn/supplier/jms/PropertiesPopulated1Tests.java diff --git a/supplier/jms-supplier/src/test/java/org/springframework/cloud/fn/supplier/jms/PropertiesPopulated2Tests.java b/supplier/spring-jms-supplier/src/test/java/org/springframework/cloud/fn/supplier/jms/PropertiesPopulated2Tests.java similarity index 100% rename from supplier/jms-supplier/src/test/java/org/springframework/cloud/fn/supplier/jms/PropertiesPopulated2Tests.java rename to supplier/spring-jms-supplier/src/test/java/org/springframework/cloud/fn/supplier/jms/PropertiesPopulated2Tests.java diff --git a/supplier/jms-supplier/src/test/java/org/springframework/cloud/fn/supplier/jms/PropertiesPopulated3Tests.java b/supplier/spring-jms-supplier/src/test/java/org/springframework/cloud/fn/supplier/jms/PropertiesPopulated3Tests.java similarity index 100% rename from supplier/jms-supplier/src/test/java/org/springframework/cloud/fn/supplier/jms/PropertiesPopulated3Tests.java rename to supplier/spring-jms-supplier/src/test/java/org/springframework/cloud/fn/supplier/jms/PropertiesPopulated3Tests.java diff --git a/supplier/kafka-supplier/README.adoc b/supplier/spring-kafka-supplier/README.adoc similarity index 100% rename from supplier/kafka-supplier/README.adoc rename to supplier/spring-kafka-supplier/README.adoc diff --git a/supplier/kafka-supplier/build.gradle b/supplier/spring-kafka-supplier/build.gradle similarity index 100% rename from supplier/kafka-supplier/build.gradle rename to supplier/spring-kafka-supplier/build.gradle diff --git a/supplier/kafka-supplier/src/main/java/org/springframework/cloud/fn/supplier/kafka/KafkaSupplierConfiguration.java b/supplier/spring-kafka-supplier/src/main/java/org/springframework/cloud/fn/supplier/kafka/KafkaSupplierConfiguration.java similarity index 100% rename from supplier/kafka-supplier/src/main/java/org/springframework/cloud/fn/supplier/kafka/KafkaSupplierConfiguration.java rename to supplier/spring-kafka-supplier/src/main/java/org/springframework/cloud/fn/supplier/kafka/KafkaSupplierConfiguration.java diff --git a/supplier/kafka-supplier/src/main/java/org/springframework/cloud/fn/supplier/kafka/KafkaSupplierProperties.java b/supplier/spring-kafka-supplier/src/main/java/org/springframework/cloud/fn/supplier/kafka/KafkaSupplierProperties.java similarity index 100% rename from supplier/kafka-supplier/src/main/java/org/springframework/cloud/fn/supplier/kafka/KafkaSupplierProperties.java rename to supplier/spring-kafka-supplier/src/main/java/org/springframework/cloud/fn/supplier/kafka/KafkaSupplierProperties.java diff --git a/supplier/kafka-supplier/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/supplier/spring-kafka-supplier/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from supplier/kafka-supplier/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to supplier/spring-kafka-supplier/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/supplier/kafka-supplier/src/test/java/org/springframework/cloud/fn/supplier/kafka/KafkaSupplierTests.java b/supplier/spring-kafka-supplier/src/test/java/org/springframework/cloud/fn/supplier/kafka/KafkaSupplierTests.java similarity index 100% rename from supplier/kafka-supplier/src/test/java/org/springframework/cloud/fn/supplier/kafka/KafkaSupplierTests.java rename to supplier/spring-kafka-supplier/src/test/java/org/springframework/cloud/fn/supplier/kafka/KafkaSupplierTests.java diff --git a/supplier/mail-supplier/README.adoc b/supplier/spring-mail-supplier/README.adoc similarity index 100% rename from supplier/mail-supplier/README.adoc rename to supplier/spring-mail-supplier/README.adoc diff --git a/supplier/mail-supplier/build.gradle b/supplier/spring-mail-supplier/build.gradle similarity index 100% rename from supplier/mail-supplier/build.gradle rename to supplier/spring-mail-supplier/build.gradle diff --git a/supplier/mail-supplier/src/main/java/org/springframework/cloud/fn/supplier/mail/MailSupplierConfiguration.java b/supplier/spring-mail-supplier/src/main/java/org/springframework/cloud/fn/supplier/mail/MailSupplierConfiguration.java similarity index 100% rename from supplier/mail-supplier/src/main/java/org/springframework/cloud/fn/supplier/mail/MailSupplierConfiguration.java rename to supplier/spring-mail-supplier/src/main/java/org/springframework/cloud/fn/supplier/mail/MailSupplierConfiguration.java diff --git a/supplier/mail-supplier/src/main/java/org/springframework/cloud/fn/supplier/mail/MailSupplierProperties.java b/supplier/spring-mail-supplier/src/main/java/org/springframework/cloud/fn/supplier/mail/MailSupplierProperties.java similarity index 100% rename from supplier/mail-supplier/src/main/java/org/springframework/cloud/fn/supplier/mail/MailSupplierProperties.java rename to supplier/spring-mail-supplier/src/main/java/org/springframework/cloud/fn/supplier/mail/MailSupplierProperties.java diff --git a/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/AbstractMailSupplierTests.java b/supplier/spring-mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/AbstractMailSupplierTests.java similarity index 100% rename from supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/AbstractMailSupplierTests.java rename to supplier/spring-mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/AbstractMailSupplierTests.java diff --git a/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapFailTests.java b/supplier/spring-mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapFailTests.java similarity index 100% rename from supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapFailTests.java rename to supplier/spring-mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapFailTests.java diff --git a/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapIdlePassTests.java b/supplier/spring-mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapIdlePassTests.java similarity index 100% rename from supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapIdlePassTests.java rename to supplier/spring-mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapIdlePassTests.java diff --git a/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapPassTests.java b/supplier/spring-mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapPassTests.java similarity index 100% rename from supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapPassTests.java rename to supplier/spring-mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/ImapPassTests.java diff --git a/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/Pop3FailTests.java b/supplier/spring-mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/Pop3FailTests.java similarity index 100% rename from supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/Pop3FailTests.java rename to supplier/spring-mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/Pop3FailTests.java diff --git a/supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/Pop3PassTests.java b/supplier/spring-mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/Pop3PassTests.java similarity index 100% rename from supplier/mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/Pop3PassTests.java rename to supplier/spring-mail-supplier/src/test/java/org/springframework/cloud/fn/supplier/mail/Pop3PassTests.java diff --git a/supplier/mongodb-supplier/README.adoc b/supplier/spring-mongodb-supplier/README.adoc similarity index 100% rename from supplier/mongodb-supplier/README.adoc rename to supplier/spring-mongodb-supplier/README.adoc diff --git a/supplier/mongodb-supplier/build.gradle b/supplier/spring-mongodb-supplier/build.gradle similarity index 66% rename from supplier/mongodb-supplier/build.gradle rename to supplier/spring-mongodb-supplier/build.gradle index 71c99aab..0bed0ba5 100644 --- a/supplier/mongodb-supplier/build.gradle +++ b/supplier/spring-mongodb-supplier/build.gradle @@ -1,9 +1,9 @@ dependencies { - api project(':splitter-function') + api project(':spring-splitter-function') api 'org.springframework.integration:spring-integration-mongodb' api 'org.mongodb:mongodb-driver-sync' api 'org.springframework.cloud:spring-cloud-function-context' testImplementation 'org.testcontainers:mongodb' - testImplementation project(':mongodb-consumer').sourceSets.test.output + testImplementation project(':spring-mongodb-consumer').sourceSets.test.output } diff --git a/supplier/mongodb-supplier/src/main/java/org/springframework/cloud/fn/supplier/mongo/MongodbSupplierConfiguration.java b/supplier/spring-mongodb-supplier/src/main/java/org/springframework/cloud/fn/supplier/mongo/MongodbSupplierConfiguration.java similarity index 100% rename from supplier/mongodb-supplier/src/main/java/org/springframework/cloud/fn/supplier/mongo/MongodbSupplierConfiguration.java rename to supplier/spring-mongodb-supplier/src/main/java/org/springframework/cloud/fn/supplier/mongo/MongodbSupplierConfiguration.java diff --git a/supplier/mongodb-supplier/src/main/java/org/springframework/cloud/fn/supplier/mongo/MongodbSupplierProperties.java b/supplier/spring-mongodb-supplier/src/main/java/org/springframework/cloud/fn/supplier/mongo/MongodbSupplierProperties.java similarity index 100% rename from supplier/mongodb-supplier/src/main/java/org/springframework/cloud/fn/supplier/mongo/MongodbSupplierProperties.java rename to supplier/spring-mongodb-supplier/src/main/java/org/springframework/cloud/fn/supplier/mongo/MongodbSupplierProperties.java diff --git a/supplier/mongodb-supplier/src/main/resources/application.properties b/supplier/spring-mongodb-supplier/src/main/resources/application.properties similarity index 100% rename from supplier/mongodb-supplier/src/main/resources/application.properties rename to supplier/spring-mongodb-supplier/src/main/resources/application.properties diff --git a/supplier/mongodb-supplier/src/test/java/org/springframework/cloud/fn/supplier/mongo/MongodbSupplierApplicationTests.java b/supplier/spring-mongodb-supplier/src/test/java/org/springframework/cloud/fn/supplier/mongo/MongodbSupplierApplicationTests.java similarity index 100% rename from supplier/mongodb-supplier/src/test/java/org/springframework/cloud/fn/supplier/mongo/MongodbSupplierApplicationTests.java rename to supplier/spring-mongodb-supplier/src/test/java/org/springframework/cloud/fn/supplier/mongo/MongodbSupplierApplicationTests.java diff --git a/supplier/mqtt-supplier/README.adoc b/supplier/spring-mqtt-supplier/README.adoc similarity index 100% rename from supplier/mqtt-supplier/README.adoc rename to supplier/spring-mqtt-supplier/README.adoc diff --git a/supplier/spring-mqtt-supplier/build.gradle b/supplier/spring-mqtt-supplier/build.gradle new file mode 100644 index 00000000..65cad74e --- /dev/null +++ b/supplier/spring-mqtt-supplier/build.gradle @@ -0,0 +1,3 @@ +dependencies { + api project(':spring-mqtt-common') +} diff --git a/supplier/mqtt-supplier/src/main/java/org/springframework/cloud/fn/supplier/mqtt/MqttSupplierConfiguration.java b/supplier/spring-mqtt-supplier/src/main/java/org/springframework/cloud/fn/supplier/mqtt/MqttSupplierConfiguration.java similarity index 100% rename from supplier/mqtt-supplier/src/main/java/org/springframework/cloud/fn/supplier/mqtt/MqttSupplierConfiguration.java rename to supplier/spring-mqtt-supplier/src/main/java/org/springframework/cloud/fn/supplier/mqtt/MqttSupplierConfiguration.java diff --git a/supplier/mqtt-supplier/src/main/java/org/springframework/cloud/fn/supplier/mqtt/MqttSupplierProperties.java b/supplier/spring-mqtt-supplier/src/main/java/org/springframework/cloud/fn/supplier/mqtt/MqttSupplierProperties.java similarity index 100% rename from supplier/mqtt-supplier/src/main/java/org/springframework/cloud/fn/supplier/mqtt/MqttSupplierProperties.java rename to supplier/spring-mqtt-supplier/src/main/java/org/springframework/cloud/fn/supplier/mqtt/MqttSupplierProperties.java diff --git a/supplier/mqtt-supplier/src/test/java/org/springframework/cloud/fn/supplier/mqtt/MqttSupplierTests.java b/supplier/spring-mqtt-supplier/src/test/java/org/springframework/cloud/fn/supplier/mqtt/MqttSupplierTests.java similarity index 100% rename from supplier/mqtt-supplier/src/test/java/org/springframework/cloud/fn/supplier/mqtt/MqttSupplierTests.java rename to supplier/spring-mqtt-supplier/src/test/java/org/springframework/cloud/fn/supplier/mqtt/MqttSupplierTests.java diff --git a/supplier/mqtt-supplier/src/test/resources/logback.xml b/supplier/spring-mqtt-supplier/src/test/resources/logback.xml similarity index 100% rename from supplier/mqtt-supplier/src/test/resources/logback.xml rename to supplier/spring-mqtt-supplier/src/test/resources/logback.xml diff --git a/supplier/rabbit-supplier/README.adoc b/supplier/spring-rabbit-supplier/README.adoc similarity index 100% rename from supplier/rabbit-supplier/README.adoc rename to supplier/spring-rabbit-supplier/README.adoc diff --git a/supplier/rabbit-supplier/build.gradle b/supplier/spring-rabbit-supplier/build.gradle similarity index 100% rename from supplier/rabbit-supplier/build.gradle rename to supplier/spring-rabbit-supplier/build.gradle diff --git a/supplier/rabbit-supplier/src/main/java/org/springframework/cloud/fn/supplier/rabbit/RabbitSupplierConfiguration.java b/supplier/spring-rabbit-supplier/src/main/java/org/springframework/cloud/fn/supplier/rabbit/RabbitSupplierConfiguration.java similarity index 100% rename from supplier/rabbit-supplier/src/main/java/org/springframework/cloud/fn/supplier/rabbit/RabbitSupplierConfiguration.java rename to supplier/spring-rabbit-supplier/src/main/java/org/springframework/cloud/fn/supplier/rabbit/RabbitSupplierConfiguration.java diff --git a/supplier/rabbit-supplier/src/main/java/org/springframework/cloud/fn/supplier/rabbit/RabbitSupplierProperties.java b/supplier/spring-rabbit-supplier/src/main/java/org/springframework/cloud/fn/supplier/rabbit/RabbitSupplierProperties.java similarity index 100% rename from supplier/rabbit-supplier/src/main/java/org/springframework/cloud/fn/supplier/rabbit/RabbitSupplierProperties.java rename to supplier/spring-rabbit-supplier/src/main/java/org/springframework/cloud/fn/supplier/rabbit/RabbitSupplierProperties.java diff --git a/supplier/s3-supplier/README.adoc b/supplier/spring-s3-supplier/README.adoc similarity index 100% rename from supplier/s3-supplier/README.adoc rename to supplier/spring-s3-supplier/README.adoc diff --git a/supplier/spring-s3-supplier/build.gradle b/supplier/spring-s3-supplier/build.gradle new file mode 100644 index 00000000..428ab21d --- /dev/null +++ b/supplier/spring-s3-supplier/build.gradle @@ -0,0 +1,5 @@ +dependencies { + api project(':spring-aws-s3-common') + api project(':spring-file-common') + api project(':spring-metadata-store-common') +} diff --git a/supplier/s3-supplier/src/main/java/org/springframework/cloud/fn/supplier/s3/AwsS3SupplierConfiguration.java b/supplier/spring-s3-supplier/src/main/java/org/springframework/cloud/fn/supplier/s3/AwsS3SupplierConfiguration.java similarity index 100% rename from supplier/s3-supplier/src/main/java/org/springframework/cloud/fn/supplier/s3/AwsS3SupplierConfiguration.java rename to supplier/spring-s3-supplier/src/main/java/org/springframework/cloud/fn/supplier/s3/AwsS3SupplierConfiguration.java diff --git a/supplier/s3-supplier/src/main/java/org/springframework/cloud/fn/supplier/s3/AwsS3SupplierProperties.java b/supplier/spring-s3-supplier/src/main/java/org/springframework/cloud/fn/supplier/s3/AwsS3SupplierProperties.java similarity index 100% rename from supplier/s3-supplier/src/main/java/org/springframework/cloud/fn/supplier/s3/AwsS3SupplierProperties.java rename to supplier/spring-s3-supplier/src/main/java/org/springframework/cloud/fn/supplier/s3/AwsS3SupplierProperties.java diff --git a/supplier/s3-supplier/src/test/java/org/springframework/cloud/fn/supplier/s3/AbstractAwsS3SupplierMockTests.java b/supplier/spring-s3-supplier/src/test/java/org/springframework/cloud/fn/supplier/s3/AbstractAwsS3SupplierMockTests.java similarity index 100% rename from supplier/s3-supplier/src/test/java/org/springframework/cloud/fn/supplier/s3/AbstractAwsS3SupplierMockTests.java rename to supplier/spring-s3-supplier/src/test/java/org/springframework/cloud/fn/supplier/s3/AbstractAwsS3SupplierMockTests.java diff --git a/supplier/s3-supplier/src/test/java/org/springframework/cloud/fn/supplier/s3/AmazonS3FilesTransferredTests.java b/supplier/spring-s3-supplier/src/test/java/org/springframework/cloud/fn/supplier/s3/AmazonS3FilesTransferredTests.java similarity index 100% rename from supplier/s3-supplier/src/test/java/org/springframework/cloud/fn/supplier/s3/AmazonS3FilesTransferredTests.java rename to supplier/spring-s3-supplier/src/test/java/org/springframework/cloud/fn/supplier/s3/AmazonS3FilesTransferredTests.java diff --git a/supplier/s3-supplier/src/test/java/org/springframework/cloud/fn/supplier/s3/AmazonS3LinesTransferredTests.java b/supplier/spring-s3-supplier/src/test/java/org/springframework/cloud/fn/supplier/s3/AmazonS3LinesTransferredTests.java similarity index 100% rename from supplier/s3-supplier/src/test/java/org/springframework/cloud/fn/supplier/s3/AmazonS3LinesTransferredTests.java rename to supplier/spring-s3-supplier/src/test/java/org/springframework/cloud/fn/supplier/s3/AmazonS3LinesTransferredTests.java diff --git a/supplier/s3-supplier/src/test/java/org/springframework/cloud/fn/supplier/s3/AmazonS3ListOnlyTests.java b/supplier/spring-s3-supplier/src/test/java/org/springframework/cloud/fn/supplier/s3/AmazonS3ListOnlyTests.java similarity index 100% rename from supplier/s3-supplier/src/test/java/org/springframework/cloud/fn/supplier/s3/AmazonS3ListOnlyTests.java rename to supplier/spring-s3-supplier/src/test/java/org/springframework/cloud/fn/supplier/s3/AmazonS3ListOnlyTests.java diff --git a/supplier/sftp-supplier/README.adoc b/supplier/spring-sftp-supplier/README.adoc similarity index 100% rename from supplier/sftp-supplier/README.adoc rename to supplier/spring-sftp-supplier/README.adoc diff --git a/supplier/spring-sftp-supplier/build.gradle b/supplier/spring-sftp-supplier/build.gradle new file mode 100644 index 00000000..59c4e379 --- /dev/null +++ b/supplier/spring-sftp-supplier/build.gradle @@ -0,0 +1,7 @@ +dependencies { + api 'org.springframework.integration:spring-integration-sftp' + api project(':spring-file-common') + api project(':spring-metadata-store-common') + + testImplementation project(':spring-function-test-support') +} diff --git a/supplier/sftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/sftp/SftpSupplierConfiguration.java b/supplier/spring-sftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/sftp/SftpSupplierConfiguration.java similarity index 100% rename from supplier/sftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/sftp/SftpSupplierConfiguration.java rename to supplier/spring-sftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/sftp/SftpSupplierConfiguration.java diff --git a/supplier/sftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/sftp/SftpSupplierFactoryConfiguration.java b/supplier/spring-sftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/sftp/SftpSupplierFactoryConfiguration.java similarity index 100% rename from supplier/sftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/sftp/SftpSupplierFactoryConfiguration.java rename to supplier/spring-sftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/sftp/SftpSupplierFactoryConfiguration.java diff --git a/supplier/sftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/sftp/SftpSupplierProperties.java b/supplier/spring-sftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/sftp/SftpSupplierProperties.java similarity index 100% rename from supplier/sftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/sftp/SftpSupplierProperties.java rename to supplier/spring-sftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/sftp/SftpSupplierProperties.java diff --git a/supplier/sftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/sftp/SftpSupplierRotator.java b/supplier/spring-sftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/sftp/SftpSupplierRotator.java similarity index 100% rename from supplier/sftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/sftp/SftpSupplierRotator.java rename to supplier/spring-sftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/sftp/SftpSupplierRotator.java diff --git a/supplier/sftp-supplier/src/test/java/org/springframework/cloud/fn/supplier/sftp/SftpSupplierApplicationTests.java b/supplier/spring-sftp-supplier/src/test/java/org/springframework/cloud/fn/supplier/sftp/SftpSupplierApplicationTests.java similarity index 100% rename from supplier/sftp-supplier/src/test/java/org/springframework/cloud/fn/supplier/sftp/SftpSupplierApplicationTests.java rename to supplier/spring-sftp-supplier/src/test/java/org/springframework/cloud/fn/supplier/sftp/SftpSupplierApplicationTests.java diff --git a/supplier/sftp-supplier/src/test/resources/logback.xml b/supplier/spring-sftp-supplier/src/test/resources/logback.xml similarity index 100% rename from supplier/sftp-supplier/src/test/resources/logback.xml rename to supplier/spring-sftp-supplier/src/test/resources/logback.xml diff --git a/supplier/syslog-supplier/README.adoc b/supplier/spring-syslog-supplier/README.adoc similarity index 100% rename from supplier/syslog-supplier/README.adoc rename to supplier/spring-syslog-supplier/README.adoc diff --git a/supplier/syslog-supplier/build.gradle b/supplier/spring-syslog-supplier/build.gradle similarity index 100% rename from supplier/syslog-supplier/build.gradle rename to supplier/spring-syslog-supplier/build.gradle diff --git a/supplier/syslog-supplier/src/main/java/org/springframework/cloud/fn/supplier/syslog/SyslogSupplierConfiguration.java b/supplier/spring-syslog-supplier/src/main/java/org/springframework/cloud/fn/supplier/syslog/SyslogSupplierConfiguration.java similarity index 100% rename from supplier/syslog-supplier/src/main/java/org/springframework/cloud/fn/supplier/syslog/SyslogSupplierConfiguration.java rename to supplier/spring-syslog-supplier/src/main/java/org/springframework/cloud/fn/supplier/syslog/SyslogSupplierConfiguration.java diff --git a/supplier/syslog-supplier/src/main/java/org/springframework/cloud/fn/supplier/syslog/SyslogSupplierProperties.java b/supplier/spring-syslog-supplier/src/main/java/org/springframework/cloud/fn/supplier/syslog/SyslogSupplierProperties.java similarity index 100% rename from supplier/syslog-supplier/src/main/java/org/springframework/cloud/fn/supplier/syslog/SyslogSupplierProperties.java rename to supplier/spring-syslog-supplier/src/main/java/org/springframework/cloud/fn/supplier/syslog/SyslogSupplierProperties.java diff --git a/supplier/syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/AbstractSyslogSupplierTests.java b/supplier/spring-syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/AbstractSyslogSupplierTests.java similarity index 100% rename from supplier/syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/AbstractSyslogSupplierTests.java rename to supplier/spring-syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/AbstractSyslogSupplierTests.java diff --git a/supplier/syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/NotNioTests.java b/supplier/spring-syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/NotNioTests.java similarity index 100% rename from supplier/syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/NotNioTests.java rename to supplier/spring-syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/NotNioTests.java diff --git a/supplier/syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/PropertiesPopulatedTests.java b/supplier/spring-syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/PropertiesPopulatedTests.java similarity index 100% rename from supplier/syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/PropertiesPopulatedTests.java rename to supplier/spring-syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/PropertiesPopulatedTests.java diff --git a/supplier/syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/Tcp3164Tests.java b/supplier/spring-syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/Tcp3164Tests.java similarity index 100% rename from supplier/syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/Tcp3164Tests.java rename to supplier/spring-syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/Tcp3164Tests.java diff --git a/supplier/syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/Tcp5424Tests.java b/supplier/spring-syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/Tcp5424Tests.java similarity index 100% rename from supplier/syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/Tcp5424Tests.java rename to supplier/spring-syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/Tcp5424Tests.java diff --git a/supplier/syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/TcpAndUdp3164Tests.java b/supplier/spring-syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/TcpAndUdp3164Tests.java similarity index 100% rename from supplier/syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/TcpAndUdp3164Tests.java rename to supplier/spring-syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/TcpAndUdp3164Tests.java diff --git a/supplier/syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/TcpAndUdp5424Tests.java b/supplier/spring-syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/TcpAndUdp5424Tests.java similarity index 100% rename from supplier/syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/TcpAndUdp5424Tests.java rename to supplier/spring-syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/TcpAndUdp5424Tests.java diff --git a/supplier/syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/Udp3164Tests.java b/supplier/spring-syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/Udp3164Tests.java similarity index 100% rename from supplier/syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/Udp3164Tests.java rename to supplier/spring-syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/Udp3164Tests.java diff --git a/supplier/syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/Udp5424Tests.java b/supplier/spring-syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/Udp5424Tests.java similarity index 100% rename from supplier/syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/Udp5424Tests.java rename to supplier/spring-syslog-supplier/src/test/java/org/springframework/cloud/fn/supplier/syslog/Udp5424Tests.java diff --git a/supplier/tcp-supplier/README.adoc b/supplier/spring-tcp-supplier/README.adoc similarity index 100% rename from supplier/tcp-supplier/README.adoc rename to supplier/spring-tcp-supplier/README.adoc diff --git a/supplier/spring-tcp-supplier/build.gradle b/supplier/spring-tcp-supplier/build.gradle new file mode 100644 index 00000000..bb8d13d8 --- /dev/null +++ b/supplier/spring-tcp-supplier/build.gradle @@ -0,0 +1,3 @@ +dependencies { + api project(':spring-tcp-common') +} diff --git a/supplier/tcp-supplier/src/main/java/org/springframework/cloud/fn/supplier/tcp/TcpSupplierConfiguration.java b/supplier/spring-tcp-supplier/src/main/java/org/springframework/cloud/fn/supplier/tcp/TcpSupplierConfiguration.java similarity index 100% rename from supplier/tcp-supplier/src/main/java/org/springframework/cloud/fn/supplier/tcp/TcpSupplierConfiguration.java rename to supplier/spring-tcp-supplier/src/main/java/org/springframework/cloud/fn/supplier/tcp/TcpSupplierConfiguration.java diff --git a/supplier/tcp-supplier/src/main/java/org/springframework/cloud/fn/supplier/tcp/TcpSupplierProperties.java b/supplier/spring-tcp-supplier/src/main/java/org/springframework/cloud/fn/supplier/tcp/TcpSupplierProperties.java similarity index 100% rename from supplier/tcp-supplier/src/main/java/org/springframework/cloud/fn/supplier/tcp/TcpSupplierProperties.java rename to supplier/spring-tcp-supplier/src/main/java/org/springframework/cloud/fn/supplier/tcp/TcpSupplierProperties.java diff --git a/supplier/tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/AbstractTcpSupplierTests.java b/supplier/spring-tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/AbstractTcpSupplierTests.java similarity index 100% rename from supplier/tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/AbstractTcpSupplierTests.java rename to supplier/spring-tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/AbstractTcpSupplierTests.java diff --git a/supplier/tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/CRLFTests.java b/supplier/spring-tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/CRLFTests.java similarity index 100% rename from supplier/tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/CRLFTests.java rename to supplier/spring-tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/CRLFTests.java diff --git a/supplier/tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/L1Tests.java b/supplier/spring-tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/L1Tests.java similarity index 100% rename from supplier/tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/L1Tests.java rename to supplier/spring-tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/L1Tests.java diff --git a/supplier/tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/L2Tests.java b/supplier/spring-tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/L2Tests.java similarity index 100% rename from supplier/tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/L2Tests.java rename to supplier/spring-tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/L2Tests.java diff --git a/supplier/tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/L4Tests.java b/supplier/spring-tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/L4Tests.java similarity index 100% rename from supplier/tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/L4Tests.java rename to supplier/spring-tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/L4Tests.java diff --git a/supplier/tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/LFTests.java b/supplier/spring-tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/LFTests.java similarity index 100% rename from supplier/tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/LFTests.java rename to supplier/spring-tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/LFTests.java diff --git a/supplier/tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/NULLTests.java b/supplier/spring-tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/NULLTests.java similarity index 100% rename from supplier/tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/NULLTests.java rename to supplier/spring-tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/NULLTests.java diff --git a/supplier/tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/NotNioTests.java b/supplier/spring-tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/NotNioTests.java similarity index 100% rename from supplier/tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/NotNioTests.java rename to supplier/spring-tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/NotNioTests.java diff --git a/supplier/tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/PropertiesPopulatedTests.java b/supplier/spring-tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/PropertiesPopulatedTests.java similarity index 100% rename from supplier/tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/PropertiesPopulatedTests.java rename to supplier/spring-tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/PropertiesPopulatedTests.java diff --git a/supplier/tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/RAWTests.java b/supplier/spring-tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/RAWTests.java similarity index 100% rename from supplier/tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/RAWTests.java rename to supplier/spring-tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/RAWTests.java diff --git a/supplier/tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/STXETXTests.java b/supplier/spring-tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/STXETXTests.java similarity index 100% rename from supplier/tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/STXETXTests.java rename to supplier/spring-tcp-supplier/src/test/java/org/springframework/cloud/fn/supplier/tcp/STXETXTests.java diff --git a/supplier/time-supplier/README.adoc b/supplier/spring-time-supplier/README.adoc similarity index 100% rename from supplier/time-supplier/README.adoc rename to supplier/spring-time-supplier/README.adoc diff --git a/supplier/time-supplier/src/main/java/org/springframework/cloud/fn/supplier/time/DateFormat.java b/supplier/spring-time-supplier/src/main/java/org/springframework/cloud/fn/supplier/time/DateFormat.java similarity index 100% rename from supplier/time-supplier/src/main/java/org/springframework/cloud/fn/supplier/time/DateFormat.java rename to supplier/spring-time-supplier/src/main/java/org/springframework/cloud/fn/supplier/time/DateFormat.java diff --git a/supplier/time-supplier/src/main/java/org/springframework/cloud/fn/supplier/time/TimeSupplierConfiguration.java b/supplier/spring-time-supplier/src/main/java/org/springframework/cloud/fn/supplier/time/TimeSupplierConfiguration.java similarity index 100% rename from supplier/time-supplier/src/main/java/org/springframework/cloud/fn/supplier/time/TimeSupplierConfiguration.java rename to supplier/spring-time-supplier/src/main/java/org/springframework/cloud/fn/supplier/time/TimeSupplierConfiguration.java diff --git a/supplier/time-supplier/src/main/java/org/springframework/cloud/fn/supplier/time/TimeSupplierProperties.java b/supplier/spring-time-supplier/src/main/java/org/springframework/cloud/fn/supplier/time/TimeSupplierProperties.java similarity index 100% rename from supplier/time-supplier/src/main/java/org/springframework/cloud/fn/supplier/time/TimeSupplierProperties.java rename to supplier/spring-time-supplier/src/main/java/org/springframework/cloud/fn/supplier/time/TimeSupplierProperties.java diff --git a/supplier/time-supplier/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/supplier/spring-time-supplier/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from supplier/time-supplier/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to supplier/spring-time-supplier/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/supplier/time-supplier/src/test/java/org/springframework/cloud/fn/supplier/time/SimpleTimeSupplierTests.java b/supplier/spring-time-supplier/src/test/java/org/springframework/cloud/fn/supplier/time/SimpleTimeSupplierTests.java similarity index 100% rename from supplier/time-supplier/src/test/java/org/springframework/cloud/fn/supplier/time/SimpleTimeSupplierTests.java rename to supplier/spring-time-supplier/src/test/java/org/springframework/cloud/fn/supplier/time/SimpleTimeSupplierTests.java diff --git a/supplier/time-supplier/src/test/java/org/springframework/cloud/fn/supplier/time/TimeSupplierApplicationTests.java b/supplier/spring-time-supplier/src/test/java/org/springframework/cloud/fn/supplier/time/TimeSupplierApplicationTests.java similarity index 100% rename from supplier/time-supplier/src/test/java/org/springframework/cloud/fn/supplier/time/TimeSupplierApplicationTests.java rename to supplier/spring-time-supplier/src/test/java/org/springframework/cloud/fn/supplier/time/TimeSupplierApplicationTests.java diff --git a/supplier/time-supplier/src/test/java/org/springframework/cloud/fn/supplier/time/VariationToSimpleTests.java b/supplier/spring-time-supplier/src/test/java/org/springframework/cloud/fn/supplier/time/VariationToSimpleTests.java similarity index 100% rename from supplier/time-supplier/src/test/java/org/springframework/cloud/fn/supplier/time/VariationToSimpleTests.java rename to supplier/spring-time-supplier/src/test/java/org/springframework/cloud/fn/supplier/time/VariationToSimpleTests.java diff --git a/supplier/twitter-supplier/README.adoc b/supplier/spring-twitter-supplier/README.adoc similarity index 100% rename from supplier/twitter-supplier/README.adoc rename to supplier/spring-twitter-supplier/README.adoc diff --git a/supplier/twitter-supplier/build.gradle b/supplier/spring-twitter-supplier/build.gradle similarity index 79% rename from supplier/twitter-supplier/build.gradle rename to supplier/spring-twitter-supplier/build.gradle index 71d4b647..56491d71 100644 --- a/supplier/twitter-supplier/build.gradle +++ b/supplier/spring-twitter-supplier/build.gradle @@ -1,5 +1,5 @@ dependencies { - api project(':twitter-common') + api project(':spring-twitter-common') api 'org.springframework.integration:spring-integration-jms' api 'jakarta.jms:jakarta.jms-api' diff --git a/supplier/twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/friendships/TwitterFriendshipsSupplierConfiguration.java b/supplier/spring-twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/friendships/TwitterFriendshipsSupplierConfiguration.java similarity index 100% rename from supplier/twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/friendships/TwitterFriendshipsSupplierConfiguration.java rename to supplier/spring-twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/friendships/TwitterFriendshipsSupplierConfiguration.java diff --git a/supplier/twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/friendships/TwitterFriendshipsSupplierProperties.java b/supplier/spring-twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/friendships/TwitterFriendshipsSupplierProperties.java similarity index 100% rename from supplier/twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/friendships/TwitterFriendshipsSupplierProperties.java rename to supplier/spring-twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/friendships/TwitterFriendshipsSupplierProperties.java diff --git a/supplier/twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/message/TwitterMessageSupplierConfiguration.java b/supplier/spring-twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/message/TwitterMessageSupplierConfiguration.java similarity index 100% rename from supplier/twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/message/TwitterMessageSupplierConfiguration.java rename to supplier/spring-twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/message/TwitterMessageSupplierConfiguration.java diff --git a/supplier/twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/message/TwitterMessageSupplierProperties.java b/supplier/spring-twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/message/TwitterMessageSupplierProperties.java similarity index 100% rename from supplier/twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/message/TwitterMessageSupplierProperties.java rename to supplier/spring-twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/message/TwitterMessageSupplierProperties.java diff --git a/supplier/twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/status/search/SearchPagination.java b/supplier/spring-twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/status/search/SearchPagination.java similarity index 100% rename from supplier/twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/status/search/SearchPagination.java rename to supplier/spring-twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/status/search/SearchPagination.java diff --git a/supplier/twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/status/search/TwitterSearchSupplierConfiguration.java b/supplier/spring-twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/status/search/TwitterSearchSupplierConfiguration.java similarity index 100% rename from supplier/twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/status/search/TwitterSearchSupplierConfiguration.java rename to supplier/spring-twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/status/search/TwitterSearchSupplierConfiguration.java diff --git a/supplier/twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/status/search/TwitterSearchSupplierProperties.java b/supplier/spring-twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/status/search/TwitterSearchSupplierProperties.java similarity index 100% rename from supplier/twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/status/search/TwitterSearchSupplierProperties.java rename to supplier/spring-twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/status/search/TwitterSearchSupplierProperties.java diff --git a/supplier/twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/status/stream/TwitterStreamSupplierConfiguration.java b/supplier/spring-twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/status/stream/TwitterStreamSupplierConfiguration.java similarity index 100% rename from supplier/twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/status/stream/TwitterStreamSupplierConfiguration.java rename to supplier/spring-twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/status/stream/TwitterStreamSupplierConfiguration.java diff --git a/supplier/twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/status/stream/TwitterStreamSupplierProperties.java b/supplier/spring-twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/status/stream/TwitterStreamSupplierProperties.java similarity index 100% rename from supplier/twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/status/stream/TwitterStreamSupplierProperties.java rename to supplier/spring-twitter-supplier/src/main/java/org/springframework/cloud/fn/supplier/twitter/status/stream/TwitterStreamSupplierProperties.java diff --git a/supplier/twitter-supplier/src/test/java/org/springframework/cloud/fn/supplier/twitter/status/search/SearchPaginationTests.java b/supplier/spring-twitter-supplier/src/test/java/org/springframework/cloud/fn/supplier/twitter/status/search/SearchPaginationTests.java similarity index 100% rename from supplier/twitter-supplier/src/test/java/org/springframework/cloud/fn/supplier/twitter/status/search/SearchPaginationTests.java rename to supplier/spring-twitter-supplier/src/test/java/org/springframework/cloud/fn/supplier/twitter/status/search/SearchPaginationTests.java diff --git a/supplier/twitter-supplier/src/test/java/org/springframework/cloud/fn/supplier/twitter/status/stream/TwitterStreamSupplierTests.java b/supplier/spring-twitter-supplier/src/test/java/org/springframework/cloud/fn/supplier/twitter/status/stream/TwitterStreamSupplierTests.java similarity index 100% rename from supplier/twitter-supplier/src/test/java/org/springframework/cloud/fn/supplier/twitter/status/stream/TwitterStreamSupplierTests.java rename to supplier/spring-twitter-supplier/src/test/java/org/springframework/cloud/fn/supplier/twitter/status/stream/TwitterStreamSupplierTests.java diff --git a/supplier/twitter-supplier/src/test/resources/logback.xml b/supplier/spring-twitter-supplier/src/test/resources/logback.xml similarity index 100% rename from supplier/twitter-supplier/src/test/resources/logback.xml rename to supplier/spring-twitter-supplier/src/test/resources/logback.xml diff --git a/supplier/twitter-supplier/src/test/resources/response/stream_test_1.json b/supplier/spring-twitter-supplier/src/test/resources/response/stream_test_1.json similarity index 100% rename from supplier/twitter-supplier/src/test/resources/response/stream_test_1.json rename to supplier/spring-twitter-supplier/src/test/resources/response/stream_test_1.json diff --git a/supplier/websocket-supplier/README.adoc b/supplier/spring-websocket-supplier/README.adoc similarity index 100% rename from supplier/websocket-supplier/README.adoc rename to supplier/spring-websocket-supplier/README.adoc diff --git a/supplier/websocket-supplier/build.gradle b/supplier/spring-websocket-supplier/build.gradle similarity index 79% rename from supplier/websocket-supplier/build.gradle rename to supplier/spring-websocket-supplier/build.gradle index fcaf5fdd..6b321cd1 100644 --- a/supplier/websocket-supplier/build.gradle +++ b/supplier/spring-websocket-supplier/build.gradle @@ -3,5 +3,5 @@ dependencies { testImplementation 'org.springframework.boot:spring-boot-starter-web' testImplementation 'org.springframework.boot:spring-boot-starter-security' - testImplementation project(':function-test-support') + testImplementation project(':spring-function-test-support') } diff --git a/supplier/websocket-supplier/src/main/java/org/springframework/cloud/fn/supplier/websocket/WebsocketSupplierConfiguration.java b/supplier/spring-websocket-supplier/src/main/java/org/springframework/cloud/fn/supplier/websocket/WebsocketSupplierConfiguration.java similarity index 100% rename from supplier/websocket-supplier/src/main/java/org/springframework/cloud/fn/supplier/websocket/WebsocketSupplierConfiguration.java rename to supplier/spring-websocket-supplier/src/main/java/org/springframework/cloud/fn/supplier/websocket/WebsocketSupplierConfiguration.java diff --git a/supplier/websocket-supplier/src/main/java/org/springframework/cloud/fn/supplier/websocket/WebsocketSupplierProperties.java b/supplier/spring-websocket-supplier/src/main/java/org/springframework/cloud/fn/supplier/websocket/WebsocketSupplierProperties.java similarity index 100% rename from supplier/websocket-supplier/src/main/java/org/springframework/cloud/fn/supplier/websocket/WebsocketSupplierProperties.java rename to supplier/spring-websocket-supplier/src/main/java/org/springframework/cloud/fn/supplier/websocket/WebsocketSupplierProperties.java diff --git a/supplier/websocket-supplier/src/test/java/org/springframework/cloud/fn/supplier/websocket/WebsocketSupplierTests.java b/supplier/spring-websocket-supplier/src/test/java/org/springframework/cloud/fn/supplier/websocket/WebsocketSupplierTests.java similarity index 100% rename from supplier/websocket-supplier/src/test/java/org/springframework/cloud/fn/supplier/websocket/WebsocketSupplierTests.java rename to supplier/spring-websocket-supplier/src/test/java/org/springframework/cloud/fn/supplier/websocket/WebsocketSupplierTests.java diff --git a/supplier/xmpp-supplier/README.adoc b/supplier/spring-xmpp-supplier/README.adoc similarity index 100% rename from supplier/xmpp-supplier/README.adoc rename to supplier/spring-xmpp-supplier/README.adoc diff --git a/supplier/spring-xmpp-supplier/build.gradle b/supplier/spring-xmpp-supplier/build.gradle new file mode 100644 index 00000000..f6b868a7 --- /dev/null +++ b/supplier/spring-xmpp-supplier/build.gradle @@ -0,0 +1,5 @@ +dependencies { + api project(':spring-xmpp-common') + + testImplementation project(':spring-function-test-support') +} diff --git a/supplier/xmpp-supplier/src/main/java/org/springframework/cloud/fn/supplier/xmpp/XmppSupplierConfiguration.java b/supplier/spring-xmpp-supplier/src/main/java/org/springframework/cloud/fn/supplier/xmpp/XmppSupplierConfiguration.java similarity index 100% rename from supplier/xmpp-supplier/src/main/java/org/springframework/cloud/fn/supplier/xmpp/XmppSupplierConfiguration.java rename to supplier/spring-xmpp-supplier/src/main/java/org/springframework/cloud/fn/supplier/xmpp/XmppSupplierConfiguration.java diff --git a/supplier/xmpp-supplier/src/main/java/org/springframework/cloud/fn/supplier/xmpp/XmppSupplierProperties.java b/supplier/spring-xmpp-supplier/src/main/java/org/springframework/cloud/fn/supplier/xmpp/XmppSupplierProperties.java similarity index 100% rename from supplier/xmpp-supplier/src/main/java/org/springframework/cloud/fn/supplier/xmpp/XmppSupplierProperties.java rename to supplier/spring-xmpp-supplier/src/main/java/org/springframework/cloud/fn/supplier/xmpp/XmppSupplierProperties.java diff --git a/supplier/xmpp-supplier/src/test/java/org/springframework/cloud/fn/supplier/xmpp/XmppSupplierConfigurationTests.java b/supplier/spring-xmpp-supplier/src/test/java/org/springframework/cloud/fn/supplier/xmpp/XmppSupplierConfigurationTests.java similarity index 100% rename from supplier/xmpp-supplier/src/test/java/org/springframework/cloud/fn/supplier/xmpp/XmppSupplierConfigurationTests.java rename to supplier/spring-xmpp-supplier/src/test/java/org/springframework/cloud/fn/supplier/xmpp/XmppSupplierConfigurationTests.java diff --git a/supplier/zeromq-supplier/README.adoc b/supplier/spring-zeromq-supplier/README.adoc similarity index 100% rename from supplier/zeromq-supplier/README.adoc rename to supplier/spring-zeromq-supplier/README.adoc diff --git a/supplier/zeromq-supplier/build.gradle b/supplier/spring-zeromq-supplier/build.gradle similarity index 100% rename from supplier/zeromq-supplier/build.gradle rename to supplier/spring-zeromq-supplier/build.gradle diff --git a/supplier/zeromq-supplier/src/main/java/org/springframework/cloud/fn/supplier/zeromq/ZeroMqSupplierConfiguration.java b/supplier/spring-zeromq-supplier/src/main/java/org/springframework/cloud/fn/supplier/zeromq/ZeroMqSupplierConfiguration.java similarity index 100% rename from supplier/zeromq-supplier/src/main/java/org/springframework/cloud/fn/supplier/zeromq/ZeroMqSupplierConfiguration.java rename to supplier/spring-zeromq-supplier/src/main/java/org/springframework/cloud/fn/supplier/zeromq/ZeroMqSupplierConfiguration.java diff --git a/supplier/zeromq-supplier/src/main/java/org/springframework/cloud/fn/supplier/zeromq/ZeroMqSupplierProperties.java b/supplier/spring-zeromq-supplier/src/main/java/org/springframework/cloud/fn/supplier/zeromq/ZeroMqSupplierProperties.java similarity index 100% rename from supplier/zeromq-supplier/src/main/java/org/springframework/cloud/fn/supplier/zeromq/ZeroMqSupplierProperties.java rename to supplier/spring-zeromq-supplier/src/main/java/org/springframework/cloud/fn/supplier/zeromq/ZeroMqSupplierProperties.java diff --git a/supplier/zeromq-supplier/src/test/java/org/springframework/cloud/fn/supplier/zeromq/ZeroMqSupplierConfigurationTests.java b/supplier/spring-zeromq-supplier/src/test/java/org/springframework/cloud/fn/supplier/zeromq/ZeroMqSupplierConfigurationTests.java similarity index 100% rename from supplier/zeromq-supplier/src/test/java/org/springframework/cloud/fn/supplier/zeromq/ZeroMqSupplierConfigurationTests.java rename to supplier/spring-zeromq-supplier/src/test/java/org/springframework/cloud/fn/supplier/zeromq/ZeroMqSupplierConfigurationTests.java diff --git a/supplier/tcp-supplier/build.gradle b/supplier/tcp-supplier/build.gradle deleted file mode 100644 index 39f81c78..00000000 --- a/supplier/tcp-supplier/build.gradle +++ /dev/null @@ -1,3 +0,0 @@ -dependencies { - api project(':tcp-common') -} diff --git a/supplier/xmpp-supplier/build.gradle b/supplier/xmpp-supplier/build.gradle deleted file mode 100644 index 40ccc9f9..00000000 --- a/supplier/xmpp-supplier/build.gradle +++ /dev/null @@ -1,5 +0,0 @@ -dependencies { - api project(':xmpp-common') - - testImplementation project(':function-test-support') -}