You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@eventmesh.apache.org by jo...@apache.org on 2023/01/02 02:13:19 UTC
[incubator-eventmesh] branch config-manage-improve updated: Improve configuration management of Knative SPI Impl (#2791)
This is an automated email from the ASF dual-hosted git repository.
jonyang pushed a commit to branch config-manage-improve
in repository https://gitbox.apache.org/repos/asf/incubator-eventmesh.git
The following commit(s) were added to refs/heads/config-manage-improve by this push:
new 2b354f210 Improve configuration management of Knative SPI Impl (#2791)
2b354f210 is described below
commit 2b354f210140b9fc77f10817c58bc4985c828047
Author: eight-nines <73...@users.noreply.github.com>
AuthorDate: Mon Jan 2 10:13:14 2023 +0800
Improve configuration management of Knative SPI Impl (#2791)
[1] KnativeConsumerImpl and KnativeProducerImpl config improve
[2] KnativeConsumerImpl and KnativeProducerImpl config UT
---
.../knative/config/ClientConfiguration.java | 52 +++++++++++++++++-----
.../knative/consumer/KnativeConsumerImpl.java | 13 +++++-
.../knative/producer/KnativeProducerImpl.java | 14 ++++--
.../knative/config/ClientConfigurationTest.java | 51 +++++++++++++++++++++
.../knative/consumer/KnativeConsumerImplTest.java | 5 ++-
.../knative/producer/KnativeProducerImplTest.java | 4 +-
.../src/test/resources/knative-client.properties | 18 ++++++++
7 files changed, 138 insertions(+), 19 deletions(-)
diff --git a/eventmesh-connector-plugin/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/config/ClientConfiguration.java b/eventmesh-connector-plugin/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/config/ClientConfiguration.java
index 5ce9c8fa1..9f23dc6d6 100644
--- a/eventmesh-connector-plugin/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/config/ClientConfiguration.java
+++ b/eventmesh-connector-plugin/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/config/ClientConfiguration.java
@@ -17,28 +17,56 @@
package org.apache.eventmesh.connector.knative.config;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.eventmesh.common.config.Config;
+import org.apache.eventmesh.common.config.ConfigFiled;
+import org.apache.eventmesh.common.config.convert.converter.ListConverter.ListConverterSemi;
-import com.google.common.base.Preconditions;
+import java.util.List;
+@Config(prefix = "eventMesh.server.knative", path = "classPath://knative-client.properties")
public class ClientConfiguration {
+ @ConfigFiled(field = "service", converter = ListConverterSemi.class)
+ public List<String> service;
+
+ /**
+ * In keeping with the old way of configuration parsing, the value is taken from the service field [0]
+ */
+ @ConfigFiled(reload = true)
public String emurl = "";
+
+ /**
+ * In keeping with the old way of configuration parsing, the value is taken from the service field [1]
+ */
+ @ConfigFiled(reload = true)
public String serviceAddr = "";
- public void init() {
- String serviceAddrStr = ConfigurationWrapper.getProp(ConfKeys.KEYS_EVENTMESH_KNATIVE_SERVICE_ADDR);
- Preconditions.checkState(StringUtils.isNotEmpty(serviceAddrStr),
- String.format("%s error", ConfKeys.KEYS_EVENTMESH_KNATIVE_SERVICE_ADDR));
- serviceAddr = StringUtils.trim(serviceAddrStr);
- String[] temp = serviceAddr.split(";");
- emurl = temp[0];
- serviceAddr = temp[1];
+ public void reload() {
+ emurl = this.service.get(0);
+ serviceAddr = this.service.get(1);
+ }
+
+ public List<String> getService() {
+ return service;
+ }
+
+ public void setService(List<String> service) {
+ this.service = service;
}
- static class ConfKeys {
+ public String getEmurl() {
+ return emurl;
+ }
- public static final String KEYS_EVENTMESH_KNATIVE_SERVICE_ADDR = "eventMesh.server.knative.service";
+ public void setEmurl(String emurl) {
+ this.emurl = emurl;
+ }
+
+ public String getServiceAddr() {
+ return serviceAddr;
+ }
+ public void setServiceAddr(String serviceAddr) {
+ this.serviceAddr = serviceAddr;
}
}
diff --git a/eventmesh-connector-plugin/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/consumer/KnativeConsumerImpl.java b/eventmesh-connector-plugin/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/consumer/KnativeConsumerImpl.java
index 32c0a252c..8c17c2e50 100644
--- a/eventmesh-connector-plugin/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/consumer/KnativeConsumerImpl.java
+++ b/eventmesh-connector-plugin/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/consumer/KnativeConsumerImpl.java
@@ -20,6 +20,7 @@ package org.apache.eventmesh.connector.knative.consumer;
import org.apache.eventmesh.api.AbstractContext;
import org.apache.eventmesh.api.EventListener;
import org.apache.eventmesh.api.consumer.Consumer;
+import org.apache.eventmesh.common.config.Config;
import org.apache.eventmesh.connector.knative.config.ClientConfiguration;
import java.util.List;
@@ -30,17 +31,21 @@ import org.slf4j.LoggerFactory;
import io.cloudevents.CloudEvent;
+@Config(field = "clientConfiguration")
public class KnativeConsumerImpl implements Consumer {
private PullConsumerImpl pullConsumer;
+ /**
+ * Unified configuration class corresponding to knative-client.properties
+ */
+ private ClientConfiguration clientConfiguration;
+
private static final Logger logger = LoggerFactory.getLogger(KnativeConsumerImpl.class);
@Override
public synchronized void init(Properties properties) throws Exception {
// Load parameters from properties file:
- final ClientConfiguration clientConfiguration = new ClientConfiguration();
- clientConfiguration.init();
properties.put("emUrl", clientConfiguration.emurl);
properties.put("serviceAddr", clientConfiguration.serviceAddr);
@@ -90,4 +95,8 @@ public class KnativeConsumerImpl implements Consumer {
public void shutdown() {
pullConsumer.shutdown();
}
+
+ public ClientConfiguration getClientConfiguration() {
+ return this.clientConfiguration;
+ }
}
diff --git a/eventmesh-connector-plugin/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/producer/KnativeProducerImpl.java b/eventmesh-connector-plugin/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/producer/KnativeProducerImpl.java
index 3c0a22a15..a27709e53 100644
--- a/eventmesh-connector-plugin/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/producer/KnativeProducerImpl.java
+++ b/eventmesh-connector-plugin/eventmesh-connector-knative/src/main/java/org/apache/eventmesh/connector/knative/producer/KnativeProducerImpl.java
@@ -21,22 +21,26 @@ import org.apache.eventmesh.api.RequestReplyCallback;
import org.apache.eventmesh.api.SendCallback;
import org.apache.eventmesh.api.exception.ConnectorRuntimeException;
import org.apache.eventmesh.api.producer.Producer;
+import org.apache.eventmesh.common.config.Config;
import org.apache.eventmesh.connector.knative.config.ClientConfiguration;
import java.util.Properties;
import io.cloudevents.CloudEvent;
+@Config(field = "clientConfiguration")
public class KnativeProducerImpl implements Producer {
private ProducerImpl producer;
+ /**
+ * Unified configuration class corresponding to knative-client.properties
+ */
+ private ClientConfiguration clientConfiguration;
+
@Override
public synchronized void init(Properties properties) throws Exception {
// Load parameters from properties file:
- final ClientConfiguration clientConfiguration = new ClientConfiguration();
- clientConfiguration.init();
-
properties.put("url", clientConfiguration.serviceAddr);
producer = new ProducerImpl(properties);
}
@@ -90,4 +94,8 @@ public class KnativeProducerImpl implements Producer {
public void setExtFields() {
throw new ConnectorRuntimeException("SetExtFields is not supported");
}
+
+ public ClientConfiguration getClientConfiguration() {
+ return this.clientConfiguration;
+ }
}
diff --git a/eventmesh-connector-plugin/eventmesh-connector-knative/src/test/java/org/apache/eventmesh/connector/knative/config/ClientConfigurationTest.java b/eventmesh-connector-plugin/eventmesh-connector-knative/src/test/java/org/apache/eventmesh/connector/knative/config/ClientConfigurationTest.java
new file mode 100644
index 000000000..b873ff2b5
--- /dev/null
+++ b/eventmesh-connector-plugin/eventmesh-connector-knative/src/test/java/org/apache/eventmesh/connector/knative/config/ClientConfigurationTest.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ *
+ * http://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.
+ */
+
+package org.apache.eventmesh.connector.knative.config;
+
+import org.apache.eventmesh.api.factory.ConnectorPluginFactory;
+import org.apache.eventmesh.connector.knative.consumer.KnativeConsumerImpl;
+import org.apache.eventmesh.connector.knative.producer.KnativeProducerImpl;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class ClientConfigurationTest {
+
+ @Test
+ public void getConfigWhenRocketMQConsumerInit() {
+ KnativeConsumerImpl consumer =
+ (KnativeConsumerImpl) ConnectorPluginFactory.getMeshMQPushConsumer("knative");
+
+ ClientConfiguration config = consumer.getClientConfiguration();
+ assertConfig(config);
+ }
+
+ @Test
+ public void getConfigWhenRocketMQProducerInit() {
+ KnativeProducerImpl producer =
+ (KnativeProducerImpl) ConnectorPluginFactory.getMeshMQProducer("knative");
+
+ ClientConfiguration config = producer.getClientConfiguration();
+ assertConfig(config);
+ }
+
+ private void assertConfig(ClientConfiguration config) {
+ Assert.assertEquals(config.getEmurl(), "127.0.0.1");
+ Assert.assertEquals(config.getServiceAddr(), "cloudevents-player.default.127.0.0.1.sslip.io");
+ }
+}
\ No newline at end of file
diff --git a/eventmesh-connector-plugin/eventmesh-connector-knative/src/test/java/org/apache/eventmesh/connector/knative/consumer/KnativeConsumerImplTest.java b/eventmesh-connector-plugin/eventmesh-connector-knative/src/test/java/org/apache/eventmesh/connector/knative/consumer/KnativeConsumerImplTest.java
index e5edc1261..c5690fb75 100644
--- a/eventmesh-connector-plugin/eventmesh-connector-knative/src/test/java/org/apache/eventmesh/connector/knative/consumer/KnativeConsumerImplTest.java
+++ b/eventmesh-connector-plugin/eventmesh-connector-knative/src/test/java/org/apache/eventmesh/connector/knative/consumer/KnativeConsumerImplTest.java
@@ -17,6 +17,8 @@
package org.apache.eventmesh.connector.knative.consumer;
+import org.apache.eventmesh.api.factory.ConnectorPluginFactory;
+
import java.util.Properties;
import org.junit.Assert;
@@ -31,7 +33,8 @@ public class KnativeConsumerImplTest {
properties.put("topic", topic);
// Create a Knative consumer:
- KnativeConsumerImpl knativeConsumer = new KnativeConsumerImpl();
+ KnativeConsumerImpl knativeConsumer =
+ (KnativeConsumerImpl) ConnectorPluginFactory.getMeshMQPushConsumer("knative");
try {
knativeConsumer.init(properties);
diff --git a/eventmesh-connector-plugin/eventmesh-connector-knative/src/test/java/org/apache/eventmesh/connector/knative/producer/KnativeProducerImplTest.java b/eventmesh-connector-plugin/eventmesh-connector-knative/src/test/java/org/apache/eventmesh/connector/knative/producer/KnativeProducerImplTest.java
index b2936ca82..e2fb9ce72 100644
--- a/eventmesh-connector-plugin/eventmesh-connector-knative/src/test/java/org/apache/eventmesh/connector/knative/producer/KnativeProducerImplTest.java
+++ b/eventmesh-connector-plugin/eventmesh-connector-knative/src/test/java/org/apache/eventmesh/connector/knative/producer/KnativeProducerImplTest.java
@@ -20,6 +20,7 @@ package org.apache.eventmesh.connector.knative.producer;
import org.apache.eventmesh.api.SendCallback;
import org.apache.eventmesh.api.SendResult;
import org.apache.eventmesh.api.exception.OnExceptionContext;
+import org.apache.eventmesh.api.factory.ConnectorPluginFactory;
import org.apache.eventmesh.connector.knative.cloudevent.KnativeMessageFactory;
import org.apache.eventmesh.connector.knative.cloudevent.impl.KnativeHeaders;
@@ -42,7 +43,8 @@ public class KnativeProducerImplTest {
properties.put("data", "Hello Knative from EventMesh!");
// Create a Knative producer:
- KnativeProducerImpl knativehProducer = new KnativeProducerImpl();
+ KnativeProducerImpl knativehProducer =
+ (KnativeProducerImpl) ConnectorPluginFactory.getMeshMQProducer("knative");
try {
knativehProducer.init(properties);
diff --git a/eventmesh-connector-plugin/eventmesh-connector-knative/src/test/resources/knative-client.properties b/eventmesh-connector-plugin/eventmesh-connector-knative/src/test/resources/knative-client.properties
new file mode 100644
index 000000000..8fec1c430
--- /dev/null
+++ b/eventmesh-connector-plugin/eventmesh-connector-knative/src/test/resources/knative-client.properties
@@ -0,0 +1,18 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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
+#
+# http://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.
+#
+#######################knative-client##################
+eventMesh.server.knative.service=127.0.0.1;cloudevents-player.default.127.0.0.1.sslip.io
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@eventmesh.apache.org
For additional commands, e-mail: commits-help@eventmesh.apache.org