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/04/09 14:38:28 UTC
[sling-whiteboard] branch master updated: [api-regions] methods
signature changed to a more conventional naming
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 574dc93 [api-regions] methods signature changed to a more conventional naming
574dc93 is described below
commit 574dc93da165d67a3a39d814a83125311f76ae2a
Author: stripodi <st...@192.168.1.111>
AuthorDate: Tue Apr 9 16:38:17 2019 +0200
[api-regions] methods signature changed to a more conventional naming
---
.../apache/sling/feature/apiregions/ApiRegion.java | 6 ++--
.../apiregions/io/json/ApiRegionsJSONParser.java | 2 +-
.../sling/feature/apiregions/ApiRegionTest.java | 34 +++++++++++-----------
.../io/json/ApiRegionsJSONSerializerTest.java | 8 ++---
4 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/ApiRegion.java b/feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/ApiRegion.java
index 3ac34e1..c44532f 100644
--- a/feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/ApiRegion.java
+++ b/feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/ApiRegion.java
@@ -103,15 +103,15 @@ public final class ApiRegion implements Iterable<String> {
return parent;
}
- public void addApis(Iterable<String> apis) {
+ public void addAll(Iterable<String> apis) {
requireNonNull(apis, "Impossible to import null APIs");
for (String api : apis) {
- addApi(api);
+ add(api);
}
}
- public boolean addApi(String api) {
+ public boolean add(String api) {
// ignore null, empty package and non well-formed packages names, i.e. javax.jms.doc-files
if (isEmpty(api) || !PACKAGE_NAME_VALIDATION.matcher(api).matches()) {
// ignore it
diff --git a/feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/io/json/ApiRegionsJSONParser.java b/feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/io/json/ApiRegionsJSONParser.java
index df8add1..294914d 100644
--- a/feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/io/json/ApiRegionsJSONParser.java
+++ b/feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/io/json/ApiRegionsJSONParser.java
@@ -127,7 +127,7 @@ public final class ApiRegionsJSONParser implements JSONConstants {
&& apis != null
&& !apis.isEmpty()) {
ApiRegion apiRegion = apiRegions.addNewRegion(regionName);
- apiRegion.addApis(apis);
+ apiRegion.addAll(apis);
}
}
diff --git a/feature-api-regions/src/test/java/org/apache/sling/feature/apiregions/ApiRegionTest.java b/feature-api-regions/src/test/java/org/apache/sling/feature/apiregions/ApiRegionTest.java
index 948aa42..03279ac 100644
--- a/feature-api-regions/src/test/java/org/apache/sling/feature/apiregions/ApiRegionTest.java
+++ b/feature-api-regions/src/test/java/org/apache/sling/feature/apiregions/ApiRegionTest.java
@@ -50,22 +50,22 @@ public class ApiRegionTest {
private void ingnoreApi(String api) {
ApiRegion testRegion = new ApiRegion(getClass().getName(), null);
- assertFalse(testRegion.addApi(api));
+ assertFalse(testRegion.add(api));
assertFalse(testRegion.contains(api));
}
@Test
public void inheritanceCheck() {
ApiRegion granpa = new ApiRegion("granpa", null);
- assertTrue(granpa.addApi("org.apache.sling.feature.apiregions"));
+ assertTrue(granpa.add("org.apache.sling.feature.apiregions"));
ApiRegion father = new ApiRegion("father", granpa);
- assertTrue(father.addApi("org.apache.sling.feature.apiregions.io"));
- assertFalse(father.addApi("org.apache.sling.feature.apiregions")); // inherited by granpa
+ assertTrue(father.add("org.apache.sling.feature.apiregions.io"));
+ assertFalse(father.add("org.apache.sling.feature.apiregions")); // inherited by granpa
ApiRegion child = new ApiRegion("child", father);
- assertFalse(child.addApi("org.apache.sling.feature.apiregions.io")); // inherited by father
- assertFalse(child.addApi("org.apache.sling.feature.apiregions")); // inherited by granpa
+ assertFalse(child.add("org.apache.sling.feature.apiregions.io")); // inherited by father
+ assertFalse(child.add("org.apache.sling.feature.apiregions")); // inherited by granpa
assertSame(father, child.getParent());
assertSame(granpa, father.getParent());
@@ -75,13 +75,13 @@ public class ApiRegionTest {
@Test
public void inheritanceContainsCheck() {
ApiRegion granpa = new ApiRegion("granpa", null);
- granpa.addApi("org.apache.sling.feature.apiregions");
+ granpa.add("org.apache.sling.feature.apiregions");
ApiRegion father = new ApiRegion("father", granpa);
- father.addApi("org.apache.sling.feature.apiregions.io");
+ father.add("org.apache.sling.feature.apiregions.io");
ApiRegion child = new ApiRegion("child", father);
- child.addApi("org.apache.sling.feature.apiregions.io.json");
+ child.add("org.apache.sling.feature.apiregions.io.json");
assertTrue(child.contains("org.apache.sling.feature.apiregions.io.json"));
assertTrue(child.contains("org.apache.sling.feature.apiregions.io")); // inherited by father
@@ -91,7 +91,7 @@ public class ApiRegionTest {
@Test
public void inheritanceEmptyCheck() {
ApiRegion granpa = new ApiRegion("granpa", null);
- granpa.addApi("org.apache.sling.feature.apiregions");
+ granpa.add("org.apache.sling.feature.apiregions");
ApiRegion father = new ApiRegion("father", granpa);
ApiRegion child = new ApiRegion("child", father);
@@ -107,19 +107,19 @@ public class ApiRegionTest {
@Test
public void inheritanceAvoidsDuplicates() {
ApiRegion granpa = new ApiRegion("granpa", null);
- assertTrue(granpa.addApi("org.apache.sling.feature.apiregions"));
+ assertTrue(granpa.add("org.apache.sling.feature.apiregions"));
ApiRegion father = new ApiRegion("father", granpa);
- assertFalse(father.addApi("org.apache.sling.feature.apiregions"));
+ assertFalse(father.add("org.apache.sling.feature.apiregions"));
}
@Test
public void inheritaceRemove() {
ApiRegion father = new ApiRegion("father", null);
- father.addApi("org.apache.sling.feature.apiregions");
+ father.add("org.apache.sling.feature.apiregions");
ApiRegion child = new ApiRegion("child", father);
- child.addApi("org.apache.sling.feature.apiregions.io");
+ child.add("org.apache.sling.feature.apiregions.io");
assertFalse(child.remove(null));
assertFalse(child.remove(""));
@@ -132,13 +132,13 @@ public class ApiRegionTest {
@Test
public void inheritanceIteratorCheck() {
ApiRegion granpa = new ApiRegion("granpa", null);
- granpa.addApi("org.apache.sling.feature.apiregions");
+ granpa.add("org.apache.sling.feature.apiregions");
ApiRegion father = new ApiRegion("father", granpa);
- father.addApi("org.apache.sling.feature.apiregions.io");
+ father.add("org.apache.sling.feature.apiregions.io");
ApiRegion child = new ApiRegion("child", father);
- child.addApi("org.apache.sling.feature.apiregions.io.json");
+ child.add("org.apache.sling.feature.apiregions.io.json");
// build the expected packages
diff --git a/feature-api-regions/src/test/java/org/apache/sling/feature/apiregions/io/json/ApiRegionsJSONSerializerTest.java b/feature-api-regions/src/test/java/org/apache/sling/feature/apiregions/io/json/ApiRegionsJSONSerializerTest.java
index 5d7fc05..13db6ee 100644
--- a/feature-api-regions/src/test/java/org/apache/sling/feature/apiregions/io/json/ApiRegionsJSONSerializerTest.java
+++ b/feature-api-regions/src/test/java/org/apache/sling/feature/apiregions/io/json/ApiRegionsJSONSerializerTest.java
@@ -65,12 +65,12 @@ public final class ApiRegionsJSONSerializerTest {
ApiRegions apiRegions = new ApiRegions();
ApiRegion base = apiRegions.addNewRegion("base");
- base.addApi("org.apache.felix.inventory");
- base.addApi("org.apache.felix.metatype");
+ base.add("org.apache.felix.inventory");
+ base.add("org.apache.felix.metatype");
ApiRegion extended = apiRegions.addNewRegion("extended");
- extended.addApi("org.apache.felix.scr.component");
- extended.addApi("org.apache.felix.scr.info");
+ extended.add("org.apache.felix.scr.component");
+ extended.add("org.apache.felix.scr.info");
StringWriter writer = new StringWriter();
ApiRegionsJSONSerializer.serializeApiRegions(apiRegions, writer);