Alon Bar-Lev has uploaded a new change for review. Change subject: extapi: use collection instead of list ......................................................................
extapi: use collection instead of list primitive types are better, no real reason to use list in these. Topic: AAA Change-Id: I0555f7f10bae370c3605b5253cab09620ff770bb Signed-off-by: Alon Bar-Lev <[email protected]> --- M backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/NegotiationFilter.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/internal/InternalAuthn.java M backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthn.java M backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/Base.java M backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/aaa/Acct.java M backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/aaa/Authn.java M backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/aaa/Authz.java M backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManager.java 8 files changed, 39 insertions(+), 37 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/48/30248/1 diff --git a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/NegotiationFilter.java b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/NegotiationFilter.java index 0d6d157..d177614 100644 --- a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/NegotiationFilter.java +++ b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/NegotiationFilter.java @@ -3,6 +3,7 @@ import java.io.IOException; import java.util.ArrayDeque; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.Deque; import java.util.List; @@ -72,7 +73,7 @@ * stacks of profiles later when processing requests. */ private void findNegotiatingProfiles(ServletRequest req) { - List<String> schemes = new ArrayList<String>(); + Collection<String> schemes = new ArrayList<String>(); if (profiles == null) { synchronized (this) { if (profiles == null) { @@ -84,7 +85,7 @@ ExtMap authnContext = profile.getAuthn().getContext(); if ((authnContext.<Long> get(Authn.ContextKeys.CAPABILITIES).longValue() & caps) != 0) { profiles.add(0, profile); - schemes.addAll(authnContext.<List<String>>get(Authn.ContextKeys.HTTP_AUTHENTICATION_SCHEME, Collections.<String>emptyList())); + schemes.addAll(authnContext.<Collection<String>>get(Authn.ContextKeys.HTTP_AUTHENTICATION_SCHEME, Collections.<String>emptyList())); } } } diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/internal/InternalAuthn.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/internal/InternalAuthn.java index 0257ba6..811af90 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/internal/InternalAuthn.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/internal/InternalAuthn.java @@ -1,6 +1,6 @@ package org.ovirt.engine.extensions.aaa.builtin.internal; -import java.util.List; +import java.util.Collection; import java.util.Properties; import org.ovirt.engine.api.extensions.Base; import org.ovirt.engine.api.extensions.ExtMap; @@ -57,7 +57,7 @@ private void doLoad(ExtMap input, ExtMap output) { context = input.<ExtMap> get(Base.InvokeKeys.CONTEXT); - context.<List<String>> get( + context.<Collection<String>> get( Base.ContextKeys.CONFIGURATION_SENSITIVE_KEYS ).add("config.authn.user.password"); context.mput( diff --git a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthn.java b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthn.java index cbcc723..90b03bc 100644 --- a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthn.java +++ b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/kerberosldap/KerberosLdapAuthn.java @@ -1,6 +1,6 @@ package org.ovirt.engine.extensions.aaa.builtin.kerberosldap; -import java.util.List; +import java.util.Collection; import java.util.Properties; import org.ovirt.engine.api.extensions.Base; @@ -52,7 +52,7 @@ configuration = context.<Properties> get(Base.ContextKeys.CONFIGURATION); Utils.setDefaults(configuration, getAuthzName()); broker = LdapFactory.getInstance(getAuthzName()); - context.<List<String>> get( + context.<Collection<String>> get( Base.ContextKeys.CONFIGURATION_SENSITIVE_KEYS ).add("config.authn.user.password"); context.mput( diff --git a/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/Base.java b/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/Base.java index 2a4806b..e8ed109 100644 --- a/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/Base.java +++ b/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/Base.java @@ -1,6 +1,6 @@ package org.ovirt.engine.api.extensions; -import java.util.List; +import java.util.Collection; import java.util.Properties; /** @@ -157,7 +157,7 @@ * Loaded extension list. * @see ExtensionRecord */ - public static final ExtKey EXTENSIONS = new ExtKey("GLOBAL_EXTENSIONS", List/*<ExtMap>*/.class, "246498c0-2f4d-4135-8cb7-c5eabfd2f6ff"); + public static final ExtKey EXTENSIONS = new ExtKey("GLOBAL_EXTENSIONS", Collection/*<ExtMap>*/.class, "246498c0-2f4d-4135-8cb7-c5eabfd2f6ff"); /** * Application name. @@ -186,17 +186,17 @@ public static final ExtKey INTERFACE_VERSION_MAX = new ExtKey("EXTENSION_INTERFACE_VERSION_MAX", Integer.class, "f4cff49f-2717-4901-8ee9-df362446e3e7"); /** * Sensitive configuration keys. - * List of String. + * Collection of String. * Values should not be printed. */ - public static final ExtKey CONFIGURATION_SENSITIVE_KEYS = new ExtKey("EXTENSION_CONFIGURATION_SENSITIVE_KEYS", List/*<String>*/.class, "a456efa1-73ff-4204-9f9b-ebff01e35263"); + public static final ExtKey CONFIGURATION_SENSITIVE_KEYS = new ExtKey("EXTENSION_CONFIGURATION_SENSITIVE_KEYS", Collection/*<String>*/.class, "a456efa1-73ff-4204-9f9b-ebff01e35263"); /** Locale to use. */ public static final ExtKey LOCALE = new ExtKey("EXTENSION_LOCALE", String.class, "0780b112-0ce0-404a-b85e-8765d778bb29"); /** * Extensions' interfaces. - * List of String. + * Collection of String. */ - public static final ExtKey PROVIDES = new ExtKey("EXTENSION_PROVIDES", List/*<String>*/.class, "8cf373a6-65b5-4594-b828-0e275087de91"); + public static final ExtKey PROVIDES = new ExtKey("EXTENSION_PROVIDES", Collection/*<String>*/.class, "8cf373a6-65b5-4594-b828-0e275087de91"); /** Extension instance name. */ public static final ExtKey INSTANCE_NAME = new ExtKey("EXTENSION_INSTANCE_NAME", String.class, "65c67ff6-aeca-4bd5-a245-8674327f011b"); /** @@ -303,9 +303,9 @@ public static final ExtKey INSTANCE_NAME = new ExtKey("EXTENSION_RECORD_INSTANCE_NAME", String.class, "6e1f2c27-b89e-42bd-94c1-e709eb8ce0d4"); /** * Extensions' interfaces. - * List of String. + * Collection of String. */ - public static final ExtKey PROVIDES = new ExtKey("EXTENSION_RECORD_PROVIDES", List/*<String>*/.class, "701129bb-5956-427a-b962-6b1c1a13e4e7"); + public static final ExtKey PROVIDES = new ExtKey("EXTENSION_RECORD_PROVIDES", Collection/*<String>*/.class, "701129bb-5956-427a-b962-6b1c1a13e4e7"); } /** diff --git a/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/aaa/Acct.java b/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/aaa/Acct.java index e4cded4..46efd3b 100644 --- a/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/aaa/Acct.java +++ b/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/aaa/Acct.java @@ -1,6 +1,6 @@ package org.ovirt.engine.api.extensions.aaa; -import java.util.List; +import java.util.Collection; import org.ovirt.engine.api.extensions.ExtKey; import org.ovirt.engine.api.extensions.ExtMap; @@ -192,8 +192,8 @@ public static final ExtKey NAME = new ExtKey("AAA_ACCT_OPERATION_RECORD_NAME", String.class, "47d9102d-6c70-46f8-a2ec-1e4e728c213b"); /** * Parameters. - * List of {@link ExtMap}. + * Collection of {@link ExtMap}. */ - public static final ExtKey PARAMETERS = new ExtKey("AAA_ACCT_OPERATION_RECORD_PARAMETERS", List/*<ExtMap>*/.class, "e752f6c5-2806-44e2-a80d-3f283aa8b54d"); + public static final ExtKey PARAMETERS = new ExtKey("AAA_ACCT_OPERATION_RECORD_PARAMETERS", Collection/*<ExtMap>*/.class, "e752f6c5-2806-44e2-a80d-3f283aa8b54d"); } } diff --git a/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/aaa/Authn.java b/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/aaa/Authn.java index 3502897..9e38c12 100644 --- a/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/aaa/Authn.java +++ b/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/aaa/Authn.java @@ -1,6 +1,6 @@ package org.ovirt.engine.api.extensions.aaa; -import java.util.List; +import java.util.Collection; import org.ovirt.engine.api.extensions.ExtKey; import org.ovirt.engine.api.extensions.ExtMap; @@ -28,7 +28,7 @@ * (unauthorized) response message as a value of the * WWW-Authenticate header. */ - public static final ExtKey HTTP_AUTHENTICATION_SCHEME = new ExtKey("AAA_HTTP_AUTHENTICATION_SCHEME", List/*<String>*/.class, "c0a5c8b4-870b-436e-aeb9-1cd5307b2058"); + public static final ExtKey HTTP_AUTHENTICATION_SCHEME = new ExtKey("AAA_HTTP_AUTHENTICATION_SCHEME", Collection/*<String>*/.class, "c0a5c8b4-870b-436e-aeb9-1cd5307b2058"); } /** @@ -84,16 +84,16 @@ public static final ExtKey AUTH_RECORD = new ExtKey("AAA_AUTHN_AUTH_RECORD", ExtMap.class, "e9462168-b53b-44ac-9af5-f25e1697173e"); /** * Credentials challenge record. - * List of {@link ExtMap} + * Collection of {@link ExtMap} * @see CredentialsChallengeRecord */ - public static final ExtKey CREDENTIALS_CHALLENGE_RECORD = new ExtKey("AAA_AUTHN_CREDENTIALS_CHALLENGE_RECORD", List/*<ExtMap>*/.class, "c3fce607-4a07-43a5-986c-399cbdb5ac90"); + public static final ExtKey CREDENTIALS_CHALLENGE_RECORD = new ExtKey("AAA_AUTHN_CREDENTIALS_CHALLENGE_RECORD", Collection/*<ExtMap>*/.class, "c3fce607-4a07-43a5-986c-399cbdb5ac90"); /** * Credentials challenge response record. - * List of {@link ExtMap} + * Collection of {@link ExtMap} * @see CredentialsChallengeResponseRecord */ - public static final ExtKey CREDENTIALS_CHALLENGE_RESPONSE_RECORD = new ExtKey("AAA_AUTHN_CREDENTIALS_CHALLENGE_RESPONSE_RECORD", List/*<ExtMap>*/.class, "5b25f21e-f2df-4f50-a110-a60b360d67e8"); + public static final ExtKey CREDENTIALS_CHALLENGE_RESPONSE_RECORD = new ExtKey("AAA_AUTHN_CREDENTIALS_CHALLENGE_RESPONSE_RECORD", Collection/*<ExtMap>*/.class, "5b25f21e-f2df-4f50-a110-a60b360d67e8"); } /** diff --git a/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/aaa/Authz.java b/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/aaa/Authz.java index c483204..1975bf0 100644 --- a/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/aaa/Authz.java +++ b/backend/manager/modules/extensions-api-root/extensions-api/src/main/java/org/ovirt/engine/api/extensions/aaa/Authz.java @@ -1,6 +1,6 @@ package org.ovirt.engine.api.extensions.aaa; -import java.util.List; +import java.util.Collection; import org.ovirt.engine.api.extensions.ExtKey; import org.ovirt.engine.api.extensions.ExtMap; @@ -20,7 +20,7 @@ * Query can be done within the context of namespace, to avoid * scanning entire network. At least one namespace must be available. */ - public static final ExtKey AVAILABLE_NAMESPACES = new ExtKey("AAA_AUTHZ_AVAILABLE_NAMESPACES", List/*<String>*/.class, "6dffa34c-955f-486a-bd35-0a272b45a711"); + public static final ExtKey AVAILABLE_NAMESPACES = new ExtKey("AAA_AUTHZ_AVAILABLE_NAMESPACES", Collection/*<String>*/.class, "6dffa34c-955f-486a-bd35-0a272b45a711"); /** * Maximum query filter size. * Limit the number of entries within {@link InvokeKeys#QUERY_FILTER}. @@ -83,10 +83,10 @@ /** * Query result. * Execute query until no results. - * Output is List of {@link ExtMap}. + * Output is Collection of {@link ExtMap}. * Actual content depends on the query. */ - public static final ExtKey QUERY_RESULT = new ExtKey("AAA_AUTHZ_QUERY_RESULT", List/*<ExtMap>*/.class, "0cde6caf-b851-41cb-8de2-cd34327d7249"); + public static final ExtKey QUERY_RESULT = new ExtKey("AAA_AUTHZ_QUERY_RESULT", Collection/*<ExtMap>*/.class, "0cde6caf-b851-41cb-8de2-cd34327d7249"); } /** @@ -217,10 +217,10 @@ public static final ExtKey TITLE = new ExtKey("AAA_AUTHZ_PRINCIPAL_TITLE", String.class, "506d3833-5c86-495c-af4c-0de2ef2da4ed"); /** * Groups. - * List of {@link GroupRecord}. + * Collection of {@link GroupRecord}. * @see GroupRecord */ - public static final ExtKey GROUPS = new ExtKey("AAA_AUTHZ_PRINCIPAL_GROUPS", List/*<GroupRecord>*/.class, "738ec045-aade-478f-90f9-13f4aa229a54"); + public static final ExtKey GROUPS = new ExtKey("AAA_AUTHZ_PRINCIPAL_GROUPS", Collection/*<GroupRecord>*/.class, "738ec045-aade-478f-90f9-13f4aa229a54"); } /** @@ -237,10 +237,10 @@ public static final ExtKey DISPLAY_NAME = new ExtKey("AAA_AUTHZ_GROUP_DISPLAY_NAME", String.class, "cc2c8f75-bfac-453b-9184-c6ee18d62ef5"); /** * Groups. - * List of {@link GroupRecord}. + * Collection of {@link GroupRecord}. * @see GroupRecord */ - public static final ExtKey GROUPS = new ExtKey("AAA_AUTHZ_GROUP_GROUPS", List/*<GroupRecord>*/.class, "c4f34760-084b-4f29-b9cf-e77bb539ec18"); + public static final ExtKey GROUPS = new ExtKey("AAA_AUTHZ_GROUP_GROUPS", Collection/*<GroupRecord>*/.class, "c4f34760-084b-4f29-b9cf-e77bb539ec18"); } /** @@ -293,11 +293,11 @@ public static final ExtKey OPERATOR = new ExtKey("AAA_AUTHZ_QUERY_FILTER_OPERATOR", Integer.class, "c8588111-25a3-40e9-bf82-44acd3d0049d"); /** * Nested filter. - * List of QueryFilterRecord. + * Collection of QueryFilterRecord. * Either {@link #FILTER} or {@link #KEY} should be available. * @see QueryFilterRecord */ - public static final ExtKey FILTER = new ExtKey("AAA_AUTHZ_QUERY_FILTER_FILTER", List/*<QueryFilterRecord>*/.class, "a84d8b7a-0436-46bc-a49a-4dfda94e3a51"); + public static final ExtKey FILTER = new ExtKey("AAA_AUTHZ_QUERY_FILTER_FILTER", Collection/*<QueryFilterRecord>*/.class, "a84d8b7a-0436-46bc-a49a-4dfda94e3a51"); /** * Key to filter. * This key with appropriate value must exist within this record. 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 adfca12..f8c0f47 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 @@ -5,6 +5,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Locale; @@ -149,7 +150,7 @@ private void dumpConfig(ExtensionProxy extension) { Logger logger = extension.getContext().<Logger> get(TRACE_LOG_CONTEXT_KEY); if (logger.isDebugEnabled()) { - List sensitive = extension.getContext().<List>get(Base.ContextKeys.CONFIGURATION_SENSITIVE_KEYS); + Collection sensitive = extension.getContext().<Collection>get(Base.ContextKeys.CONFIGURATION_SENSITIVE_KEYS); logger.debug("Config BEGIN"); for (Map.Entry<Object, Object> entry : extension.getContext().<Properties>get(Base.ContextKeys.CONFIGURATION).entrySet()) { logger.debug( @@ -164,7 +165,7 @@ } } - private List<String> splitString(String s) { + private Collection<String> splitString(String s) { return new ArrayList<String>(Arrays.asList(s.trim().split("\\s*,\\s*", 0))); } @@ -251,7 +252,7 @@ public List<ExtensionProxy> getExtensionsByService(String provides) { List<ExtensionProxy> results = new ArrayList<>(); for (ExtensionEntry entry : initializedEntries.values()) { - if (entry.extension.getContext().<List> get(Base.ContextKeys.PROVIDES).contains(provides)) { + if (entry.extension.getContext().<Collection<String>> get(Base.ContextKeys.PROVIDES).contains(provides)) { results.add(entry.extension); } } @@ -305,7 +306,7 @@ entry.initialized = true; initializedEntries.put(extensionName, entry); synchronized (globalContext) { - globalContext.<List<ExtMap>> get(Base.GlobalContextKeys.EXTENSIONS).add( + globalContext.<Collection<ExtMap>> get(Base.GlobalContextKeys.EXTENSIONS).add( new ExtMap().mput( Base.ExtensionRecord.INSTANCE_NAME, entry.extension.getContext().get(Base.ContextKeys.INSTANCE_NAME) -- To view, visit http://gerrit.ovirt.org/30248 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0555f7f10bae370c3605b5253cab09620ff770bb Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
