This is an automated email from the ASF dual-hosted git repository. wqliang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-eventmesh.git
commit eeaff3c3de75363e6a89393df00d0802e91bb253 Merge: 1cbe15ed6 df11c3fab Author: wqliang <[email protected]> AuthorDate: Tue Mar 7 11:00:25 2023 +0800 Merge pull request #3355 from apache/revert-3354-eventmesh-3353 Revert "[ISSUE #3353]Tidy up the eventmesh-storage module" build.gradle | 4 +- docs/en/design-document/08-spi.md | 8 +-- docs/zh/design-document/08-spi.md | 10 +-- .../eventmesh-admin-rocketmq/build.gradle | 4 +- .../common/config/CommonConfiguration.java | 3 - .../common/config/CommonConfigurationTest.java | 1 - .../src/test/resources/configuration.properties | 1 - eventmesh-connectors/{README.md => README} | 0 eventmesh-examples/build.gradle | 2 +- eventmesh-runtime/build.gradle | 4 +- eventmesh-runtime/conf/eventmesh.properties | 5 +- .../admin/controller/ClientManageController.java | 4 +- .../eventmesh/runtime/boot/EventMeshServer.java | 10 +-- .../runtime/connector/ConnectorResource.java | 14 ++-- .../runtime/core/plugin/MQAdminWrapper.java | 4 +- .../runtime/core/plugin/MQConsumerWrapper.java | 4 +- .../runtime/core/plugin/MQProducerWrapper.java | 4 +- .../protocol/grpc/consumer/EventMeshConsumer.java | 4 +- .../protocol/grpc/producer/EventMeshProducer.java | 3 +- .../protocol/http/consumer/EventMeshConsumer.java | 6 +- .../protocol/http/producer/EventMeshProducer.java | 2 +- .../tcp/client/group/ClientGroupWrapper.java | 9 ++- .../eventmesh/runtime/storage/StorageResource.java | 78 --------------------- .../controller/ClientManageControllerTest.java | 1 - .../runtime/boot/EventMeshServerTest.java | 1 - .../EventMeshGrpcConfigurationTest.java | 3 +- .../EventMeshHTTPConfigurationTest.java | 3 +- .../EventMeshTCPConfigurationTest.java | 4 +- .../eventmesh/runtime/util/EventMeshUtilTest.java | 2 +- .../src/test/resources/configuration.properties | 1 - eventmesh-starter/build.gradle | 4 +- .../build.gradle | 0 .../gradle.properties | 0 .../org/apache/eventmesh/api/AbstractContext.java | 0 .../apache/eventmesh/api/AsyncConsumeContext.java | 0 .../org/apache/eventmesh/api/EventListener.java | 0 .../org/apache/eventmesh/api/EventMeshAction.java | 0 .../api/EventMeshAsyncConsumeContext.java | 0 .../java/org/apache/eventmesh/api/LifeCycle.java | 0 .../apache/eventmesh/api/RequestReplyCallback.java | 0 .../org/apache/eventmesh/api/SendCallback.java | 0 .../java/org/apache/eventmesh/api/SendResult.java | 0 .../java/org/apache/eventmesh/api/admin/Admin.java | 0 .../eventmesh/api/admin/TopicProperties.java | 0 .../api/connector/ConnectorResourceService.java} | 4 +- .../apache/eventmesh/api/consumer/Consumer.java | 0 .../api/exception/ConnectorRuntimeException.java | 0 .../api/exception/OnExceptionContext.java | 0 .../api/factory/ConnectorPluginFactory.java} | 4 +- .../apache/eventmesh/api/producer/Producer.java | 0 .../build.gradle | 4 +- .../gradle.properties | 0 .../connector}/kafka/common/Constants.java | 2 +- .../kafka/common/EventMeshConstants.java | 2 +- .../kafka/config/ClientConfiguration.java | 2 +- .../ConnectorResourceServiceKafkaImpl.java} | 6 +- .../connector}/kafka/consumer/ConsumerImpl.java | 4 +- .../kafka/consumer/KafkaConsumerImpl.java | 4 +- .../kafka/consumer/KafkaConsumerRunner.java | 4 +- .../kafka/producer/KafkaProducerImpl.java | 4 +- .../connector}/kafka/producer/ProducerImpl.java | 2 +- ...entmesh.api.connector.ConnectorResourceService} | 2 +- .../org.apache.eventmesh.api.consumer.Consumer | 2 +- .../org.apache.eventmesh.api.producer.Producer | 2 +- .../src/main/resources/kafka-client.properties | 0 .../kafka/config/ClientConfigurationTest.java | 12 ++-- .../org.apache.io.openmessaging.producer.Producer | 2 +- .../src/test/resources/kafka-client.properties | 0 .../build.gradle | 4 +- .../gradle.properties | 0 .../knative/cloudevent/KnativeMessageFactory.java | 4 +- .../impl/KnativeBinaryMessageReader.java | 2 +- .../knative/cloudevent/impl/KnativeHeaders.java | 2 +- .../cloudevent/impl/KnativeMessageWriter.java | 2 +- .../knative/config/ClientConfiguration.java | 2 +- .../ConnectorResourceServiceKnativeImpl.java} | 6 +- .../knative/consumer/DefaultConsumer.java | 4 +- .../knative/consumer/KnativeConsumerImpl.java | 4 +- .../knative/consumer/PullConsumerImpl.java | 10 +-- .../connector}/knative/domain/NonStandardKeys.java | 4 +- .../patch/EventMeshConsumeConcurrentlyContext.java | 2 +- .../patch/EventMeshConsumeConcurrentlyStatus.java | 2 +- .../EventMeshMessageListenerConcurrently.java | 2 +- .../knative/producer/AbstractProducer.java | 2 +- .../knative/producer/KnativeProducerImpl.java | 4 +- .../connector}/knative/producer/ProducerImpl.java | 8 +-- .../connector}/knative/utils/CloudEventUtils.java | 4 +- ...entmesh.api.connector.ConnectorResourceService} | 2 +- .../org.apache.eventmesh.api.consumer.Consumer | 2 +- .../org.apache.eventmesh.api.producer.Producer | 2 +- .../src/main/resources/knative-client.properties | 0 .../knative/config/ClientConfigurationTest.java | 12 ++-- .../knative/consumer/KnativeConsumerImplTest.java | 6 +- .../knative/producer/KnativeProducerImplTest.java | 10 +-- .../src/test/resources/knative-client.properties | 0 .../README.md | 0 .../build.gradle | 2 +- .../gradle.properties | 0 .../pravega-connector.jpg | Bin .../PravegaConnectorResourceServiceImpl.java} | 8 +-- .../connector}/pravega/PravegaConsumerImpl.java | 8 +-- .../connector}/pravega/PravegaProducerImpl.java | 8 +-- .../connector}/pravega/client/PravegaClient.java | 6 +- .../pravega/client/PravegaCloudEventWriter.java | 2 +- .../connector}/pravega/client/PravegaEvent.java | 4 +- .../connector}/pravega/client/SubscribeTask.java | 2 +- .../pravega/config/PravegaConnectorConfig.java | 2 +- .../exception/PravegaConnectorException.java | 2 +- ...entmesh.api.connector.ConnectorResourceService} | 2 +- .../org.apache.eventmesh.api.consumer.Consumer | 2 +- .../org.apache.eventmesh.api.producer.Producer | 2 +- .../main/resources/pravega-connector.properties | 0 .../pravega/client/PravegaClientTest.java | 4 +- .../pravega/config/PravegaConnectorConfigTest.java | 12 ++-- .../test/resources/pravega-connector.properties | 0 .../build.gradle | 4 +- .../gradle.properties | 0 .../pulsar/client/PulsarClientWrapper.java | 6 +- .../pulsar/config/ClientConfiguration.java | 4 +- .../ConnectorResourceServicePulsarImpl.java} | 6 +- .../pulsar/consumer/PulsarConsumerImpl.java | 4 +- .../pulsar/producer/AbstractProducer.java | 2 +- .../connector}/pulsar/producer/ProducerImpl.java | 8 +-- .../pulsar/producer/PulsarProducerImpl.java | 4 +- .../connector}/pulsar/utils/CloudEventUtils.java | 2 +- ...entmesh.api.connector.ConnectorResourceService} | 2 +- .../org.apache.eventmesh.api.consumer.Consumer | 2 +- .../org.apache.eventmesh.api.producer.Producer | 2 +- .../src/main/resources/pulsar-client.properties | 0 .../pulsar/config/ClientConfigurationTest.java | 12 ++-- .../src/test/resources/pulsar-client.properties | 0 .../build.gradle | 4 +- .../gradle.properties | 0 .../connector}/rabbitmq/client/RabbitmqClient.java | 2 +- .../rabbitmq/client/RabbitmqConnectionFactory.java | 2 +- .../rabbitmq/cloudevent/RabbitmqCloudEvent.java | 6 +- .../cloudevent/RabbitmqCloudEventWriter.java | 2 +- .../rabbitmq/config/ConfigurationHolder.java | 2 +- .../RabbitmqConnectorResourceService.java} | 6 +- .../rabbitmq/consumer/RabbitmqConsumer.java | 8 +-- .../rabbitmq/consumer/RabbitmqConsumerHandler.java | 6 +- .../exception/RabbitmqaConnectorException.java | 2 +- .../rabbitmq/producer/RabbitmqProducer.java | 14 ++-- .../connector}/rabbitmq/utils/ByteArrayUtils.java | 2 +- ...entmesh.api.connector.ConnectorResourceService} | 2 +- .../org.apache.eventmesh.api.consumer.Consumer | 2 +- .../org.apache.eventmesh.api.producer.Producer | 2 +- .../src/main/resources/rabbitmq-client.properties | 0 .../rabbitmq/RabbitmqMockConnectionFactory.java | 4 +- .../connector}/rabbitmq/RabbitmqServer.java | 12 ++-- .../cloudevent/RabbitmqCloudEventTest.java | 2 +- .../rabbitmq/config/ConfigurationHolderTest.java | 12 ++-- .../rabbitmq/consumer/RabbitmqConsumerTest.java | 4 +- .../rabbitmq/producer/RabbitmqProducerTest.java | 4 +- .../src/test/resources/rabbitmq-client.properties | 0 .../build.gradle | 2 +- .../gradle.properties | 0 .../connector}/redis/client/RedissonClient.java | 6 +- .../redis/cloudevent/CloudEventCodec.java | 2 +- .../connector}/redis/config/RedisProperties.java | 2 +- .../connector/RedisConnectorResourceService.java} | 6 +- .../connector}/redis/consumer/RedisConsumer.java | 4 +- .../connector}/redis/producer/RedisProducer.java | 4 +- ...entmesh.api.connector.ConnectorResourceService} | 2 +- .../org.apache.eventmesh.api.consumer.Consumer | 2 +- .../org.apache.eventmesh.api.producer.Producer | 2 +- .../src/main/resources/redis-client.properties | 0 .../connector}/redis/AbstractRedisServer.java | 2 +- .../redis/client/RedissonClientTest.java | 6 +- .../redis/config/RedisPropertiesTest.java | 4 +- .../connector/redis/connector}/UnitTest.java | 10 +-- .../redis/consumer/RedisConsumerTest.java | 6 +- .../redis/producer/RedisProducerTest.java | 4 +- .../src/test/resources/redis-client.properties | 0 .../build.gradle | 4 +- .../gradle.properties | 0 .../connector}/rocketmq/admin/RocketMQAdmin.java | 4 +- .../rocketmq/admin/RocketMQAdminAdaptor.java | 2 +- .../connector}/rocketmq/admin/command/Command.java | 4 +- .../cloudevent/RocketMQMessageFactory.java | 8 +-- .../impl/RocketMQBinaryMessageReader.java | 2 +- .../rocketmq/cloudevent/impl/RocketMQHeaders.java | 2 +- .../cloudevent/impl/RocketMQMessageWriter.java | 2 +- .../rocketmq/common/EventMeshConstants.java | 2 +- .../connector}/rocketmq/config/ClientConfig.java | 4 +- .../rocketmq/config/ClientConfiguration.java | 2 +- .../ConnectorResourceServiceRocketmqImpl.java} | 6 +- .../rocketmq/consumer/PushConsumerImpl.java | 22 +++--- .../rocketmq/consumer/RocketMQConsumerImpl.java | 4 +- .../rocketmq/domain/NonStandardKeys.java | 2 +- .../exception/RMQMessageFormatException.java | 2 +- .../rocketmq/exception/RMQTimeoutException.java | 2 +- .../patch/EventMeshConsumeConcurrentlyContext.java | 2 +- .../patch/EventMeshConsumeConcurrentlyStatus.java | 2 +- .../EventMeshMessageListenerConcurrently.java | 2 +- .../rocketmq/producer/AbstractProducer.java | 12 ++-- .../connector}/rocketmq/producer/ProducerImpl.java | 6 +- .../rocketmq/producer/RocketMQProducerImpl.java | 6 +- .../connector}/rocketmq/utils/BeanUtils.java | 2 +- .../connector}/rocketmq/utils/CloudEventUtils.java | 2 +- .../connector}/rocketmq/utils/OMSUtil.java | 2 +- .../ConsumeMessageConcurrentlyService.java | 2 +- .../eventmesh/org.apache.eventmesh.api.admin.Admin | 2 +- ...entmesh.api.connector.ConnectorResourceService} | 2 +- .../org.apache.eventmesh.api.consumer.Consumer | 2 +- .../org.apache.eventmesh.api.producer.Producer | 2 +- .../src/main/resources/rocketmq-client.properties | 0 .../rocketmq/config/ClientConfigurationTest.java | 12 ++-- .../producer/DefaultProducerImplTest.java | 0 .../rocketmq/consumer/PushConsumerImplTest.java | 4 +- .../apache/rocketmq/producer/ProducerImplTest.java | 4 +- .../rocketmq/promise/DefaultPromiseTest.java | 0 .../org/apache/rocketmq/utils/BeanUtilsTest.java | 6 +- .../org.apache.io.openmessaging.producer.Producer | 2 +- .../src/test/resources/rocketmq-client.properties | 0 .../build.gradle | 2 +- .../gradle.properties | 0 .../standalone/admin/StandaloneAdmin.java | 8 +-- .../standalone/admin/StandaloneAdminAdaptor.java | 2 +- .../connector}/standalone/broker/MessageQueue.java | 4 +- .../standalone/broker/StandaloneBroker.java | 8 +-- .../standalone/broker/model/MessageEntity.java | 2 +- .../standalone/broker/model/TopicMetadata.java | 2 +- .../broker/task/HistoryMessageClearTask.java | 8 +-- .../standalone/broker/task/SubScribeTask.java | 4 +- .../standalone/consumer/StandaloneConsumer.java | 8 +-- .../consumer/StandaloneConsumerAdaptor.java | 2 +- .../standalone/producer/StandaloneProducer.java | 6 +- .../producer/StandaloneProducerAdaptor.java | 2 +- .../StandaloneConnectorResourceService.java} | 6 +- .../eventmesh/org.apache.eventmesh.api.admin.Admin | 2 +- ...entmesh.api.connector.ConnectorResourceService} | 2 +- .../org.apache.eventmesh.api.consumer.Consumer | 2 +- .../org.apache.eventmesh.api.producer.Producer | 2 +- .../standalone/broker/StandaloneBrokerTest.java | 6 +- ...he.eventmesh.api.storage.StorageResourceService | 16 ----- ...he.eventmesh.api.storage.StorageResourceService | 16 ----- ...he.eventmesh.api.storage.StorageResourceService | 16 ----- .../org.apache.eventmesh.api.consumer.Consumer | 16 ----- .../org.apache.eventmesh.api.producer.Producer | 16 ----- ...he.eventmesh.api.storage.StorageResourceService | 16 ----- ...he.eventmesh.api.storage.StorageResourceService | 16 ----- .../org.apache.eventmesh.api.consumer.Consumer | 16 ----- .../org.apache.eventmesh.api.producer.Producer | 16 ----- ...he.eventmesh.api.storage.StorageResourceService | 16 ----- .../resource/StandaloneStorageResourceService.java | 33 --------- .../org.apache.eventmesh.api.consumer.Consumer | 16 ----- .../org.apache.eventmesh.api.producer.Producer | 16 ----- ...he.eventmesh.api.storage.StorageResourceService | 16 ----- .../eventmesh-webhook-receive/build.gradle | 2 +- .../webhook/receive/WebHookMQProducer.java | 4 +- settings.gradle | 20 +++--- 252 files changed, 410 insertions(+), 738 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
