From 19f904eb6654e4ef1ec28224194100dffb4e7797 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Thu, 23 Nov 2023 15:45:29 -0500 Subject: [PATCH] Migrate project to Gradle * Upgrade all the dependencies to the latest versions * Fix some incompatibilities * Fix some warnings --- .gitignore | 9 + CODE_OF_CONDUCT.adoc | 44 + LICENSE.txt | 202 ++ build.gradle | 173 ++ common/aws-s3-common/build.gradle | 6 + common/aws-s3-common/pom.xml | 37 - common/config-common/pom.xml | 28 - common/debezium-autoconfigure/build.gradle | 17 + common/debezium-autoconfigure/pom.xml | 106 - common/file-common/build.gradle | 3 + common/file-common/pom.xml | 23 - common/ftp-common/build.gradle | 3 + common/ftp-common/pom.xml | 25 - common/function-test-support/build.gradle | 8 + common/function-test-support/pom.xml | 72 - common/metadata-store-common/build.gradle | 20 + common/metadata-store-common/pom.xml | 112 - common/mongodb-common/pom.xml | 43 - .../src/main/resources/application.properties | 1 - common/mqtt-common/build.gradle | 3 + common/mqtt-common/pom.xml | 23 - common/pom.xml | 41 - common/redis-common/pom.xml | 35 - .../src/main/resources/application.properties | 1 - common/tcp-common/build.gradle | 3 + common/tcp-common/pom.xml | 25 - common/tensorflow-common/build.gradle | 15 + common/tensorflow-common/pom.xml | 76 - common/twitter-common/build.gradle | 8 + common/twitter-common/pom.xml | 33 - common/xmpp-common/build.gradle | 3 + common/xmpp-common/pom.xml | 24 - consumer/analytics-consumer/build.gradle | 7 + consumer/analytics-consumer/pom.xml | 46 - .../analytics/CountWithAmountTest.java | 2 +- .../analytics/ExpressionCounterNameTests.java | 2 +- .../fn/consumer/analytics/FixedTagsTests.java | 4 +- .../analytics/GaugeWithAmountTest.java | 9 +- .../analytics/LiteralTagExpressionsTests.java | 4 +- consumer/cassandra-consumer/build.gradle | 6 + consumer/cassandra-consumer/pom.xml | 34 - consumer/elasticsearch-consumer/build.gradle | 6 + consumer/elasticsearch-consumer/pom.xml | 48 - ...ElasticsearchConsumerApplicationTests.java | 8 + consumer/file-consumer/build.gradle | 3 + consumer/file-consumer/pom.xml | 23 - consumer/ftp-consumer/build.gradle | 6 + consumer/ftp-consumer/pom.xml | 34 - consumer/jdbc-consumer/build.gradle | 10 + consumer/jdbc-consumer/pom.xml | 58 - .../jdbc/ExplicitTableCreationTests.java | 2 +- .../jdbc/ImplicitTableCreationTests.java | 2 +- .../fn/consumer/jdbc/SimpleMappingTests.java | 2 +- .../cloud/fn/consumer/jdbc/SpELTests.java | 2 +- consumer/kafka-publisher/build.gradle | 5 + consumer/kafka-publisher/pom.xml | 34 - .../kafka/KafkaPublisherConfiguration.java | 2 +- .../KafkaPublisherConfigurationTests.java | 15 +- consumer/log-consumer/build.gradle | 5 + consumer/log-consumer/pom.xml | 30 - .../log/LogConsumerApplicationTests.java | 1 + consumer/mongodb-consumer/build.gradle | 6 + consumer/mongodb-consumer/pom.xml | 41 - .../MongoDbConsumerApplicationTests.java | 1 - .../mongo/MongoDbTestContainerSupport.java | 2 +- consumer/mqtt-consumer/build.gradle | 3 + consumer/mqtt-consumer/pom.xml | 23 - consumer/pom.xml | 49 - consumer/rabbit-consumer/build.gradle | 5 + consumer/rabbit-consumer/pom.xml | 31 - consumer/redis-consumer/build.gradle | 4 + consumer/redis-consumer/pom.xml | 41 - .../redis/AbstractRedisConsumerTests.java | 3 - .../redis/RedisTestContainerSupport.java | 0 consumer/rsocket-consumer/build.gradle | 3 + consumer/rsocket-consumer/pom.xml | 24 - .../rsocket/RsocketConsumerTests.java | 3 +- consumer/s3-consumer/build.gradle | 11 + consumer/s3-consumer/pom.xml | 38 - .../s3/AbstractAwsS3ConsumerMockTests.java | 6 +- .../consumer/s3/AmazonS3UploadFileTests.java | 2 +- .../s3/AmazonS3UploadInputStreamTests.java | 3 +- consumer/sftp-consumer/build.gradle | 5 + consumer/sftp-consumer/pom.xml | 29 - consumer/tcp-consumer/build.gradle | 3 + consumer/tcp-consumer/pom.xml | 24 - consumer/twitter-consumer/build.gradle | 4 + consumer/twitter-consumer/pom.xml | 29 - consumer/wavefront-consumer/build.gradle | 3 + consumer/wavefront-consumer/pom.xml | 28 - consumer/websocket-consumer/build.gradle | 8 + consumer/websocket-consumer/pom.xml | 42 - consumer/xmpp-consumer/build.gradle | 5 + consumer/xmpp-consumer/pom.xml | 31 - consumer/zeromq-consumer/build.gradle | 3 + consumer/zeromq-consumer/pom.xml | 23 - function-dependencies/build.gradle | 20 + function-dependencies/pom.xml | 310 --- function/aggregator-function/build.gradle | 18 + function/aggregator-function/pom.xml | 99 - ...psAndMongoMessageStoreAggregatorTests.java | 2 +- .../RedisMessageStoreAggregatorTests.java | 1 + function/filter-function/build.gradle | 3 + function/filter-function/pom.xml | 25 - .../header-enricher-function/build.gradle | 3 + function/header-enricher-function/pom.xml | 25 - function/header-filter-function/build.gradle | 3 + function/header-filter-function/pom.xml | 30 - function/http-request-function/build.gradle | 5 + function/http-request-function/pom.xml | 29 - .../image-recognition-function/build.gradle | 3 + function/image-recognition-function/pom.xml | 41 - .../object-detection-function/build.gradle | 18 + function/object-detection-function/pom.xml | 74 - .../ObjectDetectionInputAdapter.java | 2 +- .../ObjectDetectionOutputConverter.java | 2 +- .../protos/StringIntLabelMapOuterClass.java | 1864 ----------------- function/payload-converter-function/pom.xml | 18 - function/pom.xml | 40 - .../build.gradle | 3 + .../semantic-segmentation-function/pom.xml | 39 - .../attic/SemanticSegmentationUtils.java | 2 +- function/spel-function/build.gradle | 3 + function/spel-function/pom.xml | 25 - function/splitter-function/build.gradle | 3 + function/splitter-function/pom.xml | 24 - function/task-launch-request-function/pom.xml | 17 - .../launch/request/KeyValueListParser.java | 2 +- function/twitter-function/build.gradle | 10 + function/twitter-function/pom.xml | 37 - gradle.properties | 12 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 63721 bytes gradle/wrapper/gradle-wrapper.properties | 8 + gradlew | 249 +++ gradlew.bat | 92 + pom.xml | 33 - publish-maven.gradle | 72 + settings.gradle | 17 + spring-functions-parent/pom.xml | 104 - supplier/debezium-supplier/build.gradle | 19 + supplier/debezium-supplier/pom.xml | 146 -- ...iumReactiveConsumerConfigurationTests.java | 9 - supplier/file-supplier/build.gradle | 8 + supplier/file-supplier/pom.xml | 49 - supplier/ftp-supplier/build.gradle | 8 + supplier/ftp-supplier/pom.xml | 44 - supplier/http-supplier/build.gradle | 4 + supplier/http-supplier/pom.xml | 28 - supplier/jdbc-supplier/build.gradle | 12 + supplier/jdbc-supplier/pom.xml | 69 - .../jdbc/DefaultJdbcSupplierTests.java | 1 + .../jdbc/NonSplitJdbcSupplierTests.java | 1 + supplier/jms-supplier/build.gradle | 8 + supplier/jms-supplier/pom.xml | 38 - supplier/kafka-supplier/build.gradle | 5 + supplier/kafka-supplier/pom.xml | 33 - .../fn/supplier/kafka/KafkaSupplierTests.java | 13 +- supplier/mail-supplier/build.gradle | 10 + supplier/mail-supplier/pom.xml | 33 - supplier/mongodb-supplier/build.gradle | 9 + supplier/mongodb-supplier/pom.xml | 51 - .../MongodbSupplierApplicationTests.java | 3 +- supplier/mqtt-supplier/build.gradle | 3 + supplier/mqtt-supplier/pom.xml | 24 - .../fn/supplier/mqtt/MqttSupplierTests.java | 1 - supplier/pom.xml | 47 - supplier/rabbit-supplier/build.gradle | 5 + supplier/rabbit-supplier/pom.xml | 31 - supplier/s3-supplier/build.gradle | 5 + supplier/s3-supplier/pom.xml | 34 - supplier/sftp-supplier/build.gradle | 7 + supplier/sftp-supplier/pom.xml | 48 - .../sftp/SftpSupplierConfiguration.java | 5 +- supplier/syslog-supplier/build.gradle | 3 + supplier/syslog-supplier/pom.xml | 23 - supplier/tcp-supplier/build.gradle | 3 + supplier/tcp-supplier/pom.xml | 24 - supplier/time-supplier/build.gradle | 3 + supplier/time-supplier/pom.xml | 24 - supplier/twitter-supplier/build.gradle | 13 + supplier/twitter-supplier/pom.xml | 45 - supplier/websocket-supplier/build.gradle | 7 + supplier/websocket-supplier/pom.xml | 39 - supplier/xmpp-supplier/build.gradle | 5 + supplier/xmpp-supplier/pom.xml | 33 - supplier/zeromq-supplier/build.gradle | 3 + supplier/zeromq-supplier/pom.xml | 24 - 187 files changed, 1361 insertions(+), 5254 deletions(-) create mode 100644 .gitignore create mode 100644 CODE_OF_CONDUCT.adoc create mode 100644 LICENSE.txt create mode 100644 build.gradle create mode 100644 common/aws-s3-common/build.gradle delete mode 100644 common/aws-s3-common/pom.xml delete mode 100644 common/config-common/pom.xml create mode 100644 common/debezium-autoconfigure/build.gradle delete mode 100644 common/debezium-autoconfigure/pom.xml create mode 100644 common/file-common/build.gradle delete mode 100644 common/file-common/pom.xml create mode 100644 common/ftp-common/build.gradle delete mode 100644 common/ftp-common/pom.xml create mode 100644 common/function-test-support/build.gradle delete mode 100644 common/function-test-support/pom.xml create mode 100644 common/metadata-store-common/build.gradle delete mode 100644 common/metadata-store-common/pom.xml delete mode 100644 common/mongodb-common/pom.xml delete mode 100644 common/mongodb-common/src/main/resources/application.properties create mode 100644 common/mqtt-common/build.gradle delete mode 100644 common/mqtt-common/pom.xml delete mode 100644 common/pom.xml delete mode 100644 common/redis-common/pom.xml delete mode 100644 common/redis-common/src/main/resources/application.properties create mode 100644 common/tcp-common/build.gradle delete mode 100644 common/tcp-common/pom.xml create mode 100644 common/tensorflow-common/build.gradle delete mode 100644 common/tensorflow-common/pom.xml create mode 100644 common/twitter-common/build.gradle delete mode 100644 common/twitter-common/pom.xml create mode 100644 common/xmpp-common/build.gradle delete mode 100644 common/xmpp-common/pom.xml create mode 100644 consumer/analytics-consumer/build.gradle delete mode 100644 consumer/analytics-consumer/pom.xml create mode 100644 consumer/cassandra-consumer/build.gradle delete mode 100644 consumer/cassandra-consumer/pom.xml create mode 100644 consumer/elasticsearch-consumer/build.gradle delete mode 100644 consumer/elasticsearch-consumer/pom.xml create mode 100644 consumer/file-consumer/build.gradle delete mode 100644 consumer/file-consumer/pom.xml create mode 100644 consumer/ftp-consumer/build.gradle delete mode 100644 consumer/ftp-consumer/pom.xml create mode 100644 consumer/jdbc-consumer/build.gradle delete mode 100644 consumer/jdbc-consumer/pom.xml create mode 100644 consumer/kafka-publisher/build.gradle delete mode 100644 consumer/kafka-publisher/pom.xml create mode 100644 consumer/log-consumer/build.gradle delete mode 100644 consumer/log-consumer/pom.xml create mode 100644 consumer/mongodb-consumer/build.gradle delete mode 100644 consumer/mongodb-consumer/pom.xml rename {common/mongodb-common/src/test/java/org/springframework/cloud/fn/common => consumer/mongodb-consumer/src/test/java/org/springframework/cloud/fn/consumer}/mongo/MongoDbTestContainerSupport.java (96%) create mode 100644 consumer/mqtt-consumer/build.gradle delete mode 100644 consumer/mqtt-consumer/pom.xml delete mode 100644 consumer/pom.xml create mode 100644 consumer/rabbit-consumer/build.gradle delete mode 100644 consumer/rabbit-consumer/pom.xml create mode 100644 consumer/redis-consumer/build.gradle delete mode 100644 consumer/redis-consumer/pom.xml rename {common/redis-common => consumer/redis-consumer}/src/test/java/org/springframework/cloud/fn/consumer/redis/RedisTestContainerSupport.java (100%) create mode 100644 consumer/rsocket-consumer/build.gradle delete mode 100644 consumer/rsocket-consumer/pom.xml create mode 100644 consumer/s3-consumer/build.gradle delete mode 100644 consumer/s3-consumer/pom.xml create mode 100644 consumer/sftp-consumer/build.gradle delete mode 100644 consumer/sftp-consumer/pom.xml create mode 100644 consumer/tcp-consumer/build.gradle delete mode 100644 consumer/tcp-consumer/pom.xml create mode 100644 consumer/twitter-consumer/build.gradle delete mode 100644 consumer/twitter-consumer/pom.xml create mode 100644 consumer/wavefront-consumer/build.gradle delete mode 100644 consumer/wavefront-consumer/pom.xml create mode 100644 consumer/websocket-consumer/build.gradle delete mode 100644 consumer/websocket-consumer/pom.xml create mode 100644 consumer/xmpp-consumer/build.gradle delete mode 100644 consumer/xmpp-consumer/pom.xml create mode 100644 consumer/zeromq-consumer/build.gradle delete mode 100644 consumer/zeromq-consumer/pom.xml create mode 100644 function-dependencies/build.gradle delete mode 100644 function-dependencies/pom.xml create mode 100644 function/aggregator-function/build.gradle delete mode 100644 function/aggregator-function/pom.xml create mode 100644 function/filter-function/build.gradle delete mode 100644 function/filter-function/pom.xml create mode 100644 function/header-enricher-function/build.gradle delete mode 100644 function/header-enricher-function/pom.xml create mode 100644 function/header-filter-function/build.gradle delete mode 100644 function/header-filter-function/pom.xml create mode 100644 function/http-request-function/build.gradle delete mode 100644 function/http-request-function/pom.xml create mode 100644 function/image-recognition-function/build.gradle delete mode 100644 function/image-recognition-function/pom.xml create mode 100644 function/object-detection-function/build.gradle delete mode 100644 function/object-detection-function/pom.xml delete mode 100644 function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/protos/StringIntLabelMapOuterClass.java delete mode 100644 function/payload-converter-function/pom.xml delete mode 100644 function/pom.xml create mode 100644 function/semantic-segmentation-function/build.gradle delete mode 100644 function/semantic-segmentation-function/pom.xml create mode 100644 function/spel-function/build.gradle delete mode 100644 function/spel-function/pom.xml create mode 100644 function/splitter-function/build.gradle delete mode 100644 function/splitter-function/pom.xml delete mode 100644 function/task-launch-request-function/pom.xml create mode 100644 function/twitter-function/build.gradle delete mode 100644 function/twitter-function/pom.xml create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat delete mode 100644 pom.xml create mode 100644 publish-maven.gradle create mode 100644 settings.gradle delete mode 100644 spring-functions-parent/pom.xml create mode 100644 supplier/debezium-supplier/build.gradle delete mode 100644 supplier/debezium-supplier/pom.xml create mode 100644 supplier/file-supplier/build.gradle delete mode 100644 supplier/file-supplier/pom.xml create mode 100644 supplier/ftp-supplier/build.gradle delete mode 100644 supplier/ftp-supplier/pom.xml create mode 100644 supplier/http-supplier/build.gradle delete mode 100644 supplier/http-supplier/pom.xml create mode 100644 supplier/jdbc-supplier/build.gradle delete mode 100644 supplier/jdbc-supplier/pom.xml create mode 100644 supplier/jms-supplier/build.gradle delete mode 100644 supplier/jms-supplier/pom.xml create mode 100644 supplier/kafka-supplier/build.gradle delete mode 100644 supplier/kafka-supplier/pom.xml create mode 100644 supplier/mail-supplier/build.gradle delete mode 100644 supplier/mail-supplier/pom.xml create mode 100644 supplier/mongodb-supplier/build.gradle delete mode 100644 supplier/mongodb-supplier/pom.xml create mode 100644 supplier/mqtt-supplier/build.gradle delete mode 100644 supplier/mqtt-supplier/pom.xml delete mode 100644 supplier/pom.xml create mode 100644 supplier/rabbit-supplier/build.gradle delete mode 100644 supplier/rabbit-supplier/pom.xml create mode 100644 supplier/s3-supplier/build.gradle delete mode 100644 supplier/s3-supplier/pom.xml create mode 100644 supplier/sftp-supplier/build.gradle delete mode 100644 supplier/sftp-supplier/pom.xml create mode 100644 supplier/syslog-supplier/build.gradle delete mode 100644 supplier/syslog-supplier/pom.xml create mode 100644 supplier/tcp-supplier/build.gradle delete mode 100644 supplier/tcp-supplier/pom.xml create mode 100644 supplier/time-supplier/build.gradle delete mode 100644 supplier/time-supplier/pom.xml create mode 100644 supplier/twitter-supplier/build.gradle delete mode 100644 supplier/twitter-supplier/pom.xml create mode 100644 supplier/websocket-supplier/build.gradle delete mode 100644 supplier/websocket-supplier/pom.xml create mode 100644 supplier/xmpp-supplier/build.gradle delete mode 100644 supplier/xmpp-supplier/pom.xml create mode 100644 supplier/zeromq-supplier/build.gradle delete mode 100644 supplier/zeromq-supplier/pom.xml diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..5e2c6ab5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +.settings/ +.project +.classpath +build/ +bin/ +.gradle/ +.idea/ +out/ + diff --git a/CODE_OF_CONDUCT.adoc b/CODE_OF_CONDUCT.adoc new file mode 100644 index 00000000..17783c7c --- /dev/null +++ b/CODE_OF_CONDUCT.adoc @@ -0,0 +1,44 @@ += Contributor Code of Conduct + +As contributors and maintainers of this project, and in the interest of fostering an open +and welcoming community, we pledge to respect all people who contribute through reporting +issues, posting feature requests, updating documentation, submitting pull requests or +patches, and other activities. + +We are committed to making participation in this project a harassment-free experience for +everyone, regardless of level of experience, gender, gender identity and expression, +sexual orientation, disability, personal appearance, body size, race, ethnicity, age, +religion, or nationality. + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery +* Personal attacks +* Trolling or insulting/derogatory comments +* Public or private harassment +* Publishing other's private information, such as physical or electronic addresses, + without explicit permission +* Other unethical or unprofessional conduct + +Project maintainers have the right and responsibility to remove, edit, or reject comments, +commits, code, wiki edits, issues, and other contributions that are not aligned to this +Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors +that they deem inappropriate, threatening, offensive, or harmful. + +By adopting this Code of Conduct, project maintainers commit themselves to fairly and +consistently applying these principles to every aspect of managing this project. Project +maintainers who do not follow or enforce the Code of Conduct may be permanently removed +from the project team. + +This Code of Conduct applies both within project spaces and in public spaces when an +individual is representing the project or its community. + +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by +contacting a project maintainer at spring-code-of-conduct@pivotal.io . All complaints will +be reviewed and investigated and will result in a response that is deemed necessary and +appropriate to the circumstances. Maintainers are obligated to maintain confidentiality +with regard to the reporter of an incident. + +This Code of Conduct is adapted from the +https://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at +https://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/] diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 00000000..62589edd --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + https://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + https://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..0905098e --- /dev/null +++ b/build.gradle @@ -0,0 +1,173 @@ +buildscript { + ext.isCI = System.getenv('GITHUB_ACTION') +} + +plugins { + id 'base' + id 'io.spring.dependency-management' version '1.1.4' +} + +description = 'Spring Functions Catlog' + +ext { + javaProjects = subprojects - project(':function-dependencies') +} + +allprojects { + group = 'org.springframework.cloud.fn' + + repositories { + mavenCentral() + maven { url 'https://repo.spring.io/milestone' } + if (version.endsWith('SNAPSHOT')) { + maven { url 'https://repo.spring.io/snapshot' } + } +// maven { url 'https://repo.spring.io/libs-staging-local' } + } + + ext.javadocLinks = [ + 'https://docs.oracle.com/en/java/javase/17/docs/api/', + 'https://jakarta.ee/specifications/platform/10/apidocs/', + 'https://docs.spring.io/spring-framework/docs/current/javadoc-api', + 'https://docs.spring.io/spring-integration/docs/current/api/' + ] as String[] + + apply plugin: 'io.spring.dependency-management' + + dependencyManagement { + resolutionStrategy { + cacheChangingModulesFor 0, 'seconds' + } + applyMavenExclusions = false + generatedPomCustomization { + enabled = false + } + + imports { + mavenBom "org.springframework.boot:spring-boot-dependencies:${property('spring-boot.version')}" + mavenBom "org.springframework.cloud:spring-cloud-dependencies:${property('spring-cloud.version')}" + mavenBom "software.amazon.awssdk:bom:${property('aws-sdk.version')}" + mavenBom "io.awspring.cloud:spring-cloud-aws-dependencies:${property('spring-cloud-aws.version')}" + } + + } + +} + +configure(javaProjects) { subproject -> + apply plugin: 'java-library' + apply plugin: 'eclipse' + apply plugin: 'idea' + + apply from: "${rootDir}/publish-maven.gradle" + + sourceSets { + test { + resources { + srcDirs = ['src/test/resources', 'src/test/java'] + } + } + } + + java { + withJavadocJar() + withSourcesJar() + registerFeature('optional') { + usingSourceSet(sourceSets.main) + } + registerFeature('provided') { + usingSourceSet(sourceSets.main) + } + } + + compileJava { + options.release = 17 + options.compilerArgs << '-parameters' + } + + compileTestJava { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + options.encoding = 'UTF-8' + } + + tasks.withType(JavaCompile).configureEach { + options.fork = true + } + + tasks.withType(Javadoc) { + options.addBooleanOption('Xdoclint:syntax', true) // only check syntax with doclint + } + + eclipse { + project { + natures += 'org.springframework.ide.eclipse.core.springnature' + } + } + + // dependencies that are common across all java projects + dependencies { + providedImplementation 'org.springframework.boot:spring-boot-configuration-processor' + + if (subproject.name != 'config-common') { + api project(':config-common') + } + + api 'org.springframework.boot:spring-boot-starter-validation' + api 'org.springframework.boot:spring-boot-starter-json' + api 'org.springframework.boot:spring-boot-starter-integration' + api 'com.jayway.jsonpath:json-path' + + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.integration:spring-integration-test' + testImplementation 'io.projectreactor:reactor-test' + testImplementation 'org.awaitility:awaitility' + testImplementation 'org.testcontainers:junit-jupiter' + + testRuntimeOnly 'org.apache.logging.log4j:log4j-core' + testRuntimeOnly 'org.apache.logging.log4j:log4j-jcl' + } + + // enable all compiler warnings; individual projects may customize further + ext.xLintArg = '-Xlint:all,-options,-processing' + [compileJava, compileTestJava]*.options*.compilerArgs = [xLintArg, '-parameters'] + + test { + maxHeapSize = '2g' + jvmArgs '-XX:+HeapDumpOnOutOfMemoryError' + useJUnitPlatform() + + enableAssertions = false + + logging.captureStandardOutput(LogLevel.INFO) + } + + jar { + manifest { + attributes( + 'Implementation-Version': project.version, + 'Created-By': "JDK ${System.properties['java.version']} (${System.properties['java.specification.vendor']})", + 'Implementation-Title': subproject.name, + 'Implementation-Vendor-Id': subproject.group, + 'Implementation-Vendor': 'Pivotal Software, Inc.', + 'Implementation-URL': 'https://spring.io/projects/spring-functions-catalog', + 'Automatic-Module-Name': subproject.name.replace('-', '.') + ) + } + + from("${rootProject.projectDir}") { + include 'LICENSE.txt' + into 'META-INF' + } + } + + publishing { + publications { + mavenJava(MavenPublication) { + suppressAllPomMetadataWarnings() + from components.java + } + } + } + +} \ No newline at end of file diff --git a/common/aws-s3-common/build.gradle b/common/aws-s3-common/build.gradle new file mode 100644 index 00000000..2bd41efb --- /dev/null +++ b/common/aws-s3-common/build.gradle @@ -0,0 +1,6 @@ +dependencies { + api "org.springframework.integration:spring-integration-aws:${property('spring-integration-aws.version')}" + api 'io.awspring.cloud:spring-cloud-aws-starter-s3' + api 'software.amazon.awssdk:aws-crt-client' + api 'org.springframework.integration:spring-integration-file' +} diff --git a/common/aws-s3-common/pom.xml b/common/aws-s3-common/pom.xml deleted file mode 100644 index e974d5b5..00000000 --- a/common/aws-s3-common/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - aws-s3-common - aws-s3-common - aws-s3 common - - - - org.springframework.integration - spring-integration-aws - ${spring-integration-aws.version} - - - io.awspring.cloud - spring-cloud-aws-starter-s3 - - - - software.amazon.awssdk - aws-crt-client - - - org.springframework.integration - spring-integration-file - - - - diff --git a/common/config-common/pom.xml b/common/config-common/pom.xml deleted file mode 100644 index d3d9d141..00000000 --- a/common/config-common/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.stream.app - stream-applications-build - 4.0.1-SNAPSHOT - ../../../stream-applications-build/pom.xml - - - org.springframework.cloud.fn - config-common - config-common - Function Common Configuration Components - - - - org.springframework.boot - spring-boot-autoconfigure - - - org.springframework.integration - spring-integration-core - - - - diff --git a/common/debezium-autoconfigure/build.gradle b/common/debezium-autoconfigure/build.gradle new file mode 100644 index 00000000..f51f707a --- /dev/null +++ b/common/debezium-autoconfigure/build.gradle @@ -0,0 +1,17 @@ +ext { + apicurioVersion = '2.5.1.Final' +} + +repositories { + maven { url 'https://maven.scijava.org/content/repositories/public/' } +} + +dependencies { + api 'org.springframework.integration:spring-integration-debezium' + api "io.apicurio:apicurio-registry-utils-converter:$apicurioVersion" + api "io.apicurio:apicurio-registry-client:$apicurioVersion" + + testImplementation "io.debezium:debezium-connector-mysql:$debeziumVersion" + testImplementation 'org.springframework:spring-jdbc' + testImplementation 'com.zaxxer:HikariCP' +} diff --git a/common/debezium-autoconfigure/pom.xml b/common/debezium-autoconfigure/pom.xml deleted file mode 100644 index 23d32176..00000000 --- a/common/debezium-autoconfigure/pom.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - debezium-autoconfigure - debezium-autoconfigure - Debezium Spring Boot auto-configuration - - - 2.3.3.Final - 2.4.2.Final - - - - - io.debezium - debezium-embedded - ${version.debezium} - - - org.slf4j - slf4j-reload4j - - - org.slf4j - slf4j-log4j12 - - - org.slf4j - slf4j-api - - - - - - - io.apicurio - apicurio-registry-utils-converter - ${apicurio.version} - - - io.apicurio - apicurio-registry-client - ${apicurio.version} - - - org.slf4j - slf4j-api - - - - - - - io.debezium - debezium-connector-mysql - ${version.debezium} - - - slf4j-log4j12 - org.slf4j - - - test - - - com.zaxxer - HikariCP - 4.0.3 - test - - - org.springframework - spring-jdbc - test - - - ch.qos.logback - logback-classic - 1.4.8 - test - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0 - - 1 - 1 - integration - - - - - diff --git a/common/file-common/build.gradle b/common/file-common/build.gradle new file mode 100644 index 00000000..efdad627 --- /dev/null +++ b/common/file-common/build.gradle @@ -0,0 +1,3 @@ +dependencies { + api 'org.springframework.integration:spring-integration-file' +} diff --git a/common/file-common/pom.xml b/common/file-common/pom.xml deleted file mode 100644 index 9803588a..00000000 --- a/common/file-common/pom.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - file-common - file-common - file common - - - - org.springframework.integration - spring-integration-file - - - - diff --git a/common/ftp-common/build.gradle b/common/ftp-common/build.gradle new file mode 100644 index 00000000..5038853b --- /dev/null +++ b/common/ftp-common/build.gradle @@ -0,0 +1,3 @@ +dependencies { + api 'org.springframework.integration:spring-integration-ftp' +} diff --git a/common/ftp-common/pom.xml b/common/ftp-common/pom.xml deleted file mode 100644 index 1aa6b9f6..00000000 --- a/common/ftp-common/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - ftp-common - ftp-common - ftp common - - - - - org.springframework.integration - spring-integration-ftp - - - - - diff --git a/common/function-test-support/build.gradle b/common/function-test-support/build.gradle new file mode 100644 index 00000000..ddd84b85 --- /dev/null +++ b/common/function-test-support/build.gradle @@ -0,0 +1,8 @@ +dependencies { + api 'org.junit.jupiter:junit-jupiter-api' + api 'org.testcontainers:junit-jupiter' + + optionalApi "org.apache.ftpserver:ftpserver-core:$ftpServerVersion" + optionalApi 'org.springframework.integration:spring-integration-sftp' + optionalApi 'org.springframework:spring-websocket' +} diff --git a/common/function-test-support/pom.xml b/common/function-test-support/pom.xml deleted file mode 100644 index ae755b1a..00000000 --- a/common/function-test-support/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - function-test-support - function-test-support - file consumer - - - 2.7.0 - 1.2.0 - - - - - org.springframework.boot - spring-boot-starter-test - compile - - - org.springframework.integration - spring-integration-ftp - true - - - org.springframework - spring-websocket - - - org.apache.ftpserver - ftpserver-core - ${apache-ftpserver.version} - compile - - - org.apache.sshd - sshd-sftp - ${sshd-sftp.version} - compile - - - org.junit.jupiter - junit-jupiter - compile - - - org.testcontainers - testcontainers - ${testcontainers.version} - compile - - - org.testcontainers - junit-jupiter - ${testcontainers.version} - compile - - - org.awaitility - awaitility - compile - - - - diff --git a/common/metadata-store-common/build.gradle b/common/metadata-store-common/build.gradle new file mode 100644 index 00000000..5daa8f7d --- /dev/null +++ b/common/metadata-store-common/build.gradle @@ -0,0 +1,20 @@ +ext { + curatorVersion = '5.5.0' +} + +dependencies { + optionalApi 'org.springframework.integration:spring-integration-redis' + optionalApi 'org.springframework.boot:spring-boot-starter-data-redis' + optionalApi 'org.springframework.integration:spring-integration-mongodb' + optionalApi 'org.springframework.boot:spring-boot-starter-data-mongodb' + optionalApi 'org.springframework.integration:spring-integration-jdbc' + optionalApi 'org.springframework.boot:spring-boot-starter-data-jdbc' + optionalApi 'io.awspring.cloud:spring-cloud-aws-starter' + optionalApi 'org.springframework.integration:spring-integration-zookeeper' + optionalApi 'org.springframework.integration:spring-integration-hazelcast' + optionalApi "org.springframework.integration:spring-integration-aws:${property('spring-integration-aws.version')}" + api 'software.amazon.awssdk:dynamodb' + + testImplementation 'org.hsqldb:hsqldb' + testImplementation "org.apache.curator:curator-test:$curatorVersion" +} diff --git a/common/metadata-store-common/pom.xml b/common/metadata-store-common/pom.xml deleted file mode 100644 index 0e8a95c2..00000000 --- a/common/metadata-store-common/pom.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - metadata-store-common - metadata-store-common - metadata-store common - - - - - - org.springframework.integration - spring-integration-redis - true - - - org.springframework.boot - spring-boot-starter-data-redis - true - - - - - org.springframework.integration - spring-integration-mongodb - true - - - org.springframework.boot - spring-boot-starter-data-mongodb - true - - - - io.awspring.cloud - spring-cloud-aws-starter - true - - - - org.springframework.boot - spring-boot-starter-logging - true - - - org.apache.logging.log4j - log4j-to-slf4j - - - - - - - org.springframework.integration - spring-integration-jdbc - true - - - org.springframework.boot - spring-boot-starter-jdbc - true - - - org.hsqldb - hsqldb - test - - - - - org.springframework.integration - spring-integration-zookeeper - true - - - org.apache.curator - curator-test - ${curator.version} - test - - - - - org.springframework.integration - spring-integration-hazelcast - true - - - - - org.springframework.integration - spring-integration-aws - ${spring-integration-aws.version} - true - - - software.amazon.awssdk - dynamodb - true - - - - - diff --git a/common/mongodb-common/pom.xml b/common/mongodb-common/pom.xml deleted file mode 100644 index f33aa197..00000000 --- a/common/mongodb-common/pom.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - mongodb-common - mongodb-common - MongoDB Common - - - - org.testcontainers - mongodb - ${testcontainers.version} - test - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.1.2 - - - Jar Tests Package - package - - test-jar - - - - - - - diff --git a/common/mongodb-common/src/main/resources/application.properties b/common/mongodb-common/src/main/resources/application.properties deleted file mode 100644 index 1bb8bf6d..00000000 --- a/common/mongodb-common/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -# empty diff --git a/common/mqtt-common/build.gradle b/common/mqtt-common/build.gradle new file mode 100644 index 00000000..7ce7dd1b --- /dev/null +++ b/common/mqtt-common/build.gradle @@ -0,0 +1,3 @@ +dependencies { + api 'org.springframework.integration:spring-integration-mqtt' +} diff --git a/common/mqtt-common/pom.xml b/common/mqtt-common/pom.xml deleted file mode 100644 index f8d22ab5..00000000 --- a/common/mqtt-common/pom.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - mqtt-common - mqtt-common - MQTT Common - - - - org.springframework.integration - spring-integration-mqtt - - - - diff --git a/common/pom.xml b/common/pom.xml deleted file mode 100644 index b55726ca..00000000 --- a/common/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud.fn - functions-common - 4.0.1-SNAPSHOT - java-functions-common - Java Functions Common - pom - - - config-common - debezium-autoconfigure - aws-s3-common - file-common - ftp-common - function-test-support - metadata-store-common - mongodb-common - mqtt-common - redis-common - tcp-common - twitter-common - tensorflow-common - xmpp-common - - - - - org.apache.maven.plugins - maven-deploy-plugin - 3.0.0 - - true - - - - - diff --git a/common/redis-common/pom.xml b/common/redis-common/pom.xml deleted file mode 100644 index 3c3ff5c4..00000000 --- a/common/redis-common/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - redis-common - redis-common - Redis Common - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.1.2 - - - Jar Tests Package - package - - test-jar - - - - - - - diff --git a/common/redis-common/src/main/resources/application.properties b/common/redis-common/src/main/resources/application.properties deleted file mode 100644 index 1bb8bf6d..00000000 --- a/common/redis-common/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -# empty diff --git a/common/tcp-common/build.gradle b/common/tcp-common/build.gradle new file mode 100644 index 00000000..a94a2515 --- /dev/null +++ b/common/tcp-common/build.gradle @@ -0,0 +1,3 @@ +dependencies { + api 'org.springframework.integration:spring-integration-ip' +} diff --git a/common/tcp-common/pom.xml b/common/tcp-common/pom.xml deleted file mode 100644 index c275d2e8..00000000 --- a/common/tcp-common/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - tcp-common - tcp-common - tcp common - - - - - org.springframework.integration - spring-integration-ip - - - - - diff --git a/common/tensorflow-common/build.gradle b/common/tensorflow-common/build.gradle new file mode 100644 index 00000000..6fdb6055 --- /dev/null +++ b/common/tensorflow-common/build.gradle @@ -0,0 +1,15 @@ +ext { + tensorflowVersion='1.15.0' + commonsCompressVersion='1.25.0' + commonsIoVersion='2.15.0' + pcollectionsVersion='4.0.1' +} + +dependencies { + api "org.tensorflow:tensorflow:$tensorflowVersion" + api "org.tensorflow:proto:$tensorflowVersion" + api "org.apache.commons:commons-compress:$commonsCompressVersion" + api "commons-io:commons-io:$commonsIoVersion" + api 'org.apache.commons:commons-lang3' + api "org.pcollections:pcollections:$pcollectionsVersion" +} diff --git a/common/tensorflow-common/pom.xml b/common/tensorflow-common/pom.xml deleted file mode 100644 index 0dba0fe3..00000000 --- a/common/tensorflow-common/pom.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - tensorflow-common - tensorflow-common - tensorflow common - - - true - 1.15.0 - 1.21 - 2.7 - 3.10 - 3.0.3 - 1.7.26 - - - - - org.tensorflow - tensorflow - ${tensorflow.version} - - - org.tensorflow - proto - ${tensorflow.version} - - - - org.apache.commons - commons-compress - ${apache.commons.compress} - - - commons-io - commons-io - ${commons-io.version} - - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - - - org.slf4j - slf4j-api - ${slf4j-api.version} - - - org.pcollections - pcollections - ${pcollections.version} - - - - - - tensorflow-snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - - true - - - - diff --git a/common/twitter-common/build.gradle b/common/twitter-common/build.gradle new file mode 100644 index 00000000..13052e01 --- /dev/null +++ b/common/twitter-common/build.gradle @@ -0,0 +1,8 @@ +ext { + twitter4jVersion='4.0.7' +} + +dependencies { + api "org.twitter4j:twitter4j-stream:$twitter4jVersion" + api 'org.springframework.integration:spring-integration-ip' +} diff --git a/common/twitter-common/pom.xml b/common/twitter-common/pom.xml deleted file mode 100644 index a9c1abeb..00000000 --- a/common/twitter-common/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - twitter-common - twitter-common - Twitter common - - - 4.0.7 - - - - - org.twitter4j - twitter4j-stream - ${twitter4j.version} - - - - org.springframework.integration - spring-integration-ip - - - - diff --git a/common/xmpp-common/build.gradle b/common/xmpp-common/build.gradle new file mode 100644 index 00000000..7ded6649 --- /dev/null +++ b/common/xmpp-common/build.gradle @@ -0,0 +1,3 @@ +dependencies { + api 'org.springframework.integration:spring-integration-xmpp' +} diff --git a/common/xmpp-common/pom.xml b/common/xmpp-common/pom.xml deleted file mode 100644 index 6aaea074..00000000 --- a/common/xmpp-common/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - xmpp-common - xmpp-common - XMPP common - - - - org.springframework.integration - spring-integration-xmpp - - - - diff --git a/consumer/analytics-consumer/build.gradle b/consumer/analytics-consumer/build.gradle new file mode 100644 index 00000000..c0feb350 --- /dev/null +++ b/consumer/analytics-consumer/build.gradle @@ -0,0 +1,7 @@ +dependencies { + api project(':payload-converter-function') + api 'io.micrometer:micrometer-core' + + testImplementation 'org.springframework.boot:spring-boot-starter-actuator' + testImplementation 'io.micrometer:micrometer-registry-wavefront' +} diff --git a/consumer/analytics-consumer/pom.xml b/consumer/analytics-consumer/pom.xml deleted file mode 100644 index 93bcf6b9..00000000 --- a/consumer/analytics-consumer/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - analytics-consumer - analytics-consumer - Spring Native Consumer for computing meters - - - - org.springframework.cloud.fn - payload-converter-function - ${project.version} - - - org.springframework.boot - spring-boot-starter-actuator - test - - - com.fasterxml.jackson.core - jackson-databind - compile - - - io.micrometer - micrometer-core - - - io.micrometer - micrometer-registry-wavefront - 1.9.4 - test - - - - diff --git a/consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/CountWithAmountTest.java b/consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/CountWithAmountTest.java index 48fd4798..099b6f88 100644 --- a/consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/CountWithAmountTest.java +++ b/consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/CountWithAmountTest.java @@ -37,7 +37,7 @@ class CountWithAmountTest extends AnalyticsConsumerParentTest { void testCounterSink() { String message = "hello world message"; double messageSize = Long.valueOf(message.length()).doubleValue(); - analyticsConsumer.accept(new GenericMessage(message)); + analyticsConsumer.accept(new GenericMessage<>(message)); assertThat(meterRegistry.find("counter666").counter().count()).isEqualTo(messageSize); } } diff --git a/consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/ExpressionCounterNameTests.java b/consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/ExpressionCounterNameTests.java index 2cec7676..ebb45178 100644 --- a/consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/ExpressionCounterNameTests.java +++ b/consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/ExpressionCounterNameTests.java @@ -35,7 +35,7 @@ public class ExpressionCounterNameTests extends AnalyticsConsumerParentTest { @Test void testCounterSink() { - IntStream.range(0, 13).forEach(i -> analyticsConsumer.accept(new GenericMessage("hello"))); + IntStream.range(0, 13).forEach(i -> analyticsConsumer.accept(new GenericMessage<>("hello"))); assertThat(meterRegistry.find("hello").counter().count()).isEqualTo(13.0); } } diff --git a/consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/FixedTagsTests.java b/consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/FixedTagsTests.java index a10e8071..971a7412 100644 --- a/consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/FixedTagsTests.java +++ b/consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/FixedTagsTests.java @@ -38,8 +38,8 @@ import static org.assertj.core.api.Assertions.assertThat; public class FixedTagsTests extends AnalyticsConsumerParentTest { @Test - void testАnalyticsSink() { - IntStream.range(0, 13).forEach(i -> analyticsConsumer.accept(new GenericMessage("hello"))); + void testAnalyticsSink() { + IntStream.range(0, 13).forEach(i -> analyticsConsumer.accept(new GenericMessage<>("hello"))); Meter counterMeter = meterRegistry.find("counter666").meter(); assertThat(StreamSupport.stream(counterMeter.measure().spliterator(), false) .mapToDouble(m -> m.getValue()).sum()).isEqualTo(13.0); diff --git a/consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/GaugeWithAmountTest.java b/consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/GaugeWithAmountTest.java index 3ad28445..052a482b 100644 --- a/consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/GaugeWithAmountTest.java +++ b/consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/GaugeWithAmountTest.java @@ -35,20 +35,20 @@ import static org.assertj.core.api.Assertions.assertThat; class GaugeWithAmountTest extends AnalyticsConsumerParentTest { @Test - void testАnalyticsSink() { + void testAnalyticsSink() { String messageSmall = "hello"; - analyticsConsumer.accept(new GenericMessage(messageSmall)); + analyticsConsumer.accept(new GenericMessage<>(messageSmall)); assertThat(meterRegistry.find("myGauge").gauge().value()).isEqualTo(size(messageSmall)); assertThat(meterRegistry.find("myGauge").gauge().getId().getTags()).hasSize(1); assertThat(meterRegistry.find("myGauge").gauge().getId().getTag("foo")).isEqualTo("bar"); String messageMiddle = "hello world"; - analyticsConsumer.accept(new GenericMessage(messageMiddle)); + analyticsConsumer.accept(new GenericMessage<>(messageMiddle)); assertThat(meterRegistry.find("myGauge").gauge().value()).isEqualTo(size(messageMiddle)); String messageLarge = "hello world, hello people!"; - analyticsConsumer.accept(new GenericMessage(messageLarge)); + analyticsConsumer.accept(new GenericMessage<>(messageLarge)); assertThat(meterRegistry.find("myGauge").gauge().value()).isEqualTo(size(messageLarge)); } @@ -56,4 +56,5 @@ class GaugeWithAmountTest extends AnalyticsConsumerParentTest { private double size(String msg) { return Long.valueOf(msg.length()).doubleValue(); } + } diff --git a/consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/LiteralTagExpressionsTests.java b/consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/LiteralTagExpressionsTests.java index 2b8410d9..55a1e898 100644 --- a/consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/LiteralTagExpressionsTests.java +++ b/consumer/analytics-consumer/src/test/java/org/springframework/cloud/fn/consumer/analytics/LiteralTagExpressionsTests.java @@ -38,8 +38,7 @@ public class LiteralTagExpressionsTests extends AnalyticsConsumerParentTest { @Test void testCounterSink() { - - IntStream.range(0, 13).forEach(i -> analyticsConsumer.accept(new GenericMessage("hello"))); + IntStream.range(0, 13).forEach(i -> analyticsConsumer.accept(new GenericMessage<>("hello"))); Counter fooCounter = meterRegistry.find("counter666").tag("foo", "bar").counter(); assertThat(fooCounter.count()).isEqualTo(13.0); @@ -49,4 +48,5 @@ public class LiteralTagExpressionsTests extends AnalyticsConsumerParentTest { assertThat(fooCounter.getId()).isEqualTo(gorkCounter.getId()); } + } diff --git a/consumer/cassandra-consumer/build.gradle b/consumer/cassandra-consumer/build.gradle new file mode 100644 index 00000000..ae50f32c --- /dev/null +++ b/consumer/cassandra-consumer/build.gradle @@ -0,0 +1,6 @@ +dependencies { + api 'org.springframework.integration:spring-integration-cassandra' + api 'org.springframework.boot:spring-boot-starter-data-cassandra-reactive' + + testImplementation 'org.testcontainers:cassandra' +} diff --git a/consumer/cassandra-consumer/pom.xml b/consumer/cassandra-consumer/pom.xml deleted file mode 100644 index f120f52c..00000000 --- a/consumer/cassandra-consumer/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - cassandra-consumer - cassandra-consumer - Cassandra Consumer - - - - org.springframework.boot - spring-boot-starter-data-cassandra-reactive - - - org.springframework.integration - spring-integration-cassandra - - - org.testcontainers - cassandra - ${testcontainers.version} - test - - - - diff --git a/consumer/elasticsearch-consumer/build.gradle b/consumer/elasticsearch-consumer/build.gradle new file mode 100644 index 00000000..55fe5937 --- /dev/null +++ b/consumer/elasticsearch-consumer/build.gradle @@ -0,0 +1,6 @@ +dependencies { + api project(':payload-converter-function') + api 'org.springframework.boot:spring-boot-starter-data-elasticsearch' + + testImplementation 'org.testcontainers:elasticsearch' +} diff --git a/consumer/elasticsearch-consumer/pom.xml b/consumer/elasticsearch-consumer/pom.xml deleted file mode 100644 index a41c05d4..00000000 --- a/consumer/elasticsearch-consumer/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - - 8.5.0 - - - elasticsearch-consumer - elasticsearch-consumer - elasticsearch consumer - - - - co.elastic.clients - elasticsearch-java - ${elasticsearch.version} - - - org.elasticsearch - elasticsearch-x-content - ${elasticsearch.version} - - - - org.springframework.boot - spring-boot-starter-data-elasticsearch - - - org.springframework.cloud.fn - payload-converter-function - ${project.version} - - - org.testcontainers - elasticsearch - ${testcontainers.version} - test - - - diff --git a/consumer/elasticsearch-consumer/src/test/java/org/springframework/cloud/fn/consumer/elasticsearch/ElasticsearchConsumerApplicationTests.java b/consumer/elasticsearch-consumer/src/test/java/org/springframework/cloud/fn/consumer/elasticsearch/ElasticsearchConsumerApplicationTests.java index 1ca21ad7..371ec084 100644 --- a/consumer/elasticsearch-consumer/src/test/java/org/springframework/cloud/fn/consumer/elasticsearch/ElasticsearchConsumerApplicationTests.java +++ b/consumer/elasticsearch-consumer/src/test/java/org/springframework/cloud/fn/consumer/elasticsearch/ElasticsearchConsumerApplicationTests.java @@ -60,6 +60,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException; @Tag("integration") @Testcontainers(disabledWithoutDocker = true) public class ElasticsearchConsumerApplicationTests { + private static final Logger log = LoggerFactory.getLogger(ElasticsearchConsumerApplicationTests.class); @Container @@ -73,6 +74,7 @@ public class ElasticsearchConsumerApplicationTests { .withUserConfiguration(ElasticsearchConsumerTestApplication.class, SpelExpressionConverterConfiguration.class); @Test + @SuppressWarnings("unchecked") public void testBasicJsonString() { this.contextRunner .withPropertyValues("elasticsearch.consumer.index=foo", "elasticsearch.consumer.id=1", @@ -96,6 +98,7 @@ public class ElasticsearchConsumerApplicationTests { } @Test + @SuppressWarnings("unchecked") public void testIdPassedAsMessageHeader() { this.contextRunner .withPropertyValues("elasticsearch.consumer.index=foo", @@ -121,6 +124,7 @@ public class ElasticsearchConsumerApplicationTests { } @Test + @SuppressWarnings({ "unchecked", "rawtypes"}) public void testJsonAsMap() { this.contextRunner .withPropertyValues("elasticsearch.consumer.index=foo", "elasticsearch.consumer.id=3", @@ -152,6 +156,7 @@ public class ElasticsearchConsumerApplicationTests { } @Test + @SuppressWarnings("unchecked") public void testAsyncIndexing() { this.contextRunner .withPropertyValues("elasticsearch.consumer.index=foo", "elasticsearch.consumer.async=true", @@ -177,6 +182,7 @@ public class ElasticsearchConsumerApplicationTests { } @Test + @SuppressWarnings("unchecked") public void testBulkIndexingWithIdFromHeader() { this.contextRunner .withPropertyValues("elasticsearch.consumer.index=foo_" + UUID.randomUUID(), "elasticsearch.consumer.batch-size=10", @@ -216,6 +222,7 @@ public class ElasticsearchConsumerApplicationTests { } @Test + @SuppressWarnings("unchecked") public void testBulkIndexingItemFailure() { this.contextRunner .withPropertyValues("elasticsearch.consumer.index=foo_" + UUID.randomUUID(), "elasticsearch.consumer.batch-size=10", @@ -260,6 +267,7 @@ public class ElasticsearchConsumerApplicationTests { } @Test + @SuppressWarnings("unchecked") public void testIndexFromMessageHeader() { this.contextRunner .withPropertyValues("elasticsearch.consumer.index=foo", diff --git a/consumer/file-consumer/build.gradle b/consumer/file-consumer/build.gradle new file mode 100644 index 00000000..efdad627 --- /dev/null +++ b/consumer/file-consumer/build.gradle @@ -0,0 +1,3 @@ +dependencies { + api 'org.springframework.integration:spring-integration-file' +} diff --git a/consumer/file-consumer/pom.xml b/consumer/file-consumer/pom.xml deleted file mode 100644 index ae403cb2..00000000 --- a/consumer/file-consumer/pom.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - file-consumer - file-consumer - file consumer - - - - org.springframework.integration - spring-integration-file - - - - diff --git a/consumer/ftp-consumer/build.gradle b/consumer/ftp-consumer/build.gradle new file mode 100644 index 00000000..35fd8915 --- /dev/null +++ b/consumer/ftp-consumer/build.gradle @@ -0,0 +1,6 @@ +dependencies { + api project(':ftp-common') + + testImplementation project(':function-test-support') + testImplementation "org.apache.ftpserver:ftpserver-core:$ftpServerVersion" +} diff --git a/consumer/ftp-consumer/pom.xml b/consumer/ftp-consumer/pom.xml deleted file mode 100644 index edbaf169..00000000 --- a/consumer/ftp-consumer/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - ftp-consumer - ftp-consumer - file consumer - - - - org.springframework.integration - spring-integration-ftp - - - org.springframework.cloud.fn - ftp-common - ${project.version} - - - org.springframework.cloud.fn - function-test-support - ${project.version} - test - - - - diff --git a/consumer/jdbc-consumer/build.gradle b/consumer/jdbc-consumer/build.gradle new file mode 100644 index 00000000..a42e198c --- /dev/null +++ b/consumer/jdbc-consumer/build.gradle @@ -0,0 +1,10 @@ +dependencies { + api 'org.springframework.integration:spring-integration-jdbc' + api 'org.springframework.boot:spring-boot-starter-jdbc' + + runtimeOnly 'org.hsqldb:hsqldb' + runtimeOnly 'com.h2database:h2' + runtimeOnly 'org.mariadb.jdbc:mariadb-java-client' + runtimeOnly 'org.postgresql:postgresql' + runtimeOnly 'com.microsoft.sqlserver:mssql-jdbc' +} diff --git a/consumer/jdbc-consumer/pom.xml b/consumer/jdbc-consumer/pom.xml deleted file mode 100644 index a0b6d6d4..00000000 --- a/consumer/jdbc-consumer/pom.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - jdbc-consumer - jdbc-consumer - jdbc consumer - - - - org.springframework.integration - spring-integration-jdbc - - - org.springframework.boot - spring-boot-starter-jdbc - - - org.hsqldb - hsqldb - runtime - - - com.h2database - h2 - runtime - - - org.mariadb.jdbc - mariadb-java-client - runtime - - - org.postgresql - postgresql - runtime - - - com.microsoft.sqlserver - mssql-jdbc - runtime - - - com.microsoft.azure - azure-keyvault - - - - - - diff --git a/consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/ExplicitTableCreationTests.java b/consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/ExplicitTableCreationTests.java index bba4fb4e..6c2c065c 100644 --- a/consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/ExplicitTableCreationTests.java +++ b/consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/ExplicitTableCreationTests.java @@ -47,7 +47,7 @@ public class ExplicitTableCreationTests extends JdbcConsumerApplicationTests { Payload result = jdbcOperations.query("select a, b from foobar", new BeanPropertyRowMapper<>(Payload.class)) .get(0); - assertThat(result).isEqualToComparingFieldByField(sent); + assertThat(result).usingRecursiveComparison().isEqualTo(sent); } } diff --git a/consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/ImplicitTableCreationTests.java b/consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/ImplicitTableCreationTests.java index 0d79c476..fb0eaaaa 100644 --- a/consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/ImplicitTableCreationTests.java +++ b/consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/ImplicitTableCreationTests.java @@ -47,7 +47,7 @@ public class ImplicitTableCreationTests extends JdbcConsumerApplicationTests { jdbcConsumer.accept(message); Payload result = jdbcOperations .query("select a, b from no_script", new BeanPropertyRowMapper<>(Payload.class)).get(0); - assertThat(result).isEqualToComparingFieldByField(sent); + assertThat(result).usingRecursiveComparison().isEqualTo(sent); } } diff --git a/consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/SimpleMappingTests.java b/consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/SimpleMappingTests.java index 3efbe4b4..b69e4755 100644 --- a/consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/SimpleMappingTests.java +++ b/consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/SimpleMappingTests.java @@ -44,7 +44,7 @@ public class SimpleMappingTests extends JdbcConsumerApplicationTests { jdbcConsumer.accept(message); Payload result = jdbcOperations .query("select a, b from messages", new BeanPropertyRowMapper<>(Payload.class)).get(0); - assertThat(result).isEqualToComparingFieldByField(sent); + assertThat(result).usingRecursiveComparison().isEqualTo(sent); } } diff --git a/consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/SpELTests.java b/consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/SpELTests.java index 8ec1ddf0..c7906006 100644 --- a/consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/SpELTests.java +++ b/consumer/jdbc-consumer/src/test/java/org/springframework/cloud/fn/consumer/jdbc/SpELTests.java @@ -46,7 +46,7 @@ public class SpELTests extends JdbcConsumerApplicationTests { Payload expected = new Payload("hell", 666); Payload result = jdbcOperations .query("select a, b from messages", new BeanPropertyRowMapper<>(Payload.class)).get(0); - assertThat(result).isEqualToComparingFieldByField(expected); + assertThat(result).usingRecursiveComparison().isEqualTo(expected); } } diff --git a/consumer/kafka-publisher/build.gradle b/consumer/kafka-publisher/build.gradle new file mode 100644 index 00000000..2a46e034 --- /dev/null +++ b/consumer/kafka-publisher/build.gradle @@ -0,0 +1,5 @@ +dependencies { + api 'org.springframework.integration:spring-integration-kafka' + + testImplementation 'org.springframework.kafka:spring-kafka-test' +} diff --git a/consumer/kafka-publisher/pom.xml b/consumer/kafka-publisher/pom.xml deleted file mode 100644 index 1f8f599f..00000000 --- a/consumer/kafka-publisher/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - 4.0.0 - - - spring-functions-parent - org.springframework.cloud.fn - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - kafka-publisher - kafka-publisher - Apache Kafka Publisher(Consumer Function) - - - - org.springframework.integration - spring-integration-kafka - - - - org.springframework.kafka - spring-kafka-test - test - - - org.springframework.integration - spring-integration-test - test - - - - diff --git a/consumer/kafka-publisher/src/main/java/org/springframework/cloud/fn/consumer/kafka/KafkaPublisherConfiguration.java b/consumer/kafka-publisher/src/main/java/org/springframework/cloud/fn/consumer/kafka/KafkaPublisherConfiguration.java index 6138f10b..ad8821e4 100644 --- a/consumer/kafka-publisher/src/main/java/org/springframework/cloud/fn/consumer/kafka/KafkaPublisherConfiguration.java +++ b/consumer/kafka-publisher/src/main/java/org/springframework/cloud/fn/consumer/kafka/KafkaPublisherConfiguration.java @@ -91,7 +91,7 @@ public class KafkaPublisherConfiguration { kafkaProducerSpecComponentCustomizer.customize(kafkaProducerMessageHandlerSpec); } - return kafkaProducerMessageHandlerSpec.get(); + return kafkaProducerMessageHandlerSpec.getObject(); } /** diff --git a/consumer/kafka-publisher/src/test/java/org/springframework/cloud/fn/consumer/kafka/KafkaPublisherConfigurationTests.java b/consumer/kafka-publisher/src/test/java/org/springframework/cloud/fn/consumer/kafka/KafkaPublisherConfigurationTests.java index 124af477..e7e3d8ac 100644 --- a/consumer/kafka-publisher/src/test/java/org/springframework/cloud/fn/consumer/kafka/KafkaPublisherConfigurationTests.java +++ b/consumer/kafka-publisher/src/test/java/org/springframework/cloud/fn/consumer/kafka/KafkaPublisherConfigurationTests.java @@ -26,7 +26,6 @@ import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.producer.RecordMetadata; import org.apache.kafka.common.TopicPartition; import org.apache.kafka.common.header.Header; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import reactor.core.publisher.Sinks; @@ -41,11 +40,11 @@ import org.springframework.kafka.KafkaException; import org.springframework.kafka.core.ConsumerFactory; import org.springframework.kafka.core.KafkaTemplate; import org.springframework.kafka.support.KafkaHeaders; -import org.springframework.kafka.test.EmbeddedKafkaBroker; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHandlingException; import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.support.GenericMessage; +import org.springframework.kafka.test.context.EmbeddedKafka; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -55,23 +54,15 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; * * @since 4.0 */ +@EmbeddedKafka(partitions = 1, controlledShutdown = true) public class KafkaPublisherConfigurationTests { - static final EmbeddedKafkaBroker EMBEDDED_KAFKA = - new EmbeddedKafkaBroker(1, true, 1) - .brokerListProperty("spring.kafka.bootstrap-servers"); - final ApplicationContextRunner contextRunner = new ApplicationContextRunner() .withConfiguration(AutoConfigurations.of( KafkaAutoConfiguration.class, KafkaPublisherConfiguration.class, SpelExpressionConverterConfiguration.class)); - @BeforeAll - static void initializeEmbeddedKafka() { - EMBEDDED_KAFKA.afterPropertiesSet(); - } - @Test void defaultTopicReceivesTheRecord() { String defaultTopic = "DEFAULT_TOPIC"; @@ -98,7 +89,7 @@ public class KafkaPublisherConfigurationTests { assertThatExceptionOfType(MessageHandlingException.class) .isThrownBy(() -> kafkaConsumer.accept(new GenericMessage<>("test data"))) .withCauseInstanceOf(KafkaException.class) - .withStackTraceContaining("Topic topic1 not present in metadata after 1000 ms."); + .withStackTraceContaining("not present in metadata after 1000 ms."); }); } diff --git a/consumer/log-consumer/build.gradle b/consumer/log-consumer/build.gradle new file mode 100644 index 00000000..5053202b --- /dev/null +++ b/consumer/log-consumer/build.gradle @@ -0,0 +1,5 @@ +dependencies { + api project(':payload-converter-function') + + optionalApi 'org.hibernate.validator:hibernate-validator' +} diff --git a/consumer/log-consumer/pom.xml b/consumer/log-consumer/pom.xml deleted file mode 100644 index d6829aef..00000000 --- a/consumer/log-consumer/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - log-consumer - log-consumer - Log Consumer - - - - org.springframework.cloud.fn - payload-converter-function - ${project.version} - - - org.hibernate.validator - hibernate-validator - true - - - - diff --git a/consumer/log-consumer/src/test/java/org/springframework/cloud/fn/consumer/log/LogConsumerApplicationTests.java b/consumer/log-consumer/src/test/java/org/springframework/cloud/fn/consumer/log/LogConsumerApplicationTests.java index 5b990a01..392de1b4 100644 --- a/consumer/log-consumer/src/test/java/org/springframework/cloud/fn/consumer/log/LogConsumerApplicationTests.java +++ b/consumer/log-consumer/src/test/java/org/springframework/cloud/fn/consumer/log/LogConsumerApplicationTests.java @@ -62,6 +62,7 @@ class LogConsumerApplicationTests { testMessage(message, "{\"foo\":\"bar\"}"); } + @SuppressWarnings("unchecked") private void testMessage(Message message, String expectedPayload) { assertThat(this.loggingHandler.getLevel()).isEqualTo(LoggingHandler.Level.WARN); LogAccessor logger = TestUtils.getPropertyValue(this.loggingHandler, "messageLogger", LogAccessor.class); diff --git a/consumer/mongodb-consumer/build.gradle b/consumer/mongodb-consumer/build.gradle new file mode 100644 index 00000000..868d95df --- /dev/null +++ b/consumer/mongodb-consumer/build.gradle @@ -0,0 +1,6 @@ +dependencies { + api 'org.springframework.integration:spring-integration-mongodb' + api 'org.mongodb:mongodb-driver-reactivestreams' + + testImplementation 'org.testcontainers:mongodb' +} diff --git a/consumer/mongodb-consumer/pom.xml b/consumer/mongodb-consumer/pom.xml deleted file mode 100644 index d0e89048..00000000 --- a/consumer/mongodb-consumer/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - mongodb-consumer - mongodb-consumer - Mongo DB consumer - - - - org.springframework.integration - spring-integration-mongodb - - - org.mongodb - mongodb-driver-reactivestreams - - - org.testcontainers - mongodb - ${testcontainers.version} - test - - - org.springframework.cloud.fn - mongodb-common - ${project.version} - test-jar - test - - - - diff --git a/consumer/mongodb-consumer/src/test/java/org/springframework/cloud/fn/consumer/mongo/MongoDbConsumerApplicationTests.java b/consumer/mongodb-consumer/src/test/java/org/springframework/cloud/fn/consumer/mongo/MongoDbConsumerApplicationTests.java index b5f43bfc..680635be 100644 --- a/consumer/mongodb-consumer/src/test/java/org/springframework/cloud/fn/consumer/mongo/MongoDbConsumerApplicationTests.java +++ b/consumer/mongodb-consumer/src/test/java/org/springframework/cloud/fn/consumer/mongo/MongoDbConsumerApplicationTests.java @@ -30,7 +30,6 @@ import reactor.test.StepVerifier; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.cloud.fn.common.mongo.MongoDbTestContainerSupport; import org.springframework.data.mongodb.core.ReactiveMongoTemplate; import org.springframework.messaging.Message; import org.springframework.messaging.support.GenericMessage; diff --git a/common/mongodb-common/src/test/java/org/springframework/cloud/fn/common/mongo/MongoDbTestContainerSupport.java b/consumer/mongodb-consumer/src/test/java/org/springframework/cloud/fn/consumer/mongo/MongoDbTestContainerSupport.java similarity index 96% rename from common/mongodb-common/src/test/java/org/springframework/cloud/fn/common/mongo/MongoDbTestContainerSupport.java rename to consumer/mongodb-consumer/src/test/java/org/springframework/cloud/fn/consumer/mongo/MongoDbTestContainerSupport.java index 8848a342..bdb32724 100644 --- a/common/mongodb-common/src/test/java/org/springframework/cloud/fn/common/mongo/MongoDbTestContainerSupport.java +++ b/consumer/mongodb-consumer/src/test/java/org/springframework/cloud/fn/consumer/mongo/MongoDbTestContainerSupport.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.fn.common.mongo; +package org.springframework.cloud.fn.consumer.mongo; import java.time.Duration; diff --git a/consumer/mqtt-consumer/build.gradle b/consumer/mqtt-consumer/build.gradle new file mode 100644 index 00000000..44adc921 --- /dev/null +++ b/consumer/mqtt-consumer/build.gradle @@ -0,0 +1,3 @@ +dependencies { + api project(':mqtt-common') +} diff --git a/consumer/mqtt-consumer/pom.xml b/consumer/mqtt-consumer/pom.xml deleted file mode 100644 index 9cfbc05a..00000000 --- a/consumer/mqtt-consumer/pom.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - mqtt-consumer - mqtt-consumer - mqtt consumer - - - - org.springframework.cloud.fn - mqtt-common - ${project.version} - - - diff --git a/consumer/pom.xml b/consumer/pom.xml deleted file mode 100644 index 1cb9ef23..00000000 --- a/consumer/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud.fn - java-functions-consumer - 4.0.1-SNAPSHOT - java-functions-consumer - Java Functions Consumer - pom - - - - cassandra-consumer - elasticsearch-consumer - analytics-consumer - file-consumer - ftp-consumer - jdbc-consumer - kafka-publisher - log-consumer - mongodb-consumer - mqtt-consumer - rabbit-consumer - redis-consumer - sftp-consumer - tcp-consumer - websocket-consumer - s3-consumer - twitter-consumer - wavefront-consumer - rsocket-consumer - xmpp-consumer - zeromq-consumer - - - - - org.apache.maven.plugins - maven-deploy-plugin - 3.0.0 - - true - - - - - diff --git a/consumer/rabbit-consumer/build.gradle b/consumer/rabbit-consumer/build.gradle new file mode 100644 index 00000000..e008d507 --- /dev/null +++ b/consumer/rabbit-consumer/build.gradle @@ -0,0 +1,5 @@ +dependencies { + api 'org.springframework.integration:spring-integration-amqp' + api 'org.springframework.boot:spring-boot-starter-amqp' + api 'org.springframework.boot:spring-boot-starter-web' +} diff --git a/consumer/rabbit-consumer/pom.xml b/consumer/rabbit-consumer/pom.xml deleted file mode 100644 index 77d0ae75..00000000 --- a/consumer/rabbit-consumer/pom.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - rabbit-consumer - rabbit-consumer - Rabbit consumer - - - - org.springframework.integration - spring-integration-amqp - - - org.springframework.boot - spring-boot-starter-amqp - - - org.springframework.boot - spring-boot-starter-web - - - - diff --git a/consumer/redis-consumer/build.gradle b/consumer/redis-consumer/build.gradle new file mode 100644 index 00000000..342cbd1d --- /dev/null +++ b/consumer/redis-consumer/build.gradle @@ -0,0 +1,4 @@ +dependencies { + api 'org.springframework.integration:spring-integration-redis' + api 'org.springframework.boot:spring-boot-starter-data-redis' +} diff --git a/consumer/redis-consumer/pom.xml b/consumer/redis-consumer/pom.xml deleted file mode 100644 index ef5ab2d7..00000000 --- a/consumer/redis-consumer/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - redis-consumer - redis-consumer - Redis Consumer - - - - org.springframework.boot - spring-boot-starter-data-redis - - - org.springframework.integration - spring-integration-redis - - - org.springframework.cloud - spring-cloud-starter-bootstrap - ${spring-cloud-starters.version} - test - - - org.springframework.cloud.fn - redis-common - ${project.version} - test-jar - test - - - - diff --git a/consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/AbstractRedisConsumerTests.java b/consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/AbstractRedisConsumerTests.java index d7af0153..58370fee 100644 --- a/consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/AbstractRedisConsumerTests.java +++ b/consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/AbstractRedisConsumerTests.java @@ -18,8 +18,6 @@ package org.springframework.cloud.fn.consumer.redis; import java.util.function.Consumer; -import org.junit.jupiter.api.Tag; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; @@ -36,7 +34,6 @@ import org.springframework.test.context.DynamicPropertySource; */ @SpringBootTest @DirtiesContext -@Tag("integration") public class AbstractRedisConsumerTests implements RedisTestContainerSupport { @DynamicPropertySource diff --git a/common/redis-common/src/test/java/org/springframework/cloud/fn/consumer/redis/RedisTestContainerSupport.java b/consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/RedisTestContainerSupport.java similarity index 100% rename from common/redis-common/src/test/java/org/springframework/cloud/fn/consumer/redis/RedisTestContainerSupport.java rename to consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/RedisTestContainerSupport.java diff --git a/consumer/rsocket-consumer/build.gradle b/consumer/rsocket-consumer/build.gradle new file mode 100644 index 00000000..f672f1c5 --- /dev/null +++ b/consumer/rsocket-consumer/build.gradle @@ -0,0 +1,3 @@ +dependencies { + api 'org.springframework.boot:spring-boot-starter-rsocket' +} diff --git a/consumer/rsocket-consumer/pom.xml b/consumer/rsocket-consumer/pom.xml deleted file mode 100644 index 35aac837..00000000 --- a/consumer/rsocket-consumer/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - rsocket-consumer - rsocket-consumer - - - - org.springframework.boot - spring-boot-starter-rsocket - - - - diff --git a/consumer/rsocket-consumer/src/test/java/org/springframework/cloud/fn/consumer/rsocket/RsocketConsumerTests.java b/consumer/rsocket-consumer/src/test/java/org/springframework/cloud/fn/consumer/rsocket/RsocketConsumerTests.java index 561f7134..4c57c437 100644 --- a/consumer/rsocket-consumer/src/test/java/org/springframework/cloud/fn/consumer/rsocket/RsocketConsumerTests.java +++ b/consumer/rsocket-consumer/src/test/java/org/springframework/cloud/fn/consumer/rsocket/RsocketConsumerTests.java @@ -79,11 +79,12 @@ public class RsocketConsumerTests { @SpringBootConfiguration @Controller static class RSocketserverApplication { + static final ReplayProcessor fireForgetPayloads = ReplayProcessor.create(); @MessageMapping("test-route") void someMethod(String payload) { - this.fireForgetPayloads.onNext(payload); + fireForgetPayloads.onNext(payload); } } } diff --git a/consumer/s3-consumer/build.gradle b/consumer/s3-consumer/build.gradle new file mode 100644 index 00000000..0ea0e824 --- /dev/null +++ b/consumer/s3-consumer/build.gradle @@ -0,0 +1,11 @@ +dependencies { + api project(':aws-s3-common') + api project(':file-common') + api 'software.amazon.awssdk:s3-transfer-manager' + + testImplementation 'org.springframework:spring-web' +} + +tasks.withType(JavaForkOptions) { + jvmArgs '--add-opens', 'java.base/java.nio=ALL-UNNAMED' +} \ No newline at end of file diff --git a/consumer/s3-consumer/pom.xml b/consumer/s3-consumer/pom.xml deleted file mode 100644 index b0d08a25..00000000 --- a/consumer/s3-consumer/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - s3-consumer - s3-consumer - s3 consumer - - - - org.springframework.cloud.fn - aws-s3-common - ${project.version} - - - org.springframework.cloud.fn - file-common - ${project.version} - - - software.amazon.awssdk - s3-transfer-manager - - - org.springframework - spring-web - test - - - - diff --git a/consumer/s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AbstractAwsS3ConsumerMockTests.java b/consumer/s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AbstractAwsS3ConsumerMockTests.java index c209f941..14ccc5ba 100644 --- a/consumer/s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AbstractAwsS3ConsumerMockTests.java +++ b/consumer/s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AbstractAwsS3ConsumerMockTests.java @@ -36,6 +36,7 @@ import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Bean; import org.springframework.http.MediaType; import org.springframework.messaging.Message; @@ -43,7 +44,6 @@ import org.springframework.test.annotation.DirtiesContext; import static org.mockito.ArgumentMatchers.any; import static org.mockito.BDDMockito.willReturn; -import static org.mockito.Mockito.spy; @DirtiesContext @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, @@ -66,7 +66,7 @@ public abstract class AbstractAwsS3ConsumerMockTests { @TempDir protected static Path temporaryRemoteFolder; - @Autowired + @MockBean private S3AsyncClient amazonS3; @Autowired @@ -80,8 +80,6 @@ public abstract class AbstractAwsS3ConsumerMockTests { @BeforeEach public void setupTest() { - S3AsyncClient amazonS3 = spy(this.amazonS3); - willReturn(CompletableFuture.completedFuture(PutObjectResponse.builder().build())) .given(amazonS3) .putObject(any(PutObjectRequest.class), any(AsyncRequestBody.class)); diff --git a/consumer/s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AmazonS3UploadFileTests.java b/consumer/s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AmazonS3UploadFileTests.java index a04a8a82..2ec4d009 100644 --- a/consumer/s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AmazonS3UploadFileTests.java +++ b/consumer/s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AmazonS3UploadFileTests.java @@ -69,7 +69,7 @@ public class AmazonS3UploadFileTests extends AbstractAwsS3ConsumerMockTests { AsyncRequestBody asyncRequestBody = asyncRequestBodyArgumentCaptor.getValue(); StepVerifier.create(asyncRequestBody) - .assertNext(buffer -> assertThat(buffer.array()).isEmpty()) + .assertNext(buffer -> assertThat(TestUtils.getPropertyValue(buffer, "hb", byte[].class)).isEmpty()) .expectComplete() .verify(); diff --git a/consumer/s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AmazonS3UploadInputStreamTests.java b/consumer/s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AmazonS3UploadInputStreamTests.java index 8c179965..315aab39 100644 --- a/consumer/s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AmazonS3UploadInputStreamTests.java +++ b/consumer/s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AmazonS3UploadInputStreamTests.java @@ -17,6 +17,7 @@ package org.springframework.cloud.fn.consumer.s3; import java.io.InputStream; +import java.nio.charset.StandardCharsets; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; @@ -69,7 +70,7 @@ public class AmazonS3UploadInputStreamTests extends AbstractAwsS3ConsumerMockTes AsyncRequestBody asyncRequestBody = asyncRequestBodyArgumentCaptor.getValue(); - StepVerifier.create(asyncRequestBody.map(buffer -> new String(buffer.array()))) + StepVerifier.create(asyncRequestBody.map(buffer -> StandardCharsets.UTF_8.decode(buffer).toString())) .expectNext("a") .expectComplete() .verify(); diff --git a/consumer/sftp-consumer/build.gradle b/consumer/sftp-consumer/build.gradle new file mode 100644 index 00000000..b56532dd --- /dev/null +++ b/consumer/sftp-consumer/build.gradle @@ -0,0 +1,5 @@ +dependencies { + api 'org.springframework.integration:spring-integration-sftp' + + testImplementation project(':function-test-support') +} diff --git a/consumer/sftp-consumer/pom.xml b/consumer/sftp-consumer/pom.xml deleted file mode 100644 index b90e8ee3..00000000 --- a/consumer/sftp-consumer/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - sftp-consumer - sftp-consumer - file consumer - - - - org.springframework.integration - spring-integration-sftp - - - org.springframework.cloud.fn - function-test-support - ${project.version} - test - - - - diff --git a/consumer/tcp-consumer/build.gradle b/consumer/tcp-consumer/build.gradle new file mode 100644 index 00000000..39f81c78 --- /dev/null +++ b/consumer/tcp-consumer/build.gradle @@ -0,0 +1,3 @@ +dependencies { + api project(':tcp-common') +} diff --git a/consumer/tcp-consumer/pom.xml b/consumer/tcp-consumer/pom.xml deleted file mode 100644 index 84477595..00000000 --- a/consumer/tcp-consumer/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - tcp-consumer - tcp-consumer - tcp consumer - - - - org.springframework.cloud.fn - tcp-common - ${project.version} - - - - diff --git a/consumer/twitter-consumer/build.gradle b/consumer/twitter-consumer/build.gradle new file mode 100644 index 00000000..d4eed9fd --- /dev/null +++ b/consumer/twitter-consumer/build.gradle @@ -0,0 +1,4 @@ +dependencies { + api project(':twitter-common') + api project(':payload-converter-function') +} diff --git a/consumer/twitter-consumer/pom.xml b/consumer/twitter-consumer/pom.xml deleted file mode 100644 index 15b22fb4..00000000 --- a/consumer/twitter-consumer/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - twitter-consumer - twitter-consumer - twitter consumer - - - - org.springframework.cloud.fn - twitter-common - ${project.version} - - - org.springframework.cloud.fn - payload-converter-function - ${project.version} - - - - diff --git a/consumer/wavefront-consumer/build.gradle b/consumer/wavefront-consumer/build.gradle new file mode 100644 index 00000000..5b8dc7e6 --- /dev/null +++ b/consumer/wavefront-consumer/build.gradle @@ -0,0 +1,3 @@ +dependencies { + api 'org.springframework.boot:spring-boot-starter-web' +} diff --git a/consumer/wavefront-consumer/pom.xml b/consumer/wavefront-consumer/pom.xml deleted file mode 100644 index a2d5ced9..00000000 --- a/consumer/wavefront-consumer/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - wavefront-consumer - wavefront-consumer - Wavefront Consumer - - - 2.4.0 - - - - - org.springframework.boot - spring-boot-starter-web - - - - diff --git a/consumer/websocket-consumer/build.gradle b/consumer/websocket-consumer/build.gradle new file mode 100644 index 00000000..4997937f --- /dev/null +++ b/consumer/websocket-consumer/build.gradle @@ -0,0 +1,8 @@ +dependencies { + api 'org.springframework.boot:spring-boot-starter-actuator' + api 'org.springframework:spring-websocket' + api 'io.netty:netty-all' + + testImplementation 'org.springframework.boot:spring-boot-starter-web' + testImplementation project(':function-test-support') +} diff --git a/consumer/websocket-consumer/pom.xml b/consumer/websocket-consumer/pom.xml deleted file mode 100644 index 3a6d7c51..00000000 --- a/consumer/websocket-consumer/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - websocket-consumer - websocket-consumer - websocket consumer - - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework - spring-websocket - - - io.netty - netty-all - - - org.springframework.boot - spring-boot-starter-web - test - - - org.springframework.cloud.fn - function-test-support - ${project.version} - test - - - - diff --git a/consumer/xmpp-consumer/build.gradle b/consumer/xmpp-consumer/build.gradle new file mode 100644 index 00000000..40ccc9f9 --- /dev/null +++ b/consumer/xmpp-consumer/build.gradle @@ -0,0 +1,5 @@ +dependencies { + api project(':xmpp-common') + + testImplementation project(':function-test-support') +} diff --git a/consumer/xmpp-consumer/pom.xml b/consumer/xmpp-consumer/pom.xml deleted file mode 100644 index b7c20688..00000000 --- a/consumer/xmpp-consumer/pom.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - xmpp-consumer - xmpp-consumer - XMPP consumer - - - - org.springframework.cloud.fn - xmpp-common - ${project.version} - - - org.springframework.cloud.fn - function-test-support - ${project.version} - test - - - - diff --git a/consumer/zeromq-consumer/build.gradle b/consumer/zeromq-consumer/build.gradle new file mode 100644 index 00000000..4d5a4bed --- /dev/null +++ b/consumer/zeromq-consumer/build.gradle @@ -0,0 +1,3 @@ +dependencies { + api 'org.springframework.integration:spring-integration-zeromq' +} diff --git a/consumer/zeromq-consumer/pom.xml b/consumer/zeromq-consumer/pom.xml deleted file mode 100644 index 49c347ba..00000000 --- a/consumer/zeromq-consumer/pom.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - zeromq-consumer - zeromq-consumer - ZeroMQ consumer - - - - org.springframework.integration - spring-integration-zeromq - - - - diff --git a/function-dependencies/build.gradle b/function-dependencies/build.gradle new file mode 100644 index 00000000..1aea8767 --- /dev/null +++ b/function-dependencies/build.gradle @@ -0,0 +1,20 @@ +description = 'Spring Functions Catlog (Bill of Materials)' + +apply plugin: 'java-platform' +apply from: "${rootDir}/publish-maven.gradle" + +dependencies { + constraints { + javaProjects.sort { "$it.name" }.each { + api it + } + } +} + +publishing { + publications { + mavenJava(MavenPublication) { + from components.javaPlatform + } + } +} \ No newline at end of file diff --git a/function-dependencies/pom.xml b/function-dependencies/pom.xml deleted file mode 100644 index 34bed223..00000000 --- a/function-dependencies/pom.xml +++ /dev/null @@ -1,310 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.stream.app - stream-applications-build - 4.0.1-SNAPSHOT - ../../stream-applications-build/pom.xml - - - org.springframework.cloud.fn - function-dependencies - pom - - - - - org.springframework.cloud.fn - mail-supplier - ${project.version} - - - org.springframework.cloud.fn - syslog-supplier - ${project.version} - - - org.springframework.cloud.fn - debezium-supplier - ${project.version} - - - org.springframework.cloud.fn - file-supplier - ${project.version} - - - org.springframework.cloud.fn - ftp-supplier - ${project.version} - - - org.springframework.cloud.fn - http-supplier - ${project.version} - - - org.springframework.cloud.fn - jdbc-supplier - ${project.version} - - - org.springframework.cloud.fn - jms-supplier - ${project.version} - - - org.springframework.cloud.fn - kafka-supplier - ${project.version} - - - org.springframework.cloud.fn - mongodb-supplier - ${project.version} - - - org.springframework.cloud.fn - mqtt-supplier - ${project.version} - - - org.springframework.cloud.fn - rabbit-supplier - ${project.version} - - - org.springframework.cloud.fn - s3-supplier - ${project.version} - - - org.springframework.cloud.fn - sftp-supplier - ${project.version} - - - org.springframework.cloud.fn - tcp-supplier - ${project.version} - - - org.springframework.cloud.fn - time-supplier - ${project.version} - - - org.springframework.cloud.fn - twitter-supplier - ${project.version} - - - org.springframework.cloud.fn - websocket-supplier - ${project.version} - - - org.springframework.cloud.fn - xmpp-supplier - ${project.version} - - - org.springframework.cloud.fn - zeromq-supplier - ${project.version} - - - org.springframework.cloud.fn - analytics-consumer - ${project.version} - - - org.springframework.cloud.fn - elasticsearch-consumer - ${project.version} - - - org.springframework.cloud.fn - rsocket-consumer - ${project.version} - - - org.springframework.cloud.fn - cassandra-consumer - ${project.version} - - - org.springframework.cloud.fn - file-consumer - ${project.version} - - - org.springframework.cloud.fn - ftp-consumer - ${project.version} - - - org.springframework.cloud.fn - jdbc-consumer - ${project.version} - - - org.springframework.cloud.fn - kafka-publisher - ${project.version} - - - org.springframework.cloud.fn - log-consumer - ${project.version} - - - org.springframework.cloud.fn - mongodb-consumer - ${project.version} - - - org.springframework.cloud.fn - mqtt-consumer - ${project.version} - - - org.springframework.cloud.fn - rabbit-consumer - ${project.version} - - - org.springframework.cloud.fn - redis-consumer - ${project.version} - - - org.springframework.cloud.fn - s3-consumer - ${project.version} - - - org.springframework.cloud.fn - sftp-consumer - ${project.version} - - - org.springframework.cloud.fn - tcp-consumer - ${project.version} - - - org.springframework.cloud.fn - twitter-consumer - ${project.version} - - - org.springframework.cloud.fn - xmpp-consumer - ${project.version} - - - org.springframework.cloud.fn - wavefront-consumer - ${project.version} - - - org.springframework.cloud.fn - websocket-consumer - ${project.version} - - - org.springframework.cloud.fn - zeromq-consumer - ${project.version} - - - org.springframework.cloud.fn - aggregator-function - ${project.version} - - - org.springframework.cloud.fn - filter-function - ${project.version} - - - org.springframework.cloud.fn - header-enricher-function - ${project.version} - - - org.springframework.cloud.fn - header-filter-function - ${project.version} - - - org.springframework.cloud.fn - http-request-function - ${project.version} - - - org.springframework.cloud.fn - image-recognition-function - ${project.version} - - - org.springframework.cloud.fn - object-detection-function - ${project.version} - - - org.springframework.cloud.fn - payload-converter-function - ${project.version} - - - org.springframework.cloud.fn - semantic-segmentation-function - ${project.version} - - - org.springframework.cloud.fn - spel-function - ${project.version} - - - org.springframework.cloud.fn - splitter-function - ${project.version} - - - org.springframework.cloud.fn - task-launch-request-function - ${project.version} - - - org.springframework.cloud.fn - twitter-function - ${project.version} - - - org.springframework.cloud.fn - function-test-support - ${project.version} - test - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - 3.0.0 - - false - - - - - diff --git a/function/aggregator-function/build.gradle b/function/aggregator-function/build.gradle new file mode 100644 index 00000000..05d0414e --- /dev/null +++ b/function/aggregator-function/build.gradle @@ -0,0 +1,18 @@ +dependencies { + api project(':payload-converter-function') + api 'org.springframework.integration:spring-integration-mongodb' + api 'org.springframework.integration:spring-integration-redis' + api 'org.springframework.integration:spring-integration-jdbc' + + runtimeOnly 'org.springframework.boot:spring-boot-starter-data-redis' + runtimeOnly 'org.springframework.boot:spring-boot-starter-data-mongodb' + runtimeOnly 'org.springframework.boot:spring-boot-starter-jdbc' + runtimeOnly 'org.hsqldb:hsqldb' + runtimeOnly 'com.h2database:h2' + runtimeOnly 'org.mariadb.jdbc:mariadb-java-client' + runtimeOnly 'org.postgresql:postgresql' + + testImplementation 'org.testcontainers:mongodb' + testImplementation project(':mongodb-consumer').sourceSets.test.output + testImplementation project(':redis-consumer').sourceSets.test.output +} diff --git a/function/aggregator-function/pom.xml b/function/aggregator-function/pom.xml deleted file mode 100644 index 91b46c22..00000000 --- a/function/aggregator-function/pom.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - aggregator-function - aggregator-function - Spring Native Function for Aggregator - - - - org.springframework.cloud.fn - payload-converter-function - ${project.version} - - - org.springframework.integration - spring-integration-core - - - - org.springframework.integration - spring-integration-mongodb - - - org.springframework.boot - spring-boot-starter-data-mongodb - runtime - - - org.testcontainers - mongodb - ${testcontainers.version} - test - - - org.springframework.cloud.fn - mongodb-common - ${project.version} - test-jar - test - - - - org.springframework.integration - spring-integration-redis - - - org.springframework.boot - spring-boot-starter-data-redis - runtime - - - org.springframework.cloud.fn - redis-common - ${project.version} - test-jar - test - - - - org.springframework.integration - spring-integration-jdbc - - - org.springframework.boot - spring-boot-starter-jdbc - runtime - - - org.hsqldb - hsqldb - runtime - - - com.h2database - h2 - runtime - - - org.mariadb.jdbc - mariadb-java-client - runtime - - - org.postgresql - postgresql - runtime - - - - diff --git a/function/aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/CustomPropsAndMongoMessageStoreAggregatorTests.java b/function/aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/CustomPropsAndMongoMessageStoreAggregatorTests.java index abbc4b66..06e6e072 100644 --- a/function/aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/CustomPropsAndMongoMessageStoreAggregatorTests.java +++ b/function/aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/CustomPropsAndMongoMessageStoreAggregatorTests.java @@ -24,7 +24,7 @@ import reactor.core.publisher.Flux; import reactor.test.StepVerifier; import org.springframework.boot.test.autoconfigure.data.mongo.AutoConfigureDataMongo; -import org.springframework.cloud.fn.common.mongo.MongoDbTestContainerSupport; +import org.springframework.cloud.fn.consumer.mongo.MongoDbTestContainerSupport; import org.springframework.integration.mongodb.store.ConfigurableMongoDbMessageStore; import org.springframework.integration.test.util.TestUtils; import org.springframework.messaging.Message; diff --git a/function/aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/RedisMessageStoreAggregatorTests.java b/function/aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/RedisMessageStoreAggregatorTests.java index feb39c26..685c91d2 100644 --- a/function/aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/RedisMessageStoreAggregatorTests.java +++ b/function/aggregator-function/src/test/java/org/springframework/cloud/fn/aggregator/RedisMessageStoreAggregatorTests.java @@ -42,6 +42,7 @@ import static org.assertj.core.api.Assertions.assertThat; */ @TestPropertySource(properties = "aggregator.message-store-type=redis") public class RedisMessageStoreAggregatorTests extends AbstractAggregatorFunctionTests implements RedisTestContainerSupport { + @DynamicPropertySource static void redisProperties(DynamicPropertyRegistry registry) { registry.add("spring.data.redis.url", RedisTestContainerSupport::getUri); diff --git a/function/filter-function/build.gradle b/function/filter-function/build.gradle new file mode 100644 index 00000000..52c7b046 --- /dev/null +++ b/function/filter-function/build.gradle @@ -0,0 +1,3 @@ +dependencies { + api project(':payload-converter-function') +} diff --git a/function/filter-function/pom.xml b/function/filter-function/pom.xml deleted file mode 100644 index 0975e39b..00000000 --- a/function/filter-function/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - filter-function - filter-function - Spring Native Function for applying filter SpEL expressions - - - - org.springframework.cloud.fn - payload-converter-function - ${project.version} - - - - diff --git a/function/header-enricher-function/build.gradle b/function/header-enricher-function/build.gradle new file mode 100644 index 00000000..52c7b046 --- /dev/null +++ b/function/header-enricher-function/build.gradle @@ -0,0 +1,3 @@ +dependencies { + api project(':payload-converter-function') +} diff --git a/function/header-enricher-function/pom.xml b/function/header-enricher-function/pom.xml deleted file mode 100644 index beb8b7c1..00000000 --- a/function/header-enricher-function/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - header-enricher-function - header-enricher-function - Spring Native Function for applying message header enrichment - - - - org.springframework.cloud.fn - payload-converter-function - ${project.version} - - - - diff --git a/function/header-filter-function/build.gradle b/function/header-filter-function/build.gradle new file mode 100644 index 00000000..52c7b046 --- /dev/null +++ b/function/header-filter-function/build.gradle @@ -0,0 +1,3 @@ +dependencies { + api project(':payload-converter-function') +} diff --git a/function/header-filter-function/pom.xml b/function/header-filter-function/pom.xml deleted file mode 100644 index f8651e81..00000000 --- a/function/header-filter-function/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - header-filter-function - header-filter-function - Spring Native Function for applying message filters - - - - org.springframework.cloud.fn - payload-converter-function - ${project.version} - - - org.assertj - assertj-core - test - - - - diff --git a/function/http-request-function/build.gradle b/function/http-request-function/build.gradle new file mode 100644 index 00000000..36965082 --- /dev/null +++ b/function/http-request-function/build.gradle @@ -0,0 +1,5 @@ +dependencies { + api 'org.springframework.boot:spring-boot-starter-webflux' + + testImplementation 'com.squareup.okhttp3:mockwebserver' +} diff --git a/function/http-request-function/pom.xml b/function/http-request-function/pom.xml deleted file mode 100644 index 0d0578db..00000000 --- a/function/http-request-function/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - http-request-function - http-request-function - Spring Native Function for Submitting an HTTP request - - - - org.springframework.boot - spring-boot-starter-webflux - - - com.squareup.okhttp3 - mockwebserver - test - - - - diff --git a/function/image-recognition-function/build.gradle b/function/image-recognition-function/build.gradle new file mode 100644 index 00000000..e68b45cd --- /dev/null +++ b/function/image-recognition-function/build.gradle @@ -0,0 +1,3 @@ +dependencies { + api project(':tensorflow-common') +} diff --git a/function/image-recognition-function/pom.xml b/function/image-recognition-function/pom.xml deleted file mode 100644 index 0806bc4d..00000000 --- a/function/image-recognition-function/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - image-recognition-function - image-recognition-function - Spring Native Function for Tensorflow Integration - - - 1.3.2 - - - - - org.springframework.cloud.fn - tensorflow-common - ${project.version} - - - - - - - tensorflow-snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - - true - - - - - - diff --git a/function/object-detection-function/build.gradle b/function/object-detection-function/build.gradle new file mode 100644 index 00000000..f83a59c8 --- /dev/null +++ b/function/object-detection-function/build.gradle @@ -0,0 +1,18 @@ +plugins { + id 'com.google.protobuf' version '0.9.4' +} + +ext { + protobufVersion='3.25.1' +} + +dependencies { + api project(':tensorflow-common') + api "com.google.protobuf:protobuf-java:$protobufVersion" +} + +protobuf { + protoc { + artifact = "com.google.protobuf:protoc:$protobufVersion" + } +} \ No newline at end of file diff --git a/function/object-detection-function/pom.xml b/function/object-detection-function/pom.xml deleted file mode 100644 index 6389b5b3..00000000 --- a/function/object-detection-function/pom.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - object-detection-function - object-detection-function - Spring Native Function for Tensorflow Integration - - 3.19.6 - - - - com.google.protobuf - protobuf-java - ${protobuf.version} - - - org.springframework.cloud.fn - tensorflow-common - ${project.version} - - - - - - - com.github.os72 - protoc-jar-maven-plugin - - 3.11.4 - - - generate-sources - - run - - - - - src/main/proto - - - - - java - src/main/java - - - com.google.protobuf:protoc:${protobuf.version} - - - - - - - - - - - - - - - - - diff --git a/function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionInputAdapter.java b/function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionInputAdapter.java index 1dfff4e4..8b505841 100644 --- a/function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionInputAdapter.java +++ b/function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionInputAdapter.java @@ -62,7 +62,7 @@ public class ObjectDetectionInputAdapter implements Function> apply(byte[] inputImage) { - try (Tensor inputTensor = Tensor.create(inputImage)) { + try (Tensor inputTensor = Tensor.create(inputImage)) { return this.imageLoaderGraph.apply(Collections.singletonMap(RAW_IMAGE, inputTensor)); } } diff --git a/function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionOutputConverter.java b/function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionOutputConverter.java index f913c6ad..2c4d3801 100644 --- a/function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionOutputConverter.java +++ b/function/object-detection-function/src/main/java/org/springframework/cloud/fn/object/detection/ObjectDetectionOutputConverter.java @@ -108,7 +108,7 @@ public class ObjectDetectionOutputConverter implements Function - * String name. The most common practice is to set this to a MID or synsets - * id. Synset: a set of synonyms that share a common meaning. - * https://en.wikipedia.org/wiki/WordNet - * - * - * optional string name = 1; - * @return Whether the name field is set. - */ - boolean hasName(); - /** - * 
-     * String name. The most common practice is to set this to a MID or synsets
-     * id. Synset: a set of synonyms that share a common meaning.
-     * https://en.wikipedia.org/wiki/WordNet
-     *
- * - * optional string name = 1; - * @return The name. - */ - java.lang.String getName(); - /** - * 
-     * String name. The most common practice is to set this to a MID or synsets
-     * id. Synset: a set of synonyms that share a common meaning.
-     * https://en.wikipedia.org/wiki/WordNet
-     *
- * - * optional string name = 1; - * @return The bytes for name. - */ - com.google.protobuf.ByteString - getNameBytes(); - - /** - * 
-     * Integer id that maps to the string name above. Label ids should start
-     * from 1.
-     *
- * - * optional int32 id = 2; - * @return Whether the id field is set. - */ - boolean hasId(); - /** - * 
-     * Integer id that maps to the string name above. Label ids should start
-     * from 1.
-     *
- * - * optional int32 id = 2; - * @return The id. - */ - int getId(); - - /** - * 
-     * Human readable string label.
-     *
- * - * optional string display_name = 3; - * @return Whether the displayName field is set. - */ - boolean hasDisplayName(); - /** - * 
-     * Human readable string label.
-     *
- * - * optional string display_name = 3; - * @return The displayName. - */ - java.lang.String getDisplayName(); - /** - * 
-     * Human readable string label.
-     *
- * - * optional string display_name = 3; - * @return The bytes for displayName. - */ - com.google.protobuf.ByteString - getDisplayNameBytes(); - } - /** - * Protobuf type {@code org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem} - */ - public static final class StringIntLabelMapItem extends - com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem) - StringIntLabelMapItemOrBuilder { - private static final long serialVersionUID = 0L; - // Use StringIntLabelMapItem.newBuilder() to construct. - private StringIntLabelMapItem(com.google.protobuf.GeneratedMessageV3.Builder builder) { - super(builder); - } - private StringIntLabelMapItem() { - name_ = ""; - displayName_ = ""; - } - - @java.lang.Override - @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( - UnusedPrivateParameter unused) { - return new StringIntLabelMapItem(); - } - - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.internal_static_org_springframework_cloud_fn_object_detection_protos_StringIntLabelMapItem_descriptor; - } - - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.internal_static_org_springframework_cloud_fn_object_detection_protos_StringIntLabelMapItem_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem.class, org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem.Builder.class); - } - - private int bitField0_; - public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; - /** - * 
-     * String name. The most common practice is to set this to a MID or synsets
-     * id. Synset: a set of synonyms that share a common meaning.
-     * https://en.wikipedia.org/wiki/WordNet
-     *
- * - * optional string name = 1; - * @return Whether the name field is set. - */ - @java.lang.Override - public boolean hasName() { - return ((bitField0_ & 0x00000001) != 0); - } - /** - * 
-     * String name. The most common practice is to set this to a MID or synsets
-     * id. Synset: a set of synonyms that share a common meaning.
-     * https://en.wikipedia.org/wiki/WordNet
-     *
- * - * optional string name = 1; - * @return The name. - */ - @java.lang.Override - public java.lang.String getName() { - java.lang.Object ref = name_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - name_ = s; - } - return s; - } - } - /** - * 
-     * String name. The most common practice is to set this to a MID or synsets
-     * id. Synset: a set of synonyms that share a common meaning.
-     * https://en.wikipedia.org/wiki/WordNet
-     *
- * - * optional string name = 1; - * @return The bytes for name. - */ - @java.lang.Override - public com.google.protobuf.ByteString - getNameBytes() { - java.lang.Object ref = name_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - name_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - public static final int ID_FIELD_NUMBER = 2; - private int id_; - /** - * 
-     * Integer id that maps to the string name above. Label ids should start
-     * from 1.
-     *
- * - * optional int32 id = 2; - * @return Whether the id field is set. - */ - @java.lang.Override - public boolean hasId() { - return ((bitField0_ & 0x00000002) != 0); - } - /** - * 
-     * Integer id that maps to the string name above. Label ids should start
-     * from 1.
-     *
- * - * optional int32 id = 2; - * @return The id. - */ - @java.lang.Override - public int getId() { - return id_; - } - - public static final int DISPLAY_NAME_FIELD_NUMBER = 3; - private volatile java.lang.Object displayName_; - /** - * 
-     * Human readable string label.
-     *
- * - * optional string display_name = 3; - * @return Whether the displayName field is set. - */ - @java.lang.Override - public boolean hasDisplayName() { - return ((bitField0_ & 0x00000004) != 0); - } - /** - * 
-     * Human readable string label.
-     *
- * - * optional string display_name = 3; - * @return The displayName. - */ - @java.lang.Override - public java.lang.String getDisplayName() { - java.lang.Object ref = displayName_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - displayName_ = s; - } - return s; - } - } - /** - * 
-     * Human readable string label.
-     *
- * - * optional string display_name = 3; - * @return The bytes for displayName. - */ - @java.lang.Override - public com.google.protobuf.ByteString - getDisplayNameBytes() { - java.lang.Object ref = displayName_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - displayName_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - private byte memoizedIsInitialized = -1; - @java.lang.Override - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; - - memoizedIsInitialized = 1; - return true; - } - - @java.lang.Override - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - if (((bitField0_ & 0x00000001) != 0)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); - } - if (((bitField0_ & 0x00000002) != 0)) { - output.writeInt32(2, id_); - } - if (((bitField0_ & 0x00000004) != 0)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 3, displayName_); - } - getUnknownFields().writeTo(output); - } - - @java.lang.Override - public int getSerializedSize() { - int size = memoizedSize; - if (size != -1) return size; - - size = 0; - if (((bitField0_ & 0x00000001) != 0)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); - } - if (((bitField0_ & 0x00000002) != 0)) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size(2, id_); - } - if (((bitField0_ & 0x00000004) != 0)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, displayName_); - } - size += getUnknownFields().getSerializedSize(); - memoizedSize = size; - return size; - } - - @java.lang.Override - public boolean equals(final java.lang.Object obj) { - if (obj == this) { - return true; - } - if (!(obj instanceof org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem)) { - return super.equals(obj); - } - org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem other = (org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem) obj; - - if (hasName() != other.hasName()) return false; - if (hasName()) { - if (!getName() - .equals(other.getName())) return false; - } - if (hasId() != other.hasId()) return false; - if (hasId()) { - if (getId() - != other.getId()) return false; - } - if (hasDisplayName() != other.hasDisplayName()) return false; - if (hasDisplayName()) { - if (!getDisplayName() - .equals(other.getDisplayName())) return false; - } - if (!getUnknownFields().equals(other.getUnknownFields())) return false; - return true; - } - - @java.lang.Override - public int hashCode() { - if (memoizedHashCode != 0) { - return memoizedHashCode; - } - int hash = 41; - hash = (19 * hash) + getDescriptor().hashCode(); - if (hasName()) { - hash = (37 * hash) + NAME_FIELD_NUMBER; - hash = (53 * hash) + getName().hashCode(); - } - if (hasId()) { - hash = (37 * hash) + ID_FIELD_NUMBER; - hash = (53 * hash) + getId(); - } - if (hasDisplayName()) { - hash = (37 * hash) + DISPLAY_NAME_FIELD_NUMBER; - hash = (53 * hash) + getDisplayName().hashCode(); - } - hash = (29 * hash) + getUnknownFields().hashCode(); - memoizedHashCode = hash; - return hash; - } - - public static org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem parseFrom( - java.nio.ByteBuffer data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem parseFrom( - java.nio.ByteBuffer data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem parseFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); - } - public static org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); - } - public static org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input); - } - public static org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input, extensionRegistry); - } - public static org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); - } - public static org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); - } - - @java.lang.Override - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder() { - return DEFAULT_INSTANCE.toBuilder(); - } - public static Builder newBuilder(org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem prototype) { - return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); - } - @java.lang.Override - public Builder toBuilder() { - return this == DEFAULT_INSTANCE - ? new Builder() : new Builder().mergeFrom(this); - } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** - * Protobuf type {@code org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem) - org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItemOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.internal_static_org_springframework_cloud_fn_object_detection_protos_StringIntLabelMapItem_descriptor; - } - - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.internal_static_org_springframework_cloud_fn_object_detection_protos_StringIntLabelMapItem_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem.class, org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem.Builder.class); - } - - // Construct using org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem.newBuilder() - private Builder() { - - } - - private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - super(parent); - - } - @java.lang.Override - public Builder clear() { - super.clear(); - name_ = ""; - bitField0_ = (bitField0_ & ~0x00000001); - id_ = 0; - bitField0_ = (bitField0_ & ~0x00000002); - displayName_ = ""; - bitField0_ = (bitField0_ & ~0x00000004); - return this; - } - - @java.lang.Override - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.internal_static_org_springframework_cloud_fn_object_detection_protos_StringIntLabelMapItem_descriptor; - } - - @java.lang.Override - public org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem getDefaultInstanceForType() { - return org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem.getDefaultInstance(); - } - - @java.lang.Override - public org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem build() { - org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - @java.lang.Override - public org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem buildPartial() { - org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem result = new org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) != 0)) { - to_bitField0_ |= 0x00000001; - } - result.name_ = name_; - if (((from_bitField0_ & 0x00000002) != 0)) { - result.id_ = id_; - to_bitField0_ |= 0x00000002; - } - if (((from_bitField0_ & 0x00000004) != 0)) { - to_bitField0_ |= 0x00000004; - } - result.displayName_ = displayName_; - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; - } - - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } - @java.lang.Override - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem) { - return mergeFrom((org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem other) { - if (other == org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem.getDefaultInstance()) return this; - if (other.hasName()) { - bitField0_ |= 0x00000001; - name_ = other.name_; - onChanged(); - } - if (other.hasId()) { - setId(other.getId()); - } - if (other.hasDisplayName()) { - bitField0_ |= 0x00000004; - displayName_ = other.displayName_; - onChanged(); - } - this.mergeUnknownFields(other.getUnknownFields()); - onChanged(); - return this; - } - - @java.lang.Override - public final boolean isInitialized() { - return true; - } - - @java.lang.Override - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - name_ = input.readBytes(); - bitField0_ |= 0x00000001; - break; - } // case 10 - case 16: { - id_ = input.readInt32(); - bitField0_ |= 0x00000002; - break; - } // case 16 - case 26: { - displayName_ = input.readBytes(); - bitField0_ |= 0x00000004; - break; - } // case 26 - default: { - if (!super.parseUnknownField(input, extensionRegistry, tag)) { - done = true; // was an endgroup tag - } - break; - } // default: - } // switch (tag) - } // while (!done) - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.unwrapIOException(); - } finally { - onChanged(); - } // finally - return this; - } - private int bitField0_; - - private java.lang.Object name_ = ""; - /** - * 
-       * String name. The most common practice is to set this to a MID or synsets
-       * id. Synset: a set of synonyms that share a common meaning.
-       * https://en.wikipedia.org/wiki/WordNet
-       *
- * - * optional string name = 1; - * @return Whether the name field is set. - */ - public boolean hasName() { - return ((bitField0_ & 0x00000001) != 0); - } - /** - * 
-       * String name. The most common practice is to set this to a MID or synsets
-       * id. Synset: a set of synonyms that share a common meaning.
-       * https://en.wikipedia.org/wiki/WordNet
-       *
- * - * optional string name = 1; - * @return The name. - */ - public java.lang.String getName() { - java.lang.Object ref = name_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - name_ = s; - } - return s; - } else { - return (java.lang.String) ref; - } - } - /** - * 
-       * String name. The most common practice is to set this to a MID or synsets
-       * id. Synset: a set of synonyms that share a common meaning.
-       * https://en.wikipedia.org/wiki/WordNet
-       *
- * - * optional string name = 1; - * @return The bytes for name. - */ - public com.google.protobuf.ByteString - getNameBytes() { - java.lang.Object ref = name_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - name_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * 
-       * String name. The most common practice is to set this to a MID or synsets
-       * id. Synset: a set of synonyms that share a common meaning.
-       * https://en.wikipedia.org/wiki/WordNet
-       *
- * - * optional string name = 1; - * @param value The name to set. - * @return This builder for chaining. - */ - public Builder setName( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - name_ = value; - onChanged(); - return this; - } - /** - * 
-       * String name. The most common practice is to set this to a MID or synsets
-       * id. Synset: a set of synonyms that share a common meaning.
-       * https://en.wikipedia.org/wiki/WordNet
-       *
- * - * optional string name = 1; - * @return This builder for chaining. - */ - public Builder clearName() { - bitField0_ = (bitField0_ & ~0x00000001); - name_ = getDefaultInstance().getName(); - onChanged(); - return this; - } - /** - * 
-       * String name. The most common practice is to set this to a MID or synsets
-       * id. Synset: a set of synonyms that share a common meaning.
-       * https://en.wikipedia.org/wiki/WordNet
-       *
- * - * optional string name = 1; - * @param value The bytes for name to set. - * @return This builder for chaining. - */ - public Builder setNameBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - name_ = value; - onChanged(); - return this; - } - - private int id_ ; - /** - * 
-       * Integer id that maps to the string name above. Label ids should start
-       * from 1.
-       *
- * - * optional int32 id = 2; - * @return Whether the id field is set. - */ - @java.lang.Override - public boolean hasId() { - return ((bitField0_ & 0x00000002) != 0); - } - /** - * 
-       * Integer id that maps to the string name above. Label ids should start
-       * from 1.
-       *
- * - * optional int32 id = 2; - * @return The id. - */ - @java.lang.Override - public int getId() { - return id_; - } - /** - * 
-       * Integer id that maps to the string name above. Label ids should start
-       * from 1.
-       *
- * - * optional int32 id = 2; - * @param value The id to set. - * @return This builder for chaining. - */ - public Builder setId(int value) { - bitField0_ |= 0x00000002; - id_ = value; - onChanged(); - return this; - } - /** - * 
-       * Integer id that maps to the string name above. Label ids should start
-       * from 1.
-       *
- * - * optional int32 id = 2; - * @return This builder for chaining. - */ - public Builder clearId() { - bitField0_ = (bitField0_ & ~0x00000002); - id_ = 0; - onChanged(); - return this; - } - - private java.lang.Object displayName_ = ""; - /** - * 
-       * Human readable string label.
-       *
- * - * optional string display_name = 3; - * @return Whether the displayName field is set. - */ - public boolean hasDisplayName() { - return ((bitField0_ & 0x00000004) != 0); - } - /** - * 
-       * Human readable string label.
-       *
- * - * optional string display_name = 3; - * @return The displayName. - */ - public java.lang.String getDisplayName() { - java.lang.Object ref = displayName_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - displayName_ = s; - } - return s; - } else { - return (java.lang.String) ref; - } - } - /** - * 
-       * Human readable string label.
-       *
- * - * optional string display_name = 3; - * @return The bytes for displayName. - */ - public com.google.protobuf.ByteString - getDisplayNameBytes() { - java.lang.Object ref = displayName_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - displayName_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * 
-       * Human readable string label.
-       *
- * - * optional string display_name = 3; - * @param value The displayName to set. - * @return This builder for chaining. - */ - public Builder setDisplayName( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000004; - displayName_ = value; - onChanged(); - return this; - } - /** - * 
-       * Human readable string label.
-       *
- * - * optional string display_name = 3; - * @return This builder for chaining. - */ - public Builder clearDisplayName() { - bitField0_ = (bitField0_ & ~0x00000004); - displayName_ = getDefaultInstance().getDisplayName(); - onChanged(); - return this; - } - /** - * 
-       * Human readable string label.
-       *
- * - * optional string display_name = 3; - * @param value The bytes for displayName to set. - * @return This builder for chaining. - */ - public Builder setDisplayNameBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000004; - displayName_ = value; - onChanged(); - return this; - } - @java.lang.Override - public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFields(unknownFields); - } - - @java.lang.Override - public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.mergeUnknownFields(unknownFields); - } - - - // @@protoc_insertion_point(builder_scope:org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem) - } - - // @@protoc_insertion_point(class_scope:org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem) - private static final org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem DEFAULT_INSTANCE; - static { - DEFAULT_INSTANCE = new org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem(); - } - - public static org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem getDefaultInstance() { - return DEFAULT_INSTANCE; - } - - @java.lang.Deprecated public static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override - public StringIntLabelMapItem parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - Builder builder = newBuilder(); - try { - builder.mergeFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(builder.buildPartial()); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e) - .setUnfinishedMessage(builder.buildPartial()); - } - return builder.buildPartial(); - } - }; - - public static com.google.protobuf.Parser parser() { - return PARSER; - } - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - @java.lang.Override - public org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem getDefaultInstanceForType() { - return DEFAULT_INSTANCE; - } - - } - - public interface StringIntLabelMapOrBuilder extends - // @@protoc_insertion_point(interface_extends:org.springframework.cloud.fn.object.detection.protos.StringIntLabelMap) - com.google.protobuf.MessageOrBuilder { - - /** - * repeated .org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem item = 1; - */ - java.util.List - getItemList(); - /** - * repeated .org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem item = 1; - */ - org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem getItem(int index); - /** - * repeated .org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem item = 1; - */ - int getItemCount(); - /** - * repeated .org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem item = 1; - */ - java.util.List - getItemOrBuilderList(); - /** - * repeated .org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem item = 1; - */ - org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItemOrBuilder getItemOrBuilder( - int index); - } - /** - * Protobuf type {@code org.springframework.cloud.fn.object.detection.protos.StringIntLabelMap} - */ - public static final class StringIntLabelMap extends - com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:org.springframework.cloud.fn.object.detection.protos.StringIntLabelMap) - StringIntLabelMapOrBuilder { - private static final long serialVersionUID = 0L; - // Use StringIntLabelMap.newBuilder() to construct. - private StringIntLabelMap(com.google.protobuf.GeneratedMessageV3.Builder builder) { - super(builder); - } - private StringIntLabelMap() { - item_ = java.util.Collections.emptyList(); - } - - @java.lang.Override - @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( - UnusedPrivateParameter unused) { - return new StringIntLabelMap(); - } - - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.internal_static_org_springframework_cloud_fn_object_detection_protos_StringIntLabelMap_descriptor; - } - - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.internal_static_org_springframework_cloud_fn_object_detection_protos_StringIntLabelMap_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap.class, org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap.Builder.class); - } - - public static final int ITEM_FIELD_NUMBER = 1; - private java.util.List item_; - /** - * repeated .org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem item = 1; - */ - @java.lang.Override - public java.util.List getItemList() { - return item_; - } - /** - * repeated .org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem item = 1; - */ - @java.lang.Override - public java.util.List - getItemOrBuilderList() { - return item_; - } - /** - * repeated .org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem item = 1; - */ - @java.lang.Override - public int getItemCount() { - return item_.size(); - } - /** - * repeated .org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem item = 1; - */ - @java.lang.Override - public org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem getItem(int index) { - return item_.get(index); - } - /** - * repeated .org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem item = 1; - */ - @java.lang.Override - public org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItemOrBuilder getItemOrBuilder( - int index) { - return item_.get(index); - } - - private byte memoizedIsInitialized = -1; - @java.lang.Override - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized == 1) return true; - if (isInitialized == 0) return false; - - memoizedIsInitialized = 1; - return true; - } - - @java.lang.Override - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - for (int i = 0; i < item_.size(); i++) { - output.writeMessage(1, item_.get(i)); - } - getUnknownFields().writeTo(output); - } - - @java.lang.Override - public int getSerializedSize() { - int size = memoizedSize; - if (size != -1) return size; - - size = 0; - for (int i = 0; i < item_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, item_.get(i)); - } - size += getUnknownFields().getSerializedSize(); - memoizedSize = size; - return size; - } - - @java.lang.Override - public boolean equals(final java.lang.Object obj) { - if (obj == this) { - return true; - } - if (!(obj instanceof org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap)) { - return super.equals(obj); - } - org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap other = (org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap) obj; - - if (!getItemList() - .equals(other.getItemList())) return false; - if (!getUnknownFields().equals(other.getUnknownFields())) return false; - return true; - } - - @java.lang.Override - public int hashCode() { - if (memoizedHashCode != 0) { - return memoizedHashCode; - } - int hash = 41; - hash = (19 * hash) + getDescriptor().hashCode(); - if (getItemCount() > 0) { - hash = (37 * hash) + ITEM_FIELD_NUMBER; - hash = (53 * hash) + getItemList().hashCode(); - } - hash = (29 * hash) + getUnknownFields().hashCode(); - memoizedHashCode = hash; - return hash; - } - - public static org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap parseFrom( - java.nio.ByteBuffer data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap parseFrom( - java.nio.ByteBuffer data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap parseFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); - } - public static org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); - } - public static org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input); - } - public static org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input, extensionRegistry); - } - public static org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); - } - public static org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); - } - - @java.lang.Override - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder() { - return DEFAULT_INSTANCE.toBuilder(); - } - public static Builder newBuilder(org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap prototype) { - return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); - } - @java.lang.Override - public Builder toBuilder() { - return this == DEFAULT_INSTANCE - ? new Builder() : new Builder().mergeFrom(this); - } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** - * Protobuf type {@code org.springframework.cloud.fn.object.detection.protos.StringIntLabelMap} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:org.springframework.cloud.fn.object.detection.protos.StringIntLabelMap) - org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.internal_static_org_springframework_cloud_fn_object_detection_protos_StringIntLabelMap_descriptor; - } - - @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.internal_static_org_springframework_cloud_fn_object_detection_protos_StringIntLabelMap_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap.class, org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap.Builder.class); - } - - // Construct using org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap.newBuilder() - private Builder() { - - } - - private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - super(parent); - - } - @java.lang.Override - public Builder clear() { - super.clear(); - if (itemBuilder_ == null) { - item_ = java.util.Collections.emptyList(); - } else { - item_ = null; - itemBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000001); - return this; - } - - @java.lang.Override - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.internal_static_org_springframework_cloud_fn_object_detection_protos_StringIntLabelMap_descriptor; - } - - @java.lang.Override - public org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap getDefaultInstanceForType() { - return org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap.getDefaultInstance(); - } - - @java.lang.Override - public org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap build() { - org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - @java.lang.Override - public org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap buildPartial() { - org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap result = new org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap(this); - int from_bitField0_ = bitField0_; - if (itemBuilder_ == null) { - if (((bitField0_ & 0x00000001) != 0)) { - item_ = java.util.Collections.unmodifiableList(item_); - bitField0_ = (bitField0_ & ~0x00000001); - } - result.item_ = item_; - } else { - result.item_ = itemBuilder_.build(); - } - onBuilt(); - return result; - } - - @java.lang.Override - public Builder clone() { - return super.clone(); - } - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.setField(field, value); - } - @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { - return super.addRepeatedField(field, value); - } - @java.lang.Override - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap) { - return mergeFrom((org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap other) { - if (other == org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap.getDefaultInstance()) return this; - if (itemBuilder_ == null) { - if (!other.item_.isEmpty()) { - if (item_.isEmpty()) { - item_ = other.item_; - bitField0_ = (bitField0_ & ~0x00000001); - } else { - ensureItemIsMutable(); - item_.addAll(other.item_); - } - onChanged(); - } - } else { - if (!other.item_.isEmpty()) { - if (itemBuilder_.isEmpty()) { - itemBuilder_.dispose(); - itemBuilder_ = null; - item_ = other.item_; - bitField0_ = (bitField0_ & ~0x00000001); - itemBuilder_ = - com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? - getItemFieldBuilder() : null; - } else { - itemBuilder_.addAllMessages(other.item_); - } - } - } - this.mergeUnknownFields(other.getUnknownFields()); - onChanged(); - return this; - } - - @java.lang.Override - public final boolean isInitialized() { - return true; - } - - @java.lang.Override - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: { - org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem m = - input.readMessage( - org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem.PARSER, - extensionRegistry); - if (itemBuilder_ == null) { - ensureItemIsMutable(); - item_.add(m); - } else { - itemBuilder_.addMessage(m); - } - break; - } // case 10 - default: { - if (!super.parseUnknownField(input, extensionRegistry, tag)) { - done = true; // was an endgroup tag - } - break; - } // default: - } // switch (tag) - } // while (!done) - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.unwrapIOException(); - } finally { - onChanged(); - } // finally - return this; - } - private int bitField0_; - - private java.util.List item_ = - java.util.Collections.emptyList(); - private void ensureItemIsMutable() { - if (!((bitField0_ & 0x00000001) != 0)) { - item_ = new java.util.ArrayList(item_); - bitField0_ |= 0x00000001; - } - } - - private com.google.protobuf.RepeatedFieldBuilderV3< - org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem, org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem.Builder, org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItemOrBuilder> itemBuilder_; - - /** - * repeated .org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem item = 1; - */ - public java.util.List getItemList() { - if (itemBuilder_ == null) { - return java.util.Collections.unmodifiableList(item_); - } else { - return itemBuilder_.getMessageList(); - } - } - /** - * repeated .org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem item = 1; - */ - public int getItemCount() { - if (itemBuilder_ == null) { - return item_.size(); - } else { - return itemBuilder_.getCount(); - } - } - /** - * repeated .org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem item = 1; - */ - public org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem getItem(int index) { - if (itemBuilder_ == null) { - return item_.get(index); - } else { - return itemBuilder_.getMessage(index); - } - } - /** - * repeated .org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem item = 1; - */ - public Builder setItem( - int index, org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem value) { - if (itemBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureItemIsMutable(); - item_.set(index, value); - onChanged(); - } else { - itemBuilder_.setMessage(index, value); - } - return this; - } - /** - * repeated .org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem item = 1; - */ - public Builder setItem( - int index, org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem.Builder builderForValue) { - if (itemBuilder_ == null) { - ensureItemIsMutable(); - item_.set(index, builderForValue.build()); - onChanged(); - } else { - itemBuilder_.setMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem item = 1; - */ - public Builder addItem(org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem value) { - if (itemBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureItemIsMutable(); - item_.add(value); - onChanged(); - } else { - itemBuilder_.addMessage(value); - } - return this; - } - /** - * repeated .org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem item = 1; - */ - public Builder addItem( - int index, org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem value) { - if (itemBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureItemIsMutable(); - item_.add(index, value); - onChanged(); - } else { - itemBuilder_.addMessage(index, value); - } - return this; - } - /** - * repeated .org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem item = 1; - */ - public Builder addItem( - org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem.Builder builderForValue) { - if (itemBuilder_ == null) { - ensureItemIsMutable(); - item_.add(builderForValue.build()); - onChanged(); - } else { - itemBuilder_.addMessage(builderForValue.build()); - } - return this; - } - /** - * repeated .org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem item = 1; - */ - public Builder addItem( - int index, org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem.Builder builderForValue) { - if (itemBuilder_ == null) { - ensureItemIsMutable(); - item_.add(index, builderForValue.build()); - onChanged(); - } else { - itemBuilder_.addMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem item = 1; - */ - public Builder addAllItem( - java.lang.Iterable values) { - if (itemBuilder_ == null) { - ensureItemIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll( - values, item_); - onChanged(); - } else { - itemBuilder_.addAllMessages(values); - } - return this; - } - /** - * repeated .org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem item = 1; - */ - public Builder clearItem() { - if (itemBuilder_ == null) { - item_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); - onChanged(); - } else { - itemBuilder_.clear(); - } - return this; - } - /** - * repeated .org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem item = 1; - */ - public Builder removeItem(int index) { - if (itemBuilder_ == null) { - ensureItemIsMutable(); - item_.remove(index); - onChanged(); - } else { - itemBuilder_.remove(index); - } - return this; - } - /** - * repeated .org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem item = 1; - */ - public org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem.Builder getItemBuilder( - int index) { - return getItemFieldBuilder().getBuilder(index); - } - /** - * repeated .org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem item = 1; - */ - public org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItemOrBuilder getItemOrBuilder( - int index) { - if (itemBuilder_ == null) { - return item_.get(index); } else { - return itemBuilder_.getMessageOrBuilder(index); - } - } - /** - * repeated .org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem item = 1; - */ - public java.util.List - getItemOrBuilderList() { - if (itemBuilder_ != null) { - return itemBuilder_.getMessageOrBuilderList(); - } else { - return java.util.Collections.unmodifiableList(item_); - } - } - /** - * repeated .org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem item = 1; - */ - public org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem.Builder addItemBuilder() { - return getItemFieldBuilder().addBuilder( - org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem.getDefaultInstance()); - } - /** - * repeated .org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem item = 1; - */ - public org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem.Builder addItemBuilder( - int index) { - return getItemFieldBuilder().addBuilder( - index, org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem.getDefaultInstance()); - } - /** - * repeated .org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapItem item = 1; - */ - public java.util.List - getItemBuilderList() { - return getItemFieldBuilder().getBuilderList(); - } - private com.google.protobuf.RepeatedFieldBuilderV3< - org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem, org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem.Builder, org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItemOrBuilder> - getItemFieldBuilder() { - if (itemBuilder_ == null) { - itemBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem, org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItem.Builder, org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMapItemOrBuilder>( - item_, - ((bitField0_ & 0x00000001) != 0), - getParentForChildren(), - isClean()); - item_ = null; - } - return itemBuilder_; - } - @java.lang.Override - public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFields(unknownFields); - } - - @java.lang.Override - public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.mergeUnknownFields(unknownFields); - } - - - // @@protoc_insertion_point(builder_scope:org.springframework.cloud.fn.object.detection.protos.StringIntLabelMap) - } - - // @@protoc_insertion_point(class_scope:org.springframework.cloud.fn.object.detection.protos.StringIntLabelMap) - private static final org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap DEFAULT_INSTANCE; - static { - DEFAULT_INSTANCE = new org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap(); - } - - public static org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap getDefaultInstance() { - return DEFAULT_INSTANCE; - } - - @java.lang.Deprecated public static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override - public StringIntLabelMap parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - Builder builder = newBuilder(); - try { - builder.mergeFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(builder.buildPartial()); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e) - .setUnfinishedMessage(builder.buildPartial()); - } - return builder.buildPartial(); - } - }; - - public static com.google.protobuf.Parser parser() { - return PARSER; - } - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - @java.lang.Override - public org.springframework.cloud.fn.object.detection.protos.StringIntLabelMapOuterClass.StringIntLabelMap getDefaultInstanceForType() { - return DEFAULT_INSTANCE; - } - - } - - private static final com.google.protobuf.Descriptors.Descriptor - internal_static_org_springframework_cloud_fn_object_detection_protos_StringIntLabelMapItem_descriptor; - private static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_org_springframework_cloud_fn_object_detection_protos_StringIntLabelMapItem_fieldAccessorTable; - private static final com.google.protobuf.Descriptors.Descriptor - internal_static_org_springframework_cloud_fn_object_detection_protos_StringIntLabelMap_descriptor; - private static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable - internal_static_org_springframework_cloud_fn_object_detection_protos_StringIntLabelMap_fieldAccessorTable; - - public static com.google.protobuf.Descriptors.FileDescriptor - getDescriptor() { - return descriptor; - } - private static com.google.protobuf.Descriptors.FileDescriptor - descriptor; - static { - java.lang.String[] descriptorData = { - "\n\032string_int_label_map.proto\0224org.spring" + - "framework.cloud.fn.object.detection.prot" + - "os\"G\n\025StringIntLabelMapItem\022\014\n\004name\030\001 \001(" + - "\t\022\n\n\002id\030\002 \001(\005\022\024\n\014display_name\030\003 \001(\t\"n\n\021S" + - "tringIntLabelMap\022Y\n\004item\030\001 \003(\0132K.org.spr" + - "ingframework.cloud.fn.object.detection.p" + - "rotos.StringIntLabelMapItem" - }; - descriptor = com.google.protobuf.Descriptors.FileDescriptor - .internalBuildGeneratedFileFrom(descriptorData, - new com.google.protobuf.Descriptors.FileDescriptor[] { - }); - internal_static_org_springframework_cloud_fn_object_detection_protos_StringIntLabelMapItem_descriptor = - getDescriptor().getMessageTypes().get(0); - internal_static_org_springframework_cloud_fn_object_detection_protos_StringIntLabelMapItem_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_org_springframework_cloud_fn_object_detection_protos_StringIntLabelMapItem_descriptor, - new java.lang.String[] { "Name", "Id", "DisplayName", }); - internal_static_org_springframework_cloud_fn_object_detection_protos_StringIntLabelMap_descriptor = - getDescriptor().getMessageTypes().get(1); - internal_static_org_springframework_cloud_fn_object_detection_protos_StringIntLabelMap_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_org_springframework_cloud_fn_object_detection_protos_StringIntLabelMap_descriptor, - new java.lang.String[] { "Item", }); - } - - // @@protoc_insertion_point(outer_class_scope) -} diff --git a/function/payload-converter-function/pom.xml b/function/payload-converter-function/pom.xml deleted file mode 100644 index 44762e19..00000000 --- a/function/payload-converter-function/pom.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - payload-converter-function - payload-converter-function - Utility message conversion functions - - diff --git a/function/pom.xml b/function/pom.xml deleted file mode 100644 index a7c03576..00000000 --- a/function/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud.fn - java-functions-function - 4.0.1-SNAPSHOT - java-functions-function - Java Functions Function - pom - - - aggregator-function - filter-function - header-enricher-function - header-filter-function - http-request-function - spel-function - payload-converter-function - splitter-function - task-launch-request-function - twitter-function - image-recognition-function - object-detection-function - semantic-segmentation-function - - - - - org.apache.maven.plugins - maven-deploy-plugin - 3.0.0 - - true - - - - - diff --git a/function/semantic-segmentation-function/build.gradle b/function/semantic-segmentation-function/build.gradle new file mode 100644 index 00000000..e68b45cd --- /dev/null +++ b/function/semantic-segmentation-function/build.gradle @@ -0,0 +1,3 @@ +dependencies { + api project(':tensorflow-common') +} diff --git a/function/semantic-segmentation-function/pom.xml b/function/semantic-segmentation-function/pom.xml deleted file mode 100644 index fd653dca..00000000 --- a/function/semantic-segmentation-function/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - semantic-segmentation-function - semantic-segmentation-function - Spring Native Function for Tensorflow semantic-segmentation integration - - - 1.3.2 - - - - - org.springframework.cloud.fn - tensorflow-common - ${project.version} - - - - - - tensorflow-snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - - true - - - - - diff --git a/function/semantic-segmentation-function/src/main/java/org/springframework/cloud/fn/semantic/segmentation/attic/SemanticSegmentationUtils.java b/function/semantic-segmentation-function/src/main/java/org/springframework/cloud/fn/semantic/segmentation/attic/SemanticSegmentationUtils.java index ee6c1ef6..9f0f223f 100644 --- a/function/semantic-segmentation-function/src/main/java/org/springframework/cloud/fn/semantic/segmentation/attic/SemanticSegmentationUtils.java +++ b/function/semantic-segmentation-function/src/main/java/org/springframework/cloud/fn/semantic/segmentation/attic/SemanticSegmentationUtils.java @@ -44,7 +44,7 @@ import static java.awt.image.BufferedImage.TYPE_3BYTE_BGR; /** * - * Semantic image segmentation - the task of assigning a semantic label, such as “road”, “sky”, “person”, “dog”, to + * Semantic image segmentation - the task of assigning a semantic label, such as "road", "sky", "person", "dog", to * every pixel in an image. * * https://ai.googleblog.com/2018/03/semantic-image-segmentation-with.html diff --git a/function/spel-function/build.gradle b/function/spel-function/build.gradle new file mode 100644 index 00000000..52c7b046 --- /dev/null +++ b/function/spel-function/build.gradle @@ -0,0 +1,3 @@ +dependencies { + api project(':payload-converter-function') +} diff --git a/function/spel-function/pom.xml b/function/spel-function/pom.xml deleted file mode 100644 index 6551bf7b..00000000 --- a/function/spel-function/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - spel-function - spel-function - Spring Native Function for applying SpEL expressions - - - - org.springframework.cloud.fn - payload-converter-function - ${project.version} - - - - diff --git a/function/splitter-function/build.gradle b/function/splitter-function/build.gradle new file mode 100644 index 00000000..efdad627 --- /dev/null +++ b/function/splitter-function/build.gradle @@ -0,0 +1,3 @@ +dependencies { + api 'org.springframework.integration:spring-integration-file' +} diff --git a/function/splitter-function/pom.xml b/function/splitter-function/pom.xml deleted file mode 100644 index e66b4b90..00000000 --- a/function/splitter-function/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - splitter-function - splitter-function - Spring Native Function for Splitter - - - - org.springframework.integration - spring-integration-file - - - - diff --git a/function/task-launch-request-function/pom.xml b/function/task-launch-request-function/pom.xml deleted file mode 100644 index fbf462dc..00000000 --- a/function/task-launch-request-function/pom.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - task-launch-request-function - task-launch-request-function - - diff --git a/function/task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/KeyValueListParser.java b/function/task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/KeyValueListParser.java index 48f01f0e..308d1c33 100644 --- a/function/task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/KeyValueListParser.java +++ b/function/task-launch-request-function/src/main/java/org/springframework/cloud/fn/task/launch/request/KeyValueListParser.java @@ -33,7 +33,7 @@ abstract class KeyValueListParser { static Map parseCommaDelimitedKeyValuePairs(String value) { Map keyValuePairs = new HashMap<>(); - if (StringUtils.isEmpty(value)) { + if (!StringUtils.hasText(value)) { return keyValuePairs; } diff --git a/function/twitter-function/build.gradle b/function/twitter-function/build.gradle new file mode 100644 index 00000000..40cddd80 --- /dev/null +++ b/function/twitter-function/build.gradle @@ -0,0 +1,10 @@ +ext { + mockserverVersion='5.13.2' +} + +dependencies { + api project(':twitter-common') + + testImplementation "org.mock-server:mockserver-netty:$mockserverVersion" + testImplementation "org.mock-server:mockserver-client-java:$mockserverVersion" +} diff --git a/function/twitter-function/pom.xml b/function/twitter-function/pom.xml deleted file mode 100644 index bc8b9fb8..00000000 --- a/function/twitter-function/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - twitter-function - twitter-function - twitter functions - - - - org.springframework.cloud.fn - twitter-common - ${project.version} - - - org.mock-server - mockserver-netty - ${mockserver.version} - test - - - org.mock-server - mockserver-client-java - ${mockserver.version} - test - - - - diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..fd795d19 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,12 @@ +version=5.0.0-SNAPSHOT +org.gradle.caching=true +org.gradle.parallel=true + +spring-boot.version=3.2.0 +spring-cloud.version=2023.0.0-SNAPSHOT +aws-sdk.version=2.20.162 +spring-cloud-aws.version=3.0.3 +spring-integration-aws.version=3.0.4 + +debeziumVersion = 2.4.1.Final +ftpServerVersion=1.2.0 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..7f93135c49b765f8051ef9d0a6055ff8e46073d8 GIT binary patch literal 63721 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鯊%1Et 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⁢ zv5o9#E7!G0XmdzfsS{efPNi`1b44~SZ4Z8fuX!I}#8g+(wxzQwUT#Xb2(tbY1+EUhGKoT@KEU9Ktl>_0 z%bjDJg;#*gtJZv!-Zs`?^}v5eKmnbjqlvnSzE@_SP|LG_PJ6CYU+6zY6>92%E+ z=j@TZf-iW4(%U{lnYxQA;7Q!b;^brF8n0D>)`q5>|WDDXLrqYU_tKN2>=#@~OE7grMnNh?UOz-O~6 z6%rHy{#h9K0AT+lDC7q4{hw^|q6*Ry;;L%Q@)Ga}$60_q%D)rv(CtS$CQbpq9|y1e zRSrN4;$Jyl{m5bZw`$8TGvb}(LpY{-cQ)fcyJv7l3S52TLXVDsphtv&aPuDk1OzCA z4A^QtC(!11`IsNx_HnSy?>EKpHJWT^wmS~hc^p^zIIh@9f6U@I2 zC=Mve{j2^)mS#U$e{@Q?SO6%LDsXz@SY+=cK_QMmXBIU)j!$ajc-zLx3V60EXJ!qC zi<%2x8Q24YN+&8U@CIlN zrZkcT9yh%LrlGS9`G)KdP(@9Eo-AQz@8GEFWcb7U=a0H^ZVbLmz{+&M7W(nXJ4sN8 zJLR7eeK(K8`2-}j(T7JsO`L!+CvbueT%izanm-^A1Dn{`1Nw`9P?cq;7no+XfC`K(GO9?O^5zNIt4M+M8LM0=7Gz8UA@Z0N+lg+cX)NfazRu z5D)~HA^(u%w^cz+@2@_#S|u>GpB+j4KzQ^&Wcl9f z&hG#bCA(Yk0D&t&aJE^xME^&E-&xGHhXn%}psEIj641H+Nl-}boj;)Zt*t(4wZ5DN z@GXF$bL=&pBq-#vkTkh>7hl%K5|3 z{`Vn9b$iR-SoGENp}bn4;fR3>9sA%X2@1L3aE9yTra;Wb#_`xWwLSLdfu+PAu+o3| zGVnpzPr=ch{uuoHjtw7+_!L_2;knQ!DuDl0R`|%jr+}jFzXtrHIKc323?JO{l&;VF z*L1+}JU7%QJOg|5|Tc|D8fN zJORAg=_vsy{ak|o);@)Yh8Lkcg@$FG3k@ep36BRa^>~UmnRPziS>Z=`Jb2x*Q#`%A zU*i3&Vg?TluO@X0O;r2Jl6LKLUOVhSqg1*qOt^|8*c7 zo(298@+r$k_wQNGHv{|$tW(T8L+4_`FQ{kEW5Jgg{yf7ey4ss_(SNKfz(N9lx&a;< je(UuV8hP?p&}TPdm1I$XmG#(RzlD&B2izSj9sl%y5~4qc literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..46671acb --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,8 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 00000000..1aa94a42 --- /dev/null +++ b/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..93e3f59f --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/pom.xml b/pom.xml deleted file mode 100644 index e96b6abe..00000000 --- a/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud.fn - java-functions-parent - 4.0.1-SNAPSHOT - java-functions-parent - Java Functions Parent - pom - - - spring-functions-parent - common - consumer - function - supplier - function-dependencies - - - - - org.apache.maven.plugins - maven-deploy-plugin - 3.0.0 - - true - - - - - diff --git a/publish-maven.gradle b/publish-maven.gradle new file mode 100644 index 00000000..f655787b --- /dev/null +++ b/publish-maven.gradle @@ -0,0 +1,72 @@ +apply plugin: 'maven-publish' + +publishing { + publications { + mavenJava(MavenPublication) { + pom { + afterEvaluate { + name = project.description + description = project.description + } + url = 'https://github.com/spring-cloud/spring-functions-catalog' + organization { + name = 'Spring IO' + url = 'https://spring.io/projects/spring-functions-catalog' + } + licenses { + license { + name = 'Apache License, Version 2.0' + url = 'https://www.apache.org/licenses/LICENSE-2.0.txt' + distribution = 'repo' + } + } + scm { + url = 'https://github.com/spring-cloud/spring-functions-catalog' + connection = 'https://github.com/spring-cloud/spring-functions-catalog.git' + developerConnection = 'git@github.com/spring-cloud/spring-functions-catalog.git' + } + developers { + developer { + id = 'artembilan' + name = 'Artem Bilan' + email = 'abilan@vmware.com' + roles = ['project lead'] + } + developer { + id = 'corneil' + name = 'Corneil du Plessis' + email = 'pcorneil@vmware.com' + } + developer { + id = 'sobychacko' + name = 'Soby Chacko' + email = 'chackos@vmware.com' + } + developer { + id = 'onobc' + name = 'Chris Bono' + email = 'cbono@vmware.com' + } + developer { + id = 'tzolov' + name = 'Christian Tzolov' + email = 'ctzolov@vmware.com' + } + } + issueManagement { + system = 'GitHub' + url = 'https://github.com/spring-cloud/spring-functions-catalog/issues' + } + } + versionMapping { + usage('java-api') { + fromResolutionResult() + } + usage('java-runtime') { + fromResolutionResult() + } + } + } + } +} + diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..468b4990 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,17 @@ +plugins { + id 'com.gradle.enterprise' version '3.15.1' + id 'io.spring.ge.conventions' version '0.0.13' +} + +rootProject.name = 'spring-functions-catalog' + +include 'function-dependencies' + +['common', 'consumer', 'function', 'supplier'].each { group -> + def groupDir = file(group) + groupDir.eachDir { subProject -> + include "${subProject.name}" + project(":${subProject.name}").projectDir = new File(groupDir.absolutePath, subProject.name) + } +} + diff --git a/spring-functions-parent/pom.xml b/spring-functions-parent/pom.xml deleted file mode 100644 index 759eefd6..00000000 --- a/spring-functions-parent/pom.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.stream.app - stream-applications-build - 4.0.1-SNAPSHOT - ../../stream-applications-build/pom.xml - - - org.springframework.cloud.fn - spring-functions-parent - pom - - 3.19.6 - - - - com.google.protobuf - protobuf-java - ${protobuf.version} - - - org.springframework.cloud.fn - config-common - ${project.version} - - - - org.springframework.boot - spring-boot-configuration-processor - provided - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-starter-json - - - org.springframework.boot - spring-boot-starter-integration - - - com.jayway.jsonpath - json-path - - - - org.springframework.boot - spring-boot-starter-test - test - - - org.junit.jupiter - junit-jupiter - test - - - org.springframework.integration - spring-integration-test - test - - - io.projectreactor - reactor-test - test - - - org.testcontainers - testcontainers - ${testcontainers.version} - test - - - org.testcontainers - junit-jupiter - ${testcontainers.version} - test - - - org.awaitility - awaitility - test - - - - - - org.apache.maven.plugins - maven-deploy-plugin - 3.0.0 - - false - - - - - diff --git a/supplier/debezium-supplier/build.gradle b/supplier/debezium-supplier/build.gradle new file mode 100644 index 00000000..f197e5b2 --- /dev/null +++ b/supplier/debezium-supplier/build.gradle @@ -0,0 +1,19 @@ +repositories { + maven { url 'https://maven.scijava.org/content/repositories/public/' } +} + +dependencies { + api project(':debezium-autoconfigure') + api "io.debezium:debezium-connector-mysql:$debeziumVersion" + api "io.debezium:debezium-connector-mongodb:$debeziumVersion" + api "io.debezium:debezium-connector-postgres:$debeziumVersion" + api "io.debezium:debezium-connector-oracle:$debeziumVersion" + api "io.debezium:debezium-connector-sqlserver:$debeziumVersion" + api "io.debezium:debezium-connector-db2:$debeziumVersion" + api "io.debezium:debezium-connector-vitess:$debeziumVersion" + api "io.debezium:debezium-connector-spanner:$debeziumVersion" + api "io.debezium:debezium-connector-spanner:$debeziumVersion" + + testImplementation 'com.zaxxer:HikariCP' + testImplementation 'org.springframework:spring-jdbc' +} diff --git a/supplier/debezium-supplier/pom.xml b/supplier/debezium-supplier/pom.xml deleted file mode 100644 index ea4d5605..00000000 --- a/supplier/debezium-supplier/pom.xml +++ /dev/null @@ -1,146 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - debezium-supplier - debezium-supplier - Debezium Supplier - - - 2.3.3.Final - - - - - org.springframework.cloud.fn - debezium-autoconfigure - ${project.version} - - - - - io.debezium - debezium-connector-mysql - ${version.debezium} - - - slf4j-log4j12 - org.slf4j - - - - - io.debezium - debezium-connector-mongodb - ${version.debezium} - - - slf4j-log4j12 - org.slf4j - - - - - io.debezium - debezium-connector-postgres - ${version.debezium} - - - slf4j-log4j12 - org.slf4j - - - - - io.debezium - debezium-connector-oracle - ${version.debezium} - - - slf4j-log4j12 - org.slf4j - - - - - io.debezium - debezium-connector-sqlserver - ${version.debezium} - - - slf4j-log4j12 - org.slf4j - - - - - io.debezium - debezium-connector-db2 - ${version.debezium} - - - slf4j-log4j12 - org.slf4j - - - - - io.debezium - debezium-connector-vitess - ${version.debezium} - - - slf4j-log4j12 - org.slf4j - - - - - io.debezium - debezium-connector-spanner - ${version.debezium} - - - slf4j-log4j12 - org.slf4j - - - true - - - - - com.zaxxer - HikariCP - 4.0.3 - test - - - org.springframework - spring-jdbc - test - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0 - - 1 - 1 - integration - - - - - diff --git a/supplier/debezium-supplier/src/test/java/org/springframework/cloud/fn/supplier/debezium/it/supplier/DebeziumReactiveConsumerConfigurationTests.java b/supplier/debezium-supplier/src/test/java/org/springframework/cloud/fn/supplier/debezium/it/supplier/DebeziumReactiveConsumerConfigurationTests.java index a11cefcf..72f89a8f 100644 --- a/supplier/debezium-supplier/src/test/java/org/springframework/cloud/fn/supplier/debezium/it/supplier/DebeziumReactiveConsumerConfigurationTests.java +++ b/supplier/debezium-supplier/src/test/java/org/springframework/cloud/fn/supplier/debezium/it/supplier/DebeziumReactiveConsumerConfigurationTests.java @@ -47,15 +47,6 @@ public class DebeziumReactiveConsumerConfigurationTests { }); } - @Test - void noConnectorWithProperty() { - this.contextRunner.withPropertyValues("debezium.properties.connector.class=Dummy") - .withClassLoader(new FilteredClassLoader("io.debezium.engine.DebeziumEngine$Builder")) - .run((context) -> { - assertThat(context).doesNotHaveBean(DebeziumEngine.class); - }); - } - @Test void withConnectorWithProperty() { this.contextRunner.withPropertyValues("debezium.properties.connector.class=Dummy").run((context) -> { diff --git a/supplier/file-supplier/build.gradle b/supplier/file-supplier/build.gradle new file mode 100644 index 00000000..2b78b520 --- /dev/null +++ b/supplier/file-supplier/build.gradle @@ -0,0 +1,8 @@ +dependencies { + api project(':file-common') + api project(':metadata-store-common') + + testImplementation 'org.springframework.integration:spring-integration-jdbc' + testImplementation 'org.springframework.boot:spring-boot-starter-jdbc' + testImplementation 'org.hsqldb:hsqldb' +} diff --git a/supplier/file-supplier/pom.xml b/supplier/file-supplier/pom.xml deleted file mode 100644 index 3774a655..00000000 --- a/supplier/file-supplier/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - file-supplier - file-supplier - file supplier - - - - org.springframework.integration - spring-integration-file - - - org.springframework.cloud.fn - metadata-store-common - ${project.version} - - - org.springframework.cloud.fn - file-common - ${project.version} - - - - org.springframework.integration - spring-integration-jdbc - test - - - org.springframework.boot - spring-boot-starter-jdbc - test - - - org.hsqldb - hsqldb - test - - - - diff --git a/supplier/ftp-supplier/build.gradle b/supplier/ftp-supplier/build.gradle new file mode 100644 index 00000000..3d6f082f --- /dev/null +++ b/supplier/ftp-supplier/build.gradle @@ -0,0 +1,8 @@ +dependencies { + api project(':ftp-common') + api project(':file-common') + api project(':metadata-store-common') + + testImplementation project(':function-test-support') + testImplementation "org.apache.ftpserver:ftpserver-core:$ftpServerVersion" +} diff --git a/supplier/ftp-supplier/pom.xml b/supplier/ftp-supplier/pom.xml deleted file mode 100644 index 28657f18..00000000 --- a/supplier/ftp-supplier/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - ftp-supplier - ftp-supplier - ftp supplier - - - - org.springframework.integration - spring-integration-ftp - - - org.springframework.cloud.fn - file-common - ${project.version} - - - org.springframework.cloud.fn - ftp-common - ${project.version} - - - org.springframework.cloud.fn - metadata-store-common - ${project.version} - - - org.springframework.cloud.fn - function-test-support - ${project.version} - test - - - - diff --git a/supplier/http-supplier/build.gradle b/supplier/http-supplier/build.gradle new file mode 100644 index 00000000..c63be415 --- /dev/null +++ b/supplier/http-supplier/build.gradle @@ -0,0 +1,4 @@ +dependencies { + api 'org.springframework.boot:spring-boot-starter-webflux' + api 'org.springframework.integration:spring-integration-webflux' +} diff --git a/supplier/http-supplier/pom.xml b/supplier/http-supplier/pom.xml deleted file mode 100644 index a45468c2..00000000 --- a/supplier/http-supplier/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - http-supplier - http-supplier - HTTP Supplier - - - - org.springframework.boot - spring-boot-starter-webflux - - - org.springframework.integration - spring-integration-webflux - - - - diff --git a/supplier/jdbc-supplier/build.gradle b/supplier/jdbc-supplier/build.gradle new file mode 100644 index 00000000..532e3b5c --- /dev/null +++ b/supplier/jdbc-supplier/build.gradle @@ -0,0 +1,12 @@ +dependencies { + api project(':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' + + runtimeOnly 'org.hsqldb:hsqldb' + runtimeOnly 'com.h2database:h2' + runtimeOnly 'org.mariadb.jdbc:mariadb-java-client' + runtimeOnly 'org.postgresql:postgresql' + runtimeOnly 'com.microsoft.sqlserver:mssql-jdbc' +} diff --git a/supplier/jdbc-supplier/pom.xml b/supplier/jdbc-supplier/pom.xml deleted file mode 100644 index 85d46244..00000000 --- a/supplier/jdbc-supplier/pom.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - jdbc-supplier - jdbc-supplier - JDBC supplier - - - - org.springframework.integration - spring-integration-jdbc - - - org.springframework.boot - spring-boot-starter-jdbc - - - org.springframework.cloud - spring-cloud-function-context - ${spring-cloud-function.version} - - - org.springframework.cloud.fn - splitter-function - ${project.version} - - - org.hsqldb - hsqldb - runtime - - - com.h2database - h2 - runtime - - - org.mariadb.jdbc - mariadb-java-client - runtime - - - org.postgresql - postgresql - runtime - - - com.microsoft.sqlserver - mssql-jdbc - runtime - - - com.microsoft.azure - azure-keyvault - - - - - - diff --git a/supplier/jdbc-supplier/src/test/java/org/springframework/cloud/fn/supplier/jdbc/DefaultJdbcSupplierTests.java b/supplier/jdbc-supplier/src/test/java/org/springframework/cloud/fn/supplier/jdbc/DefaultJdbcSupplierTests.java index 44073f55..030d2c58 100644 --- a/supplier/jdbc-supplier/src/test/java/org/springframework/cloud/fn/supplier/jdbc/DefaultJdbcSupplierTests.java +++ b/supplier/jdbc-supplier/src/test/java/org/springframework/cloud/fn/supplier/jdbc/DefaultJdbcSupplierTests.java @@ -46,6 +46,7 @@ public class DefaultJdbcSupplierTests { JdbcTemplate jdbcTemplate; @Test + @SuppressWarnings({ "unchecked", "rawtypes"}) void testExtraction() { final Flux> messageFlux = jdbcSupplier.get(); StepVerifier stepVerifier = diff --git a/supplier/jdbc-supplier/src/test/java/org/springframework/cloud/fn/supplier/jdbc/NonSplitJdbcSupplierTests.java b/supplier/jdbc-supplier/src/test/java/org/springframework/cloud/fn/supplier/jdbc/NonSplitJdbcSupplierTests.java index eb6f550f..a6413e7b 100644 --- a/supplier/jdbc-supplier/src/test/java/org/springframework/cloud/fn/supplier/jdbc/NonSplitJdbcSupplierTests.java +++ b/supplier/jdbc-supplier/src/test/java/org/springframework/cloud/fn/supplier/jdbc/NonSplitJdbcSupplierTests.java @@ -43,6 +43,7 @@ public class NonSplitJdbcSupplierTests { Supplier> jdbcSupplier; @Test + @SuppressWarnings("unchecked") void testExtraction() { final Message message = jdbcSupplier.get(); final List> payload = (List>) message.getPayload(); diff --git a/supplier/jms-supplier/build.gradle b/supplier/jms-supplier/build.gradle new file mode 100644 index 00000000..51f23251 --- /dev/null +++ b/supplier/jms-supplier/build.gradle @@ -0,0 +1,8 @@ +dependencies { + api 'org.springframework.integration:spring-integration-jms' + + providedImplementation 'jakarta.jms:jakarta.jms-api' + + testImplementation 'org.springframework.boot:spring-boot-starter-artemis' + testImplementation 'org.apache.activemq:artemis-jakarta-server' +} diff --git a/supplier/jms-supplier/pom.xml b/supplier/jms-supplier/pom.xml deleted file mode 100644 index 452ba7da..00000000 --- a/supplier/jms-supplier/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - jms-supplier - jms-supplier - jms supplier - - - - org.springframework.integration - spring-integration-jms - - - jakarta.jms - jakarta.jms-api - provided - - - org.springframework.boot - spring-boot-starter-artemis - test - - - org.apache.activemq - artemis-jms-server - 2.26.0 - test - - - diff --git a/supplier/kafka-supplier/build.gradle b/supplier/kafka-supplier/build.gradle new file mode 100644 index 00000000..2a46e034 --- /dev/null +++ b/supplier/kafka-supplier/build.gradle @@ -0,0 +1,5 @@ +dependencies { + api 'org.springframework.integration:spring-integration-kafka' + + testImplementation 'org.springframework.kafka:spring-kafka-test' +} diff --git a/supplier/kafka-supplier/pom.xml b/supplier/kafka-supplier/pom.xml deleted file mode 100644 index 845badf9..00000000 --- a/supplier/kafka-supplier/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - - kafka-supplier - kafka-supplier - Apache Kafka Supplier based on Apache Kafka Consumer - - - - org.springframework.integration - spring-integration-kafka - - - - org.springframework.kafka - spring-kafka-test - test - - - - diff --git a/supplier/kafka-supplier/src/test/java/org/springframework/cloud/fn/supplier/kafka/KafkaSupplierTests.java b/supplier/kafka-supplier/src/test/java/org/springframework/cloud/fn/supplier/kafka/KafkaSupplierTests.java index b4621378..68c3585c 100644 --- a/supplier/kafka-supplier/src/test/java/org/springframework/cloud/fn/supplier/kafka/KafkaSupplierTests.java +++ b/supplier/kafka-supplier/src/test/java/org/springframework/cloud/fn/supplier/kafka/KafkaSupplierTests.java @@ -20,7 +20,6 @@ import java.time.Duration; import java.util.List; import java.util.function.Supplier; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; import reactor.test.StepVerifier; @@ -32,7 +31,7 @@ import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.cloud.fn.common.config.SpelExpressionConverterConfiguration; import org.springframework.context.ApplicationContext; import org.springframework.kafka.core.KafkaTemplate; -import org.springframework.kafka.test.EmbeddedKafkaBroker; +import org.springframework.kafka.test.context.EmbeddedKafka; import org.springframework.messaging.Message; /** @@ -40,12 +39,9 @@ import org.springframework.messaging.Message; * * @since 4.0 */ +@EmbeddedKafka(partitions = 1, controlledShutdown = true) public class KafkaSupplierTests { - static final EmbeddedKafkaBroker EMBEDDED_KAFKA = - new EmbeddedKafkaBroker(1, true, 1) - .brokerListProperty("spring.kafka.bootstrap-servers"); - final ApplicationContextRunner contextRunner = new ApplicationContextRunner() .withConfiguration(AutoConfigurations.of( IntegrationAutoConfiguration.class, @@ -53,11 +49,6 @@ public class KafkaSupplierTests { KafkaSupplierConfiguration.class, SpelExpressionConverterConfiguration.class)); - @BeforeAll - static void initializeEmbeddedKafka() { - EMBEDDED_KAFKA.afterPropertiesSet(); - } - @Test void recordModeAndTopicPattern() { this.contextRunner.withPropertyValues( diff --git a/supplier/mail-supplier/build.gradle b/supplier/mail-supplier/build.gradle new file mode 100644 index 00000000..ddc8b03e --- /dev/null +++ b/supplier/mail-supplier/build.gradle @@ -0,0 +1,10 @@ +ext { + greenmailVersion='2.1.0-alpha-3' +} + +dependencies { + api 'org.springframework.integration:spring-integration-mail' + api 'org.eclipse.angus:jakarta.mail:2.0.2' + + testImplementation "com.icegreen:greenmail:$greenmailVersion" +} diff --git a/supplier/mail-supplier/pom.xml b/supplier/mail-supplier/pom.xml deleted file mode 100644 index f601d6c6..00000000 --- a/supplier/mail-supplier/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - mail-supplier - mail-supplier - Mail Supplier - - - - org.springframework.integration - spring-integration-mail - - - org.eclipse.angus - jakarta.mail - 1.0.0 - - - com.icegreen - greenmail - 2.0.0 - test - - - diff --git a/supplier/mongodb-supplier/build.gradle b/supplier/mongodb-supplier/build.gradle new file mode 100644 index 00000000..71c99aab --- /dev/null +++ b/supplier/mongodb-supplier/build.gradle @@ -0,0 +1,9 @@ +dependencies { + api project(':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 +} diff --git a/supplier/mongodb-supplier/pom.xml b/supplier/mongodb-supplier/pom.xml deleted file mode 100644 index 7b6b5b61..00000000 --- a/supplier/mongodb-supplier/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - mongodb-supplier - mongodb-supplier - Mongo DB supplier - - - - org.springframework.integration - spring-integration-mongodb - - - org.mongodb - mongodb-driver-sync - - - org.springframework.cloud - spring-cloud-function-context - ${spring-cloud-function.version} - - - org.springframework.cloud.fn - splitter-function - ${project.version} - - - org.testcontainers - mongodb - ${testcontainers.version} - test - - - org.springframework.cloud.fn - mongodb-common - ${project.version} - test-jar - test - - - - diff --git a/supplier/mongodb-supplier/src/test/java/org/springframework/cloud/fn/supplier/mongo/MongodbSupplierApplicationTests.java b/supplier/mongodb-supplier/src/test/java/org/springframework/cloud/fn/supplier/mongo/MongodbSupplierApplicationTests.java index 14305fb9..f22b6fc5 100644 --- a/supplier/mongodb-supplier/src/test/java/org/springframework/cloud/fn/supplier/mongo/MongodbSupplierApplicationTests.java +++ b/supplier/mongodb-supplier/src/test/java/org/springframework/cloud/fn/supplier/mongo/MongodbSupplierApplicationTests.java @@ -32,7 +32,7 @@ import reactor.test.StepVerifier; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.cloud.fn.common.mongo.MongoDbTestContainerSupport; +import org.springframework.cloud.fn.consumer.mongo.MongoDbTestContainerSupport; import org.springframework.messaging.Message; import org.springframework.test.context.DynamicPropertyRegistry; import org.springframework.test.context.DynamicPropertySource; @@ -95,6 +95,7 @@ class MongodbSupplierApplicationTests implements MongoDbTestContainerSupport { assertThat(this.mongodbSupplier.get().collectList().block()).isEmpty(); } + @SuppressWarnings("unchecked") private Map toMap(Message message) { Map map = null; try { diff --git a/supplier/mqtt-supplier/build.gradle b/supplier/mqtt-supplier/build.gradle new file mode 100644 index 00000000..44adc921 --- /dev/null +++ b/supplier/mqtt-supplier/build.gradle @@ -0,0 +1,3 @@ +dependencies { + api project(':mqtt-common') +} diff --git a/supplier/mqtt-supplier/pom.xml b/supplier/mqtt-supplier/pom.xml deleted file mode 100644 index 72a9aa3d..00000000 --- a/supplier/mqtt-supplier/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - mqtt-supplier - mqtt-supplier - mqtt supplier - - - - org.springframework.cloud.fn - mqtt-common - ${project.version} - - - - diff --git a/supplier/mqtt-supplier/src/test/java/org/springframework/cloud/fn/supplier/mqtt/MqttSupplierTests.java b/supplier/mqtt-supplier/src/test/java/org/springframework/cloud/fn/supplier/mqtt/MqttSupplierTests.java index d859b0b6..2ac19f94 100644 --- a/supplier/mqtt-supplier/src/test/java/org/springframework/cloud/fn/supplier/mqtt/MqttSupplierTests.java +++ b/supplier/mqtt-supplier/src/test/java/org/springframework/cloud/fn/supplier/mqtt/MqttSupplierTests.java @@ -58,7 +58,6 @@ import static org.assertj.core.api.Assertions.assertThat; "mqtt.ssl-properties.com.ibm.ssl.protocol=TLS", "mqtt.ssl-properties.com.ibm.ssl.keyStoreType=TEST"}) @DirtiesContext -@Tag("integration") public class MqttSupplierTests { static { diff --git a/supplier/pom.xml b/supplier/pom.xml deleted file mode 100644 index 7becd809..00000000 --- a/supplier/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud.fn - java-functions-supplier - 4.0.1-SNAPSHOT - java-functions-supplier - Java Functions Supplier - pom - - - file-supplier - ftp-supplier - http-supplier - jdbc-supplier - jms-supplier - kafka-supplier - mail-supplier - mongodb-supplier - mqtt-supplier - sftp-supplier - tcp-supplier - time-supplier - rabbit-supplier - websocket-supplier - s3-supplier - twitter-supplier - debezium-supplier - syslog-supplier - xmpp-supplier - zeromq-supplier - - - - - org.apache.maven.plugins - maven-deploy-plugin - 3.0.0 - - true - - - - - diff --git a/supplier/rabbit-supplier/build.gradle b/supplier/rabbit-supplier/build.gradle new file mode 100644 index 00000000..e008d507 --- /dev/null +++ b/supplier/rabbit-supplier/build.gradle @@ -0,0 +1,5 @@ +dependencies { + api 'org.springframework.integration:spring-integration-amqp' + api 'org.springframework.boot:spring-boot-starter-amqp' + api 'org.springframework.boot:spring-boot-starter-web' +} diff --git a/supplier/rabbit-supplier/pom.xml b/supplier/rabbit-supplier/pom.xml deleted file mode 100644 index 573a4f3b..00000000 --- a/supplier/rabbit-supplier/pom.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - rabbit-supplier - rabbit-supplier - Rabbit supplier - - - - org.springframework.integration - spring-integration-amqp - - - org.springframework.boot - spring-boot-starter-amqp - - - org.springframework.boot - spring-boot-starter-web - - - - diff --git a/supplier/s3-supplier/build.gradle b/supplier/s3-supplier/build.gradle new file mode 100644 index 00000000..517d3c95 --- /dev/null +++ b/supplier/s3-supplier/build.gradle @@ -0,0 +1,5 @@ +dependencies { + api project(':aws-s3-common') + api project(':file-common') + api project(':metadata-store-common') +} diff --git a/supplier/s3-supplier/pom.xml b/supplier/s3-supplier/pom.xml deleted file mode 100644 index c35ab32f..00000000 --- a/supplier/s3-supplier/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - s3-supplier - s3-supplier - s3 supplier - - - - org.springframework.cloud.fn - aws-s3-common - ${project.version} - - - org.springframework.cloud.fn - file-common - ${project.version} - - - org.springframework.cloud.fn - metadata-store-common - ${project.version} - - - - diff --git a/supplier/sftp-supplier/build.gradle b/supplier/sftp-supplier/build.gradle new file mode 100644 index 00000000..90adb7af --- /dev/null +++ b/supplier/sftp-supplier/build.gradle @@ -0,0 +1,7 @@ +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/sftp-supplier/pom.xml b/supplier/sftp-supplier/pom.xml deleted file mode 100644 index df3c8d97..00000000 --- a/supplier/sftp-supplier/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - sftp-supplier - sftp-supplier - sftp supplier - - - - org.springframework.boot - spring-boot-starter-logging - - - org.springframework.integration - spring-integration-sftp - - - org.springframework.cloud.fn - file-common - ${project.version} - - - org.springframework.cloud.fn - ftp-common - ${project.version} - - - org.springframework.cloud.fn - metadata-store-common - ${project.version} - - - org.springframework.cloud.fn - function-test-support - ${project.version} - test - - - - diff --git a/supplier/sftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/sftp/SftpSupplierConfiguration.java b/supplier/sftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/sftp/SftpSupplierConfiguration.java index 9ff6450a..fb90b276 100644 --- a/supplier/sftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/sftp/SftpSupplierConfiguration.java +++ b/supplier/sftp-supplier/src/main/java/org/springframework/cloud/fn/supplier/sftp/SftpSupplierConfiguration.java @@ -61,6 +61,7 @@ import org.springframework.integration.handler.MessageProcessor; import org.springframework.integration.metadata.ConcurrentMetadataStore; import org.springframework.integration.sftp.dsl.Sftp; import org.springframework.integration.sftp.dsl.SftpInboundChannelAdapterSpec; +import org.springframework.integration.sftp.dsl.SftpStreamingInboundChannelAdapterSpec; import org.springframework.integration.sftp.dsl.SftpOutboundGatewaySpec; import org.springframework.integration.sftp.filters.SftpPersistentAcceptOnceFileListFilter; import org.springframework.integration.sftp.filters.SftpRegexPatternFileListFilter; @@ -193,7 +194,7 @@ public class SftpSupplierConfiguration { * @return a {@link MessageSource}. */ @Bean - public MessageSource targetMessageSource(SftpRemoteFileTemplate sftpTemplate, + public SftpStreamingInboundChannelAdapterSpec targetMessageSource(SftpRemoteFileTemplate sftpTemplate, SftpSupplierProperties sftpSupplierProperties, FileListFilter fileListFilter) { @@ -201,7 +202,7 @@ public class SftpSupplierConfiguration { .remoteDirectory(remoteDirectory(sftpSupplierProperties)) .remoteFileSeparator(sftpSupplierProperties.getRemoteFileSeparator()) .filter(fileListFilter) - .maxFetchSize(sftpSupplierProperties.getMaxFetch()).get(); + .maxFetchSize(sftpSupplierProperties.getMaxFetch()); } @Bean diff --git a/supplier/syslog-supplier/build.gradle b/supplier/syslog-supplier/build.gradle new file mode 100644 index 00000000..a2f5c8ac --- /dev/null +++ b/supplier/syslog-supplier/build.gradle @@ -0,0 +1,3 @@ +dependencies { + api 'org.springframework.integration:spring-integration-syslog' +} diff --git a/supplier/syslog-supplier/pom.xml b/supplier/syslog-supplier/pom.xml deleted file mode 100644 index 904c63c3..00000000 --- a/supplier/syslog-supplier/pom.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - syslog-supplier - syslog-supplier - syslog supplier - - - - org.springframework.integration - spring-integration-syslog - - - - diff --git a/supplier/tcp-supplier/build.gradle b/supplier/tcp-supplier/build.gradle new file mode 100644 index 00000000..39f81c78 --- /dev/null +++ b/supplier/tcp-supplier/build.gradle @@ -0,0 +1,3 @@ +dependencies { + api project(':tcp-common') +} diff --git a/supplier/tcp-supplier/pom.xml b/supplier/tcp-supplier/pom.xml deleted file mode 100644 index 7169eb3e..00000000 --- a/supplier/tcp-supplier/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - tcp-supplier - tcp-supplier - tcp supplier - - - - org.springframework.cloud.fn - tcp-common - ${project.version} - - - - diff --git a/supplier/time-supplier/build.gradle b/supplier/time-supplier/build.gradle new file mode 100644 index 00000000..b80a5be0 --- /dev/null +++ b/supplier/time-supplier/build.gradle @@ -0,0 +1,3 @@ +dependencies { + api 'org.apache.commons:commons-lang3' +} diff --git a/supplier/time-supplier/pom.xml b/supplier/time-supplier/pom.xml deleted file mode 100644 index e78c61c1..00000000 --- a/supplier/time-supplier/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - time-supplier - time-supplier - time supplier - - - - org.apache.commons - commons-lang3 - - - - diff --git a/supplier/twitter-supplier/build.gradle b/supplier/twitter-supplier/build.gradle new file mode 100644 index 00000000..49615fd3 --- /dev/null +++ b/supplier/twitter-supplier/build.gradle @@ -0,0 +1,13 @@ +ext { + mockserverVersion='5.13.2' +} + +dependencies { + api project(':twitter-common') + api 'org.springframework.integration:spring-integration-jms' + + providedImplementation 'jakarta.jms:jakarta.jms-api' + + testImplementation "org.mock-server:mockserver-netty:$mockserverVersion" + testImplementation "org.mock-server:mockserver-client-java:$mockserverVersion" +} diff --git a/supplier/twitter-supplier/pom.xml b/supplier/twitter-supplier/pom.xml deleted file mode 100644 index a6a9af2d..00000000 --- a/supplier/twitter-supplier/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - twitter-supplier - twitter-supplier - twitter suppliers - - - - org.springframework.cloud.fn - twitter-common - ${project.version} - - - org.springframework.integration - spring-integration-jms - - - jakarta.jms - jakarta.jms-api - provided - - - org.mock-server - mockserver-netty - ${mockserver.version} - test - - - org.mock-server - mockserver-client-java - ${mockserver.version} - test - - - - diff --git a/supplier/websocket-supplier/build.gradle b/supplier/websocket-supplier/build.gradle new file mode 100644 index 00000000..fcaf5fdd --- /dev/null +++ b/supplier/websocket-supplier/build.gradle @@ -0,0 +1,7 @@ +dependencies { + api 'org.springframework.integration:spring-integration-websocket' + + testImplementation 'org.springframework.boot:spring-boot-starter-web' + testImplementation 'org.springframework.boot:spring-boot-starter-security' + testImplementation project(':function-test-support') +} diff --git a/supplier/websocket-supplier/pom.xml b/supplier/websocket-supplier/pom.xml deleted file mode 100644 index 5728b56c..00000000 --- a/supplier/websocket-supplier/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - websocket-supplier - websocket-supplier - websocket supplier - - - - org.springframework.integration - spring-integration-websocket - - - org.springframework.boot - spring-boot-starter-web - test - - - org.springframework.boot - spring-boot-starter-security - test - - - org.springframework.cloud.fn - function-test-support - ${project.version} - test - - - - diff --git a/supplier/xmpp-supplier/build.gradle b/supplier/xmpp-supplier/build.gradle new file mode 100644 index 00000000..40ccc9f9 --- /dev/null +++ b/supplier/xmpp-supplier/build.gradle @@ -0,0 +1,5 @@ +dependencies { + api project(':xmpp-common') + + testImplementation project(':function-test-support') +} diff --git a/supplier/xmpp-supplier/pom.xml b/supplier/xmpp-supplier/pom.xml deleted file mode 100644 index f166b621..00000000 --- a/supplier/xmpp-supplier/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - xmpp-supplier - xmpp-supplier - XMPP supplier - - - - org.springframework.cloud.fn - xmpp-common - ${project.version} - - - - - org.springframework.cloud.fn - function-test-support - ${project.version} - test - - - - diff --git a/supplier/zeromq-supplier/build.gradle b/supplier/zeromq-supplier/build.gradle new file mode 100644 index 00000000..4d5a4bed --- /dev/null +++ b/supplier/zeromq-supplier/build.gradle @@ -0,0 +1,3 @@ +dependencies { + api 'org.springframework.integration:spring-integration-zeromq' +} diff --git a/supplier/zeromq-supplier/pom.xml b/supplier/zeromq-supplier/pom.xml deleted file mode 100644 index a6f1ab7a..00000000 --- a/supplier/zeromq-supplier/pom.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - 4.0.0 - - - org.springframework.cloud.fn - spring-functions-parent - 4.0.1-SNAPSHOT - ../../spring-functions-parent/pom.xml - - - zeromq-supplier - zeromq-supplier - ZeroMQ supplier - - - - org.springframework.integration - spring-integration-zeromq - - - -