Yair Zaslavsky has uploaded a new change for review. Change subject: 8. [WIP] core: remove AuthenticationProfile[Factory/Manager] ......................................................................
8. [WIP] core: remove AuthenticationProfile[Factory/Manager] This patch removes AuthenticationProfile Factory and Manager as they became redundant due to AuthenticationProfileRepository Change-Id: Ibc218487b9a9a507785e261197cfa0556fd4f0b2 Signed-off-by: Yair Zaslavsky <[email protected]> --- D backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthenticationProfileFactory.java D backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthenticationProfileManager.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/DirectorySearchQueryTestBase.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetDomainListQueryTest.java 4 files changed, 6 insertions(+), 130 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/21/24721/1 diff --git a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthenticationProfileFactory.java b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthenticationProfileFactory.java deleted file mode 100644 index 9952256..0000000 --- a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthenticationProfileFactory.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.ovirt.engine.core.aaa; - -import org.ovirt.engine.core.extensions.mgr.Configuration; -import org.ovirt.engine.core.extensions.mgr.ConfigurationException; -import org.ovirt.engine.core.extensions.mgr.Factory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * An authentication profile is just a pair composed of an authenticator and a directory, so this class just looks up - * those two objects when the profile is created. - */ - -// TODO: remove this class later - it is replaced by AuthenticatorProfileRepository -public class AuthenticationProfileFactory implements Factory<AuthenticationProfile> { - private static final Logger log = LoggerFactory.getLogger(AuthenticationProfileFactory.class); - - // Names of the parameters: - private static final String AUTHENTICATOR_PARAMETER = "authenticator"; - private static final String DIRECTORY_PARAMETER = "directory"; - - /** - * {@inheritDoc} - */ - @Override - public String getType() { - return "default"; - } - - /** - * {@inheritDoc} - */ - @Override - public AuthenticationProfile create(Configuration config) throws ConfigurationException { - - // Create the authenticator: - Configuration authenticatorView = config.getView(AUTHENTICATOR_PARAMETER); - Authenticator authenticator = AuthenticatorManager.getInstance().parseAuthenticator(authenticatorView); - - // Create the directory: - Configuration directoryView = config.getView(DIRECTORY_PARAMETER); - Directory directory = DirectoryManager.getInstance().parseDirectory(directoryView); - - // Create the new profile: - return new AuthenticationProfile(authenticator, directory); - } -} diff --git a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthenticationProfileManager.java b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthenticationProfileManager.java deleted file mode 100644 index 7f664a8..0000000 --- a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthenticationProfileManager.java +++ /dev/null @@ -1,77 +0,0 @@ -package org.ovirt.engine.core.aaa; - -import java.util.List; - -import org.ovirt.engine.core.extensions.mgr.Configuration; -import org.ovirt.engine.core.extensions.mgr.Factory; -import org.ovirt.engine.core.extensions.mgr.Manager; - - - - -/** - * The authentication profile manager is responsible for managing a set of authentication profiles. - */ -public class AuthenticationProfileManager extends Manager<AuthenticationProfile> { - /** - * This is a singleton and this is the instance. - */ - private static AuthenticationProfileManager manager; - - static { - manager = new AuthenticationProfileManager(); - } - - /** - * Get an instance of the directory manager. - */ - public static AuthenticationProfileManager getInstance() { - return manager; - } - - - /** - * There is only one authenticator profile factory, and it isn't configurable. - */ - private AuthenticationProfileFactory factory; - - private AuthenticationProfileManager() { - super(AuthenticationProfileFactory.class); - factory = new AuthenticationProfileFactory(); - } - - /** - * This method is overridden because this manager doesn't need to find the factory class, it is always the same. - */ - @Override - protected Factory<AuthenticationProfile> findFactory(Configuration config) { - return factory; - } - - /** - * Returns an unmodifiable list containing all the authentication profiles that have been previously loaded. - */ - public List<AuthenticationProfile> getProfiles() { - return getObjects(); - } - - /** - * Gets the authentication profile for the given name. - * - * @param name the name of the profile - * @return the requested profile or {@code null} if no such profile can be found - */ - public AuthenticationProfile getProfile(String name) { - return getObject(name); - } - - /** - * Register an authentication profile. - * - * @param name the name of the profile - * @param profile the profile to register - */ - public void registerProfile(String name, AuthenticationProfile profile) { - registerObject(name, profile); - } -} diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/DirectorySearchQueryTestBase.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/DirectorySearchQueryTestBase.java index e86ec03..990f7ad 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/DirectorySearchQueryTestBase.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/DirectorySearchQueryTestBase.java @@ -9,7 +9,7 @@ import org.junit.ClassRule; import org.mockito.Mock; import org.ovirt.engine.core.aaa.AuthenticationProfile; -import org.ovirt.engine.core.aaa.AuthenticationProfileManager; +import org.ovirt.engine.core.aaa.AuthenticationProfileRepository; import org.ovirt.engine.core.aaa.Authenticator; import org.ovirt.engine.core.aaa.AuthenticatorManager; import org.ovirt.engine.core.aaa.Directory; @@ -46,13 +46,13 @@ doReturn(NAME).when(profileMock).getName(); doReturn(authenticatorMock).when(profileMock).getAuthenticator(); doReturn(directoryMock).when(profileMock).getDirectory(); - AuthenticationProfileManager.getInstance().registerProfile(NAME, profileMock); + AuthenticationProfileRepository.getInstance().registerProfile(profileMock); } @After public void tearDown() { AuthenticatorManager.getInstance().clear(); DirectoryManager.getInstance().clear(); - AuthenticationProfileManager.getInstance().clear(); + AuthenticationProfileRepository.getInstance().clear(); } } 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 64103ae..9fffe96 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 @@ -14,7 +14,7 @@ import org.junit.ClassRule; import org.junit.Test; import org.ovirt.engine.core.aaa.AuthenticationProfile; -import org.ovirt.engine.core.aaa.AuthenticationProfileManager; +import org.ovirt.engine.core.aaa.AuthenticationProfileRepository; import org.ovirt.engine.core.aaa.Authenticator; import org.ovirt.engine.core.aaa.AuthenticatorManager; import org.ovirt.engine.core.aaa.Directory; @@ -71,14 +71,14 @@ doReturn(name).when(profileMock).getName(); doReturn(directoryMock).when(profileMock).getDirectory(); doReturn(authenticatorMock).when(profileMock).getAuthenticator(); - AuthenticationProfileManager.getInstance().registerProfile(name, profileMock); + AuthenticationProfileRepository.getInstance().registerProfile(profileMock); } @After public void tearDown() { DirectoryManager.getInstance().clear(); AuthenticatorManager.getInstance().clear(); - AuthenticationProfileManager.getInstance().clear(); + AuthenticationProfileRepository.getInstance().clear(); } @Test -- To view, visit http://gerrit.ovirt.org/24721 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibc218487b9a9a507785e261197cfa0556fd4f0b2 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yair Zaslavsky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
