Yair Zaslavsky has uploaded a new change for review. Change subject: aaa: Change return types of signatures from ExtensionProxy to Extension ......................................................................
aaa: Change return types of signatures from ExtensionProxy to Extension Change return types of signatures from ExtensionProxy to Extension where possible. This save one cast at AuthenticationProfileRepository Change-Id: I248a84ad2461ff26a2eb0979040c0a1e0316bd22 Topic: AAA Signed-off-by: Yair Zaslavsky <[email protected]> --- M backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthenticationProfileRepository.java M backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManager.java 2 files changed, 9 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/42/26442/1 diff --git a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthenticationProfileRepository.java b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthenticationProfileRepository.java index b0b846a..126401b 100644 --- a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthenticationProfileRepository.java +++ b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/AuthenticationProfileRepository.java @@ -82,8 +82,8 @@ for (ExtensionProxy authnExtension : ExtensionsManager.getInstance().getProvidedExtensions(AUTHN_SERVICE)) { registerProfile( new AuthenticationProfile( - (Authenticator) (Extension) authnExtension, - (Directory) (Extension) ExtensionsManager.getInstance().getExtensionByName( + (Authenticator) authnExtension, + (Directory) ExtensionsManager.getInstance().getExtensionByName( authnExtension.getContext().<Properties>get(Base.ContextKeys.CONFIGURATION).getProperty( AUTHN_AUTHZ_PLUGIN ) diff --git a/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManager.java b/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManager.java index 7a03590..58edb51 100644 --- a/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManager.java +++ b/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManager.java @@ -18,14 +18,13 @@ import org.jboss.modules.ModuleIdentifier; import org.jboss.modules.ModuleLoadException; import org.jboss.modules.ModuleLoader; +import org.ovirt.engine.api.extensions.Base; +import org.ovirt.engine.api.extensions.ExtKey; +import org.ovirt.engine.api.extensions.ExtMap; +import org.ovirt.engine.api.extensions.Extension; import org.ovirt.engine.core.utils.EngineLocalConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import org.ovirt.engine.api.extensions.Base; -import org.ovirt.engine.api.extensions.ExtMap; -import org.ovirt.engine.api.extensions.ExtKey; -import org.ovirt.engine.api.extensions.Extension; /** * This class is responsible for loading the required {@code Configuration} in order to create an extension. It holds * the logic of ordering and solving conflicts during loading the configuration @@ -77,8 +76,8 @@ return instance; } - public List<ExtensionProxy> getProvidedExtensions(String provides) { - List<ExtensionProxy> results = new ArrayList<>(); + public List<Extension> getProvidedExtensions(String provides) { + List<Extension> results = new ArrayList<>(); for (ExtensionEntry entry : loadedEntries.values()) { if (entry.activated && entry.extension.getContext().<List>get(Base.ContextKeys.PROVIDES).contains(provides)) { results.add(entry.extension); @@ -87,7 +86,7 @@ return results; } - public ExtensionProxy getExtensionByName(String name) throws ConfigurationException { + public Extension getExtensionByName(String name) throws ConfigurationException { ExtensionEntry entry = loadedEntries.get(name); if (entry == null) { throw new ConfigurationException(String.format( -- To view, visit http://gerrit.ovirt.org/26442 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I248a84ad2461ff26a2eb0979040c0a1e0316bd22 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
