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:26 UTC
[rocketmq-eventbridge] 04/04: remove class
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);
}