Repository: syncope Updated Branches: refs/heads/2_0_X 70e3dbed0 -> a11cfa3f6
restores method removed by a previous commit, maybe accidentally + console alignment to the new names of some TO fields: TO field name change frequently affects the console pages. Please be carefully Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/a11cfa3f Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/a11cfa3f Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/a11cfa3f Branch: refs/heads/2_0_X Commit: a11cfa3f6ce8b86871fd47a309613d7f9b57f130 Parents: 70e3dbe Author: fmartelli <[email protected]> Authored: Thu Jul 20 16:18:14 2017 +0200 Committer: fmartelli <[email protected]> Committed: Thu Jul 20 16:18:47 2017 +0200 ---------------------------------------------------------------------- .../panels/TypeExtensionDirectoryPanel.java | 2 +- .../console/rest/AbstractAnyRestClient.java | 5 +++ .../status/ResourceStatusDirectoryPanel.java | 4 +-- .../console/status/ResourceStatusModal.java | 4 +-- .../syncope/fit/console/BulkActionITCase.java | 32 ++++++++++---------- .../syncope/fit/console/TopologyITCase.java | 2 +- 6 files changed, 27 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/a11cfa3f/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java index 7b5f682..a5a0a66 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java @@ -174,7 +174,7 @@ public class TypeExtensionDirectoryPanel public TypeExtensionDataProvider(final int paginatorRows) { super(paginatorRows); - setSort("anyKey", SortOrder.ASCENDING); + setSort("anyType", SortOrder.ASCENDING); } @Override http://git-wip-us.apache.org/repos/asf/syncope/blob/a11cfa3f/client/console/src/main/java/org/apache/syncope/client/console/rest/AbstractAnyRestClient.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/AbstractAnyRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/AbstractAnyRestClient.java index 1386e62..9d7d1d7 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/rest/AbstractAnyRestClient.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/AbstractAnyRestClient.java @@ -28,6 +28,7 @@ import org.apache.syncope.common.lib.patch.AssociationPatch; import org.apache.syncope.common.lib.patch.DeassociationPatch; import org.apache.syncope.common.lib.patch.StatusPatch; import org.apache.syncope.common.lib.to.AnyTO; +import org.apache.syncope.common.lib.to.BulkAction; import org.apache.syncope.common.lib.to.BulkActionResult; import org.apache.syncope.common.lib.to.ProvisioningResult; import org.apache.syncope.common.lib.types.ResourceAssociationAction; @@ -187,4 +188,8 @@ public abstract class AbstractAnyRestClient<TO extends AnyTO, P extends AnyPatch } return result; } + + public BulkActionResult bulkAction(final BulkAction action) { + return getService(getAnyServiceClass()).bulk(action).readEntity(BulkActionResult.class); + } } http://git-wip-us.apache.org/repos/asf/syncope/blob/a11cfa3f/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusDirectoryPanel.java index 2844a74..041305e 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusDirectoryPanel.java @@ -75,7 +75,7 @@ public class ResourceStatusDirectoryPanel this.multiLevelPanelRef = multiLevelPanelRef; this.type = type; this.resourceTO = resourceTO; - this.itemKeyFieldName = "anyKey"; + this.itemKeyFieldName = "key"; initResultTable(); } @@ -90,7 +90,7 @@ public class ResourceStatusDirectoryPanel final List<IColumn<StatusBean, String>> columns = new ArrayList<>(); columns.add(new PropertyColumn<StatusBean, String>( - new StringResourceModel("anyKey", this), "anyKey", "anyKey")); + new StringResourceModel("key", this), "key", "key")); columns.add(new PropertyColumn<StatusBean, String>( new StringResourceModel("connObjectLink", this), "connObjectLink", "connObjectLink")); http://git-wip-us.apache.org/repos/asf/syncope/blob/a11cfa3f/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusModal.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusModal.java b/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusModal.java index 508217a..18bdd0f 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusModal.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusModal.java @@ -22,9 +22,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.Transformer; import org.apache.syncope.client.console.commons.Constants; import org.apache.syncope.client.console.commons.DirectoryDataProvider; +import org.apache.syncope.client.console.commons.SerializableTransformer; import org.apache.syncope.client.console.commons.status.StatusBean; import org.apache.syncope.client.console.panels.DirectoryPanel; import org.apache.syncope.client.console.panels.MultilevelPanel; @@ -53,7 +53,7 @@ public class ResourceStatusModal extends StatusModal<ResourceTO> { super(baseModal, pageReference, resource, null, false); List<String> availableAnyTypes = CollectionUtils.collect( - resource.getProvisions(), new Transformer<ProvisionTO, String>() { + resource.getProvisions(), new SerializableTransformer<ProvisionTO, String>() { @Override public String transform(final ProvisionTO provision) { http://git-wip-us.apache.org/repos/asf/syncope/blob/a11cfa3f/fit/core-reference/src/test/java/org/apache/syncope/fit/console/BulkActionITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/BulkActionITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/BulkActionITCase.java index a57980a..a55bf67 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/BulkActionITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/BulkActionITCase.java @@ -85,7 +85,7 @@ public class BulkActionITCase extends AbstractConsoleITCase { + "firstLevelContainer:first:container:content:searchContainer:resultTable:tablePanel:groupForm:" + "checkgroup:dataTable", WebMarkupContainer.class); - component = findComponentByProp("resourceName", + component = findComponentByProp("resource", TAB_PANEL + "outerObjectsRepeater:2:outer:form:content:status:" + "firstLevelContainer:first:container:content:searchContainer:resultTable:tablePanel:groupForm:" + "checkgroup:dataTable", "resource-csv"); @@ -105,7 +105,7 @@ public class BulkActionITCase extends AbstractConsoleITCase { TESTER.assertComponent(TAB_PANEL + "outerObjectsRepeater:2:outer:form:content:status:" + "secondLevelContainer:second:container", WebMarkupContainer.class); - assertNotNull(findComponentByProp("resourceName", TAB_PANEL + "outerObjectsRepeater:2:outer:" + assertNotNull(findComponentByProp("resource", TAB_PANEL + "outerObjectsRepeater:2:outer:" + "form:content:status:secondLevelContainer:second:container", "resource-csv")); } @@ -119,7 +119,7 @@ public class BulkActionITCase extends AbstractConsoleITCase { userStatusBulkAction(0, "Syncope"); } - private void userStatusBulkAction(final int index, final String resourceName) { + private void userStatusBulkAction(final int index, final String resource) { // suspend TESTER.clickLink("body:realmsLI:realms"); TESTER.clickLink("body:content:body:container:content:tabbedPanel:tabs-container:tabs:1:link"); @@ -138,13 +138,13 @@ public class BulkActionITCase extends AbstractConsoleITCase { + "firstLevelContainer:first:container:content:searchContainer:resultTable:tablePanel:groupForm:" + "checkgroup:dataTable", WebMarkupContainer.class); - component = findComponentByProp("resourceName", + component = findComponentByProp("resource", TAB_PANEL + "outerObjectsRepeater:2:outer:form:content:status:firstLevelContainer:first:container:" - + "content:searchContainer:resultTable:tablePanel:groupForm:checkgroup:dataTable", resourceName); + + "content:searchContainer:resultTable:tablePanel:groupForm:checkgroup:dataTable", resource); component = TESTER.getComponentFromLastRenderedPage(component.getPageRelativePath() + ":cells:1:cell:check"); assertEquals(Status.ACTIVE, StatusBean.class.cast(component.getDefaultModelObject()).getStatus()); - assertEquals(resourceName, StatusBean.class.cast(component.getDefaultModelObject()).getResource()); + assertEquals(resource, StatusBean.class.cast(component.getDefaultModelObject()).getResource()); FormTester formTester = TESTER.newFormTester( TAB_PANEL + "outerObjectsRepeater:2:outer:form:content:status:firstLevelContainer:" @@ -175,13 +175,13 @@ public class BulkActionITCase extends AbstractConsoleITCase { + "outerObjectsRepeater:2:outer:form:content:status:secondLevelContainer:back", Constants.ON_CLICK); - component = findComponentByProp("resourceName", + component = findComponentByProp("resource", TAB_PANEL + "outerObjectsRepeater:2:outer:form:content:status:firstLevelContainer:first:container:" - + "content:searchContainer:resultTable:tablePanel:groupForm:checkgroup:dataTable", resourceName); + + "content:searchContainer:resultTable:tablePanel:groupForm:checkgroup:dataTable", resource); component = TESTER.getComponentFromLastRenderedPage(component.getPageRelativePath() + ":cells:1:cell:check"); assertEquals(Status.SUSPENDED, StatusBean.class.cast(component.getDefaultModelObject()).getStatus()); - assertEquals(resourceName, StatusBean.class.cast(component.getDefaultModelObject()).getResource()); + assertEquals(resource, StatusBean.class.cast(component.getDefaultModelObject()).getResource()); // re-activate TESTER.clickLink("body:realmsLI:realms"); @@ -230,13 +230,13 @@ public class BulkActionITCase extends AbstractConsoleITCase { + "outerObjectsRepeater:2:outer:form:content:status:secondLevelContainer:back", Constants.ON_CLICK); - component = findComponentByProp("resourceName", + component = findComponentByProp("resource", TAB_PANEL + "outerObjectsRepeater:2:outer:form:content:status:firstLevelContainer:first:container:" - + "content:searchContainer:resultTable:tablePanel:groupForm:checkgroup:dataTable", resourceName); + + "content:searchContainer:resultTable:tablePanel:groupForm:checkgroup:dataTable", resource); component = TESTER.getComponentFromLastRenderedPage(component.getPageRelativePath() + ":cells:1:cell:check"); assertEquals(Status.ACTIVE, StatusBean.class.cast(component.getDefaultModelObject()).getStatus()); - assertEquals(resourceName, StatusBean.class.cast(component.getDefaultModelObject()).getResource()); + assertEquals(resource, StatusBean.class.cast(component.getDefaultModelObject()).getResource()); TESTER.executeAjaxEvent(TAB_PANEL + "outerObjectsRepeater:2:outer:dialog:footer:buttons:0:button", Constants.ON_CLICK); @@ -265,7 +265,7 @@ public class BulkActionITCase extends AbstractConsoleITCase { + "container:content:searchContainer:resultTable:tablePanel:groupForm:checkgroup:dataTable:topToolbars:" + "toolbars:1:headers:2:header:orderByLink", true); - component = findComponentByProp("resourceName", + component = findComponentByProp("resource", TAB_PANEL + "outerObjectsRepeater:2:outer:form:content:status:" + "firstLevelContainer:first:container:content:searchContainer:resultTable:tablePanel:groupForm:" + "checkgroup:dataTable", "ws-target-resource-1"); @@ -285,7 +285,7 @@ public class BulkActionITCase extends AbstractConsoleITCase { TESTER.assertComponent(TAB_PANEL + "outerObjectsRepeater:2:outer:form:content:status:" + "secondLevelContainer:second:container", WebMarkupContainer.class); - assertNotNull(findComponentByProp("resourceName", TAB_PANEL + "outerObjectsRepeater:2:outer:" + assertNotNull(findComponentByProp("resource", TAB_PANEL + "outerObjectsRepeater:2:outer:" + "form:content:status:secondLevelContainer:second:container:selectedObjects", "resource-testdb2")); } @@ -313,7 +313,7 @@ public class BulkActionITCase extends AbstractConsoleITCase { + "container:content:searchContainer:resultTable:tablePanel:groupForm:checkgroup:dataTable:topToolbars:" + "toolbars:1:headers:2:header:orderByLink", true); - component = findComponentByProp("resourceName", + component = findComponentByProp("resource", TAB_PANEL + "outerObjectsRepeater:2:outer:form:content:status:" + "firstLevelContainer:first:container:content:searchContainer:resultTable:tablePanel:groupForm:" + "checkgroup:dataTable", "ws-target-resource-1"); @@ -333,7 +333,7 @@ public class BulkActionITCase extends AbstractConsoleITCase { TESTER.assertComponent(TAB_PANEL + "outerObjectsRepeater:2:outer:form:content:status:" + "secondLevelContainer:second:container", WebMarkupContainer.class); - assertNotNull(findComponentByProp("resourceName", TAB_PANEL + "outerObjectsRepeater:2:outer:" + assertNotNull(findComponentByProp("resource", TAB_PANEL + "outerObjectsRepeater:2:outer:" + "form:content:status:secondLevelContainer:second:container:selectedObjects", "resource-testdb2")); } http://git-wip-us.apache.org/repos/asf/syncope/blob/a11cfa3f/fit/core-reference/src/test/java/org/apache/syncope/fit/console/TopologyITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/TopologyITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/TopologyITCase.java index 312b632..de883c8 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/TopologyITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/TopologyITCase.java @@ -95,7 +95,7 @@ public class TopologyITCase extends AbstractConsoleITCase { Constants.ON_CHANGE); formTester.setValue("content:anyTypes:dropDownChoiceField", "0"); - component = findComponentByProp("anyKey", "body:toggle:outerObjectsRepeater:1:outer:form:content:status:" + component = findComponentByProp("key", "body:toggle:outerObjectsRepeater:1:outer:form:content:status:" + "firstLevelContainer:first:container:content:searchContainer:resultTable:tablePanel:groupForm:" + "checkgroup:dataTable", "b3cbc78d-32e6-4bd4-92e0-bbe07566a2ee");
