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 20:31:57 UTC
[sling-whiteboard] branch master updated: [feature-diff] the
FeatureElementComparator is not intended to be part of public OSGi APIs
This is an automated email from the ASF dual-hosted git repository.
simonetripodi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
The following commit(s) were added to refs/heads/master by this push:
new 7d3981b [feature-diff] the FeatureElementComparator is not intended to be part of public OSGi APIs
7d3981b is described below
commit 7d3981bc6ecf2ad77d90b042b31060c8b6993ab2
Author: Simo Tripodi <st...@adobe.com>
AuthorDate: Wed Jun 19 22:31:50 2019 +0200
[feature-diff] the FeatureElementComparator is not intended to be part
of public OSGi APIs
---
.../org/apache/sling/feature/diff/FeatureDiff.java | 2 +-
.../diff/impl/AbstractFeatureElementComparator.java | 2 --
.../sling/feature/diff/impl/BundlesComparator.java | 1 -
.../feature/diff/impl/ConfigurationsComparator.java | 1 -
.../feature/diff/impl/ExtensionsComparator.java | 1 -
.../{spi => impl}/FeatureElementComparator.java | 2 +-
.../diff/impl/FrameworkPropertiesComparator.java | 1 -
.../apache/sling/feature/diff/spi/package-info.java | 21 ---------------------
.../apache/sling/feature/diff/FeatureDiffTest.java | 2 +-
.../feature/diff/impl/AbstractComparatorTest.java | 1 -
10 files changed, 3 insertions(+), 31 deletions(-)
diff --git a/feature-diff/src/main/java/org/apache/sling/feature/diff/FeatureDiff.java b/feature-diff/src/main/java/org/apache/sling/feature/diff/FeatureDiff.java
index e1dd463..705abb5 100644
--- a/feature-diff/src/main/java/org/apache/sling/feature/diff/FeatureDiff.java
+++ b/feature-diff/src/main/java/org/apache/sling/feature/diff/FeatureDiff.java
@@ -25,7 +25,7 @@ import java.util.LinkedList;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Feature;
import org.apache.sling.feature.Prototype;
-import org.apache.sling.feature.diff.spi.FeatureElementComparator;
+import org.apache.sling.feature.diff.impl.FeatureElementComparator;
public final class FeatureDiff {
diff --git a/feature-diff/src/main/java/org/apache/sling/feature/diff/impl/AbstractFeatureElementComparator.java b/feature-diff/src/main/java/org/apache/sling/feature/diff/impl/AbstractFeatureElementComparator.java
index 9949a59..33364f2 100644
--- a/feature-diff/src/main/java/org/apache/sling/feature/diff/impl/AbstractFeatureElementComparator.java
+++ b/feature-diff/src/main/java/org/apache/sling/feature/diff/impl/AbstractFeatureElementComparator.java
@@ -16,8 +16,6 @@
*/
package org.apache.sling.feature.diff.impl;
-import org.apache.sling.feature.diff.spi.FeatureElementComparator;
-
abstract class AbstractFeatureElementComparator implements FeatureElementComparator {
private final String id;
diff --git a/feature-diff/src/main/java/org/apache/sling/feature/diff/impl/BundlesComparator.java b/feature-diff/src/main/java/org/apache/sling/feature/diff/impl/BundlesComparator.java
index 618ede9..e225a11 100644
--- a/feature-diff/src/main/java/org/apache/sling/feature/diff/impl/BundlesComparator.java
+++ b/feature-diff/src/main/java/org/apache/sling/feature/diff/impl/BundlesComparator.java
@@ -19,7 +19,6 @@ package org.apache.sling.feature.diff.impl;
import org.apache.sling.feature.Artifact;
import org.apache.sling.feature.Artifacts;
import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.diff.spi.FeatureElementComparator;
import com.google.auto.service.AutoService;
diff --git a/feature-diff/src/main/java/org/apache/sling/feature/diff/impl/ConfigurationsComparator.java b/feature-diff/src/main/java/org/apache/sling/feature/diff/impl/ConfigurationsComparator.java
index e9d05e4..bd046f4 100644
--- a/feature-diff/src/main/java/org/apache/sling/feature/diff/impl/ConfigurationsComparator.java
+++ b/feature-diff/src/main/java/org/apache/sling/feature/diff/impl/ConfigurationsComparator.java
@@ -24,7 +24,6 @@ import java.util.Enumeration;
import org.apache.sling.feature.Configuration;
import org.apache.sling.feature.Configurations;
import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.diff.spi.FeatureElementComparator;
import com.google.auto.service.AutoService;
diff --git a/feature-diff/src/main/java/org/apache/sling/feature/diff/impl/ExtensionsComparator.java b/feature-diff/src/main/java/org/apache/sling/feature/diff/impl/ExtensionsComparator.java
index 16fa466..303e488 100644
--- a/feature-diff/src/main/java/org/apache/sling/feature/diff/impl/ExtensionsComparator.java
+++ b/feature-diff/src/main/java/org/apache/sling/feature/diff/impl/ExtensionsComparator.java
@@ -28,7 +28,6 @@ import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Extension;
import org.apache.sling.feature.Extensions;
import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.diff.spi.FeatureElementComparator;
import com.google.auto.service.AutoService;
diff --git a/feature-diff/src/main/java/org/apache/sling/feature/diff/spi/FeatureElementComparator.java b/feature-diff/src/main/java/org/apache/sling/feature/diff/impl/FeatureElementComparator.java
similarity index 97%
rename from feature-diff/src/main/java/org/apache/sling/feature/diff/spi/FeatureElementComparator.java
rename to feature-diff/src/main/java/org/apache/sling/feature/diff/impl/FeatureElementComparator.java
index 536c775..9b3c1cc 100644
--- a/feature-diff/src/main/java/org/apache/sling/feature/diff/spi/FeatureElementComparator.java
+++ b/feature-diff/src/main/java/org/apache/sling/feature/diff/impl/FeatureElementComparator.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.diff.spi;
+package org.apache.sling.feature.diff.impl;
import org.apache.sling.feature.Feature;
diff --git a/feature-diff/src/main/java/org/apache/sling/feature/diff/impl/FrameworkPropertiesComparator.java b/feature-diff/src/main/java/org/apache/sling/feature/diff/impl/FrameworkPropertiesComparator.java
index b9f56dd..0dd5f4e 100644
--- a/feature-diff/src/main/java/org/apache/sling/feature/diff/impl/FrameworkPropertiesComparator.java
+++ b/feature-diff/src/main/java/org/apache/sling/feature/diff/impl/FrameworkPropertiesComparator.java
@@ -21,7 +21,6 @@ import java.util.Map.Entry;
import java.util.Objects;
import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.diff.spi.FeatureElementComparator;
import com.google.auto.service.AutoService;
diff --git a/feature-diff/src/main/java/org/apache/sling/feature/diff/spi/package-info.java b/feature-diff/src/main/java/org/apache/sling/feature/diff/spi/package-info.java
deleted file mode 100644
index 42f68d8..0000000
--- a/feature-diff/src/main/java/org/apache/sling/feature/diff/spi/package-info.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * 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.
- */
-
-/**
- * APIs to compare different Apache Sling Feature Model versions.
- */
-package org.apache.sling.feature.diff.spi;
diff --git a/feature-diff/src/test/java/org/apache/sling/feature/diff/FeatureDiffTest.java b/feature-diff/src/test/java/org/apache/sling/feature/diff/FeatureDiffTest.java
index 87f4c67..7a16d22 100644
--- a/feature-diff/src/test/java/org/apache/sling/feature/diff/FeatureDiffTest.java
+++ b/feature-diff/src/test/java/org/apache/sling/feature/diff/FeatureDiffTest.java
@@ -23,7 +23,7 @@ import static org.junit.Assert.assertTrue;
import java.util.HashSet;
import java.util.Set;
-import org.apache.sling.feature.diff.spi.FeatureElementComparator;
+import org.apache.sling.feature.diff.impl.FeatureElementComparator;
import org.junit.Test;
public final class FeatureDiffTest {
diff --git a/feature-diff/src/test/java/org/apache/sling/feature/diff/impl/AbstractComparatorTest.java b/feature-diff/src/test/java/org/apache/sling/feature/diff/impl/AbstractComparatorTest.java
index 2840bbb..e68dfbe 100644
--- a/feature-diff/src/test/java/org/apache/sling/feature/diff/impl/AbstractComparatorTest.java
+++ b/feature-diff/src/test/java/org/apache/sling/feature/diff/impl/AbstractComparatorTest.java
@@ -19,7 +19,6 @@ package org.apache.sling.feature.diff.impl;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Feature;
import org.apache.sling.feature.Prototype;
-import org.apache.sling.feature.diff.spi.FeatureElementComparator;
import org.junit.After;
import org.junit.Before;