[r2f] reducing redundant code
diff --git a/src/main/java/org/apache/sling/feature/inventoryservice/impl/AbstractFeatureInventoryPrinter.java b/src/main/java/org/apache/sling/feature/inventoryservice/impl/AbstractFeatureInventoryPrinter.java
new file mode 100644
index 0000000..c11efa2
--- /dev/null
+++ b/src/main/java/org/apache/sling/feature/inventoryservice/impl/AbstractFeatureInventoryPrinter.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.feature.inventoryservice.impl;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.nio.file.Files.newBufferedReader;
+
+import java.io.BufferedReader;
+import java.io.PrintWriter;
+import java.net.URI;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.apache.felix.inventory.Format;
+import org.apache.felix.inventory.InventoryPrinter;
+import org.osgi.framework.BundleContext;
+import org.osgi.service.component.annotations.Activate;
+
+abstract class AbstractFeatureInventoryPrinter implements InventoryPrinter {
+
+ private static final String SLING_FEATURE_PROPERTY_NAME = "sling.feature";
+
+ @Activate
+ BundleContext bundleContext;
+
+ @Override
+ public final void print(PrintWriter printWriter, Format format, boolean isZip) {
+ String featureLocation = bundleContext.getProperty(SLING_FEATURE_PROPERTY_NAME);
+ URI previousFeatureURI = URI.create(featureLocation);
+ Path previousFeaturePath = Paths.get(previousFeatureURI);
+
+ try (BufferedReader reader = newBufferedReader(previousFeaturePath, UTF_8)) {
+ onFeature(featureLocation, reader, printWriter);
+ } catch (Exception e) {
+ e.printStackTrace(printWriter);
+ }
+ printWriter.println();
+ }
+
+ protected abstract void onFeature(String featureLocation, BufferedReader reader, PrintWriter printWriter) throws Exception;
+
+}
diff --git a/src/main/java/org/apache/sling/feature/inventoryservice/impl/AbstractRuntimeEnvironment2FeatureModelPrinter.java b/src/main/java/org/apache/sling/feature/inventoryservice/impl/AbstractRuntimeEnvironment2FeatureModelPrinter.java
index bb3e322..6d71c9d 100644
--- a/src/main/java/org/apache/sling/feature/inventoryservice/impl/AbstractRuntimeEnvironment2FeatureModelPrinter.java
+++ b/src/main/java/org/apache/sling/feature/inventoryservice/impl/AbstractRuntimeEnvironment2FeatureModelPrinter.java
@@ -16,54 +16,27 @@
*/
package org.apache.sling.feature.inventoryservice.impl;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.nio.file.Files.newBufferedReader;
import static org.apache.sling.feature.io.json.FeatureJSONReader.read;
import static org.apache.sling.feature.io.json.FeatureJSONWriter.write;
-import java.io.IOException;
+import java.io.BufferedReader;
import java.io.PrintWriter;
-import java.io.Reader;
-import java.net.URI;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import org.apache.felix.inventory.Format;
-import org.apache.felix.inventory.InventoryPrinter;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Feature;
import org.apache.sling.feature.r2f.ConversionRequest;
import org.apache.sling.feature.r2f.DefaultConversionRequest;
import org.apache.sling.feature.r2f.RuntimeEnvironment2FeatureModel;
-import org.osgi.framework.BundleContext;
-import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Reference;
-abstract class AbstractRuntimeEnvironment2FeatureModelPrinter implements InventoryPrinter {
-
- private static final String SLING_FEATURE_PROPERTY_NAME = "sling.feature";
+abstract class AbstractRuntimeEnvironment2FeatureModelPrinter extends AbstractFeatureInventoryPrinter {
@Reference
RuntimeEnvironment2FeatureModel generator;
- @Activate
- BundleContext bundleContext;
-
@Override
- public final void print(PrintWriter printWriter, Format format, boolean isZip) {
- String previousFeatureLocation = bundleContext.getProperty(SLING_FEATURE_PROPERTY_NAME);
- URI previousFeatureURI = URI.create(previousFeatureLocation);
- Path previousFeaturePath = Paths.get(previousFeatureURI);
- Feature previousFeature = null;
-
- try (Reader reader = newBufferedReader(previousFeaturePath, UTF_8)) {
- previousFeature = read(reader, previousFeatureLocation);
- } catch (IOException e) {
- throw new RuntimeException("An error occurred while reading 'sling.feature' framework-property "
- + previousFeatureLocation
- + ", see causing error(s):",
- e);
- }
+ protected void onFeature(String featureLocation, BufferedReader reader, PrintWriter printWriter) throws Exception {
+ Feature previousFeature = read(reader, featureLocation);
String groupId = previousFeature.getId().getGroupId();
String artifactId = previousFeature.getId().getArtifactId();
@@ -77,15 +50,7 @@
Feature computedFeature = compute(previousFeature, currentFeature);
- try {
- write(printWriter, computedFeature);
- } catch (IOException e) {
- printWriter.append("An error occured while searlizing ")
- .append(computedFeature.toString())
- .append(":\n");
-
- e.printStackTrace(printWriter);
- }
+ write(printWriter, computedFeature);
}
protected abstract Feature compute(Feature previousFeature, Feature currentFeature);
diff --git a/src/main/java/org/apache/sling/feature/inventoryservice/impl/FeaturesInventoryPrinter.java b/src/main/java/org/apache/sling/feature/inventoryservice/impl/FeaturesInventoryPrinter.java
index ac9710c..76bff52 100644
--- a/src/main/java/org/apache/sling/feature/inventoryservice/impl/FeaturesInventoryPrinter.java
+++ b/src/main/java/org/apache/sling/feature/inventoryservice/impl/FeaturesInventoryPrinter.java
@@ -18,36 +18,30 @@
*/
package org.apache.sling.feature.inventoryservice.impl;
-import org.apache.felix.inventory.Format;
-import org.apache.felix.inventory.InventoryPrinter;
-import org.osgi.framework.BundleContext;
-import org.osgi.service.component.annotations.Activate;
+import static org.apache.felix.inventory.InventoryPrinter.FORMAT;
+import static org.apache.felix.inventory.InventoryPrinter.NAME;
+import static org.apache.felix.inventory.InventoryPrinter.TITLE;
+
+import java.io.BufferedReader;
+import java.io.PrintWriter;
+
import org.osgi.service.component.annotations.Component;
-import java.io.PrintWriter;
-import java.net.URI;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
@Component(
-property = {InventoryPrinter.NAME + "=launch_feature",
- InventoryPrinter.TITLE + "=Launch Feature",
- InventoryPrinter.FORMAT + "=JSON"})
-public class FeaturesInventoryPrinter implements InventoryPrinter
-{
- @Activate
- BundleContext bc;
+ property = {
+ NAME + "=launch_feature",
+ TITLE + "=Launch Feature",
+ FORMAT + "=JSON"
+ }
+)
+public class FeaturesInventoryPrinter extends AbstractFeatureInventoryPrinter {
@Override
- public void print(PrintWriter printWriter, Format format, boolean isZip) {
- try {
- Path path = Paths.get(new URI(bc.getProperty("sling.feature")));
- byte[] bytes = Files.readAllBytes(path);
- printWriter.print(new String(bytes));
- } catch (Exception e) {
- e.printStackTrace(printWriter);
+ protected void onFeature(String featureLocation, BufferedReader reader, PrintWriter printWriter) throws Exception {
+ String line = null;
+ while ((line = reader.readLine()) != null) {
+ printWriter.println(line);
}
- printWriter.println();
}
+
}
