[sling-org-apache-sling-feature-launcher] branch master updated: Move extension constants to Extension class

[cz...@apache.org]

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-feature-launcher.git


The following commit(s) were added to refs/heads/master by this push:
     new 0c1999c  Move extension constants to Extension class
0c1999c is described below

commit 0c1999c2fffa525412c0eca86cbb04ae2e44fa35
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Nov 21 15:13:09 2018 +0100

    Move extension constants to Extension class
---
 .../org/apache/sling/feature/launcher/impl/FeatureProcessor.java     | 4 ++--
 .../launcher/impl/extensions/handlers/ContentPackageHandler.java     | 5 ++---
 .../feature/launcher/impl/extensions/handlers/RepoInitHandler.java   | 5 ++---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java b/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java
index 1ea92aa..552c5cb 100644
--- a/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java
+++ b/src/main/java/org/apache/sling/feature/launcher/impl/FeatureProcessor.java
@@ -35,7 +35,6 @@ import org.apache.sling.feature.Configuration;
 import org.apache.sling.feature.Extension;
 import org.apache.sling.feature.ExtensionType;
 import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.FeatureConstants;
 import org.apache.sling.feature.builder.BuilderContext;
 import org.apache.sling.feature.builder.FeatureBuilder;
 import org.apache.sling.feature.builder.MergeHandler;
@@ -197,7 +196,8 @@ public class FeatureProcessor {
         }
         for (final Extension ext : app.getExtensions())
         {
-            if (ext.getType() == ExtensionType.ARTIFACTS && ext.getName().equals(FeatureConstants.EXTENSION_NAME_CONTENT_PACKAGES))
+            if (ext.getType() == ExtensionType.ARTIFACTS
+                    && ext.getName().equals(Extension.EXTENSION_NAME_CONTENT_PACKAGES))
             {
                 for (final Artifact a : ext.getArtifacts())
                 {
diff --git a/src/main/java/org/apache/sling/feature/launcher/impl/extensions/handlers/ContentPackageHandler.java b/src/main/java/org/apache/sling/feature/launcher/impl/extensions/handlers/ContentPackageHandler.java
index bfcd083..dfc0db4 100644
--- a/src/main/java/org/apache/sling/feature/launcher/impl/extensions/handlers/ContentPackageHandler.java
+++ b/src/main/java/org/apache/sling/feature/launcher/impl/extensions/handlers/ContentPackageHandler.java
@@ -21,8 +21,6 @@ import java.io.IOException;
 import org.apache.sling.feature.Artifact;
 import org.apache.sling.feature.Extension;
 import org.apache.sling.feature.ExtensionType;
-import org.apache.sling.feature.FeatureConstants;
-import org.apache.sling.feature.launcher.impl.FeatureProcessor;
 import org.apache.sling.feature.launcher.spi.LauncherPrepareContext;
 import org.apache.sling.feature.launcher.spi.extensions.ExtensionHandler;
 import org.apache.sling.feature.launcher.spi.extensions.ExtensionInstallationContext;
@@ -32,7 +30,8 @@ public class ContentPackageHandler implements ExtensionHandler
     @Override
     public boolean handle(Extension extension, LauncherPrepareContext prepareContext, ExtensionInstallationContext installationContext) throws IOException
     {
-        if ( extension.getType() == ExtensionType.ARTIFACTS && extension.getName().equals(FeatureConstants.EXTENSION_NAME_CONTENT_PACKAGES) ) {
+        if (extension.getType() == ExtensionType.ARTIFACTS
+                && extension.getName().equals(Extension.EXTENSION_NAME_CONTENT_PACKAGES)) {
             for(final Artifact a : extension.getArtifacts() ) {
                 installationContext.addInstallableArtifact(prepareContext.getArtifactFile(a.getId()));
             }
diff --git a/src/main/java/org/apache/sling/feature/launcher/impl/extensions/handlers/RepoInitHandler.java b/src/main/java/org/apache/sling/feature/launcher/impl/extensions/handlers/RepoInitHandler.java
index 8110954..c639104 100644
--- a/src/main/java/org/apache/sling/feature/launcher/impl/extensions/handlers/RepoInitHandler.java
+++ b/src/main/java/org/apache/sling/feature/launcher/impl/extensions/handlers/RepoInitHandler.java
@@ -21,7 +21,6 @@ import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.sling.feature.Configuration;
 import org.apache.sling.feature.Extension;
 import org.apache.sling.feature.ExtensionType;
-import org.apache.sling.feature.FeatureConstants;
 import org.apache.sling.feature.launcher.spi.LauncherPrepareContext;
 import org.apache.sling.feature.launcher.spi.extensions.ExtensionHandler;
 import org.apache.sling.feature.launcher.spi.extensions.ExtensionInstallationContext;
@@ -33,9 +32,9 @@ public class RepoInitHandler implements ExtensionHandler
     @Override
     public boolean handle(Extension extension, LauncherPrepareContext prepareContext, ExtensionInstallationContext installationContext) throws Exception
     {
-        if ( extension.getName().equals(FeatureConstants.EXTENSION_NAME_REPOINIT) ) {
+        if (extension.getName().equals(Extension.EXTENSION_NAME_REPOINIT)) {
             if ( extension.getType() != ExtensionType.TEXT ) {
-                throw new Exception(FeatureConstants.EXTENSION_NAME_REPOINIT + " extension must be of type text");
+                throw new Exception(Extension.EXTENSION_NAME_REPOINIT + " extension must be of type text");
             }
             final Configuration cfg = new Configuration("org.apache.sling.jcr.repoinit.RepositoryInitializer~repoinit"
                     + String.valueOf(index.getAndIncrement()));