From 5dc9b46b8e9470f8e9190173353b1bf14340a75c Mon Sep 17 00:00:00 2001 From: Bai Xiaofeng Date: Tue, 5 Jan 2021 14:24:16 +0800 Subject: [PATCH] Revert "JBPM-9273 System error occurred while adding deployment unit" (#3527) This reverts commit c2fda7a88672fd491a64e3482f833f2657d500a2. --- .../client/container/ContainerPresenter.java | 29 +--------- .../client/container/ContainerView.java | 5 -- .../client/resources/i18n/Constants.java | 3 - .../resources/i18n/Constants.properties | 1 - .../container/ContainerPresenterTest.java | 56 +++++++------------ 5 files changed, 22 insertions(+), 72 deletions(-) diff --git a/kie-wb-common-screens/kie-wb-common-server-ui/kie-wb-common-server-ui-client/src/main/java/org/kie/workbench/common/screens/server/management/client/container/ContainerPresenter.java b/kie-wb-common-screens/kie-wb-common-server-ui/kie-wb-common-server-ui-client/src/main/java/org/kie/workbench/common/screens/server/management/client/container/ContainerPresenter.java index f4ce17f50ff..184bdab2ff8 100644 --- a/kie-wb-common-screens/kie-wb-common-server-ui/kie-wb-common-server-ui-client/src/main/java/org/kie/workbench/common/screens/server/management/client/container/ContainerPresenter.java +++ b/kie-wb-common-screens/kie-wb-common-server-ui/kie-wb-common-server-ui-client/src/main/java/org/kie/workbench/common/screens/server/management/client/container/ContainerPresenter.java @@ -17,9 +17,7 @@ package org.kie.workbench.common.screens.server.management.client.container; import java.util.Collection; -import java.util.Collections; import java.util.Map; -import java.util.Optional; import javax.annotation.PostConstruct; import javax.enterprise.context.Dependent; @@ -32,8 +30,6 @@ import org.jboss.errai.common.client.api.ErrorCallback; import org.jboss.errai.common.client.api.RemoteCallback; import org.kie.server.api.model.KieContainerStatus; -import org.kie.server.api.model.Message; -import org.kie.server.api.model.Severity; import org.kie.server.controller.api.model.events.ServerInstanceUpdated; import org.kie.server.controller.api.model.runtime.Container; import org.kie.server.controller.api.model.spec.Capability; @@ -147,7 +143,6 @@ public void loadContainers(@Observes final ContainerSpecData content) { containerSpec != null && containerSpec.getId() != null && containerSpec.getId().equals(content.getContainerSpec().getId())) { - resetReleaseIdForFailedContainers(content.getContainers(), content.getContainerSpec()); setup(content.getContainerSpec(), content.getContainers()); } else { @@ -155,20 +150,6 @@ public void loadContainers(@Observes final ContainerSpecData content) { } } - private void resetReleaseIdForFailedContainers(Collection containers, ContainerSpec containerSpec) { - containers.forEach(container -> { - if (KieContainerStatus.FAILED == container.getStatus() || container.getResolvedReleasedId() == null) { - container.setResolvedReleasedId(containerSpec.getReleasedId()); - container.addMessage(new Message(Severity.ERROR, Collections.emptyList())); - } - }); - Optional optionalContainer = containers.stream().filter(container -> KieContainerStatus.FAILED != container.getStatus()).findFirst(); - if (!optionalContainer.isPresent() && containers.size() > 0) { - containerSpec.setStatus(KieContainerStatus.FAILED); - } - } - - public void refreshOnContainerUpdateEvent(@Observes final ContainerUpdateEvent updateEvent) { final ContainerRuntimeOperation runtimeOperation = updateEvent.getContainerRuntimeOperation(); @@ -257,17 +238,11 @@ protected void updateStatus(final KieContainerStatus status) { break; case STOPPED: view.updateToggleActivationButton(false); - view.setContainerStartState(State.DISABLED); - view.setContainerStopState(State.ENABLED); - view.enableRemoveButton(); - view.disableToggleActivationButton(); - break; case DISPOSING: case FAILED: view.enableRemoveButton(); - view.updateToggleActivationButton(false); view.setContainerStartState(State.DISABLED); - view.setContainerStopState(State.DISABLED); + view.setContainerStopState(State.ENABLED); view.disableToggleActivationButton(); break; } @@ -426,7 +401,5 @@ public interface View extends UberView { String getStopContainerErrorMessage(); String getStartContainerErrorMessage(); - - String getFailedContainerErrrMessage(); } } diff --git a/kie-wb-common-screens/kie-wb-common-server-ui/kie-wb-common-server-ui-client/src/main/java/org/kie/workbench/common/screens/server/management/client/container/ContainerView.java b/kie-wb-common-screens/kie-wb-common-server-ui/kie-wb-common-server-ui-client/src/main/java/org/kie/workbench/common/screens/server/management/client/container/ContainerView.java index 6f76d9330df..1b16a22470e 100644 --- a/kie-wb-common-screens/kie-wb-common-server-ui/kie-wb-common-server-ui-client/src/main/java/org/kie/workbench/common/screens/server/management/client/container/ContainerView.java +++ b/kie-wb-common-screens/kie-wb-common-server-ui/kie-wb-common-server-ui-client/src/main/java/org/kie/workbench/common/screens/server/management/client/container/ContainerView.java @@ -275,11 +275,6 @@ public String getStartContainerErrorMessage() { return translationService.format(Constants.ContainerView_StartContainerErrorMessage); } - @Override - public String getFailedContainerErrrMessage() { - return translationService.format(Constants.NewContainer_FailedContainer); - } - private String getConfirmRemovePopupMessage() { return translationService.format(Constants.ContainerView_ConfirmRemovePopupMessage); } diff --git a/kie-wb-common-screens/kie-wb-common-server-ui/kie-wb-common-server-ui-client/src/main/java/org/kie/workbench/common/screens/server/management/client/resources/i18n/Constants.java b/kie-wb-common-screens/kie-wb-common-server-ui/kie-wb-common-server-ui-client/src/main/java/org/kie/workbench/common/screens/server/management/client/resources/i18n/Constants.java index 950e4a6a7e6..f3e07a4803e 100644 --- a/kie-wb-common-screens/kie-wb-common-server-ui/kie-wb-common-server-ui-client/src/main/java/org/kie/workbench/common/screens/server/management/client/resources/i18n/Constants.java +++ b/kie-wb-common-screens/kie-wb-common-server-ui/kie-wb-common-server-ui-client/src/main/java/org/kie/workbench/common/screens/server/management/client/resources/i18n/Constants.java @@ -250,7 +250,4 @@ public class Constants { @TranslationKey(defaultValue = "") public static final String NewContainer_Deploying = "NewContainer.Deploying"; - - @TranslationKey(defaultValue = "") - public static final String NewContainer_FailedContainer = "NewContainer.FailedContainer"; } diff --git a/kie-wb-common-screens/kie-wb-common-server-ui/kie-wb-common-server-ui-client/src/main/resources/org/kie/workbench/common/screens/server/management/client/resources/i18n/Constants.properties b/kie-wb-common-screens/kie-wb-common-server-ui/kie-wb-common-server-ui-client/src/main/resources/org/kie/workbench/common/screens/server/management/client/resources/i18n/Constants.properties index d39347381d6..a50494b53d9 100644 --- a/kie-wb-common-screens/kie-wb-common-server-ui/kie-wb-common-server-ui-client/src/main/resources/org/kie/workbench/common/screens/server/management/client/resources/i18n/Constants.properties +++ b/kie-wb-common-screens/kie-wb-common-server-ui/kie-wb-common-server-ui-client/src/main/resources/org/kie/workbench/common/screens/server/management/client/resources/i18n/Constants.properties @@ -152,4 +152,3 @@ NewContainer.GAVNotExist.Save=GAV '{0}' not found in the Maven repository. Are y NewContainer.Save=Ok NewContainer.SaveContainerSpec=Save Container Spec NewContainer.Deploying={0} is deploying -NewContainer.FailedContainer=The Container failed on kie server. diff --git a/kie-wb-common-screens/kie-wb-common-server-ui/kie-wb-common-server-ui-client/src/test/java/org/kie/workbench/common/screens/server/management/client/container/ContainerPresenterTest.java b/kie-wb-common-screens/kie-wb-common-server-ui/kie-wb-common-server-ui-client/src/test/java/org/kie/workbench/common/screens/server/management/client/container/ContainerPresenterTest.java index fa83d029ac2..d07c6fc7c5d 100644 --- a/kie-wb-common-screens/kie-wb-common-server-ui/kie-wb-common-server-ui-client/src/test/java/org/kie/workbench/common/screens/server/management/client/container/ContainerPresenterTest.java +++ b/kie-wb-common-screens/kie-wb-common-server-ui/kie-wb-common-server-ui-client/src/test/java/org/kie/workbench/common/screens/server/management/client/container/ContainerPresenterTest.java @@ -196,7 +196,6 @@ public void testInit() { @Test public void testStartContainer() { presenter.loadContainers(containerSpecData); - presenter.startContainer(); verify(view).setContainerStartState(State.ENABLED); @@ -299,7 +298,8 @@ public void testDeactivateThenActivateContainerFromStartedState() { public void testLoadContainersEmpty() { presenter.loadContainers(containerSpecData); - verifyLoad(true, 1, false); + verifyLoad(true, + 1); } @Test @@ -314,12 +314,14 @@ public void testLoadContainersOnlyOnSelectedContainerEvent() { presenter.setContainerSpec(containerSpec1); presenter.loadContainers(containerSpecData); - verifyLoad(true, 0, false); + verifyLoad(true, + 0); presenter.setContainerSpec(containerSpec); presenter.loadContainers(containerSpecData); - verifyLoad(true, 1, false); + verifyLoad(true, + 1); } @@ -333,7 +335,8 @@ public void testRefresh() { presenter.loadContainers(containerSpecData); presenter.refresh(); - verifyLoad(true, 2, false); + verifyLoad(true, + 2); } @Test @@ -347,7 +350,8 @@ public void testLoadContainers() { containerSpecData.getContainers().add(container); presenter.loadContainers(containerSpecData); - verifyLoad(true, 1, false); + verifyLoad(true, + 1); } @Test @@ -362,29 +366,12 @@ public void testLoadContainersNonStoped() { containerSpecData.getContainers().add(container); presenter.loadContainers(containerSpecData); - verifyLoad(false, 1, false); + verifyLoad(false, + 1); } - @Test - public void testLoadContainersHasFailed() { - final Container container = new Container("containerSpecId", - "containerName", - new ServerInstanceKey(), - Collections.emptyList(), - null, - null); - container.setStatus(KieContainerStatus.FAILED); - containerSpecData.getContainers().add(container); - assertNull(container.getResolvedReleasedId()); - presenter.loadContainers(containerSpecData); - - assertEquals(KieContainerStatus.FAILED, containerSpecData.getContainerSpec().getStatus()); - assertNotNull(container.getResolvedReleasedId()); - - verifyLoad(false, 1, true); - } - - private void verifyLoad(boolean empty, int times, boolean hasFailed) { + private void verifyLoad(boolean empty, + int times) { verify(containerStatusEmptyPresenter, times(times)).setup(containerSpec); verify(containerRemoteStatusPresenter, @@ -418,11 +405,8 @@ private void verifyLoad(boolean empty, int times, boolean hasFailed) { verify(view, times(times)).setContainerStartState(State.DISABLED); - if (!hasFailed) { - verify(view, times(times)).setContainerStopState(State.ENABLED); - } else { - verify(view, times(times)).setContainerStopState(State.DISABLED); - } + verify(view, + times(times)).setContainerStopState(State.ENABLED); verify(containerProcessConfigPresenter, times(times)).setup(containerSpec, @@ -440,7 +424,8 @@ public void testLoad() { presenter.load(new ContainerSpecSelected(containerSpec)); - verifyLoad(true, 1, false); + verifyLoad(true, + 1); } @Test @@ -513,7 +498,8 @@ public void testOnRefresh() { presenter.onRefresh(new RefreshRemoteServers(containerSpec)); - verifyLoad(true, 1, false); + verifyLoad(true, + 1); } @Test @@ -597,7 +583,7 @@ public void testUpdateStatusForFailed() { verify(view).enableRemoveButton(); verify(view).setContainerStartState(State.DISABLED); - verify(view).setContainerStopState(State.DISABLED); + verify(view).setContainerStopState(State.ENABLED); verify(view).disableToggleActivationButton(); }