Clean up code: remove code, avoid using deprecated methods
diff --git a/src/main/java/org/apache/sling/feature/modelconverter/FeatureToProvisioning.java b/src/main/java/org/apache/sling/feature/modelconverter/FeatureToProvisioning.java
index 1a7ed3b..11c4b9f 100644
--- a/src/main/java/org/apache/sling/feature/modelconverter/FeatureToProvisioning.java
+++ b/src/main/java/org/apache/sling/feature/modelconverter/FeatureToProvisioning.java
@@ -42,6 +42,7 @@
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Extension;
+import org.apache.sling.feature.ExtensionState;
import org.apache.sling.feature.ExtensionType;
import org.apache.sling.feature.builder.BuilderContext;
import org.apache.sling.feature.builder.FeatureBuilder;
@@ -304,7 +305,7 @@
repoinitCfg.getProperties().put("scripts", repoinitContents);
runMode.getConfigurations().add(repoinitCfg);
}
- } else if ( ext.isRequired() ) {
+ } else if ( ext.getState() == ExtensionState.REQUIRED ) {
LOGGER.error("Unable to convert required extension {}", ext.getName());
System.exit(1);
}
diff --git a/src/main/java/org/apache/sling/feature/modelconverter/ProvisioningToFeature.java b/src/main/java/org/apache/sling/feature/modelconverter/ProvisioningToFeature.java
index 770dda9..10cd4c4 100644
--- a/src/main/java/org/apache/sling/feature/modelconverter/ProvisioningToFeature.java
+++ b/src/main/java/org/apache/sling/feature/modelconverter/ProvisioningToFeature.java
@@ -38,6 +38,7 @@
import org.apache.sling.feature.Bundles;
import org.apache.sling.feature.Configurations;
import org.apache.sling.feature.Extension;
+import org.apache.sling.feature.ExtensionState;
import org.apache.sling.feature.ExtensionType;
import org.apache.sling.feature.Extensions;
import org.apache.sling.feature.io.artifacts.ArtifactHandler;
@@ -372,7 +373,7 @@
if ( newArtifact.getId().getType().equals("zip") ) {
if ( cpExtension == null ) {
cpExtension = new Extension(ExtensionType.ARTIFACTS,
- Extension.EXTENSION_NAME_CONTENT_PACKAGES, true);
+ Extension.EXTENSION_NAME_CONTENT_PACKAGES, ExtensionState.REQUIRED);
extensions.add(cpExtension);
}
cpExtension.getArtifacts().add(newArtifact);
@@ -449,38 +450,13 @@
Extension repoExtension = extensions.getByName(Extension.EXTENSION_NAME_REPOINIT);
if ( repoExtension == null ) {
- // TODO: As of now only TEXT is accepted for Repoinit -> verify and adjust
-// repoExtension = new Extension(ExtensionType.JSON, Extension.EXTENSION_NAME_REPOINIT, true);
- repoExtension = new Extension(ExtensionType.TEXT, Extension.EXTENSION_NAME_REPOINIT, true);
+ repoExtension = new Extension(ExtensionType.TEXT, Extension.EXTENSION_NAME_REPOINIT, ExtensionState.REQUIRED);
extensions.add(repoExtension);
-// repoExtension.setText(textToJSON(repoinitText.toString()));
repoExtension.setText(repoinitText.toString());
} else {
throw new IllegalStateException("Repoinit sections already processed");
}
}
-}
-
- private static String textToJSON(String text) {
- text = text.replace('\t', ' ');
- String[] lines = text.split("[\n]");
-
- StringBuilder sb = new StringBuilder();
- sb.append('[');
-
- boolean first = true;
- for (String t : lines) {
- if (first)
- first = false;
- else
- sb.append(',');
-
- sb.append('"');
- sb.append(t);
- sb.append('"');
- }
- sb.append(']');
- return sb.toString();
}
private static List<org.apache.sling.feature.Feature> buildFeatures(Model model, String bareFileName, Map<String, Object> options) {
diff --git a/src/test/java/org/apache/sling/feature/modelconverter/ModelConverterTest.java b/src/test/java/org/apache/sling/feature/modelconverter/ModelConverterTest.java
index 233145a..e28c37f 100644
--- a/src/test/java/org/apache/sling/feature/modelconverter/ModelConverterTest.java
+++ b/src/test/java/org/apache/sling/feature/modelconverter/ModelConverterTest.java
@@ -705,7 +705,6 @@
for (int i=0; i<al1.size(); i++) {
Artifact a1 = al1.get(i);
String a1Version = a1.getVersion();
- String resolvedVersion = a1Version;
Artifact a1Resolved = null;
if(a1Version.startsWith("${") && a1Version.endsWith("}")) {
String variableName = a1Version.substring(2, a1Version.length() - 1);
@@ -720,7 +719,6 @@
Artifact a2 = it.next();
// LOGGER.debug("Check Artifacts, first: '{}', second: '{}'", a1, a2);
String a2Version = a2.getVersion();
- String resolvedVersion2 = a2Version;
Artifact a2Resolved = null;
if(a2Version.startsWith("${") && a2Version.endsWith("}")) {
String variableName = a2Version.substring(2, a2Version.length() - 1);
@@ -786,7 +784,7 @@
assertEquals(ex.getType(), ac.getType());
assertEquals(ex.getName(), ac.getName());
- assertEquals(ex.isRequired(), ac.isRequired());
+ assertEquals(ex.getState(), ac.getState());
if (ex.getType() == ExtensionType.TEXT) {
String exTxt;
