SLING-7786 : Use R7 configuration admin supporting named factory configurations
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 @@
/**
* 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 @@
* @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 @@
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);
}
