[sling-org-apache-sling-installer-factory-configuration] branch master updated: SLING-7786 : Use R7 configuration admin supporting named factory configurations

[cziegeler]

This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git


The following commit(s) were added to refs/heads/master by this push:
     new 3e08818  SLING-7786 : Use R7 configuration admin supporting named 
factory configurations
3e08818 is described below

commit 3e0881817ed16cd344152c104a03797b69e36335
Author: Carsten Ziegeler <czieg...@adobe.com>
AuthorDate: Fri Jul 27 11:01:03 2018 +0200

    SLING-7786 : Use R7 configuration admin supporting named factory 
configurations
---
 .../installer/factories/configuration/impl/ConfigTaskCreator.java   | 6 +++---
 .../sling/installer/factories/configuration/impl/ConfigUtil.java    | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java
 
b/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java
index d375f89..61cdacf 100644
--- 
a/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java
+++ 
b/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java
@@ -200,12 +200,12 @@ public class ConfigTaskCreator
     /**
      * Compute the extension
      */
-    private static String getExtension(String url) {
+    private static String getExtension(final String url) {
         final int pos = url.lastIndexOf('.');
         return (pos < 0 ? "" : url.substring(pos+1));
     }
 
-    private static boolean isConfigExtension(String extension) {
+    private static boolean isConfigExtension(final String extension) {
         if ( extension.equals("cfg")
                 || extension.equals("config")
                 || extension.equals("xml")
@@ -221,7 +221,7 @@ public class ConfigTaskCreator
      * @param path  the path to be changed, null ignored
      * @return the updated path
      */
-    private static String separatorsToUnix(String path) {
+    private static String separatorsToUnix(final String path) {
         if (path == null || path.indexOf('\\') == -1) {
             return path;
         }
diff --git 
a/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigUtil.java
 
b/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigUtil.java
index f1f0e5a..8a664f0 100644
--- 
a/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigUtil.java
+++ 
b/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigUtil.java
@@ -216,6 +216,12 @@ abstract class ConfigUtil {
         return result;
     }
 
+    /**
+     * Get the PID for a factory PID by using the R7 format
+     * @param factoryPID The factory pid
+     * @param name The name
+     * @return The PID
+     */
     public static String getPIDOfFactoryPID(final String factoryPID, final 
String name) {
         return factoryPID.concat("~").concat(name);
     }