From feb9efceaa2570dd6e30ef76391d5a98f379ce47 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Mon, 12 Jun 2023 13:15:21 +0200 Subject: [PATCH] bug5849: completed passing through of MongoDB archiving error message --- .../landscape/ui/client/LandscapeManagementPanel.java | 7 +++---- .../ui/client/LandscapeManagementWriteService.java | 3 +-- .../ui/client/LandscapeManagementWriteServiceAsync.java | 3 +-- .../ui/server/LandscapeManagementWriteServiceImpl.java | 4 ++-- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/java/com.sap.sailing.landscape.ui/src/com/sap/sailing/landscape/ui/client/LandscapeManagementPanel.java b/java/com.sap.sailing.landscape.ui/src/com/sap/sailing/landscape/ui/client/LandscapeManagementPanel.java index ea2742f6a1f..78d5f58215f 100755 --- a/java/com.sap.sailing.landscape.ui/src/com/sap/sailing/landscape/ui/client/LandscapeManagementPanel.java +++ b/java/com.sap.sailing.landscape.ui/src/com/sap/sailing/landscape/ui/client/LandscapeManagementPanel.java @@ -1028,16 +1028,15 @@ public class LandscapeManagementPanel extends SimplePanel { sshKeyManagementPanel.getSelectedKeyPair()==null?null:sshKeyManagementPanel.getSelectedKeyPair().getName(), sshKeyManagementPanel.getPassphraseForPrivateKeyDecryption() != null ? sshKeyManagementPanel.getPassphraseForPrivateKeyDecryption().getBytes() : null, - new AsyncCallback, String>>() { + new AsyncCallback() { @Override public void onFailure(Throwable caught) { applicationReplicaSetActionChainingCallback.onFailure(caught); } @Override - public void onSuccess(Util.Pair, String> result) { - applicationReplicaSetActionChainingCallback.onSuccess(result.getA()); - final String mongoDbArchivingErrorMessage = result.getB(); + public void onSuccess(String mongoDbArchivingErrorMessage) { + applicationReplicaSetActionChainingCallback.onSuccess(/* application replica set (removed) */ null); if (mongoDbArchivingErrorMessage != null) { errorReporter.reportError(stringMessages.errorArchivingMongoDBTo( selectedMongoEndpointForDBArchiving.getReplicaSetName(), mongoDbArchivingErrorMessage)); diff --git a/java/com.sap.sailing.landscape.ui/src/com/sap/sailing/landscape/ui/client/LandscapeManagementWriteService.java b/java/com.sap.sailing.landscape.ui/src/com/sap/sailing/landscape/ui/client/LandscapeManagementWriteService.java index eeba5039730..efe7a34982d 100755 --- a/java/com.sap.sailing.landscape.ui/src/com/sap/sailing/landscape/ui/client/LandscapeManagementWriteService.java +++ b/java/com.sap.sailing.landscape.ui/src/com/sap/sailing/landscape/ui/client/LandscapeManagementWriteService.java @@ -18,7 +18,6 @@ import com.sap.sailing.landscape.ui.shared.SSHKeyPairDTO; import com.sap.sailing.landscape.ui.shared.SailingApplicationReplicaSetDTO; import com.sap.sailing.landscape.ui.shared.SerializationDummyDTO; import com.sap.sse.common.Duration; -import com.sap.sse.common.Util.Pair; import com.sap.sse.common.Util.Triple; import com.sap.sse.landscape.aws.common.shared.RedirectDTO; @@ -85,7 +84,7 @@ public interface LandscapeManagementWriteService extends RemoteService { void defineDefaultRedirect(String regionId, String hostname, RedirectDTO redirect, String keyName, String passphraseForPrivateKeyDecryption); - Pair, String> removeApplicationReplicaSet(String regionId, + String removeApplicationReplicaSet(String regionId, SailingApplicationReplicaSetDTO applicationReplicaSetToRemove, MongoEndpointDTO moveDatabaseHere, String optionalKeyName, byte[] passphraseForPrivateKeyDescryption) throws Exception; diff --git a/java/com.sap.sailing.landscape.ui/src/com/sap/sailing/landscape/ui/client/LandscapeManagementWriteServiceAsync.java b/java/com.sap.sailing.landscape.ui/src/com/sap/sailing/landscape/ui/client/LandscapeManagementWriteServiceAsync.java index 5ec314b6e2f..dbb0eae7889 100755 --- a/java/com.sap.sailing.landscape.ui/src/com/sap/sailing/landscape/ui/client/LandscapeManagementWriteServiceAsync.java +++ b/java/com.sap.sailing.landscape.ui/src/com/sap/sailing/landscape/ui/client/LandscapeManagementWriteServiceAsync.java @@ -21,7 +21,6 @@ import com.sap.sailing.landscape.ui.shared.SSHKeyPairDTO; import com.sap.sailing.landscape.ui.shared.SailingApplicationReplicaSetDTO; import com.sap.sailing.landscape.ui.shared.SerializationDummyDTO; import com.sap.sse.common.Duration; -import com.sap.sse.common.Util.Pair; import com.sap.sse.common.Util.Triple; import com.sap.sse.landscape.aws.common.shared.RedirectDTO; @@ -119,7 +118,7 @@ public interface LandscapeManagementWriteServiceAsync { void removeApplicationReplicaSet(String regionId, SailingApplicationReplicaSetDTO applicationReplicaSetToRemove, MongoEndpointDTO moveDatabaseHere, - String optionalKeyName, byte[] passphraseForPrivateKeyDescryption, AsyncCallback, String>> callback); + String optionalKeyName, byte[] passphraseForPrivateKeyDescryption, AsyncCallback callback); void createDefaultLoadBalancerMappings(String regionId, SailingApplicationReplicaSetDTO applicationReplicaSetToCreateLoadBalancerMappingFor, diff --git a/java/com.sap.sailing.landscape.ui/src/com/sap/sailing/landscape/ui/server/LandscapeManagementWriteServiceImpl.java b/java/com.sap.sailing.landscape.ui/src/com/sap/sailing/landscape/ui/server/LandscapeManagementWriteServiceImpl.java index 3bca7ee2606..b0bbaad6c2e 100755 --- a/java/com.sap.sailing.landscape.ui/src/com/sap/sailing/landscape/ui/server/LandscapeManagementWriteServiceImpl.java +++ b/java/com.sap.sailing.landscape.ui/src/com/sap/sailing/landscape/ui/server/LandscapeManagementWriteServiceImpl.java @@ -651,7 +651,7 @@ public class LandscapeManagementWriteServiceImpl extends ResultCachingProxiedRem } @Override - public Pair, String> removeApplicationReplicaSet(String regionId, + public String removeApplicationReplicaSet(String regionId, SailingApplicationReplicaSetDTO applicationReplicaSetToRemove, MongoEndpointDTO moveDatabaseHere, String optionalKeyName, byte[] passphraseForPrivateKeyDecryption) throws Exception { @@ -661,7 +661,7 @@ public class LandscapeManagementWriteServiceImpl extends ResultCachingProxiedRem final String mongoDbArchivingErrorMessage = getLandscapeService().removeApplicationReplicaSet(regionId, convertFromApplicationReplicaSetDTO( new AwsRegion(regionId, getLandscape()), applicationReplicaSetToRemove), getMongoEndpoint(moveDatabaseHere), optionalKeyName, passphraseForPrivateKeyDecryption); - return new Pair<>(applicationReplicaSetToRemove, mongoDbArchivingErrorMessage); + return mongoDbArchivingErrorMessage; } private AwsApplicationReplicaSet> convertFromApplicationReplicaSetDTO(