You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by sh...@apache.org on 2022/12/09 06:05:22 UTC
[rocketmq-eventbridge] branch main updated (fa480ff -> 3043f65)
This is an automated email from the ASF dual-hosted git repository.
shenlin pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/rocketmq-eventbridge.git
from fa480ff fix unique index (#42)
new 6c4f6c1 update network service
new b45d520 add License
new 5174933 update param name
new 3043f65 remove class
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../rpc/impl/network/NetworkServiceAPIImpl.java | 5 +++--
.../domain/model/connection/ConnectionService.java | 20 ++++++++++++++++++--
.../eventbridge/domain/rpc/NetworkServiceAPI.java | 5 +++--
3 files changed, 24 insertions(+), 6 deletions(-)
[rocketmq-eventbridge] 02/04: add License
Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
shenlin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/rocketmq-eventbridge.git
commit b45d5208c6d2ba4b629973e47b90712f8ca2db76
Author: zh378814 <wb...@alibaba-inc.com>
AuthorDate: Thu Dec 8 13:29:05 2022 +0800
add License
---
.../eventbridge/domain/model/data/NetworkEntity.java | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/data/NetworkEntity.java b/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/data/NetworkEntity.java
index c9ea40e..7a09f3e 100644
--- a/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/data/NetworkEntity.java
+++ b/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/data/NetworkEntity.java
@@ -1,3 +1,20 @@
+/*
+ * 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.rocketmq.eventbridge.domain.model.data;
import lombok.Getter;
[rocketmq-eventbridge] 01/04: update network service
Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
shenlin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/rocketmq-eventbridge.git
commit 6c4f6c1f6b662cf60aed904042bd8e75344e6c7d
Author: zh378814 <wb...@alibaba-inc.com>
AuthorDate: Thu Dec 8 13:27:09 2022 +0800
update network service
---
.../rpc/impl/network/NetworkServiceAPIImpl.java | 10 ++++++++--
.../domain/model/connection/ConnectionService.java | 21 +++++++++++++++++++--
.../connection/parameter/NetworkParameters.java | 9 +++++++++
.../domain/model/data/NetworkEntity.java | 16 ++++++++++++++++
.../eventbridge/domain/rpc/NetworkServiceAPI.java | 8 ++++++--
5 files changed, 58 insertions(+), 6 deletions(-)
diff --git a/adapter/rpc/src/main/java/org/apache/rocketmq/eventbridge/adapter/rpc/impl/network/NetworkServiceAPIImpl.java b/adapter/rpc/src/main/java/org/apache/rocketmq/eventbridge/adapter/rpc/impl/network/NetworkServiceAPIImpl.java
index 9edd78e..5163aeb 100644
--- a/adapter/rpc/src/main/java/org/apache/rocketmq/eventbridge/adapter/rpc/impl/network/NetworkServiceAPIImpl.java
+++ b/adapter/rpc/src/main/java/org/apache/rocketmq/eventbridge/adapter/rpc/impl/network/NetworkServiceAPIImpl.java
@@ -17,18 +17,24 @@
package org.apache.rocketmq.eventbridge.adapter.rpc.impl.network;
+import org.apache.rocketmq.eventbridge.domain.model.data.NetworkEntity;
import org.apache.rocketmq.eventbridge.domain.rpc.NetworkServiceAPI;
import org.springframework.stereotype.Component;
@Component
public class NetworkServiceAPIImpl implements NetworkServiceAPI {
@Override
- public Boolean createPrivateNetwork() {
+ public Boolean createPrivateNetwork(String accountId, String connectionId, String vpcId, String vSwitchIds, String securityGroupId) {
return null;
}
@Override
- public Boolean deletePrivateNetwork() {
+ public Boolean deletePrivateNetwork(String accountId, String networkServiceId) {
return null;
}
+
+ @Override
+ public NetworkEntity getNetwork(String accountId, String connectionId) {
+ return new NetworkEntity();
+ }
}
diff --git a/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/connection/ConnectionService.java b/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/connection/ConnectionService.java
index 52d92e2..a0ed6da 100644
--- a/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/connection/ConnectionService.java
+++ b/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/connection/ConnectionService.java
@@ -29,8 +29,10 @@ import org.apache.rocketmq.eventbridge.domain.model.PaginationResult;
import org.apache.rocketmq.eventbridge.domain.model.connection.parameter.ApiKeyAuthParameters;
import org.apache.rocketmq.eventbridge.domain.model.connection.parameter.AuthParameters;
import org.apache.rocketmq.eventbridge.domain.model.connection.parameter.BasicAuthParameters;
+import org.apache.rocketmq.eventbridge.domain.model.connection.parameter.NetworkParameters;
import org.apache.rocketmq.eventbridge.domain.model.connection.parameter.OAuthHttpParameters;
import org.apache.rocketmq.eventbridge.domain.model.connection.parameter.OAuthParameters;
+import org.apache.rocketmq.eventbridge.domain.model.data.NetworkEntity;
import org.apache.rocketmq.eventbridge.domain.repository.ApiDestinationRepository;
import org.apache.rocketmq.eventbridge.domain.repository.ConnectionRepository;
import org.apache.rocketmq.eventbridge.domain.rpc.NetworkServiceAPI;
@@ -74,7 +76,12 @@ public class ConnectionService extends AbstractResourceService {
}
if (connectionRepository.createConnection(connectionDTO)) {
if (NetworkTypeEnum.PRIVATE_NETWORK.getNetworkType().equals(connectionDTO.getNetworkParameters().getNetworkType())) {
- networkServiceAPI.createPrivateNetwork();
+ List<ConnectionDTO> connection = getConnection(connectionDTO.getAccountId(), connectionDTO.getConnectionName());
+ if (!CollectionUtils.isEmpty(connection)) {
+ NetworkParameters networkParameters = connectionDTO.getNetworkParameters();
+ networkServiceAPI.createPrivateNetwork(connectionDTO.getAccountId(), Integer.toString(connection.get(0).getId()), networkParameters.getVpcId(), networkParameters.getVswitcheId(), networkParameters.getSecurityGroupId());
+ }
+
}
return connectionDTO.getConnectionName();
}
@@ -92,7 +99,7 @@ public class ConnectionService extends AbstractResourceService {
List<ConnectionDTO> connection = getConnection(accountId, connectionName);
ConnectionDTO connectionDTO = connection.get(0);
if (NetworkTypeEnum.PRIVATE_NETWORK.getNetworkType().equals(connectionDTO.getNetworkParameters().getNetworkType())) {
- networkServiceAPI.deletePrivateNetwork();
+ networkServiceAPI.deletePrivateNetwork(accountId, Integer.toString(connectionDTO.getId()));
}
connectionRepository.deleteConnection(accountId, connectionName);
if (secretManagerAPI.querySecretName(secretManagerAPI.getSecretName(accountId, connectionName))) {
@@ -117,6 +124,16 @@ public class ConnectionService extends AbstractResourceService {
if (connectionDTO == null) {
throw new EventBridgeException(EventBridgeErrorCode.ConnectionNotExist, connectionName);
}
+ for (ConnectionDTO connection : connectionDTO) {
+ if (NetworkTypeEnum.PRIVATE_NETWORK.getNetworkType().equals(connection.getNetworkParameters().getNetworkType())) {
+ NetworkEntity network = networkServiceAPI.getNetwork(accountId, connection.getAccountId());
+ NetworkParameters networkParameters = connection.getNetworkParameters();
+ networkParameters.setSocks5UserName(network.getSocks5UserName());
+ networkParameters.setSocks5Password(network.getSocks5Password());
+ networkParameters.setSocks5Endpoint(network.getSocks5Endpoint());
+ connection.setNetworkParameters(networkParameters);
+ }
+ }
return connectionDTO;
}
diff --git a/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/connection/parameter/NetworkParameters.java b/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/connection/parameter/NetworkParameters.java
index ed7ca0d..f771056 100644
--- a/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/connection/parameter/NetworkParameters.java
+++ b/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/connection/parameter/NetworkParameters.java
@@ -40,4 +40,13 @@ public class NetworkParameters {
@SerializedName("SecurityGroupId")
private String securityGroupId;
+
+ @SerializedName("Socks5UserName")
+ private String socks5UserName;
+
+ @SerializedName("Socks5Password")
+ private String socks5Password;
+
+ @SerializedName("Socks5Endpoint")
+ private String socks5Endpoint;
}
diff --git a/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/data/NetworkEntity.java b/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/data/NetworkEntity.java
new file mode 100644
index 0000000..c9ea40e
--- /dev/null
+++ b/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/data/NetworkEntity.java
@@ -0,0 +1,16 @@
+package org.apache.rocketmq.eventbridge.domain.model.data;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class NetworkEntity {
+
+ private String socks5UserName;
+
+ private String socks5Password;
+
+ private String socks5Endpoint;
+
+}
diff --git a/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/rpc/NetworkServiceAPI.java b/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/rpc/NetworkServiceAPI.java
index c2d7018..77ada12 100644
--- a/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/rpc/NetworkServiceAPI.java
+++ b/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/rpc/NetworkServiceAPI.java
@@ -17,9 +17,13 @@
package org.apache.rocketmq.eventbridge.domain.rpc;
+import org.apache.rocketmq.eventbridge.domain.model.data.NetworkEntity;
+
public interface NetworkServiceAPI {
- Boolean createPrivateNetwork();
+ Boolean createPrivateNetwork(String accountId, String connectionId, String vpcId, String vSwitchIds, String securityGroupId);
+
+ Boolean deletePrivateNetwork(String accountId, String connectionId);
- Boolean deletePrivateNetwork();
+ NetworkEntity getNetwork(String accountId, String connectionId);
}
[rocketmq-eventbridge] 04/04: remove class
Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
shenlin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/rocketmq-eventbridge.git
commit 3043f65880dcd7163cb82a77f2000426eaa658e2
Author: zh378814 <wb...@alibaba-inc.com>
AuthorDate: Fri Dec 9 10:02:57 2022 +0800
remove class
---
.../rpc/impl/network/NetworkServiceAPIImpl.java | 7 +----
.../domain/model/connection/ConnectionService.java | 23 ++++++++-------
.../connection/parameter/NetworkParameters.java | 9 ------
.../domain/model/data/NetworkEntity.java | 33 ----------------------
.../eventbridge/domain/rpc/NetworkServiceAPI.java | 3 --
5 files changed, 12 insertions(+), 63 deletions(-)
diff --git a/adapter/rpc/src/main/java/org/apache/rocketmq/eventbridge/adapter/rpc/impl/network/NetworkServiceAPIImpl.java b/adapter/rpc/src/main/java/org/apache/rocketmq/eventbridge/adapter/rpc/impl/network/NetworkServiceAPIImpl.java
index f8aed21..faa5559 100644
--- a/adapter/rpc/src/main/java/org/apache/rocketmq/eventbridge/adapter/rpc/impl/network/NetworkServiceAPIImpl.java
+++ b/adapter/rpc/src/main/java/org/apache/rocketmq/eventbridge/adapter/rpc/impl/network/NetworkServiceAPIImpl.java
@@ -17,10 +17,10 @@
package org.apache.rocketmq.eventbridge.adapter.rpc.impl.network;
-import org.apache.rocketmq.eventbridge.domain.model.data.NetworkEntity;
import org.apache.rocketmq.eventbridge.domain.rpc.NetworkServiceAPI;
import org.springframework.stereotype.Component;
+
@Component
public class NetworkServiceAPIImpl implements NetworkServiceAPI {
@Override
@@ -32,9 +32,4 @@ public class NetworkServiceAPIImpl implements NetworkServiceAPI {
public Boolean deletePrivateNetwork(String accountId, String connectionId) {
return null;
}
-
- @Override
- public NetworkEntity getNetwork(String accountId, String connectionId) {
- return new NetworkEntity();
- }
}
diff --git a/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/connection/ConnectionService.java b/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/connection/ConnectionService.java
index a0ed6da..fc3617d 100644
--- a/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/connection/ConnectionService.java
+++ b/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/connection/ConnectionService.java
@@ -32,7 +32,6 @@ import org.apache.rocketmq.eventbridge.domain.model.connection.parameter.BasicAu
import org.apache.rocketmq.eventbridge.domain.model.connection.parameter.NetworkParameters;
import org.apache.rocketmq.eventbridge.domain.model.connection.parameter.OAuthHttpParameters;
import org.apache.rocketmq.eventbridge.domain.model.connection.parameter.OAuthParameters;
-import org.apache.rocketmq.eventbridge.domain.model.data.NetworkEntity;
import org.apache.rocketmq.eventbridge.domain.repository.ApiDestinationRepository;
import org.apache.rocketmq.eventbridge.domain.repository.ConnectionRepository;
import org.apache.rocketmq.eventbridge.domain.rpc.NetworkServiceAPI;
@@ -81,7 +80,6 @@ public class ConnectionService extends AbstractResourceService {
NetworkParameters networkParameters = connectionDTO.getNetworkParameters();
networkServiceAPI.createPrivateNetwork(connectionDTO.getAccountId(), Integer.toString(connection.get(0).getId()), networkParameters.getVpcId(), networkParameters.getVswitcheId(), networkParameters.getSecurityGroupId());
}
-
}
return connectionDTO.getConnectionName();
}
@@ -116,6 +114,17 @@ public class ConnectionService extends AbstractResourceService {
if (connectionDTO.getAuthParameters() != null) {
connectionDTO.setAuthParameters(updateSecretData(connectionDTO.getAuthParameters(), accountId, connectionDTO.getConnectionName(), connectionDTO.getConnectionName()));
}
+ List<ConnectionDTO> connection = getConnection(connectionDTO.getAccountId(), connectionDTO.getConnectionName());
+ if (!CollectionUtils.isEmpty(connection)) {
+ ConnectionDTO dto = connection.get(0);
+ if (NetworkTypeEnum.PRIVATE_NETWORK.getNetworkType().equals(dto.getNetworkParameters().getNetworkType())) {
+ networkServiceAPI.deletePrivateNetwork(connectionDTO.getAccountId(), Integer.toString(dto.getId()));
+ }
+ if (NetworkTypeEnum.PRIVATE_NETWORK.getNetworkType().equals(connectionDTO.getNetworkParameters().getNetworkType())) {
+ NetworkParameters networkParameters = connectionDTO.getNetworkParameters();
+ networkServiceAPI.createPrivateNetwork(connectionDTO.getAccountId(), Integer.toString(dto.getId()), networkParameters.getVpcId(), networkParameters.getVswitcheId(), networkParameters.getSecurityGroupId());
+ }
+ }
connectionRepository.updateConnection(connectionDTO);
}
@@ -124,16 +133,6 @@ public class ConnectionService extends AbstractResourceService {
if (connectionDTO == null) {
throw new EventBridgeException(EventBridgeErrorCode.ConnectionNotExist, connectionName);
}
- for (ConnectionDTO connection : connectionDTO) {
- if (NetworkTypeEnum.PRIVATE_NETWORK.getNetworkType().equals(connection.getNetworkParameters().getNetworkType())) {
- NetworkEntity network = networkServiceAPI.getNetwork(accountId, connection.getAccountId());
- NetworkParameters networkParameters = connection.getNetworkParameters();
- networkParameters.setSocks5UserName(network.getSocks5UserName());
- networkParameters.setSocks5Password(network.getSocks5Password());
- networkParameters.setSocks5Endpoint(network.getSocks5Endpoint());
- connection.setNetworkParameters(networkParameters);
- }
- }
return connectionDTO;
}
diff --git a/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/connection/parameter/NetworkParameters.java b/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/connection/parameter/NetworkParameters.java
index f771056..ed7ca0d 100644
--- a/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/connection/parameter/NetworkParameters.java
+++ b/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/connection/parameter/NetworkParameters.java
@@ -40,13 +40,4 @@ public class NetworkParameters {
@SerializedName("SecurityGroupId")
private String securityGroupId;
-
- @SerializedName("Socks5UserName")
- private String socks5UserName;
-
- @SerializedName("Socks5Password")
- private String socks5Password;
-
- @SerializedName("Socks5Endpoint")
- private String socks5Endpoint;
}
diff --git a/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/data/NetworkEntity.java b/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/data/NetworkEntity.java
deleted file mode 100644
index 7a09f3e..0000000
--- a/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/model/data/NetworkEntity.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.rocketmq.eventbridge.domain.model.data;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Setter
-@Getter
-public class NetworkEntity {
-
- private String socks5UserName;
-
- private String socks5Password;
-
- private String socks5Endpoint;
-
-}
diff --git a/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/rpc/NetworkServiceAPI.java b/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/rpc/NetworkServiceAPI.java
index 77ada12..25857d7 100644
--- a/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/rpc/NetworkServiceAPI.java
+++ b/domain/src/main/java/org/apache/rocketmq/eventbridge/domain/rpc/NetworkServiceAPI.java
@@ -17,13 +17,10 @@
package org.apache.rocketmq.eventbridge.domain.rpc;
-import org.apache.rocketmq.eventbridge.domain.model.data.NetworkEntity;
public interface NetworkServiceAPI {
Boolean createPrivateNetwork(String accountId, String connectionId, String vpcId, String vSwitchIds, String securityGroupId);
Boolean deletePrivateNetwork(String accountId, String connectionId);
-
- NetworkEntity getNetwork(String accountId, String connectionId);
}
[rocketmq-eventbridge] 03/04: update param name
Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
shenlin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/rocketmq-eventbridge.git
commit 5174933316722e15e8655826774e8444be56ccbc
Author: zh378814 <wb...@alibaba-inc.com>
AuthorDate: Thu Dec 8 13:30:47 2022 +0800
update param name
---
.../eventbridge/adapter/rpc/impl/network/NetworkServiceAPIImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/adapter/rpc/src/main/java/org/apache/rocketmq/eventbridge/adapter/rpc/impl/network/NetworkServiceAPIImpl.java b/adapter/rpc/src/main/java/org/apache/rocketmq/eventbridge/adapter/rpc/impl/network/NetworkServiceAPIImpl.java
index 5163aeb..f8aed21 100644
--- a/adapter/rpc/src/main/java/org/apache/rocketmq/eventbridge/adapter/rpc/impl/network/NetworkServiceAPIImpl.java
+++ b/adapter/rpc/src/main/java/org/apache/rocketmq/eventbridge/adapter/rpc/impl/network/NetworkServiceAPIImpl.java
@@ -29,7 +29,7 @@ public class NetworkServiceAPIImpl implements NetworkServiceAPI {
}
@Override
- public Boolean deletePrivateNetwork(String accountId, String networkServiceId) {
+ public Boolean deletePrivateNetwork(String accountId, String connectionId) {
return null;
}