mooli tayer has uploaded a new change for review. Change subject: aaa: remove exceptional AdminDomain logic from domain sorting. ......................................................................
aaa: remove exceptional AdminDomain logic from domain sorting. Change-Id: I48ff93e74960c082bdd2dce1b15193272946d503 Topic: AAA Signed-off-by: Mooli Tayer <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDomainListQuery.java D backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginDomainComparator.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetDomainListQueryTest.java D backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LoginDomainComparatorTest.java D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetDomainListParameters.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainsResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUsersResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceTest.java 9 files changed, 13 insertions(+), 191 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/15/30015/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDomainListQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDomainListQuery.java index ccc1f19..0d42781 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDomainListQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetDomainListQuery.java @@ -7,23 +7,19 @@ import org.ovirt.engine.api.extensions.aaa.Authz; import org.ovirt.engine.core.aaa.AuthzUtils; -import org.ovirt.engine.core.common.config.Config; -import org.ovirt.engine.core.common.config.ConfigValues; -import org.ovirt.engine.core.common.queries.GetDomainListParameters; +import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; import org.ovirt.engine.core.extensions.mgr.ExtensionProxy; import org.ovirt.engine.core.extensions.mgr.ExtensionsManager; import org.ovirt.engine.core.utils.extensionsmgr.EngineExtensionsManager; -public class GetDomainListQuery<P extends GetDomainListParameters> extends QueriesCommandBase<P> { +public class GetDomainListQuery<P extends VdcQueryParametersBase> extends QueriesCommandBase<P> { + public GetDomainListQuery(P parameters) { super(parameters); } @Override protected void executeQueryCommand() { - // Get the name of the internal domain: - String internal = Config.<String> getValue(ConfigValues.AdminDomain); - // Get the list of authentication profile names: List<ExtensionProxy> extensions = getExtensionsManager().getExtensionsByService(Authz.class.getName()); @@ -31,12 +27,7 @@ for (ExtensionProxy extension : extensions) { names.add(AuthzUtils.getName(extension)); } - if (getParameters().getFilterInternalDomain()) { - names.remove(internal); - } - - // Sort it so that the internal profile is always the last: - sort(names, new LoginDomainComparator(internal)); + sort(names); // Return the sorted list: getQueryReturnValue().setReturnValue(names); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginDomainComparator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginDomainComparator.java deleted file mode 100644 index a7a2a1e..0000000 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LoginDomainComparator.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.ovirt.engine.core.bll; - -import java.io.Serializable; -import java.util.Comparator; - -/** - * Used to sort the login domain list on the login page. Business rule is sort alphabetically, - * but put "internal" at the end. - */ -public class LoginDomainComparator implements Comparator<String>, Serializable { - - private static final long serialVersionUID = -1679928871675563671L; - - private String internal; - - public LoginDomainComparator(String internal) { - this.internal = internal; - } - - @Override - public int compare(String a, String b) { - if (a == b) return 0; - if (a == null) return -1; - if (b == null) return 1; - if (a.equals(internal)) return 1; - if (b.equals(internal)) return -1; - return a.compareTo(b); - } - -} diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetDomainListQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetDomainListQueryTest.java index ea63a7b..c454d46 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetDomainListQueryTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetDomainListQueryTest.java @@ -3,7 +3,6 @@ import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; -import static org.ovirt.engine.core.utils.MockConfigRule.mockConfig; import java.util.ArrayList; import java.util.Arrays; @@ -12,22 +11,19 @@ import org.apache.commons.collections.CollectionUtils; import org.junit.Before; -import org.junit.ClassRule; import org.junit.Test; import org.ovirt.engine.api.extensions.Base; import org.ovirt.engine.api.extensions.ExtMap; import org.ovirt.engine.api.extensions.aaa.Authz; -import org.ovirt.engine.core.common.config.ConfigValues; -import org.ovirt.engine.core.common.queries.GetDomainListParameters; +import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; import org.ovirt.engine.core.extensions.mgr.ExtensionProxy; -import org.ovirt.engine.core.utils.MockConfigRule; import org.ovirt.engine.core.utils.extensionsmgr.EngineExtensionsManager; /** * A test case for the {@link GetDomainListQuery} class. */ public class GetDomainListQueryTest - extends AbstractQueryTest<GetDomainListParameters, GetDomainListQuery<GetDomainListParameters>> { + extends AbstractQueryTest<VdcQueryParametersBase, GetDomainListQuery<VdcQueryParametersBase>> { private static class MockEngineExtensionsManager extends EngineExtensionsManager { @@ -59,11 +55,6 @@ private MockEngineExtensionsManager extMgr = new MockEngineExtensionsManager(); - @ClassRule - public static final MockConfigRule MCR = new MockConfigRule( - mockConfig(ConfigValues.AdminDomain, INTERNAL) - ); - @Before @Override public void setUp() throws Exception { @@ -91,25 +82,7 @@ } @Test - public void testImplicitNoFilter() { - getQuery().executeQueryCommand(); - assertTrue("Wrong filtered domains", CollectionUtils.isEqualCollection( - (Collection<String>) getQuery().getQueryReturnValue().getReturnValue(), - Arrays.asList("aaa", "internal", "zzz"))); - } - - @Test - public void testFilter() { - doReturn(true).when(getQueryParameters()).getFilterInternalDomain(); - getQuery().executeQueryCommand(); - assertTrue("Wrong filtered domains", CollectionUtils.isEqualCollection( - (Collection<String>) getQuery().getQueryReturnValue().getReturnValue(), - Arrays.asList("aaa", "zzz"))); - } - - @Test - public void testExplicitNoFilter() { - doReturn(false).when(getQueryParameters()).getFilterInternalDomain(); + public void test() { getQuery().executeQueryCommand(); assertTrue("Wrong filtered domains", CollectionUtils.isEqualCollection( (Collection<String>) getQuery().getQueryReturnValue().getReturnValue(), diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LoginDomainComparatorTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LoginDomainComparatorTest.java deleted file mode 100644 index 6cdf81b..0000000 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LoginDomainComparatorTest.java +++ /dev/null @@ -1,89 +0,0 @@ -package org.ovirt.engine.core.bll; - -import static org.junit.Assert.assertEquals; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; - -@RunWith(MockitoJUnitRunner.class) -public class LoginDomainComparatorTest { - - @Test - public void testCompareWithoutInternal() { - List<String> list = new ArrayList<String>(); - list.add("a1"); - list.add("b1"); - list.add("c1"); - list.add("d1"); - list.add("a2"); - Collections.sort(list, new LoginDomainComparator("internal")); - assertEquals("a1", list.get(0)); - assertEquals("a2", list.get(1)); - assertEquals("b1", list.get(2)); - assertEquals("c1", list.get(3)); - assertEquals("d1", list.get(4)); - } - - @Test - public void testCompareWithInternal() { - List<String> list = new ArrayList<String>(); - list.add("a1"); - list.add("b1"); - list.add("internal"); - list.add("c1"); - list.add("d1"); - list.add("a2"); - Collections.sort(list, new LoginDomainComparator("internal")); - assertEquals("a1", list.get(0)); - assertEquals("a2", list.get(1)); - assertEquals("b1", list.get(2)); - assertEquals("c1", list.get(3)); - assertEquals("d1", list.get(4)); - assertEquals("internal", list.get(5)); - } - - @Test - public void testCompareWithTwoInternal() { - List<String> list = new ArrayList<String>(); - list.add("a1"); - list.add("b1"); - list.add("internal"); - list.add("c1"); - list.add("d1"); - list.add("internal"); - list.add("a2"); - Collections.sort(list, new LoginDomainComparator("internal")); - assertEquals("a1", list.get(0)); - assertEquals("a2", list.get(1)); - assertEquals("b1", list.get(2)); - assertEquals("c1", list.get(3)); - assertEquals("d1", list.get(4)); - assertEquals("internal", list.get(5)); - assertEquals("internal", list.get(6)); - } - - @Test - public void testCompareWithNulls() { - List<String> list = new ArrayList<String>(); - list.add(null); - list.add(null); - list.add("internal"); - list.add("c1"); - list.add("d1"); - list.add("internal"); - list.add("a2"); - Collections.sort(list, new LoginDomainComparator("internal")); - assertEquals(null, list.get(0)); - assertEquals(null, list.get(1)); - assertEquals("a2", list.get(2)); - assertEquals("c1", list.get(3)); - assertEquals("d1", list.get(4)); - assertEquals("internal", list.get(5)); - assertEquals("internal", list.get(6)); - } -} diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetDomainListParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetDomainListParameters.java deleted file mode 100644 index c22e0fd..0000000 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetDomainListParameters.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ovirt.engine.core.common.queries; - -public class GetDomainListParameters extends VdcQueryParametersBase{ - private boolean filterInternalDomain; - - public GetDomainListParameters() { - } - - public GetDomainListParameters(boolean filterInternalDomain) { - this.setFilterInternalDomain(filterInternalDomain); - } - - public void setFilterInternalDomain(boolean filterInternalDomain) { - this.filterInternalDomain = filterInternalDomain; - } - - public boolean getFilterInternalDomain() { - return filterInternalDomain; - } - -} diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainsResource.java index 00c1767..3a38e33 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainsResource.java @@ -12,7 +12,7 @@ import org.ovirt.engine.api.resource.DomainResource; import org.ovirt.engine.api.resource.DomainsResource; import org.ovirt.engine.api.restapi.model.Directory; -import org.ovirt.engine.core.common.queries.GetDomainListParameters; +import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.compat.Guid; @@ -62,7 +62,7 @@ return getBackendCollection( String.class, VdcQueryType.GetDomainList, - new GetDomainListParameters()); + new VdcQueryParametersBase()); } public Domain lookupDirectoryById(String id, boolean addlinks) { diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResource.java index 7f14465..ac0dd52 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResource.java @@ -20,7 +20,6 @@ import org.ovirt.engine.core.common.businessentities.DbGroup; import org.ovirt.engine.core.common.interfaces.SearchType; import org.ovirt.engine.core.common.queries.DirectoryIdQueryParameters; -import org.ovirt.engine.core.common.queries.GetDomainListParameters; import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; import org.ovirt.engine.core.common.queries.VdcQueryType; @@ -77,7 +76,7 @@ List<String> domains = getBackendCollection( String.class, VdcQueryType.GetDomainList, - new GetDomainListParameters()); + new VdcQueryParametersBase()); for (String domain :domains) { Guid domainId = new Guid(domain.getBytes(), true); if (domainId.toString().equals(group.getDomain().getId())) { diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUsersResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUsersResource.java index 751d092..699d8cd 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUsersResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendUsersResource.java @@ -21,7 +21,6 @@ import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.DbUser; import org.ovirt.engine.core.common.interfaces.SearchType; -import org.ovirt.engine.core.common.queries.GetDomainListParameters; import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; import org.ovirt.engine.core.common.queries.VdcQueryType; @@ -85,7 +84,7 @@ List<String> domains = getBackendCollection( String.class, VdcQueryType.GetDomainList, - new GetDomainListParameters()); + new VdcQueryParametersBase()); for (String domain :domains) { Guid domainId = asGuid(domain.getBytes(), true); if (domainId.toString().equals(user.getDomain().getId())) { diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceTest.java index 021045b..6d570fa 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUsersResourceTest.java @@ -20,8 +20,8 @@ import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.DbUser; import org.ovirt.engine.core.common.interfaces.SearchType; -import org.ovirt.engine.core.common.queries.GetDomainListParameters; import org.ovirt.engine.core.common.queries.IdQueryParameters; +import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.compat.Guid; @@ -150,7 +150,7 @@ @Test public void testAddUser_4() throws Exception { setUpEntityQueryExpectations(VdcQueryType.GetDomainList, - GetDomainListParameters.class, + VdcQueryParametersBase.class, new String[] { }, new Object[] { }, setUpDomains()); -- To view, visit http://gerrit.ovirt.org/30015 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I48ff93e74960c082bdd2dce1b15193272946d503 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: mooli tayer <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
