You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by da...@apache.org on 2019/02/09 00:27:39 UTC
[sling-org-apache-sling-feature-apiregions] branch master updated:
Some minor code improvements
This is an automated email from the ASF dual-hosted git repository.
davidb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-apiregions.git
The following commit(s) were added to refs/heads/master by this push:
new 1c64ac1 Some minor code improvements
1c64ac1 is described below
commit 1c64ac1ceef5bd9e7a959890daccb80f5fb4050b
Author: David Bosschaert <bo...@adobe.com>
AuthorDate: Fri Feb 8 16:27:28 2019 -0800
Some minor code improvements
---
.../java/org/apache/sling/feature/apiregions/impl/Activator.java | 1 +
.../org/apache/sling/feature/apiregions/impl/RegionEnforcer.java | 7 ++++---
.../org/apache/sling/feature/apiregions/impl/ResolverHookImpl.java | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/sling/feature/apiregions/impl/Activator.java b/src/main/java/org/apache/sling/feature/apiregions/impl/Activator.java
index 8064b02..010efec 100644
--- a/src/main/java/org/apache/sling/feature/apiregions/impl/Activator.java
+++ b/src/main/java/org/apache/sling/feature/apiregions/impl/Activator.java
@@ -41,5 +41,6 @@ public class Activator implements BundleActivator {
@Override
public synchronized void stop(BundleContext context) throws Exception {
+ // Nothing to do
}
}
diff --git a/src/main/java/org/apache/sling/feature/apiregions/impl/RegionEnforcer.java b/src/main/java/org/apache/sling/feature/apiregions/impl/RegionEnforcer.java
index 7ab5bca..b0d93e9 100644
--- a/src/main/java/org/apache/sling/feature/apiregions/impl/RegionEnforcer.java
+++ b/src/main/java/org/apache/sling/feature/apiregions/impl/RegionEnforcer.java
@@ -61,7 +61,8 @@ class RegionEnforcer implements ResolverHookFactory {
final Map<String, Set<String>> regionPackageMap;
final Set<String> enabledRegions;
- RegionEnforcer(BundleContext context, Dictionary<String, Object> regProps, String regionsProp) throws Exception {
+ RegionEnforcer(BundleContext context, Dictionary<String, Object> regProps, String regionsProp)
+ throws IOException, URISyntaxException {
URI idbsnverFile = getDataFileURI(context, IDBSNVER_FILENAME);
bsnVerMap = populateBSNVerMap(idbsnverFile);
if (idbsnverFile != null) {
@@ -107,7 +108,7 @@ class RegionEnforcer implements ResolverHookFactory {
for (String n : p.stringPropertyNames()) {
String[] bsnver = p.getProperty(n).split("~");
- Map.Entry<String, Version> key = new AbstractMap.SimpleEntry<String, Version>(bsnver[0], Version.valueOf(bsnver[1]));
+ Map.Entry<String, Version> key = new AbstractMap.SimpleEntry<>(bsnver[0], Version.valueOf(bsnver[1]));
List<String> l = m.get(key);
if (l == null) {
l = new ArrayList<>();
@@ -186,7 +187,7 @@ class RegionEnforcer implements ResolverHookFactory {
@Override
public ResolverHook begin(Collection<BundleRevision> triggers) {
- if (enabledRegions.size() == 0)
+ if (enabledRegions.isEmpty())
return null;
return new ResolverHookImpl(bsnVerMap, bundleFeatureMap, featureRegionMap, regionPackageMap);
}
diff --git a/src/main/java/org/apache/sling/feature/apiregions/impl/ResolverHookImpl.java b/src/main/java/org/apache/sling/feature/apiregions/impl/ResolverHookImpl.java
index 34f4409..427c357 100644
--- a/src/main/java/org/apache/sling/feature/apiregions/impl/ResolverHookImpl.java
+++ b/src/main/java/org/apache/sling/feature/apiregions/impl/ResolverHookImpl.java
@@ -158,7 +158,7 @@ class ResolverHookImpl implements ResolverHook {
}
bcRegionMap.put(bc, capRegions);
- HashSet<String> sharedRegions = new HashSet<String>(reqRegions);
+ HashSet<String> sharedRegions = new HashSet<>(reqRegions);
sharedRegions.retainAll(capRegions);
Object pkg = bc.getAttributes().get(PackageNamespace.PACKAGE_NAMESPACE);