This is an automated email from the ASF dual-hosted git repository.
bdelacretaz 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 77087e1 Consistent naming
77087e1 is described below
commit 77087e193e54973f51900ebb189e49f484cea042
Author: Bertrand Delacretaz <bdelacre...@apache.org>
AuthorDate: Fri May 7 17:42:29 2021 +0200
Consistent naming
---
.../sling/documentaggregator/api/DocumentTree.java | 2 +-
.../{JsonTargetNode.java => JsonDocumentNode.java} | 10 ++++-----
...sonMappingTarget.java => JsonDocumentTree.java} | 8 ++++----
.../{MapTargetNode.java => MapDocumentNode.java} | 6 +++---
...{MapMappingTarget.java => MapDocumentTree.java} | 8 ++++----
.../impl/PropertiesSelector.java | 24 ----------------------
.../samples/graphql/DocumentDataFetcher.java | 2 +-
.../samples/graphql/DocumentsDataFetcher.java | 2 +-
8 files changed, 19 insertions(+), 43 deletions(-)
diff --git
a/remote-content-api/document-aggregator/src/main/java/org/apache/sling/documentaggregator/api/DocumentTree.java
b/remote-content-api/document-aggregator/src/main/java/org/apache/sling/documentaggregator/api/DocumentTree.java
index d8558e0..d4e6b2a 100644
---
a/remote-content-api/document-aggregator/src/main/java/org/apache/sling/documentaggregator/api/DocumentTree.java
+++
b/remote-content-api/document-aggregator/src/main/java/org/apache/sling/documentaggregator/api/DocumentTree.java
@@ -38,5 +38,5 @@ public interface DocumentTree {
void close();
}
- @NotNull DocumentNode newTargetNode();
+ @NotNull DocumentNode newDocumentNode();
}
\ No newline at end of file
diff --git
a/remote-content-api/document-aggregator/src/main/java/org/apache/sling/documentaggregator/impl/JsonTargetNode.java
b/remote-content-api/document-aggregator/src/main/java/org/apache/sling/documentaggregator/impl/JsonDocumentNode.java
similarity index 89%
rename from
remote-content-api/document-aggregator/src/main/java/org/apache/sling/documentaggregator/impl/JsonTargetNode.java
rename to
remote-content-api/document-aggregator/src/main/java/org/apache/sling/documentaggregator/impl/JsonDocumentNode.java
index 9cb7dce..76c41b7 100644
---
a/remote-content-api/document-aggregator/src/main/java/org/apache/sling/documentaggregator/impl/JsonTargetNode.java
+++
b/remote-content-api/document-aggregator/src/main/java/org/apache/sling/documentaggregator/impl/JsonDocumentNode.java
@@ -29,14 +29,14 @@ import javax.json.JsonObjectBuilder;
import org.apache.sling.documentaggregator.api.DocumentTree;
import org.apache.sling.documentaggregator.api.DocumentTree.DocumentNode;
-/** A TargetNode that outputs to a JSON document */
-public class JsonTargetNode implements DocumentTree.DocumentNode {
+/** A DocumentNode that outputs to a JSON document */
+public class JsonDocumentNode implements DocumentTree.DocumentNode {
private final String name;
private final JsonObjectBuilder builder;
- private List<JsonTargetNode> children;
+ private List<JsonDocumentNode> children;
- JsonTargetNode(String name) {
+ JsonDocumentNode(String name) {
this.name = name;
this.builder = Json.createObjectBuilder();
}
@@ -46,7 +46,7 @@ public class JsonTargetNode implements
DocumentTree.DocumentNode {
if(children == null) {
children = new ArrayList<>();
}
- final JsonTargetNode child = new JsonTargetNode(name);
+ final JsonDocumentNode child = new JsonDocumentNode(name);
children.add(child);
return child;
}
diff --git
a/remote-content-api/document-aggregator/src/main/java/org/apache/sling/documentaggregator/impl/JsonMappingTarget.java
b/remote-content-api/document-aggregator/src/main/java/org/apache/sling/documentaggregator/impl/JsonDocumentTree.java
similarity index 82%
rename from
remote-content-api/document-aggregator/src/main/java/org/apache/sling/documentaggregator/impl/JsonMappingTarget.java
rename to
remote-content-api/document-aggregator/src/main/java/org/apache/sling/documentaggregator/impl/JsonDocumentTree.java
index 0f96063..7dad999 100644
---
a/remote-content-api/document-aggregator/src/main/java/org/apache/sling/documentaggregator/impl/JsonMappingTarget.java
+++
b/remote-content-api/document-aggregator/src/main/java/org/apache/sling/documentaggregator/impl/JsonDocumentTree.java
@@ -24,12 +24,12 @@ import org.apache.sling.documentaggregator.api.DocumentTree;
import org.jetbrains.annotations.NotNull;
import org.osgi.service.component.annotations.Component;
-/** MappingTarget that outputs to a JSON document */
+/** DocumentTree that generates a JSON document */
@Component(service = DocumentTree.class, property = { DocumentTree.TARGET_TYPE
+ "=json" })
-public class JsonMappingTarget implements DocumentTree {
+public class JsonDocumentTree implements DocumentTree {
@Override
- public @NotNull DocumentNode newTargetNode() {
- return new
JsonTargetNode("ROOT_THIS_NAME_SHOULD_NOT_APPEAR_IN_OUTPUT");
+ public @NotNull DocumentNode newDocumentNode() {
+ return new
JsonDocumentNode("ROOT_THIS_NAME_SHOULD_NOT_APPEAR_IN_OUTPUT");
}
}
\ No newline at end of file
diff --git
a/remote-content-api/document-aggregator/src/main/java/org/apache/sling/documentaggregator/impl/MapTargetNode.java
b/remote-content-api/document-aggregator/src/main/java/org/apache/sling/documentaggregator/impl/MapDocumentNode.java
similarity index 90%
rename from
remote-content-api/document-aggregator/src/main/java/org/apache/sling/documentaggregator/impl/MapTargetNode.java
rename to
remote-content-api/document-aggregator/src/main/java/org/apache/sling/documentaggregator/impl/MapDocumentNode.java
index 722d2ad..f066640 100644
---
a/remote-content-api/document-aggregator/src/main/java/org/apache/sling/documentaggregator/impl/MapTargetNode.java
+++
b/remote-content-api/document-aggregator/src/main/java/org/apache/sling/documentaggregator/impl/MapDocumentNode.java
@@ -26,14 +26,14 @@ import org.apache.sling.documentaggregator.api.DocumentTree;
import org.apache.sling.documentaggregator.api.DocumentTree.DocumentNode;
/** A TargetNode that outputs to a Map document */
-public class MapTargetNode extends HashMap<String, Object> implements
DocumentTree.DocumentNode {
+public class MapDocumentNode extends HashMap<String, Object> implements
DocumentTree.DocumentNode {
- MapTargetNode(String name) {
+ MapDocumentNode(String name) {
}
@Override
public DocumentNode addChild(String name) {
- final MapTargetNode child = new MapTargetNode(name);
+ final MapDocumentNode child = new MapDocumentNode(name);
put(name, child);
return child;
}
diff --git
a/remote-content-api/document-aggregator/src/main/java/org/apache/sling/documentaggregator/impl/MapMappingTarget.java
b/remote-content-api/document-aggregator/src/main/java/org/apache/sling/documentaggregator/impl/MapDocumentTree.java
similarity index 82%
rename from
remote-content-api/document-aggregator/src/main/java/org/apache/sling/documentaggregator/impl/MapMappingTarget.java
rename to
remote-content-api/document-aggregator/src/main/java/org/apache/sling/documentaggregator/impl/MapDocumentTree.java
index 5aaf833..5e82718 100644
---
a/remote-content-api/document-aggregator/src/main/java/org/apache/sling/documentaggregator/impl/MapMappingTarget.java
+++
b/remote-content-api/document-aggregator/src/main/java/org/apache/sling/documentaggregator/impl/MapDocumentTree.java
@@ -24,12 +24,12 @@ import org.apache.sling.documentaggregator.api.DocumentTree;
import org.jetbrains.annotations.NotNull;
import org.osgi.service.component.annotations.Component;
-/** MappingTarget that outputs to a JSON document */
+/** DocumentTree that generates a Map of Maps */
@Component(service = DocumentTree.class, property = { DocumentTree.TARGET_TYPE
+ "=map" })
-public class MapMappingTarget implements DocumentTree {
+public class MapDocumentTree implements DocumentTree {
@Override
- public @NotNull DocumentNode newTargetNode() {
- return new MapTargetNode("ROOT_THIS_NAME_SHOULD_NOT_APPEAR_IN_OUTPUT");
+ public @NotNull DocumentNode newDocumentNode() {
+ return new
MapDocumentNode("ROOT_THIS_NAME_SHOULD_NOT_APPEAR_IN_OUTPUT");
}
}
\ No newline at end of file
diff --git
a/remote-content-api/document-aggregator/src/main/java/org/apache/sling/documentaggregator/impl/PropertiesSelector.java
b/remote-content-api/document-aggregator/src/main/java/org/apache/sling/documentaggregator/impl/PropertiesSelector.java
deleted file mode 100644
index 187a62c..0000000
---
a/remote-content-api/document-aggregator/src/main/java/org/apache/sling/documentaggregator/impl/PropertiesSelector.java
+++ /dev/null
@@ -1,24 +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.documentaggregator.impl;
-
-interface PropertiesSelector {
- boolean renderProperty(String name);
-}
\ No newline at end of file
diff --git
a/remote-content-api/sample-graphql-api/src/main/java/org/apache/sling/remotecontent/samples/graphql/DocumentDataFetcher.java
b/remote-content-api/sample-graphql-api/src/main/java/org/apache/sling/remotecontent/samples/graphql/DocumentDataFetcher.java
index 48e6d1c..af048e3 100644
---
a/remote-content-api/sample-graphql-api/src/main/java/org/apache/sling/remotecontent/samples/graphql/DocumentDataFetcher.java
+++
b/remote-content-api/sample-graphql-api/src/main/java/org/apache/sling/remotecontent/samples/graphql/DocumentDataFetcher.java
@@ -54,7 +54,7 @@ public class DocumentDataFetcher implements
SlingDataFetcher<Object> {
final Resource target =
e.getCurrentResource().getResourceResolver().getResource(path);
// Use the aggregator to build the body
- final DocumentTree.DocumentNode body = mappingTarget.newTargetNode();
+ final DocumentTree.DocumentNode body = mappingTarget.newDocumentNode();
documentAggregator.aggregate(target, body, opt);
body.close();
data.put("body", body.adaptTo(Map.class));
diff --git
a/remote-content-api/sample-graphql-api/src/main/java/org/apache/sling/remotecontent/samples/graphql/DocumentsDataFetcher.java
b/remote-content-api/sample-graphql-api/src/main/java/org/apache/sling/remotecontent/samples/graphql/DocumentsDataFetcher.java
index 22a10cd..ea57780 100644
---
a/remote-content-api/sample-graphql-api/src/main/java/org/apache/sling/remotecontent/samples/graphql/DocumentsDataFetcher.java
+++
b/remote-content-api/sample-graphql-api/src/main/java/org/apache/sling/remotecontent/samples/graphql/DocumentsDataFetcher.java
@@ -46,7 +46,7 @@ public class DocumentsDataFetcher implements
SlingDataFetcher<Object> {
private DocumentAggregator documentAggregator;
private void addDocumentData(final Map<String, Object> data, String key,
Resource r, DocumentAggregator aggregator, DocumentAggregator.Options opt) {
- final DocumentTree.DocumentNode target = mappingTarget.newTargetNode();
+ final DocumentTree.DocumentNode target =
mappingTarget.newDocumentNode();
aggregator.aggregate(r, target, opt);
target.close();
data.put(key, target.adaptTo(Map.class));
