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/10 12:53:44 UTC
[sling-whiteboard] branch master updated: [apiregions]
org.apache.sling.feature.apiregions package moved to
org.apache.sling.feature.apiregions.model
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 f20ed13 [apiregions] org.apache.sling.feature.apiregions package moved to org.apache.sling.feature.apiregions.model
f20ed13 is described below
commit f20ed13f40ed1469c0f5b46945826f9d35dd9e21
Author: stripodi <st...@192.168.1.111>
AuthorDate: Wed Apr 10 14:53:34 2019 +0200
[apiregions] org.apache.sling.feature.apiregions package moved to
org.apache.sling.feature.apiregions.model
---
feature-api-regions/README.md | 32 +++++++++++-----------
feature-api-regions/pom.xml | 2 +-
.../feature/apiregions/{ => model}/ApiRegion.java | 2 +-
.../feature/apiregions/{ => model}/ApiRegions.java | 2 +-
.../apiregions/{ => model}/JoinedIterator.java | 2 +-
.../{ => model}/io/json/ApiRegionsJSONParser.java | 6 ++--
.../io/json/ApiRegionsJSONSerializer.java | 6 ++--
.../{ => model}/io/json/JSONConstants.java | 2 +-
.../{ => model}/io/json/package-info.java | 2 +-
.../apiregions/{ => model}/package-info.java | 2 +-
.../apiregions/{ => model}/ApiRegionTest.java | 3 +-
.../apiregions/{ => model}/ApiRegionsTest.java | 4 ++-
.../io/json/ApiRegionsJSONParserTest.java | 7 +++--
.../io/json/ApiRegionsJSONSerializerTest.java | 8 ++++--
14 files changed, 43 insertions(+), 37 deletions(-)
diff --git a/feature-api-regions/README.md b/feature-api-regions/README.md
index de15b06..db9032d 100644
--- a/feature-api-regions/README.md
+++ b/feature-api-regions/README.md
@@ -38,9 +38,9 @@ then obtaining simple APIs will look like:
```java
import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.apiregions.ApiRegion;
-import org.apache.sling.feature.apiregions.ApiRegions;
-import org.apache.sling.feature.apiregions.io.json.ApiRegionsJSONParser;
+import org.apache.sling.feature.apiregions.model.ApiRegion;
+import org.apache.sling.feature.apiregions.model.ApiRegions;
+import org.apache.sling.feature.apiregions.model.io.json.ApiRegionsJSONParser;
...
@@ -91,13 +91,13 @@ omit imports for brevity;
ApiRegions apiRegions = new ApiRegions();
ApiRegion granpa = apiRegions.addNew("granpa");
-granpa.add("org.apache.sling.feature.apiregions");
+granpa.add("org.apache.sling.feature.apiregions.model");
ApiRegion father = apiRegions.addNew("father");
-father.add("org.apache.sling.feature.apiregions.io");
+father.add("org.apache.sling.feature.apiregions.model.io");
ApiRegion child = apiRegions.addNew("child");
-child.add("org.apache.sling.feature.apiregions.io.json");
+child.add("org.apache.sling.feature.apiregions.model.io.json");
for (ApiRegion region : apiRegions) {
System.out.println("-" + region.getName());
@@ -114,23 +114,23 @@ That code will output:
```
- granpa
- * org.apache.sling.feature.apiregions
+ * org.apache.sling.feature.apiregions.model
--------
- father
- * org.apache.sling.feature.apiregions
- * org.apache.sling.feature.apiregions.io
+ * org.apache.sling.feature.apiregions.model
+ * org.apache.sling.feature.apiregions.model.io
--------
- child
- * org.apache.sling.feature.apiregions
- * org.apache.sling.feature.apiregions.io
- * org.apache.sling.feature.apiregions.io.json
+ * org.apache.sling.feature.apiregions.model
+ * org.apache.sling.feature.apiregions.model.io
+ * org.apache.sling.feature.apiregions.model.io.json
--------
```
JSON serialization is available as well:
```java
-import org.apache.sling.feature.apiregions.io.json.ApiRegionsJSONSerializer
+import org.apache.sling.feature.apiregions.model.io.json.ApiRegionsJSONSerializer
...
@@ -144,19 +144,19 @@ that will output:
{
"name":"granpa",
"exports":[
- "org.apache.sling.feature.apiregions"
+ "org.apache.sling.feature.apiregions.model"
]
},
{
"name":"father",
"exports":[
- "org.apache.sling.feature.apiregions.io"
+ "org.apache.sling.feature.apiregions.model.io"
]
},
{
"name":"child",
"exports":[
- "org.apache.sling.feature.apiregions.io.json"
+ "org.apache.sling.feature.apiregions.model.io.json"
]
}
]
diff --git a/feature-api-regions/pom.xml b/feature-api-regions/pom.xml
index cdf876a..03caa6b 100644
--- a/feature-api-regions/pom.xml
+++ b/feature-api-regions/pom.xml
@@ -27,7 +27,7 @@
<relativePath />
</parent>
- <artifactId>org.apache.sling.feature.apiregions</artifactId>
+ <artifactId>org.apache.sling.feature.apiregions.model</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>Apache Sling Feature Model API Regions</name>
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/model/ApiRegion.java
similarity index 99%
rename from feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/ApiRegion.java
rename to feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/model/ApiRegion.java
index e180487..3e2e620 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/model/ApiRegion.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.apiregions;
+package org.apache.sling.feature.apiregions.model;
import static java.util.Objects.requireNonNull;
diff --git a/feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/ApiRegions.java b/feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/model/ApiRegions.java
similarity index 98%
rename from feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/ApiRegions.java
rename to feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/model/ApiRegions.java
index 23a322d..b6db357 100644
--- a/feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/ApiRegions.java
+++ b/feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/model/ApiRegions.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.apiregions;
+package org.apache.sling.feature.apiregions.model;
import java.util.Iterator;
import java.util.Stack;
diff --git a/feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/JoinedIterator.java b/feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/model/JoinedIterator.java
similarity index 96%
rename from feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/JoinedIterator.java
rename to feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/model/JoinedIterator.java
index 1ab03eb..ea742ca 100644
--- a/feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/JoinedIterator.java
+++ b/feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/model/JoinedIterator.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.apiregions;
+package org.apache.sling.feature.apiregions.model;
import java.util.Iterator;
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/model/io/json/ApiRegionsJSONParser.java
similarity index 97%
rename from feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/io/json/ApiRegionsJSONParser.java
rename to feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/model/io/json/ApiRegionsJSONParser.java
index f2fdeb5..50949aa 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/model/io/json/ApiRegionsJSONParser.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.apiregions.io.json;
+package org.apache.sling.feature.apiregions.model.io.json;
import static org.apache.sling.feature.ExtensionType.JSON;
@@ -31,8 +31,8 @@ import static java.util.Objects.requireNonNull;
import org.apache.sling.feature.Extension;
import org.apache.sling.feature.Extensions;
import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.apiregions.ApiRegion;
-import org.apache.sling.feature.apiregions.ApiRegions;
+import org.apache.sling.feature.apiregions.model.ApiRegion;
+import org.apache.sling.feature.apiregions.model.ApiRegions;
/**
* <code>api-regions</code> JSON format parser implementation.
diff --git a/feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/io/json/ApiRegionsJSONSerializer.java b/feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/model/io/json/ApiRegionsJSONSerializer.java
similarity index 96%
rename from feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/io/json/ApiRegionsJSONSerializer.java
rename to feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/model/io/json/ApiRegionsJSONSerializer.java
index 4933cdd..3114e05 100644
--- a/feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/io/json/ApiRegionsJSONSerializer.java
+++ b/feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/model/io/json/ApiRegionsJSONSerializer.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.apiregions.io.json;
+package org.apache.sling.feature.apiregions.model.io.json;
import static java.util.Objects.requireNonNull;
@@ -31,8 +31,8 @@ import javax.json.stream.JsonGeneratorFactory;
import org.apache.sling.feature.Extension;
import org.apache.sling.feature.ExtensionType;
import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.apiregions.ApiRegion;
-import org.apache.sling.feature.apiregions.ApiRegions;
+import org.apache.sling.feature.apiregions.model.ApiRegion;
+import org.apache.sling.feature.apiregions.model.ApiRegions;
/**
* <code>api-regions</code> JSON format serializer implementation.
diff --git a/feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/io/json/JSONConstants.java b/feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/model/io/json/JSONConstants.java
similarity index 94%
rename from feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/io/json/JSONConstants.java
rename to feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/model/io/json/JSONConstants.java
index 93bdeb2..51e132b 100644
--- a/feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/io/json/JSONConstants.java
+++ b/feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/model/io/json/JSONConstants.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.apiregions.io.json;
+package org.apache.sling.feature.apiregions.model.io.json;
interface JSONConstants {
diff --git a/feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/io/json/package-info.java b/feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/model/io/json/package-info.java
similarity index 93%
rename from feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/io/json/package-info.java
rename to feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/model/io/json/package-info.java
index 36a97da..0ae6d31 100644
--- a/feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/io/json/package-info.java
+++ b/feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/model/io/json/package-info.java
@@ -18,4 +18,4 @@
/**
* <code>api-regions</code> Parser APIs.
*/
-package org.apache.sling.feature.apiregions.io.json;
+package org.apache.sling.feature.apiregions.model.io.json;
diff --git a/feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/package-info.java b/feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/model/package-info.java
similarity index 94%
rename from feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/package-info.java
rename to feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/model/package-info.java
index a69b40f..d890026 100644
--- a/feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/package-info.java
+++ b/feature-api-regions/src/main/java/org/apache/sling/feature/apiregions/model/package-info.java
@@ -18,4 +18,4 @@
/**
* Basic <code>api-regions</code> APIs.
*/
-package org.apache.sling.feature.apiregions;
+package org.apache.sling.feature.apiregions.model;
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/model/ApiRegionTest.java
similarity index 98%
rename from feature-api-regions/src/test/java/org/apache/sling/feature/apiregions/ApiRegionTest.java
rename to feature-api-regions/src/test/java/org/apache/sling/feature/apiregions/model/ApiRegionTest.java
index 03279ac..8c375a2 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/model/ApiRegionTest.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.apiregions;
+package org.apache.sling.feature.apiregions.model;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertTrue;
import java.util.HashSet;
import java.util.Set;
+import org.apache.sling.feature.apiregions.model.ApiRegion;
import org.junit.Test;
public class ApiRegionTest {
diff --git a/feature-api-regions/src/test/java/org/apache/sling/feature/apiregions/ApiRegionsTest.java b/feature-api-regions/src/test/java/org/apache/sling/feature/apiregions/model/ApiRegionsTest.java
similarity index 94%
rename from feature-api-regions/src/test/java/org/apache/sling/feature/apiregions/ApiRegionsTest.java
rename to feature-api-regions/src/test/java/org/apache/sling/feature/apiregions/model/ApiRegionsTest.java
index 57e14c8..71dadd3 100644
--- a/feature-api-regions/src/test/java/org/apache/sling/feature/apiregions/ApiRegionsTest.java
+++ b/feature-api-regions/src/test/java/org/apache/sling/feature/apiregions/model/ApiRegionsTest.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.apiregions;
+package org.apache.sling.feature.apiregions.model;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -27,6 +27,8 @@ import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
+import org.apache.sling.feature.apiregions.model.ApiRegion;
+import org.apache.sling.feature.apiregions.model.ApiRegions;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/feature-api-regions/src/test/java/org/apache/sling/feature/apiregions/io/json/ApiRegionsJSONParserTest.java b/feature-api-regions/src/test/java/org/apache/sling/feature/apiregions/model/io/json/ApiRegionsJSONParserTest.java
similarity index 94%
rename from feature-api-regions/src/test/java/org/apache/sling/feature/apiregions/io/json/ApiRegionsJSONParserTest.java
rename to feature-api-regions/src/test/java/org/apache/sling/feature/apiregions/model/io/json/ApiRegionsJSONParserTest.java
index 5bf36ec..a71b0ef 100644
--- a/feature-api-regions/src/test/java/org/apache/sling/feature/apiregions/io/json/ApiRegionsJSONParserTest.java
+++ b/feature-api-regions/src/test/java/org/apache/sling/feature/apiregions/model/io/json/ApiRegionsJSONParserTest.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.apiregions.io.json;
+package org.apache.sling.feature.apiregions.model.io.json;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -25,8 +25,9 @@ import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Extension;
import org.apache.sling.feature.ExtensionType;
import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.apiregions.ApiRegion;
-import org.apache.sling.feature.apiregions.ApiRegions;
+import org.apache.sling.feature.apiregions.model.ApiRegion;
+import org.apache.sling.feature.apiregions.model.ApiRegions;
+import org.apache.sling.feature.apiregions.model.io.json.ApiRegionsJSONParser;
import org.junit.Test;
public class ApiRegionsJSONParserTest {
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/model/io/json/ApiRegionsJSONSerializerTest.java
similarity index 92%
rename from feature-api-regions/src/test/java/org/apache/sling/feature/apiregions/io/json/ApiRegionsJSONSerializerTest.java
rename to feature-api-regions/src/test/java/org/apache/sling/feature/apiregions/model/io/json/ApiRegionsJSONSerializerTest.java
index f715d3b..ba1d4ce 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/model/io/json/ApiRegionsJSONSerializerTest.java
@@ -14,7 +14,7 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package org.apache.sling.feature.apiregions.io.json;
+package org.apache.sling.feature.apiregions.model.io.json;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -29,8 +29,10 @@ import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.Extension;
import org.apache.sling.feature.ExtensionType;
import org.apache.sling.feature.Feature;
-import org.apache.sling.feature.apiregions.ApiRegion;
-import org.apache.sling.feature.apiregions.ApiRegions;
+import org.apache.sling.feature.apiregions.model.ApiRegion;
+import org.apache.sling.feature.apiregions.model.ApiRegions;
+import org.apache.sling.feature.apiregions.model.io.json.ApiRegionsJSONSerializer;
+import org.apache.sling.feature.apiregions.model.io.json.JSONConstants;
import org.junit.Before;
import org.junit.Test;