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
commit 5b959883d8d8639ddcb40a6428db6fbf37a61728 Author: Simo Tripodi <[email protected]> AuthorDate: Wed Jun 19 14:46:04 2019 +0200 [feature-diff] comparators are implementations, a good style is to name the package "impl" or "internal" They don't need a package-info file --- .../sling/feature/diff/comparators/package-info.java | 17 ----------------- .../AbstractFeatureElementComparator.java | 2 +- .../diff/{comparators => impl}/BundlesComparator.java | 2 +- .../{comparators => impl}/ConfigurationsComparator.java | 2 +- .../{comparators => impl}/ExtensionsComparator.java | 2 +- .../FrameworkPropertiesComparator.java | 2 +- .../{comparators => impl}/AbstractComparatorTest.java | 2 +- .../{comparators => impl}/BundlesComparatorTest.java | 4 ++-- .../ConfigurationsComparatorTest.java | 4 ++-- .../FrameworkPropertiesComparatorTest.java | 4 ++-- 10 files changed, 12 insertions(+), 29 deletions(-) diff --git a/feature-diff/src/main/java/org/apache/sling/feature/diff/comparators/package-info.java b/feature-diff/src/main/java/org/apache/sling/feature/diff/comparators/package-info.java deleted file mode 100644 index 4a7639a..0000000 --- a/feature-diff/src/main/java/org/apache/sling/feature/diff/comparators/package-info.java +++ /dev/null @@ -1,17 +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. - */ -package org.apache.sling.feature.diff.comparators; diff --git a/feature-diff/src/main/java/org/apache/sling/feature/diff/comparators/AbstractFeatureElementComparator.java b/feature-diff/src/main/java/org/apache/sling/feature/diff/impl/AbstractFeatureElementComparator.java similarity index 96% rename from feature-diff/src/main/java/org/apache/sling/feature/diff/comparators/AbstractFeatureElementComparator.java rename to feature-diff/src/main/java/org/apache/sling/feature/diff/impl/AbstractFeatureElementComparator.java index d34ae1c..9949a59 100644 --- a/feature-diff/src/main/java/org/apache/sling/feature/diff/comparators/AbstractFeatureElementComparator.java +++ b/feature-diff/src/main/java/org/apache/sling/feature/diff/impl/AbstractFeatureElementComparator.java @@ -14,7 +14,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package org.apache.sling.feature.diff.comparators; +package org.apache.sling.feature.diff.impl; import org.apache.sling.feature.diff.spi.FeatureElementComparator; diff --git a/feature-diff/src/main/java/org/apache/sling/feature/diff/comparators/BundlesComparator.java b/feature-diff/src/main/java/org/apache/sling/feature/diff/impl/BundlesComparator.java similarity index 97% rename from feature-diff/src/main/java/org/apache/sling/feature/diff/comparators/BundlesComparator.java rename to feature-diff/src/main/java/org/apache/sling/feature/diff/impl/BundlesComparator.java index f9806ad..618ede9 100644 --- a/feature-diff/src/main/java/org/apache/sling/feature/diff/comparators/BundlesComparator.java +++ b/feature-diff/src/main/java/org/apache/sling/feature/diff/impl/BundlesComparator.java @@ -14,7 +14,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package org.apache.sling.feature.diff.comparators; +package org.apache.sling.feature.diff.impl; import org.apache.sling.feature.Artifact; import org.apache.sling.feature.Artifacts; diff --git a/feature-diff/src/main/java/org/apache/sling/feature/diff/comparators/ConfigurationsComparator.java b/feature-diff/src/main/java/org/apache/sling/feature/diff/impl/ConfigurationsComparator.java similarity index 98% rename from feature-diff/src/main/java/org/apache/sling/feature/diff/comparators/ConfigurationsComparator.java rename to feature-diff/src/main/java/org/apache/sling/feature/diff/impl/ConfigurationsComparator.java index 1b22a21..e9d05e4 100644 --- a/feature-diff/src/main/java/org/apache/sling/feature/diff/comparators/ConfigurationsComparator.java +++ b/feature-diff/src/main/java/org/apache/sling/feature/diff/impl/ConfigurationsComparator.java @@ -14,7 +14,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package org.apache.sling.feature.diff.comparators; +package org.apache.sling.feature.diff.impl; import static org.apache.commons.lang3.builder.EqualsBuilder.reflectionEquals; diff --git a/feature-diff/src/main/java/org/apache/sling/feature/diff/comparators/ExtensionsComparator.java b/feature-diff/src/main/java/org/apache/sling/feature/diff/impl/ExtensionsComparator.java similarity index 99% rename from feature-diff/src/main/java/org/apache/sling/feature/diff/comparators/ExtensionsComparator.java rename to feature-diff/src/main/java/org/apache/sling/feature/diff/impl/ExtensionsComparator.java index f4c59c8..33bb11b 100644 --- a/feature-diff/src/main/java/org/apache/sling/feature/diff/comparators/ExtensionsComparator.java +++ b/feature-diff/src/main/java/org/apache/sling/feature/diff/impl/ExtensionsComparator.java @@ -14,7 +14,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package org.apache.sling.feature.diff.comparators; +package org.apache.sling.feature.diff.impl; import java.io.IOException; import java.util.LinkedList; diff --git a/feature-diff/src/main/java/org/apache/sling/feature/diff/comparators/FrameworkPropertiesComparator.java b/feature-diff/src/main/java/org/apache/sling/feature/diff/impl/FrameworkPropertiesComparator.java similarity index 98% rename from feature-diff/src/main/java/org/apache/sling/feature/diff/comparators/FrameworkPropertiesComparator.java rename to feature-diff/src/main/java/org/apache/sling/feature/diff/impl/FrameworkPropertiesComparator.java index 1ef3815..b9f56dd 100644 --- a/feature-diff/src/main/java/org/apache/sling/feature/diff/comparators/FrameworkPropertiesComparator.java +++ b/feature-diff/src/main/java/org/apache/sling/feature/diff/impl/FrameworkPropertiesComparator.java @@ -14,7 +14,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package org.apache.sling.feature.diff.comparators; +package org.apache.sling.feature.diff.impl; import java.util.Map; import java.util.Map.Entry; diff --git a/feature-diff/src/test/java/org/apache/sling/feature/diff/comparators/AbstractComparatorTest.java b/feature-diff/src/test/java/org/apache/sling/feature/diff/impl/AbstractComparatorTest.java similarity index 97% rename from feature-diff/src/test/java/org/apache/sling/feature/diff/comparators/AbstractComparatorTest.java rename to feature-diff/src/test/java/org/apache/sling/feature/diff/impl/AbstractComparatorTest.java index 4dacbc3..2840bbb 100644 --- a/feature-diff/src/test/java/org/apache/sling/feature/diff/comparators/AbstractComparatorTest.java +++ b/feature-diff/src/test/java/org/apache/sling/feature/diff/impl/AbstractComparatorTest.java @@ -14,7 +14,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package org.apache.sling.feature.diff.comparators; +package org.apache.sling.feature.diff.impl; import org.apache.sling.feature.ArtifactId; import org.apache.sling.feature.Feature; diff --git a/feature-diff/src/test/java/org/apache/sling/feature/diff/comparators/BundlesComparatorTest.java b/feature-diff/src/test/java/org/apache/sling/feature/diff/impl/BundlesComparatorTest.java similarity index 96% rename from feature-diff/src/test/java/org/apache/sling/feature/diff/comparators/BundlesComparatorTest.java rename to feature-diff/src/test/java/org/apache/sling/feature/diff/impl/BundlesComparatorTest.java index b38edf8..0d60724 100644 --- a/feature-diff/src/test/java/org/apache/sling/feature/diff/comparators/BundlesComparatorTest.java +++ b/feature-diff/src/test/java/org/apache/sling/feature/diff/impl/BundlesComparatorTest.java @@ -14,7 +14,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package org.apache.sling.feature.diff.comparators; +package org.apache.sling.feature.diff.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -23,7 +23,7 @@ import static org.junit.Assert.assertTrue; import org.apache.sling.feature.Artifact; import org.apache.sling.feature.ArtifactId; import org.apache.sling.feature.Artifacts; -import org.apache.sling.feature.diff.comparators.BundlesComparator; +import org.apache.sling.feature.diff.impl.BundlesComparator; import org.junit.Test; public class BundlesComparatorTest extends AbstractComparatorTest<BundlesComparator> { diff --git a/feature-diff/src/test/java/org/apache/sling/feature/diff/comparators/ConfigurationsComparatorTest.java b/feature-diff/src/test/java/org/apache/sling/feature/diff/impl/ConfigurationsComparatorTest.java similarity index 97% rename from feature-diff/src/test/java/org/apache/sling/feature/diff/comparators/ConfigurationsComparatorTest.java rename to feature-diff/src/test/java/org/apache/sling/feature/diff/impl/ConfigurationsComparatorTest.java index 68bd5b6..1e333fc 100644 --- a/feature-diff/src/test/java/org/apache/sling/feature/diff/comparators/ConfigurationsComparatorTest.java +++ b/feature-diff/src/test/java/org/apache/sling/feature/diff/impl/ConfigurationsComparatorTest.java @@ -14,7 +14,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package org.apache.sling.feature.diff.comparators; +package org.apache.sling.feature.diff.impl; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -25,7 +25,7 @@ import java.util.Dictionary; import org.apache.sling.feature.Configuration; import org.apache.sling.feature.Configurations; -import org.apache.sling.feature.diff.comparators.ConfigurationsComparator; +import org.apache.sling.feature.diff.impl.ConfigurationsComparator; import org.junit.Test; public class ConfigurationsComparatorTest extends AbstractComparatorTest<ConfigurationsComparator> { diff --git a/feature-diff/src/test/java/org/apache/sling/feature/diff/comparators/FrameworkPropertiesComparatorTest.java b/feature-diff/src/test/java/org/apache/sling/feature/diff/impl/FrameworkPropertiesComparatorTest.java similarity index 95% rename from feature-diff/src/test/java/org/apache/sling/feature/diff/comparators/FrameworkPropertiesComparatorTest.java rename to feature-diff/src/test/java/org/apache/sling/feature/diff/impl/FrameworkPropertiesComparatorTest.java index 30cb04e..9c4122f 100644 --- a/feature-diff/src/test/java/org/apache/sling/feature/diff/comparators/FrameworkPropertiesComparatorTest.java +++ b/feature-diff/src/test/java/org/apache/sling/feature/diff/impl/FrameworkPropertiesComparatorTest.java @@ -14,7 +14,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package org.apache.sling.feature.diff.comparators; +package org.apache.sling.feature.diff.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -23,7 +23,7 @@ import static org.junit.Assert.assertTrue; import java.util.HashMap; import java.util.Map; -import org.apache.sling.feature.diff.comparators.FrameworkPropertiesComparator; +import org.apache.sling.feature.diff.impl.FrameworkPropertiesComparator; import org.junit.Test; public class FrameworkPropertiesComparatorTest extends AbstractComparatorTest<FrameworkPropertiesComparator> {
