You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by si...@apache.org on 2019/06/19 14:54:53 UTC
[sling-org-apache-sling-feature-inventoryprinter] branch r2f
updated: [r2f] refactoring according to new [diff] and [r2f] APIs
This is an automated email from the ASF dual-hosted git repository.
simonetripodi pushed a commit to branch r2f
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-inventoryprinter.git
The following commit(s) were added to refs/heads/r2f by this push:
new 7f9df9d [r2f] refactoring according to new [diff] and [r2f] APIs
7f9df9d is described below
commit 7f9df9d3923054c82978400e139bc051fa7f32f1
Author: Simo Tripodi <st...@adobe.com>
AuthorDate: Wed Jun 19 16:54:35 2019 +0200
[r2f] refactoring according to new [diff] and [r2f] APIs
---
.../impl/AbstractFeatureInventoryPrinter.java | 4 +---
.../AbstractRuntimeEnvironment2FeatureModelPrinter.java | 13 +------------
.../inventoryservice/impl/FeaturesInventoryPrinter.java | 7 -------
.../impl/Launch2RuntimeInventoryPrinter.java | 11 ++---------
.../inventoryservice/impl/RuntimeInventoryPrinter.java | 7 -------
5 files changed, 4 insertions(+), 38 deletions(-)
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
index 56b8f83..63ba605 100644
--- a/src/main/java/org/apache/sling/feature/inventoryservice/impl/AbstractFeatureInventoryPrinter.java
+++ b/src/main/java/org/apache/sling/feature/inventoryservice/impl/AbstractFeatureInventoryPrinter.java
@@ -24,18 +24,16 @@ import org.apache.felix.inventory.Format;
import org.apache.felix.inventory.InventoryPrinter;
import org.apache.sling.feature.Feature;
import org.apache.sling.feature.r2f.RuntimeEnvironment2FeatureModel;
-import org.osgi.framework.BundleContext;
abstract class AbstractFeatureInventoryPrinter implements InventoryPrinter {
- protected BundleContext bundleContext;
protected RuntimeEnvironment2FeatureModel generator;
@Override
public final void print(PrintWriter printWriter, Format format, boolean isZip) {
try {
- Feature launchFeature = generator.getLaunchFeature(bundleContext);
+ Feature launchFeature = generator.getLaunchFeature();
onLaunchFeature(launchFeature, printWriter);
} catch (Throwable t) {
t.printStackTrace(printWriter);
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 bb894af..8d1bdeb 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
@@ -20,24 +20,13 @@ import static org.apache.sling.feature.io.json.FeatureJSONWriter.write;
import java.io.PrintWriter;
-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;
abstract class AbstractRuntimeEnvironment2FeatureModelPrinter extends AbstractFeatureInventoryPrinter {
@Override
protected void onLaunchFeature(Feature launchFeature, PrintWriter printWriter) throws Exception {
- String groupId = launchFeature.getId().getGroupId();
- String artifactId = launchFeature.getId().getArtifactId();
- String version = launchFeature.getId().getArtifactId();
- String classifier = launchFeature.getId().getArtifactId() + "-RUNTIME";
-
- ConversionRequest request = new DefaultConversionRequest()
- .setBundleContext(bundleContext)
- .setResultId(new ArtifactId(groupId, artifactId, version, classifier, null));
- Feature runtimeFeature = generator.getRuntimeFeature(request);
+ Feature runtimeFeature = generator.getRuntimeFeature();
Feature computedFeature = compute(launchFeature, runtimeFeature);
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 642d553..3e352eb 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
@@ -28,8 +28,6 @@ import java.io.PrintWriter;
import org.apache.felix.inventory.InventoryPrinter;
import org.apache.sling.feature.Feature;
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.Component;
import org.osgi.service.component.annotations.Reference;
@@ -46,11 +44,6 @@ import org.osgi.service.component.annotations.Reference;
)
public class FeaturesInventoryPrinter extends AbstractFeatureInventoryPrinter {
- @Activate
- public void start(BundleContext bundleContext) {
- this.bundleContext = bundleContext;
- }
-
@Override
protected void onLaunchFeature(Feature launchFeature, PrintWriter printWriter) throws Exception {
write(printWriter, launchFeature);
diff --git a/src/main/java/org/apache/sling/feature/inventoryservice/impl/Launch2RuntimeInventoryPrinter.java b/src/main/java/org/apache/sling/feature/inventoryservice/impl/Launch2RuntimeInventoryPrinter.java
index 8f16ad9..d43eca9 100644
--- a/src/main/java/org/apache/sling/feature/inventoryservice/impl/Launch2RuntimeInventoryPrinter.java
+++ b/src/main/java/org/apache/sling/feature/inventoryservice/impl/Launch2RuntimeInventoryPrinter.java
@@ -24,10 +24,8 @@ import static org.apache.sling.feature.diff.FeatureDiff.compareFeatures;
import org.apache.felix.inventory.InventoryPrinter;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.diff.DefaultDiffRequest;
+import org.apache.sling.feature.diff.DiffRequest;
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.Component;
import org.osgi.service.component.annotations.Reference;
@@ -44,14 +42,9 @@ import org.osgi.service.component.annotations.Reference;
)
public class Launch2RuntimeInventoryPrinter extends AbstractRuntimeEnvironment2FeatureModelPrinter {
- @Activate
- public void start(BundleContext bundleContext) {
- this.bundleContext = bundleContext;
- }
-
@Override
protected Feature compute(Feature launchFeature, Feature runtimeFeature) {
- Feature featureDiff = compareFeatures(new DefaultDiffRequest()
+ Feature featureDiff = compareFeatures(new DiffRequest()
.setPrevious(launchFeature)
.setCurrent(runtimeFeature)
.addIncludeComparator("bundles")
diff --git a/src/main/java/org/apache/sling/feature/inventoryservice/impl/RuntimeInventoryPrinter.java b/src/main/java/org/apache/sling/feature/inventoryservice/impl/RuntimeInventoryPrinter.java
index 22aa2f6..c9e538a 100644
--- a/src/main/java/org/apache/sling/feature/inventoryservice/impl/RuntimeInventoryPrinter.java
+++ b/src/main/java/org/apache/sling/feature/inventoryservice/impl/RuntimeInventoryPrinter.java
@@ -23,8 +23,6 @@ import static org.apache.felix.inventory.InventoryPrinter.TITLE;
import org.apache.felix.inventory.InventoryPrinter;
import org.apache.sling.feature.Feature;
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.Component;
import org.osgi.service.component.annotations.Reference;
@@ -41,11 +39,6 @@ import org.osgi.service.component.annotations.Reference;
)
public final class RuntimeInventoryPrinter extends AbstractRuntimeEnvironment2FeatureModelPrinter {
- @Activate
- public void start(BundleContext bundleContext) {
- this.bundleContext = bundleContext;
- }
-
@Override
protected Feature compute(Feature previousFeature, Feature currentFeature) {
return currentFeature;