diff options
| author | Alexander Kurtakov | 2020-08-07 11:03:23 +0000 |
|---|---|---|
| committer | Alexander Kurtakov | 2020-08-07 11:48:53 +0000 |
| commit | 5fa169a893c4fd97788bd925c5b288ca98345aa6 (patch) | |
| tree | 8fec6d284f97cb09128319213d55fd2e0eeab7c7 /bundles | |
| parent | 6d7f963b18a7571025baf6cba2983956d89bf4bf (diff) | |
| download | rt.equinox.bundles-5fa169a893c4fd97788bd925c5b288ca98345aa6.tar.gz rt.equinox.bundles-5fa169a893c4fd97788bd925c5b288ca98345aa6.tar.xz rt.equinox.bundles-5fa169a893c4fd97788bd925c5b288ca98345aa6.zip | |
Bug 565890 - Bump useradmin to BREE 1.8
Fix some warnings and silence others.
Change-Id: Ie4b4e12e6f1c3b4f3fa10f4e741e9424bbb948b7
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Diffstat (limited to 'bundles')
14 files changed, 282 insertions, 187 deletions
diff --git a/bundles/org.eclipse.equinox.useradmin/.classpath b/bundles/org.eclipse.equinox.useradmin/.classpath index 866a165d0..eca7bdba8 100644 --- a/bundles/org.eclipse.equinox.useradmin/.classpath +++ b/bundles/org.eclipse.equinox.useradmin/.classpath @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/OSGi%Minimum-1.1"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/bundles/org.eclipse.equinox.useradmin/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.equinox.useradmin/.settings/org.eclipse.jdt.core.prefs index ae4c9fce7..faa47264f 100644 --- a/bundles/org.eclipse.equinox.useradmin/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.eclipse.equinox.useradmin/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,3 @@ -#Mon Nov 12 12:45:03 CST 2007 eclipse.preferences.version=1 org.eclipse.jdt.core.builder.cleanOutputFolder=clean org.eclipse.jdt.core.builder.duplicateResourceTask=warning @@ -7,29 +6,46 @@ org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch org.eclipse.jdt.core.circularClasspath=error org.eclipse.jdt.core.classpath.exclusionPatterns=enabled org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.1 +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled +org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore +org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullable.secondary= +org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.3 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.doc.comment.support=enabled org.eclipse.jdt.core.compiler.maxProblemPerUnit=1000 +org.eclipse.jdt.core.compiler.problem.APILeak=warning +org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning +org.eclipse.jdt.core.compiler.problem.deadCode=warning org.eclipse.jdt.core.compiler.problem.deprecation=warning org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled org.eclipse.jdt.core.compiler.problem.discouragedReference=error org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled org.eclipse.jdt.core.compiler.problem.fieldHiding=warning org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning org.eclipse.jdt.core.compiler.problem.forbiddenReference=error org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning @@ -37,57 +53,102 @@ org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning +org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error +org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error +org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning +org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning +org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore +org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning +org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled +org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled +org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedImport=error +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.3 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -143,7 +204,12 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert @@ -158,11 +224,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -192,6 +259,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=inser org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -215,12 +284,16 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -266,6 +339,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do n org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -301,8 +376,11 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -325,6 +403,10 @@ org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false org.eclipse.jdt.core.formatter.tabulation.char=tab org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.incompatibleJDKLevel=ignore org.eclipse.jdt.core.incompleteClasspath=error diff --git a/bundles/org.eclipse.equinox.useradmin/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.useradmin/META-INF/MANIFEST.MF index 0b21c4c40..19675814e 100644 --- a/bundles/org.eclipse.equinox.useradmin/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.useradmin/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Vendor: %bundleVendor -Bundle-Version: 1.1.800.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Activator: org.eclipse.equinox.internal.useradmin.Activator Bundle-SymbolicName: org.eclipse.equinox.useradmin Import-Service: org.osgi.service.log.LogService @@ -17,5 +17,5 @@ Import-Package: org.eclipse.osgi.framework.eventmgr;version="1.1", org.osgi.util.tracker;version="1.1" Export-Package: org.eclipse.equinox.internal.useradmin;x-internal:=true Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: OSGi/Minimum-1.1 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Automatic-Module-Name: org.eclipse.equinox.useradmin diff --git a/bundles/org.eclipse.equinox.useradmin/pom.xml b/bundles/org.eclipse.equinox.useradmin/pom.xml index 1e783e8e8..d1bc07090 100644 --- a/bundles/org.eclipse.equinox.useradmin/pom.xml +++ b/bundles/org.eclipse.equinox.useradmin/pom.xml @@ -17,8 +17,11 @@ <version>4.17.0-SNAPSHOT</version> <relativePath>../../</relativePath> </parent> + <properties> + <code.ignoredWarnings>-warn:-deprecation,raw,unchecked,discouraged,warningToken</code.ignoredWarnings> + </properties> <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.equinox.useradmin</artifactId> - <version>1.1.800-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/Activator.java b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/Activator.java index 9db29b001..836918e58 100644 --- a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/Activator.java +++ b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/Activator.java @@ -44,6 +44,7 @@ public class Activator implements BundleActivator, ServiceFactory, ServiceTracke /** * Required by BundleActivator Interface. */ + @Override public void start(BundleContext context_) throws Exception { this.context = context_; prefsTracker = new ServiceTracker(context, PreferencesService.class.getName(), this); @@ -68,6 +69,7 @@ public class Activator implements BundleActivator, ServiceFactory, ServiceTracke /** * Required by BundleActivator Interface. */ + @Override public void stop(BundleContext context_) throws Exception { if (eventAdapter != null) { eventAdapter.stop(); @@ -78,15 +80,18 @@ public class Activator implements BundleActivator, ServiceFactory, ServiceTracke unregisterUserAdminService(); } + @Override public Object getService(Bundle bundle, ServiceRegistration registration_) { userAdmin.setServiceReference(registration_.getReference()); return userAdmin; } + @Override public void ungetService(Bundle bundle, ServiceRegistration registration_, Object service) { //do nothing } + @Override public Object addingService(ServiceReference reference) { if (prefs == null) { prefs = (PreferencesService) context.getService(reference); @@ -100,10 +105,12 @@ public class Activator implements BundleActivator, ServiceFactory, ServiceTracke return null; //we don't want to track a service we are not using } + @Override public void modifiedService(ServiceReference reference, Object service) { // do nothing } + @Override public void removedService(ServiceReference reference, Object service) { if (service == prefs) { prefs = null; @@ -116,7 +123,7 @@ public class Activator implements BundleActivator, ServiceFactory, ServiceTracke * Register the UserAdmin service. */ protected void registerUserAdminService() throws Exception { - Hashtable properties = new Hashtable(7); + Hashtable<String, String> properties = new Hashtable<>(7); properties.put(Constants.SERVICE_VENDOR, UserAdminMsg.Service_Vendor); properties.put(Constants.SERVICE_DESCRIPTION, UserAdminMsg.OSGi_User_Admin_service_IBM_Implementation_3); diff --git a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/Authorization.java b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/Authorization.java index adcdb9416..32eaf2d7a 100644 --- a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/Authorization.java +++ b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/Authorization.java @@ -82,6 +82,7 @@ public class Authorization implements org.osgi.service.useradmin.Authorization { * context was created for, or <code>null</code> if no user was specified * when this Authorization context was created. */ + @Override public String getName() { useradmin.checkAlive(); return (name); @@ -102,6 +103,7 @@ public class Authorization implements org.osgi.service.useradmin.Authorization { * @return <code>true</code> if this Authorization context implies the * specified role, otherwise <code>false</code>. */ + @Override public boolean hasRole(String name_) { useradmin.checkAlive(); synchronized (useradmin) { @@ -109,7 +111,7 @@ public class Authorization implements org.osgi.service.useradmin.Authorization { if (checkRole == null) { return (false); } - return (checkRole.isImpliedBy(user, new Vector())); + return checkRole.isImpliedBy(user, new Vector<>()); } } @@ -119,6 +121,7 @@ public class Authorization implements org.osgi.service.useradmin.Authorization { * @return The names of all roles encapsulated by this Authorization * context, or <code>null</code> if no roles are in the context. */ + @Override public String[] getRoles() { useradmin.checkAlive(); @@ -127,10 +130,10 @@ public class Authorization implements org.osgi.service.useradmin.Authorization { synchronized (useradmin) //we don't want anything changing while we get the list { int length = useradmin.roles.size(); - Vector result = new Vector(length); + Vector<String> result = new Vector<>(length); for (int i = 0; i < length; i++) { - Role role = (Role) useradmin.roles.elementAt(i); - if (role.isImpliedBy(user, new Vector())) { + Role role = useradmin.roles.elementAt(i); + if (role.isImpliedBy(user, new Vector<>())) { String roleName = role.getName(); //exclude user.anyone from the list if (!roleName.equals(Role.anyoneString)) { @@ -144,7 +147,7 @@ public class Authorization implements org.osgi.service.useradmin.Authorization { } String[] copyrole = new String[size]; result.copyInto(copyrole); - return (copyrole); + return copyrole; } } } diff --git a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/Group.java b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/Group.java index 41aedd2a2..2d10698a8 100644 --- a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/Group.java +++ b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/Group.java @@ -87,14 +87,14 @@ import org.osgi.service.prefs.BackingStoreException; public class Group extends User implements org.osgi.service.useradmin.Group { - protected Vector requiredMembers; - protected Vector basicMembers; + protected Vector<org.osgi.service.useradmin.Role> requiredMembers; + protected Vector<org.osgi.service.useradmin.Role> basicMembers; protected Group(String name, UserAdmin useradmin) { super(name, useradmin); this.useradmin = useradmin; - basicMembers = new Vector(); - requiredMembers = new Vector(); + basicMembers = new Vector<>(); + requiredMembers = new Vector<>(); } /** @@ -110,6 +110,7 @@ public class Group extends User implements org.osgi.service.useradmin.Group { * @throws SecurityException If a security manager exists and the caller * does not have the <tt>UserAdminPermission</tt> with name <tt>admin</tt>. */ + @Override public boolean addMember(org.osgi.service.useradmin.Role role) { useradmin.checkAlive(); useradmin.checkAdminPermission(); @@ -152,6 +153,7 @@ public class Group extends User implements org.osgi.service.useradmin.Group { * @throws SecurityException If a security manager exists and the caller * does not have the <tt>UserAdminPermission</tt> with name <tt>admin</tt>. */ + @Override public boolean addRequiredMember(org.osgi.service.useradmin.Role role) { useradmin.checkAlive(); useradmin.checkAdminPermission(); @@ -190,6 +192,7 @@ public class Group extends User implements org.osgi.service.useradmin.Group { * @throws SecurityException If a security manager exists and the caller * does not have the <tt>UserAdminPermission</tt> with name <tt>admin</tt>. */ + @Override public boolean removeMember(org.osgi.service.useradmin.Role role) { useradmin.checkAlive(); useradmin.checkAdminPermission(); @@ -221,6 +224,7 @@ public class Group extends User implements org.osgi.service.useradmin.Group { * @return The basic members of this Group, or <code>null</code> if this * Group does not contain any basic members. */ + @Override public org.osgi.service.useradmin.Role[] getMembers() { useradmin.checkAlive(); synchronized (useradmin) { @@ -239,6 +243,7 @@ public class Group extends User implements org.osgi.service.useradmin.Group { * @return The required members of this Group, or <code>null</code> if this * Group does not contain any required members. */ + @Override public org.osgi.service.useradmin.Role[] getRequiredMembers() { useradmin.checkAlive(); synchronized (useradmin) { @@ -256,12 +261,15 @@ public class Group extends User implements org.osgi.service.useradmin.Group { * * @return The role's type. */ + @Override public int getType() { useradmin.checkAlive(); - return (org.osgi.service.useradmin.Role.GROUP); + return org.osgi.service.useradmin.Role.GROUP; } - protected boolean isImpliedBy(Role role, Vector checkLoop) { + @Override + @SuppressWarnings("unchecked") + protected boolean isImpliedBy(Role role, Vector<String> checkLoop) { if (checkLoop.contains(name)) { //we have a circular dependency return (false); @@ -271,9 +279,9 @@ public class Group extends User implements org.osgi.service.useradmin.Group { return (true); } checkLoop.addElement(name); - Vector requiredCheckLoop = (Vector) checkLoop.clone(); - Vector basicCheckLoop = (Vector) checkLoop.clone(); - Enumeration e = requiredMembers.elements(); + Vector<String> requiredCheckLoop = (Vector<String>) checkLoop.clone(); + Vector<String> basicCheckLoop = (Vector<String>) checkLoop.clone(); + Enumeration<org.osgi.service.useradmin.Role> e = requiredMembers.elements(); //check to see if we imply all of the 0 or more required roles Role requiredRole; @@ -292,7 +300,7 @@ public class Group extends User implements org.osgi.service.useradmin.Group { return (true); } } - return (false); + return false; } } diff --git a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/Role.java b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/Role.java index 051d3f9b1..bdd7d47d8 100644 --- a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/Role.java +++ b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/Role.java @@ -43,7 +43,7 @@ public class Role implements org.osgi.service.useradmin.Role { protected String name; protected UserAdminHashtable properties; - protected Vector impliedRoles; + protected Vector<Group> impliedRoles; protected UserAdmin useradmin; protected static final String anyoneString = "user.anyone"; //$NON-NLS-1$ protected boolean exists = true; @@ -56,7 +56,7 @@ public class Role implements org.osgi.service.useradmin.Role { // This is used only to track which Groups this role is directly a member of. // This info is needed so when we delete a Role, we know which groups to remove // it from. - impliedRoles = new Vector(); + impliedRoles = new Vector<>(); } /** @@ -65,6 +65,7 @@ public class Role implements org.osgi.service.useradmin.Role { * @return The role's name. */ + @Override public String getName() { useradmin.checkAlive(); return (name); @@ -75,6 +76,7 @@ public class Role implements org.osgi.service.useradmin.Role { * * @return The role's type. */ + @Override public int getType() { useradmin.checkAlive(); return (org.osgi.service.useradmin.Role.ROLE); @@ -98,9 +100,10 @@ public class Role implements org.osgi.service.useradmin.Role { * * @return Dictionary containing the properties of this Role. */ - public Dictionary getProperties() { + @Override + public Dictionary<String, Object> getProperties() { useradmin.checkAlive(); - return (properties); + return properties; } protected void addImpliedRole(Group group) { @@ -117,9 +120,9 @@ public class Role implements org.osgi.service.useradmin.Role { //we are being deleted so delete ourselves from all of the groups protected synchronized void destroy() { exists = false; - Enumeration e = impliedRoles.elements(); + Enumeration<Group> e = impliedRoles.elements(); while (e.hasMoreElements()) { - Group group = (Group) e.nextElement(); + Group group = e.nextElement(); if (group.exists) //so we don't try to remove any groups twice from storage { group.removeMember(this); @@ -129,7 +132,7 @@ public class Role implements org.osgi.service.useradmin.Role { impliedRoles = null; } - protected boolean isImpliedBy(Role role, Vector checkLoop) { //Roles do not imply themselves + protected boolean isImpliedBy(Role role, Vector<String> checkLoop) { //Roles do not imply themselves //The user.anyone role is always implied if (checkLoop.contains(name)) { //we have a circular dependency diff --git a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/User.java b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/User.java index ca8651445..76d36a7a4 100644 --- a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/User.java +++ b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/User.java @@ -71,9 +71,10 @@ public class User extends Role implements org.osgi.service.useradmin.User { * @return Dictionary containing the credentials of this User. */ - public Dictionary getCredentials() { + @Override + public Dictionary<String, Object> getCredentials() { useradmin.checkAlive(); - return (credentials); + return credentials; } /** @@ -94,6 +95,7 @@ public class User extends Role implements org.osgi.service.useradmin.User { * does not have the <tt>UserAdminPermission</tt> named after the credential * key (or a prefix of it) with action <code>getCredential</code>. */ + @Override public boolean hasCredential(String key, Object value) { useradmin.checkAlive(); Object checkValue = credentials.get(key); @@ -127,13 +129,15 @@ public class User extends Role implements org.osgi.service.useradmin.User { * * @return The role's type. */ + @Override public int getType() { useradmin.checkAlive(); return org.osgi.service.useradmin.Role.USER; } //A user always implies itself - protected boolean isImpliedBy(Role role, Vector checkLoop) { + @Override + protected boolean isImpliedBy(Role role, Vector<String> checkLoop) { if (checkLoop.contains(name)) { //we have a circular dependency return (false); diff --git a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/UserAdmin.java b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/UserAdmin.java index 495835070..24e4c23af 100644 --- a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/UserAdmin.java +++ b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/UserAdmin.java @@ -46,8 +46,8 @@ import org.osgi.service.useradmin.UserAdminPermission; public class UserAdmin implements org.osgi.service.useradmin.UserAdmin { - protected Vector users; - protected Vector roles; + protected Vector<Role> users; + protected Vector<Role> roles; protected BundleContext context; protected UserAdminEventProducer eventProducer; protected boolean alive; @@ -57,8 +57,8 @@ public class UserAdmin implements org.osgi.service.useradmin.UserAdmin { protected LogTracker log; protected UserAdmin(PreferencesService preferencesService, BundleContext context) throws Exception { - roles = new Vector(); - users = new Vector(); + roles = new Vector<>(); + users = new Vector<>(); this.context = context; log = new LogTracker(context, System.out); @@ -100,6 +100,7 @@ public class UserAdmin implements org.osgi.service.useradmin.UserAdmin { * @throws SecurityException If a security manager exists and the caller * does not have the <tt>UserAdminPermission</tt> with name <tt>admin</tt>. */ + @Override public org.osgi.service.useradmin.Role createRole(String name, int type) { checkAlive(); checkAdminPermission(); @@ -163,6 +164,7 @@ public class UserAdmin implements org.osgi.service.useradmin.UserAdmin { * @throws SecurityException If a security manager exists and the caller * does not have the <tt>UserAdminPermission</tt> with name <tt>admin</tt>. */ + @Override public boolean removeRole(String name) { checkAlive(); checkAdminPermission(); @@ -197,15 +199,16 @@ public class UserAdmin implements org.osgi.service.useradmin.UserAdmin { * @return The requested role, or <code>null</code> if this UserAdmin does * not have a role with the given name. */ + @Override public org.osgi.service.useradmin.Role getRole(String name) { checkAlive(); if (name == null) { return (null); } synchronized (this) { - Enumeration e = roles.elements(); + Enumeration<Role> e = roles.elements(); while (e.hasMoreElements()) { - Role role = (Role) e.nextElement(); + Role role = e.nextElement(); if (role.getName().equals(name)) { return (role); } @@ -228,9 +231,10 @@ public class UserAdmin implements org.osgi.service.useradmin.UserAdmin { * <code>null</code> filter is specified. * */ + @Override public org.osgi.service.useradmin.Role[] getRoles(String filterString) throws InvalidSyntaxException { checkAlive(); - Vector returnedRoles; + Vector<Role> returnedRoles; synchronized (this) { if (filterString == null) { returnedRoles = roles; @@ -239,9 +243,9 @@ public class UserAdmin implements org.osgi.service.useradmin.UserAdmin { //InvalidSyntaxException will be //thrown even if there are no roles //present. - returnedRoles = new Vector(); + returnedRoles = new Vector<>(); for (int i = 0; i < roles.size(); i++) { - Role role = (Role) roles.elementAt(i); + Role role = roles.elementAt(i); if (filter.match(role.getProperties())) { returnedRoles.addElement(role); } @@ -270,6 +274,7 @@ public class UserAdmin implements org.osgi.service.useradmin.UserAdmin { * @return A matching user, if <em>exactly</em> one is found. If zero or * more than one matching users are found, <code>null</code> is returned. */ + @Override public org.osgi.service.useradmin.User getUser(String key, String value) { checkAlive(); if (key == null) { @@ -277,10 +282,10 @@ public class UserAdmin implements org.osgi.service.useradmin.UserAdmin { } User user; User foundUser = null; - Dictionary props; + Dictionary<String, Object> props; String keyValue; synchronized (this) { - Enumeration e = users.elements(); + Enumeration<Role> e = users.elements(); while (e.hasMoreElements()) { user = (User) e.nextElement(); props = user.getProperties(); @@ -306,6 +311,7 @@ public class UserAdmin implements org.osgi.service.useradmin.UserAdmin { * * @return the Authorization object for the specified user. */ + @Override public org.osgi.service.useradmin.Authorization getAuthorization(org.osgi.service.useradmin.User user) { checkAlive(); return (new Authorization((User) user, this)); diff --git a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/UserAdminEventAdapter.java b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/UserAdminEventAdapter.java index 894b0e37e..d7a6240db 100644 --- a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/UserAdminEventAdapter.java +++ b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/UserAdminEventAdapter.java @@ -19,8 +19,9 @@ import java.util.Hashtable; import org.osgi.framework.*; import org.osgi.service.event.Event; import org.osgi.service.event.EventAdmin; -import org.osgi.service.useradmin.*; import org.osgi.service.useradmin.Role; +import org.osgi.service.useradmin.UserAdminEvent; +import org.osgi.service.useradmin.UserAdminListener; import org.osgi.util.tracker.ServiceTracker; public class UserAdminEventAdapter implements UserAdminListener { @@ -51,10 +52,10 @@ public class UserAdminEventAdapter implements UserAdminListener { } public void start() throws Exception { - Hashtable props = new Hashtable(3); - userAdminRegistration = context.registerService(UserAdminListener.class.getName(), this, props); + Hashtable<String, ?> props = new Hashtable<>(3); + userAdminRegistration = context.registerService(UserAdminListener.class, this, props); - eventAdminTracker = new ServiceTracker(context, EventAdmin.class.getName(), null); + eventAdminTracker = new ServiceTracker<>(context, EventAdmin.class, null); eventAdminTracker.open(); } @@ -71,6 +72,7 @@ public class UserAdminEventAdapter implements UserAdminListener { this.context = null; } + @Override public void roleChanged(UserAdminEvent event) { ServiceTracker currentTracker = eventAdminTracker; EventAdmin eventAdmin = currentTracker == null ? null : ((EventAdmin) currentTracker.getService()); @@ -90,7 +92,7 @@ public class UserAdminEventAdapter implements UserAdminListener { return; } String topic = TOPIC + TOPIC_SEPARATOR + typename; - Hashtable properties = new Hashtable(); + Hashtable<String, Object> properties = new Hashtable<>(); ServiceReference ref = event.getServiceReference(); if (ref == null) { throw new RuntimeException("UserAdminEvent's getServiceReference() returns null."); //$NON-NLS-1$ @@ -103,15 +105,15 @@ public class UserAdminEventAdapter implements UserAdminListener { if (role != null) { properties.put(ROLE, role); properties.put(ROLE_NAME, role.getName()); - properties.put(ROLE_TYPE, new Integer(role.getType())); + properties.put(ROLE_TYPE, Integer.valueOf(role.getType())); } properties.put(EVENT, event); - Event convertedEvent = new Event(topic, (Dictionary) properties); + Event convertedEvent = new Event(topic, (Dictionary<String, ?>) properties); eventAdmin.postEvent(convertedEvent); } } - public void putServiceReferenceProperties(Hashtable properties, ServiceReference ref) { + public void putServiceReferenceProperties(Hashtable<String, Object> properties, ServiceReference ref) { properties.put(SERVICE, ref); properties.put(SERVICE_ID, ref.getProperty(org.osgi.framework.Constants.SERVICE_ID)); Object o = ref.getProperty(org.osgi.framework.Constants.SERVICE_PID); diff --git a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/UserAdminEventProducer.java b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/UserAdminEventProducer.java index 8fc74b0b0..40b8f0307 100644 --- a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/UserAdminEventProducer.java +++ b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/UserAdminEventProducer.java @@ -32,7 +32,7 @@ public class UserAdminEventProducer extends ServiceTracker implements EventDispa static protected final String userAdminListenerClass = "org.osgi.service.useradmin.UserAdminListener"; //$NON-NLS-1$ protected LogTracker log; /** List of UserAdminListeners */ - protected EventListeners listeners; + protected CopyOnWriteIdentityMap listeners; /** EventManager for event delivery. */ protected EventManager eventManager; @@ -43,14 +43,15 @@ public class UserAdminEventProducer extends ServiceTracker implements EventDispa ThreadGroup eventGroup = new ThreadGroup("Equinox User Admin"); //$NON-NLS-1$ eventGroup.setDaemon(true); eventManager = new EventManager("UserAdmin Event Dispatcher", eventGroup); //$NON-NLS-1$ - listeners = new EventListeners(); + listeners = new CopyOnWriteIdentityMap<>(); open(); } + @Override public void close() { super.close(); - listeners.removeAllListeners(); + listeners.clear(); eventManager.close(); userAdmin = null; } @@ -63,7 +64,7 @@ public class UserAdminEventProducer extends ServiceTracker implements EventDispa ListenerQueue queue = new ListenerQueue(eventManager); /* add set of UserAdminListeners to queue */ - queue.queueListeners(listeners, this); + queue.queueListeners(listeners.entrySet(), this); /* dispatch event to set of listeners */ queue.dispatchEventAsynchronous(0, event); @@ -86,10 +87,11 @@ public class UserAdminEventProducer extends ServiceTracker implements EventDispa * <tt>ServiceReference</tt> object or <tt>null</tt> if the <tt>ServiceReference</tt> object should not * be tracked. */ + @Override public Object addingService(ServiceReference reference) { Object service = super.addingService(reference); - listeners.addListener(service, service); + listeners.put(service, service); return service; } @@ -103,8 +105,9 @@ public class UserAdminEventProducer extends ServiceTracker implements EventDispa * @param reference Reference to service that has been removed. * @param service The service object for the removed service. */ + @Override public void removedService(ServiceReference reference, Object service) { - listeners.removeListener(service); + listeners.remove(service); super.removedService(reference, service); } @@ -129,6 +132,7 @@ public class UserAdminEventProducer extends ServiceTracker implements EventDispa * as what event object to pass) so that this method * can complete the delivery of the event to the listener. */ + @Override public void dispatchEvent(Object listener, Object listenerObject, int eventAction, Object eventObject) { if (userAdmin == null) { return; diff --git a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/UserAdminHashtable.java b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/UserAdminHashtable.java index dfc6d50f9..f8c819c7a 100644 --- a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/UserAdminHashtable.java +++ b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/UserAdminHashtable.java @@ -23,7 +23,7 @@ import org.osgi.service.useradmin.UserAdminEvent; * and User credentials. */ -public class UserAdminHashtable extends Hashtable { +public class UserAdminHashtable extends Hashtable<String, Object> { /** * @@ -72,17 +72,12 @@ public class UserAdminHashtable extends Hashtable { return retVal; } - public Object put(Object key, Object value) { - if (!(key instanceof String)) { - throw new IllegalArgumentException(UserAdminMsg.INVALID_KEY_EXCEPTION); - } - + @Override + public Object put(String name, Object value) { if (!((value instanceof String) || (value instanceof byte[]))) { throw new IllegalArgumentException(UserAdminMsg.INVALID_VALUE_EXCEPTION); } - String name = (String) key; - switch (propertyType) { case PROPERTIES : userAdmin.checkChangePropertyPermission(name); @@ -95,6 +90,7 @@ public class UserAdminHashtable extends Hashtable { return put(name, value, true); } + @Override public synchronized Object remove(Object key) { if (!(key instanceof String)) { throw new IllegalArgumentException(UserAdminMsg.INVALID_KEY_EXCEPTION); @@ -126,11 +122,12 @@ public class UserAdminHashtable extends Hashtable { return super.remove(name); } + @Override public synchronized void clear() { - Enumeration e = keys(); + Enumeration<String> e = keys(); while (e.hasMoreElements()) { - String name = (String) e.nextElement(); + String name = e.nextElement(); switch (propertyType) { case PROPERTIES : @@ -164,6 +161,7 @@ public class UserAdminHashtable extends Hashtable { super.clear(); } + @Override public Object get(Object key) { if (!(key instanceof String)) { throw new IllegalArgumentException(UserAdminMsg.INVALID_KEY_EXCEPTION); diff --git a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/UserAdminStore.java b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/UserAdminStore.java index f660734fe..01a59dc38 100644 --- a/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/UserAdminStore.java +++ b/bundles/org.eclipse.equinox.useradmin/src/org/eclipse/equinox/internal/useradmin/UserAdminStore.java @@ -51,13 +51,10 @@ public class UserAdminStore { protected void init() throws BackingStoreException { try { - AccessController.doPrivileged(new PrivilegedExceptionAction() { - - public Object run() throws BackingStoreException { - rootNode = preferencesService.getUserPreferences(persistenceUserName); - loadRoles(); - return (null); - } + AccessController.doPrivileged((PrivilegedExceptionAction) () -> { + rootNode = preferencesService.getUserPreferences(persistenceUserName); + loadRoles(); + return (null); }); } catch (PrivilegedActionException ex) { @@ -67,13 +64,11 @@ public class UserAdminStore { protected void addRole(final org.osgi.service.useradmin.Role role) throws BackingStoreException { try { - AccessController.doPrivileged(new PrivilegedExceptionAction() { - public Object run() throws BackingStoreException { - Preferences node = rootNode.node(role.getName()); - node.putInt(typeString, role.getType()); - node.flush(); - return (null); - } + AccessController.doPrivileged((PrivilegedExceptionAction) () -> { + Preferences node = rootNode.node(role.getName()); + node.putInt(typeString, role.getType()); + node.flush(); + return (null); }); } catch (PrivilegedActionException ex) { log.log(LogService.LOG_ERROR, UserAdminMsg.Backing_Store_Write_Exception, ex); @@ -83,13 +78,11 @@ public class UserAdminStore { protected void removeRole(final org.osgi.service.useradmin.Role role) throws BackingStoreException { try { - AccessController.doPrivileged(new PrivilegedExceptionAction() { - public Object run() throws BackingStoreException { - Preferences node = rootNode.node(role.getName()); - node.removeNode(); - rootNode.node("").flush(); //$NON-NLS-1$ - return (null); - } + AccessController.doPrivileged((PrivilegedExceptionAction) () -> { + Preferences node = rootNode.node(role.getName()); + node.removeNode(); + rootNode.node("").flush(); //$NON-NLS-1$ + return (null); }); } catch (PrivilegedActionException ex) { log.log(LogService.LOG_ERROR, UserAdminMsg.Backing_Store_Write_Exception, ex); @@ -99,15 +92,13 @@ public class UserAdminStore { protected void clearProperties(final org.osgi.service.useradmin.Role role) throws BackingStoreException { try { - AccessController.doPrivileged(new PrivilegedExceptionAction() { - public Object run() throws BackingStoreException { - Preferences propertyNode = rootNode.node(role.getName() + "/" + propertiesNode); //$NON-NLS-1$ - propertyNode.clear(); - if (propertyNode.nodeExists(typesNode)) - propertyNode.node(typesNode).removeNode(); - propertyNode.flush(); - return (null); - } + AccessController.doPrivileged((PrivilegedExceptionAction) () -> { + Preferences propertyNode = rootNode.node(role.getName() + "/" + propertiesNode); //$NON-NLS-1$ + propertyNode.clear(); + if (propertyNode.nodeExists(typesNode)) + propertyNode.node(typesNode).removeNode(); + propertyNode.flush(); + return (null); }); } catch (PrivilegedActionException ex) { log.log(LogService.LOG_ERROR, UserAdminMsg.Backing_Store_Write_Exception, ex); @@ -117,21 +108,19 @@ public class UserAdminStore { protected void addProperty(final org.osgi.service.useradmin.Role role, final String key, final Object value) throws BackingStoreException { try { - AccessController.doPrivileged(new PrivilegedExceptionAction() { - public Object run() throws BackingStoreException { - Preferences propertyNode = rootNode.node(role.getName() + "/" + propertiesNode); //$NON-NLS-1$ - Preferences propertyTypesNode = propertyNode.node(typesNode); - if (value instanceof String) { - propertyNode.put(key, (String) value); - propertyTypesNode.putBoolean(key, true); - } else //must be a byte array, then - { - propertyNode.putByteArray(key, (byte[]) value); - propertyTypesNode.putBoolean(key, false); - } - propertyNode.flush(); - return (null); + AccessController.doPrivileged((PrivilegedExceptionAction) () -> { + Preferences propertyNode = rootNode.node(role.getName() + "/" + propertiesNode); //$NON-NLS-1$ + Preferences propertyTypesNode = propertyNode.node(typesNode); + if (value instanceof String) { + propertyNode.put(key, (String) value); + propertyTypesNode.putBoolean(key, true); + } else //must be a byte array, then + { + propertyNode.putByteArray(key, (byte[]) value); + propertyTypesNode.putBoolean(key, false); } + propertyNode.flush(); + return (null); }); } catch (PrivilegedActionException ex) { log.log(LogService.LOG_ERROR, UserAdminMsg.Backing_Store_Write_Exception, ex); @@ -141,15 +130,13 @@ public class UserAdminStore { protected void removeProperty(final org.osgi.service.useradmin.Role role, final String key) throws BackingStoreException { try { - AccessController.doPrivileged(new PrivilegedExceptionAction() { - public Object run() throws BackingStoreException { - Preferences propertyNode = rootNode.node(role.getName() + "/" + propertiesNode); //$NON-NLS-1$ - propertyNode.remove(key); - if (propertyNode.nodeExists(typesNode)) - propertyNode.node(typesNode).remove(key); - propertyNode.flush(); - return (null); - } + AccessController.doPrivileged((PrivilegedExceptionAction) () -> { + Preferences propertyNode = rootNode.node(role.getName() + "/" + propertiesNode); //$NON-NLS-1$ + propertyNode.remove(key); + if (propertyNode.nodeExists(typesNode)) + propertyNode.node(typesNode).remove(key); + propertyNode.flush(); + return (null); }); } catch (PrivilegedActionException ex) { log.log(LogService.LOG_ERROR, UserAdminMsg.Backing_Store_Write_Exception, ex); @@ -159,15 +146,13 @@ public class UserAdminStore { protected void clearCredentials(final org.osgi.service.useradmin.Role role) throws BackingStoreException { try { - AccessController.doPrivileged(new PrivilegedExceptionAction() { - public Object run() throws BackingStoreException { - Preferences credentialNode = rootNode.node(role.getName() + "/" + credentialsNode); //$NON-NLS-1$ - credentialNode.clear(); - if (credentialNode.nodeExists(typesNode)) - credentialNode.node(typesNode).removeNode(); - credentialNode.flush(); - return (null); - } + AccessController.doPrivileged((PrivilegedExceptionAction) () -> { + Preferences credentialNode = rootNode.node(role.getName() + "/" + credentialsNode); //$NON-NLS-1$ + credentialNode.clear(); + if (credentialNode.nodeExists(typesNode)) + credentialNode.node(typesNode).removeNode(); + credentialNode.flush(); + return (null); }); } catch (PrivilegedActionException ex) { log.log(LogService.LOG_ERROR, UserAdminMsg.Backing_Store_Write_Exception, ex); @@ -178,21 +163,19 @@ public class UserAdminStore { protected void addCredential(final org.osgi.service.useradmin.Role role, final String key, final Object value) throws BackingStoreException { try { - AccessController.doPrivileged(new PrivilegedExceptionAction() { - public Object run() throws BackingStoreException { - Preferences credentialNode = rootNode.node(role.getName() + "/" + credentialsNode); //$NON-NLS-1$ - Preferences credentialTypesNode = credentialNode.node(typesNode); - if (value instanceof String) { - credentialNode.put(key, (String) value); - credentialTypesNode.putBoolean(key, true); - } else //assume it is a byte array - { - credentialNode.putByteArray(key, (byte[]) value); - credentialTypesNode.putBoolean(key, false); - } - credentialNode.flush(); - return (null); + AccessController.doPrivileged((PrivilegedExceptionAction) () -> { + Preferences credentialNode = rootNode.node(role.getName() + "/" + credentialsNode); //$NON-NLS-1$ + Preferences credentialTypesNode = credentialNode.node(typesNode); + if (value instanceof String) { + credentialNode.put(key, (String) value); + credentialTypesNode.putBoolean(key, true); + } else //assume it is a byte array + { + credentialNode.putByteArray(key, (byte[]) value); + credentialTypesNode.putBoolean(key, false); } + credentialNode.flush(); + return (null); }); } catch (PrivilegedActionException ex) { log.log(LogService.LOG_ERROR, NLS.bind(UserAdminMsg.Backing_Store_Write_Exception, new Object[] {NLS.bind(UserAdminMsg.adding_Credential_to__15, role.getName())}), ex); @@ -203,15 +186,13 @@ public class UserAdminStore { protected void removeCredential(final org.osgi.service.useradmin.Role role, final String key) throws BackingStoreException { try { - AccessController.doPrivileged(new PrivilegedExceptionAction() { - public Object run() throws BackingStoreException { - Preferences credentialNode = rootNode.node(role.getName() + "/" + credentialsNode); //$NON-NLS-1$ - credentialNode.remove(key); - if (credentialNode.nodeExists(typesNode)) - credentialNode.node(typesNode).remove(key); - credentialNode.flush(); - return (null); - } + AccessController.doPrivileged((PrivilegedExceptionAction) () -> { + Preferences credentialNode = rootNode.node(role.getName() + "/" + credentialsNode); //$NON-NLS-1$ + credentialNode.remove(key); + if (credentialNode.nodeExists(typesNode)) + credentialNode.node(typesNode).remove(key); + credentialNode.flush(); + return (null); }); } catch (PrivilegedActionException ex) { log.log(LogService.LOG_ERROR, UserAdminMsg.Backing_Store_Write_Exception, ex); @@ -221,13 +202,11 @@ public class UserAdminStore { protected void addMember(final Group group, final Role role) throws BackingStoreException { try { - AccessController.doPrivileged(new PrivilegedExceptionAction() { - public Object run() throws BackingStoreException { - Preferences memberNode = rootNode.node(group.getName() + "/" + membersNode); //$NON-NLS-1$ - memberNode.put(role.getName(), basicString); - memberNode.flush(); - return (null); - } + AccessController.doPrivileged((PrivilegedExceptionAction) () -> { + Preferences memberNode = rootNode.node(group.getName() + "/" + membersNode); //$NON-NLS-1$ + memberNode.put(role.getName(), basicString); + memberNode.flush(); + return (null); }); } catch (PrivilegedActionException ex) { log.log(LogService.LOG_ERROR, NLS.bind(UserAdminMsg.Backing_Store_Write_Exception, new Object[] {NLS.bind(UserAdminMsg.adding_member__18, role.getName(), group.getName())}), ex); @@ -237,13 +216,11 @@ public class UserAdminStore { protected void addRequiredMember(final Group group, final Role role) throws BackingStoreException { try { - AccessController.doPrivileged(new PrivilegedExceptionAction() { - public Object run() throws BackingStoreException { - Preferences memberNode = rootNode.node(group.getName() + "/" + membersNode); //$NON-NLS-1$ - memberNode.put(role.getName(), requiredString); - memberNode.flush(); - return (null); - } + AccessController.doPrivileged((PrivilegedExceptionAction) () -> { + Preferences memberNode = rootNode.node(group.getName() + "/" + membersNode); //$NON-NLS-1$ + memberNode.put(role.getName(), requiredString); + memberNode.flush(); + return (null); }); } catch (PrivilegedActionException ex) { log.log(LogService.LOG_ERROR, NLS.bind(UserAdminMsg.Backing_Store_Write_Exception, new Object[] {NLS.bind(UserAdminMsg.adding_required_member__21, role.getName(), group.getName())}), ex); @@ -253,13 +230,11 @@ public class UserAdminStore { protected void removeMember(final Group group, final Role role) throws BackingStoreException { try { - AccessController.doPrivileged(new PrivilegedExceptionAction() { - public Object run() throws BackingStoreException { - Preferences memberNode = rootNode.node(group.getName() + "/" + membersNode); //$NON-NLS-1$ - memberNode.remove(role.getName()); - memberNode.flush(); - return (null); - } + AccessController.doPrivileged((PrivilegedExceptionAction) () -> { + Preferences memberNode = rootNode.node(group.getName() + "/" + membersNode); //$NON-NLS-1$ + memberNode.remove(role.getName()); + memberNode.flush(); + return (null); }); } catch (PrivilegedActionException ex) { log.log(LogService.LOG_ERROR, NLS.bind(UserAdminMsg.Backing_Store_Write_Exception, new Object[] {NLS.bind(UserAdminMsg.removing_member__24, role.getName(), group.getName())}), ex); |