Author: cziegeler
Date: Fri Jul 22 05:29:36 2016
New Revision: 1753747
URL: http://svn.apache.org/viewvc?rev=1753747&view=rev
Log:
Minor code cleanup
Modified:
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryActivator.java
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryImpl.java
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/legacy/LegacyResourceProviderFactoryAdapter.java
Modified:
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java?rev=1753747&r1=1753746&r2=1753747&view=diff
==============================================================================
---
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java
(original)
+++
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java
Fri Jul 22 05:29:36 2016
@@ -120,6 +120,7 @@ public class CommonResourceResolverFacto
/**
* @see
org.apache.sling.api.resource.ResourceResolverFactory#getAdministrativeResourceResolver(java.util.Map)
*/
+ @SuppressWarnings("deprecation")
@Override
public ResourceResolver getAdministrativeResourceResolver(final
Map<String, Object> passedAuthenticationInfo)
throws LoginException {
Modified:
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryActivator.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryActivator.java?rev=1753747&r1=1753746&r2=1753747&view=diff
==============================================================================
---
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryActivator.java
(original)
+++
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryActivator.java
Fri Jul 22 05:29:36 2016
@@ -428,7 +428,7 @@ public class ResourceResolverFactoryActi
// ---------- SCR Integration ---------------------------------------------
/**
- * Activates this component, called by SCR before registering as a service
+ * Activates this component (called by SCR before)
*/
@Activate
protected void activate(final ComponentContext componentContext) {
@@ -589,10 +589,13 @@ public class ResourceResolverFactoryActi
}
}
+ /**
+ * Modifies this component (called by SCR to update this component)
+ */
@Modified
- protected void modified(final ComponentContext context) {
+ protected void modified(final ComponentContext componentContext) {
this.deactivate();
- this.activate(context);
+ this.activate(componentContext);
}
/**
@@ -612,6 +615,9 @@ public class ResourceResolverFactoryActi
this.preconds.deactivate();
this.resourceDecoratorTracker.close();
+ // this is just a sanity call to make sure that unregister
+ // in the case that a registration happened again
+ // while deactivation
this.unregisterFactory();
}
@@ -689,6 +695,10 @@ public class ResourceResolverFactoryActi
}
}
+ /**
+ * Get the runtime service
+ * @return The runtime service
+ */
public RuntimeService getRuntimeService() {
return new RuntimeServiceImpl(this.resourceProviderTracker);
}
@@ -732,6 +742,10 @@ public class ResourceResolverFactoryActi
this.resourceDecoratorTracker.unbindResourceDecorator(decorator,
props);
}
+ /**
+ * Get the resource provider tracker
+ * @return The tracker
+ */
public ResourceProviderTracker getResourceProviderTracker() {
return resourceProviderTracker;
}
Modified:
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryImpl.java?rev=1753747&r1=1753746&r2=1753747&view=diff
==============================================================================
---
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryImpl.java
(original)
+++
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryImpl.java
Fri Jul 22 05:29:36 2016
@@ -60,6 +60,7 @@ public class ResourceResolverFactoryImpl
/**
* @see
org.apache.sling.api.resource.ResourceResolverFactory#getServiceResourceResolver(java.util.Map)
*/
+ @Override
public ResourceResolver getServiceResourceResolver(final Map<String,
Object> passedAuthenticationInfo) throws LoginException {
// create a copy of the passed authentication info as we modify the map
final Map<String, Object> authenticationInfo = new HashMap<String,
Object>();
@@ -94,6 +95,7 @@ public class ResourceResolverFactoryImpl
/**
* @see
org.apache.sling.api.resource.ResourceResolverFactory#getResourceResolver(java.util.Map)
*/
+ @Override
public ResourceResolver getResourceResolver(
final Map<String, Object> authenticationInfo) throws
LoginException {
return commonFactory.getResourceResolver(authenticationInfo);
@@ -102,6 +104,8 @@ public class ResourceResolverFactoryImpl
/**
* @see
org.apache.sling.api.resource.ResourceResolverFactory#getAdministrativeResourceResolver(java.util.Map)
*/
+ @Override
+ @SuppressWarnings("deprecation")
public ResourceResolver getAdministrativeResourceResolver(
final Map<String, Object> authenticationInfo) throws
LoginException {
return
commonFactory.getAdministrativeResourceResolver(authenticationInfo);
@@ -110,6 +114,7 @@ public class ResourceResolverFactoryImpl
/**
* @see
org.apache.sling.api.resource.ResourceResolverFactory#getThreadResourceResolver()
*/
+ @Override
public ResourceResolver getThreadResourceResolver() {
return commonFactory.getThreadResourceResolver();
}
Modified:
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/legacy/LegacyResourceProviderFactoryAdapter.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/legacy/LegacyResourceProviderFactoryAdapter.java?rev=1753747&r1=1753746&r2=1753747&view=diff
==============================================================================
---
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/legacy/LegacyResourceProviderFactoryAdapter.java
(original)
+++
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/legacy/LegacyResourceProviderFactoryAdapter.java
Fri Jul 22 05:29:36 2016
@@ -130,7 +130,6 @@ public class LegacyResourceProviderFacto
return ctx.getProviderState().hasChanges((ResolveContext) ctx);
}
- @SuppressWarnings("unchecked")
@Override
public <AdapterType> AdapterType adaptTo(final @Nonnull
ResolveContext<LegacyResourceProviderAdapter> ctx, final @Nonnull
Class<AdapterType> type) {
return (AdapterType)
ctx.getProviderState().adaptTo((ResolveContext)ctx, type);
