diff --git a/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-client/src/main/java/org/kie/workbench/common/screens/projecteditor/client/editor/ProjectScreenPresenter.java b/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-client/src/main/java/org/kie/workbench/common/screens/projecteditor/client/editor/ProjectScreenPresenter.java index 87032936cf2..63c48669e36 100644 --- a/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-client/src/main/java/org/kie/workbench/common/screens/projecteditor/client/editor/ProjectScreenPresenter.java +++ b/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-client/src/main/java/org/kie/workbench/common/screens/projecteditor/client/editor/ProjectScreenPresenter.java @@ -31,7 +31,6 @@ import org.jboss.errai.common.client.api.Caller; import org.jboss.errai.common.client.api.RemoteCallback; import org.kie.workbench.common.screens.projecteditor.client.resources.ProjectEditorResources; -import org.kie.workbench.common.screens.projecteditor.client.validation.KModuleValidator; import org.kie.workbench.common.screens.projecteditor.model.ProjectScreenModel; import org.kie.workbench.common.screens.projecteditor.service.ProjectScreenService; import org.kie.workbench.common.widgets.client.callbacks.HasBusyIndicatorDefaultErrorCallback; @@ -315,26 +314,19 @@ public void callback( Void v ) { }; } - private void saveProject( final RemoteCallback callback ) { - KModuleValidator kModuleValidator = new KModuleValidator( ProjectEditorResources.CONSTANTS ); - kModuleValidator.validate( model.getKModule() ); - - if ( !kModuleValidator.hasErrors() ) { - saveOperationService.save( pathToPomXML, - new CommandWithCommitMessage() { - @Override - public void execute( final String comment ) { + private void saveProject(final RemoteCallback callback) { + saveOperationService.save(pathToPomXML, + new CommandWithCommitMessage() { + @Override + public void execute(final String comment) { - view.showBusyIndicator( CommonConstants.INSTANCE.Saving() ); + view.showBusyIndicator(CommonConstants.INSTANCE.Saving()); - projectScreenService.call( callback, - new HasBusyIndicatorDefaultErrorCallback( view ) ).save( pathToPomXML, model, comment ); + projectScreenService.call(callback, + new HasBusyIndicatorDefaultErrorCallback(view)).save(pathToPomXML, model, comment); - } - } ); - } else { - ErrorPopup.showMessage( kModuleValidator.getErrorsString() ); - } + } + }); } private RemoteCallback getBuildSuccessCallback() { diff --git a/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-client/src/main/java/org/kie/workbench/common/screens/projecteditor/client/resources/i18n/ProjectEditorConstants.java b/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-client/src/main/java/org/kie/workbench/common/screens/projecteditor/client/resources/i18n/ProjectEditorConstants.java index 3eae71bbcbc..ff813400a5c 100644 --- a/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-client/src/main/java/org/kie/workbench/common/screens/projecteditor/client/resources/i18n/ProjectEditorConstants.java +++ b/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-client/src/main/java/org/kie/workbench/common/screens/projecteditor/client/resources/i18n/ProjectEditorConstants.java @@ -196,8 +196,6 @@ public interface ProjectEditorConstants String NewProjectWizard(); - String AKModuleMustHaveAtLeastOneDefaultKBasePleaseAddOne(); - String IncludedKnowledgeBases(); String Stateful(); diff --git a/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-client/src/main/java/org/kie/workbench/common/screens/projecteditor/client/validation/KModuleValidator.java b/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-client/src/main/java/org/kie/workbench/common/screens/projecteditor/client/validation/KModuleValidator.java deleted file mode 100644 index a941d83116c..00000000000 --- a/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-client/src/main/java/org/kie/workbench/common/screens/projecteditor/client/validation/KModuleValidator.java +++ /dev/null @@ -1,65 +0,0 @@ -package org.kie.workbench.common.screens.projecteditor.client.validation; - -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.guvnor.common.services.project.model.KBaseModel; -import org.guvnor.common.services.project.model.KModuleModel; -import org.guvnor.common.services.project.model.KSessionModel; -import org.kie.workbench.common.screens.projecteditor.client.resources.i18n.ProjectEditorConstants; - -public class KModuleValidator { - - private final ProjectEditorConstants constants; - - private Set errors = new HashSet(); - - public KModuleValidator(ProjectEditorConstants constants) { - this.constants = constants; - } - - public void validate(KModuleModel kModule) { - - if (kModule.getKBases().isEmpty()) { - return; - } - - hasDefaultKBase(kModule.getKBases()); - - for (KBaseModel kBase : kModule.getKBases().values()) { - hasOnlyOneOfEachDefaultKSession(kBase.getKSessions()); - } - } - - private void hasOnlyOneOfEachDefaultKSession(List kSessions) { - //TODO: -Rikkola- - } - - private void hasDefaultKBase(Map kBases) { - boolean hasDefault = false; - for (KBaseModel kbase : kBases.values()) { - if (kbase.isDefault()) { - hasDefault = true; - break; - } - } - - if (!hasDefault) { - errors.add(constants.AKModuleMustHaveAtLeastOneDefaultKBasePleaseAddOne()); - } - } - - public boolean hasErrors() { - return !errors.isEmpty(); - } - - public String getErrorsString() { - String list = ""; - for (String line : errors) { - list += line + "\n"; - } - return list; - } -} diff --git a/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-client/src/main/resources/org/kie/workbench/common/screens/projecteditor/client/resources/i18n/ProjectEditorConstants.properties b/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-client/src/main/resources/org/kie/workbench/common/screens/projecteditor/client/resources/i18n/ProjectEditorConstants.properties index e0fe2737aab..8284a5dba43 100644 --- a/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-client/src/main/resources/org/kie/workbench/common/screens/projecteditor/client/resources/i18n/ProjectEditorConstants.properties +++ b/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-client/src/main/resources/org/kie/workbench/common/screens/projecteditor/client/resources/i18n/ProjectEditorConstants.properties @@ -103,7 +103,6 @@ KnowledgeBasesAndSessions=Knowledge bases and sessions BracketDefaultBracket=(default) Packages=Packages NewProjectWizard=New Project Wizard -AKModuleMustHaveAtLeastOneDefaultKBasePleaseAddOne=A KModule must have at least one default KBase. Please add one. IncludedKnowledgeBases=Included Knowledge Bases Stateful=Stateful Stateless=Stateless diff --git a/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-client/src/test/java/org/kie/workbench/common/screens/projecteditor/client/validation/KModuleValidatorTest.java b/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-client/src/test/java/org/kie/workbench/common/screens/projecteditor/client/validation/KModuleValidatorTest.java deleted file mode 100644 index e6fe509a35b..00000000000 --- a/kie-wb-common-screens/kie-wb-common-project-editor/kie-wb-common-project-editor-client/src/test/java/org/kie/workbench/common/screens/projecteditor/client/validation/KModuleValidatorTest.java +++ /dev/null @@ -1,67 +0,0 @@ -package org.kie.workbench.common.screens.projecteditor.client.validation; - -import org.guvnor.common.services.project.model.KBaseModel; -import org.guvnor.common.services.project.model.KModuleModel; -import org.guvnor.common.services.project.model.KSessionModel; -import org.junit.Before; -import org.junit.Test; -import org.kie.workbench.common.screens.projecteditor.client.resources.i18n.ProjectEditorConstants; - -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; - -public class KModuleValidatorTest { - - private KModuleModel kModule; - private KModuleValidator validator; - private ProjectEditorConstants constants; - - @Before - public void setUp() throws Exception { - constants = mock(ProjectEditorConstants.class); - validator = new KModuleValidator(constants); - kModule = new KModuleModel(); - } - - @Test - public void testValidateEmptyKModule() throws Exception { - validator.validate(kModule); - assertFalse(validator.hasErrors()); - } - - @Test - public void testValidateWorkingKModule() throws Exception { - KBaseModel kBaseModel = new KBaseModel(); - kBaseModel.setDefault(true); - kModule.getKBases().put("test", kBaseModel); - - validator.validate(kModule); - - assertFalse(validator.hasErrors()); - } - - @Test - public void testValidateFailingKModule() throws Exception { - KBaseModel kBaseModel = new KBaseModel(); - kBaseModel.setDefault(false); - kModule.getKBases().put("test", kBaseModel); - - validator.validate(kModule); - - assertTrue(validator.hasErrors()); - verify(constants).AKModuleMustHaveAtLeastOneDefaultKBasePleaseAddOne(); - } - - @Test - public void testHasOnlyOneDefaultStatelessKSession() throws Exception { - KBaseModel kBaseModel = new KBaseModel(); - kBaseModel.setDefault(true); - kModule.getKBases().put("tets", kBaseModel); - - KSessionModel kSessionModel = new KSessionModel(); - kSessionModel.setDefault(true); - kBaseModel.getKSessions().add(kSessionModel); - - assertFalse(validator.hasErrors()); - } -}