You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2016/11/09 15:45:11 UTC
svn commit: r1768991 -
/sling/trunk/bundles/extensions/webconsolesecurityprovider/src/main/java/org/apache/sling/extensions/webconsolesecurityprovider/internal/
Author: cziegeler
Date: Wed Nov 9 15:45:10 2016
New Revision: 1768991
URL: http://svn.apache.org/viewvc?rev=1768991&view=rev
Log:
Clean up code
Modified:
sling/trunk/bundles/extensions/webconsolesecurityprovider/src/main/java/org/apache/sling/extensions/webconsolesecurityprovider/internal/AbstractWebConsoleSecurityProvider.java
sling/trunk/bundles/extensions/webconsolesecurityprovider/src/main/java/org/apache/sling/extensions/webconsolesecurityprovider/internal/Activator.java
sling/trunk/bundles/extensions/webconsolesecurityprovider/src/main/java/org/apache/sling/extensions/webconsolesecurityprovider/internal/ServicesListener.java
sling/trunk/bundles/extensions/webconsolesecurityprovider/src/main/java/org/apache/sling/extensions/webconsolesecurityprovider/internal/SlingWebConsoleSecurityProvider.java
sling/trunk/bundles/extensions/webconsolesecurityprovider/src/main/java/org/apache/sling/extensions/webconsolesecurityprovider/internal/SlingWebConsoleSecurityProvider2.java
Modified: sling/trunk/bundles/extensions/webconsolesecurityprovider/src/main/java/org/apache/sling/extensions/webconsolesecurityprovider/internal/AbstractWebConsoleSecurityProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/webconsolesecurityprovider/src/main/java/org/apache/sling/extensions/webconsolesecurityprovider/internal/AbstractWebConsoleSecurityProvider.java?rev=1768991&r1=1768990&r2=1768991&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/webconsolesecurityprovider/src/main/java/org/apache/sling/extensions/webconsolesecurityprovider/internal/AbstractWebConsoleSecurityProvider.java (original)
+++ sling/trunk/bundles/extensions/webconsolesecurityprovider/src/main/java/org/apache/sling/extensions/webconsolesecurityprovider/internal/AbstractWebConsoleSecurityProvider.java Wed Nov 9 15:45:10 2016
@@ -58,7 +58,8 @@ public abstract class AbstractWebConsole
* Handle configuration
* @see org.osgi.service.cm.ManagedService#updated(java.util.Dictionary)
*/
- public void updated(final Dictionary properties)
+ @Override
+ public void updated(final Dictionary<String, ?> properties)
throws ConfigurationException {
this.users = toSet(properties == null ? null : properties.get(PROP_USERS), PROP_GROUPS_DEFAULT_USER);
this.groups = toSet(properties == null ? null : properties.get(PROP_GROUPS), null);
Modified: sling/trunk/bundles/extensions/webconsolesecurityprovider/src/main/java/org/apache/sling/extensions/webconsolesecurityprovider/internal/Activator.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/webconsolesecurityprovider/src/main/java/org/apache/sling/extensions/webconsolesecurityprovider/internal/Activator.java?rev=1768991&r1=1768990&r2=1768991&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/webconsolesecurityprovider/src/main/java/org/apache/sling/extensions/webconsolesecurityprovider/internal/Activator.java (original)
+++ sling/trunk/bundles/extensions/webconsolesecurityprovider/src/main/java/org/apache/sling/extensions/webconsolesecurityprovider/internal/Activator.java Wed Nov 9 15:45:10 2016
@@ -25,19 +25,21 @@ public class Activator implements Bundle
private ServicesListener listener;
- private ServiceRegistration registration;
+ private ServiceRegistration<StartupListener> registration;
/**
* @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
*/
+ @Override
public void start(final BundleContext context) throws Exception {
listener = new ServicesListener(context);
- registration = context.registerService(StartupListener.class.getName(), listener, null);
+ registration = context.registerService(StartupListener.class, listener, null);
}
/**
* @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(final BundleContext context) throws Exception {
if ( registration != null ) {
registration.unregister();
Modified: sling/trunk/bundles/extensions/webconsolesecurityprovider/src/main/java/org/apache/sling/extensions/webconsolesecurityprovider/internal/ServicesListener.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/webconsolesecurityprovider/src/main/java/org/apache/sling/extensions/webconsolesecurityprovider/internal/ServicesListener.java?rev=1768991&r1=1768990&r2=1768991&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/webconsolesecurityprovider/src/main/java/org/apache/sling/extensions/webconsolesecurityprovider/internal/ServicesListener.java (original)
+++ sling/trunk/bundles/extensions/webconsolesecurityprovider/src/main/java/org/apache/sling/extensions/webconsolesecurityprovider/internal/ServicesListener.java Wed Nov 9 15:45:10 2016
@@ -67,10 +67,10 @@ public class ServicesListener implements
private volatile State registrationState = State.NONE;
/** The registration for the provider */
- private ServiceRegistration providerReg;
+ private ServiceRegistration<?> providerReg;
/** The registration for the provider2 */
- private ServiceRegistration provider2Reg;
+ private ServiceRegistration<?> provider2Reg;
/** Flag for marking if startup is finished. */
private final AtomicBoolean startupFinished = new AtomicBoolean(false);
@@ -91,6 +91,7 @@ public class ServicesListener implements
/**
* @see org.apache.sling.launchpad.api.StartupListener#inform(org.apache.sling.launchpad.api.StartupMode, boolean)
*/
+ @Override
public void inform(final StartupMode mode, final boolean finished) {
if ( finished && this.startupFinished.compareAndSet(false, true) ) {
notifyChange();
@@ -100,6 +101,7 @@ public class ServicesListener implements
/**
* @see org.apache.sling.launchpad.api.StartupListener#startupFinished(org.apache.sling.launchpad.api.StartupMode)
*/
+ @Override
public void startupFinished(final StartupMode mode) {
if ( this.startupFinished.compareAndSet(false, true) ) {
notifyChange();
@@ -109,6 +111,7 @@ public class ServicesListener implements
/**
* @see org.apache.sling.launchpad.api.StartupListener#startupProgress(float)
*/
+ @Override
public void startupProgress(final float progress) {
// nothing to do
}
@@ -203,7 +206,7 @@ public class ServicesListener implements
private final String serviceName;
/** The service reference. */
- private volatile ServiceReference reference;
+ private volatile ServiceReference<?> reference;
/** The service. */
private volatile Object service;
@@ -227,7 +230,7 @@ public class ServicesListener implements
// this should really never happen
throw new RuntimeException("Unexpected exception occured.", ise);
}
- final ServiceReference ref = bundleContext.getServiceReference(serviceName);
+ final ServiceReference<?> ref = bundleContext.getServiceReference(serviceName);
if ( ref != null ) {
this.retainService(ref);
}
@@ -250,7 +253,7 @@ public class ServicesListener implements
/**
* Try to get the service and notify the change.
*/
- private synchronized void retainService(final ServiceReference ref) {
+ private synchronized void retainService(final ServiceReference<?> ref) {
boolean hadService = this.service != null;
boolean getService = this.reference == null;
if ( !getService ) {
@@ -278,7 +281,7 @@ public class ServicesListener implements
/**
* Try to release the service and notify the change.
*/
- private synchronized void releaseService(final ServiceReference ref) {
+ private synchronized void releaseService(final ServiceReference<?> ref) {
if ( this.reference != null && this.reference.compareTo(ref) == 0) {
this.service = null;
bundleContext.ungetService(this.reference);
@@ -290,6 +293,7 @@ public class ServicesListener implements
/**
* @see org.osgi.framework.ServiceListener#serviceChanged(org.osgi.framework.ServiceEvent)
*/
+ @Override
public void serviceChanged(final ServiceEvent event) {
if (event.getType() == ServiceEvent.REGISTERED) {
this.retainService(event.getServiceReference());
Modified: sling/trunk/bundles/extensions/webconsolesecurityprovider/src/main/java/org/apache/sling/extensions/webconsolesecurityprovider/internal/SlingWebConsoleSecurityProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/webconsolesecurityprovider/src/main/java/org/apache/sling/extensions/webconsolesecurityprovider/internal/SlingWebConsoleSecurityProvider.java?rev=1768991&r1=1768990&r2=1768991&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/webconsolesecurityprovider/src/main/java/org/apache/sling/extensions/webconsolesecurityprovider/internal/SlingWebConsoleSecurityProvider.java (original)
+++ sling/trunk/bundles/extensions/webconsolesecurityprovider/src/main/java/org/apache/sling/extensions/webconsolesecurityprovider/internal/SlingWebConsoleSecurityProvider.java Wed Nov 9 15:45:10 2016
@@ -100,7 +100,6 @@ public class SlingWebConsoleSecurityProv
}
// check groups
- @SuppressWarnings("unchecked")
Iterator<Group> gi = a.memberOf();
while (gi.hasNext()) {
if (groups.contains(gi.next().getID())) {
Modified: sling/trunk/bundles/extensions/webconsolesecurityprovider/src/main/java/org/apache/sling/extensions/webconsolesecurityprovider/internal/SlingWebConsoleSecurityProvider2.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/webconsolesecurityprovider/src/main/java/org/apache/sling/extensions/webconsolesecurityprovider/internal/SlingWebConsoleSecurityProvider2.java?rev=1768991&r1=1768990&r2=1768991&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/webconsolesecurityprovider/src/main/java/org/apache/sling/extensions/webconsolesecurityprovider/internal/SlingWebConsoleSecurityProvider2.java (original)
+++ sling/trunk/bundles/extensions/webconsolesecurityprovider/src/main/java/org/apache/sling/extensions/webconsolesecurityprovider/internal/SlingWebConsoleSecurityProvider2.java Wed Nov 9 15:45:10 2016
@@ -117,7 +117,6 @@ public class SlingWebConsoleSecurityProv
}
// check groups
- @SuppressWarnings("unchecked")
Iterator<Group> gi = a.memberOf();
while (gi.hasNext()) {
if (groups.contains(gi.next().getID())) {