Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Major] Changes in FlatJsonVisitor

This commit is contained in:
Robert von Burg 2017-02-27 17:25:24 +01:00
parent c89e04a356
commit e27a0969ee
3 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
li.strolch.model/src/main/java/li/strolch/model/json/FromFlatJsonVisitor.java
View File

@ -15,23 +15,23 @@ import li.strolch.utils.collections.MapOfSets;
/**
* <p>
* Maps a given {@link JsonObject} to a {@link StrolchRootElement}. All {@link Parameter Parameters} on the element are
* iterated expected to be found as a member on the {@link JsonObject}.
* iterated and expected to be found as a member on the {@link JsonObject}.
* </p>
*
* <p>
* To not map a {@link Parameter} add it to the {@link MapOfSets}, to ignore a whole {@link ParameterBag} then add an
* empty set with the bag id.
* To ignore {@link Parameter Parameters} or {@link ParameterBag ParameterBags} use the
* {@link #ignoreParameter(String, String)} and {@link #ignoreBag(String)} methods
* </p>
*
* <p>
* Optional values are handled similar, but only a parameter can be optional, not a whole bag
* {@link Parameter} can be made optional by using the {@link #optionalParameter(String, String)} method
* </p>
*
* @author Robert von Burg <eitch@eitchnet.ch>
*
* @param <T>
*/
public class FromFlatJsonVisitor<T extends StrolchRootElement> {
public class FromFlatJsonVisitor {
private MapOfSets<String, String> ignoredKeys;
private MapOfSets<String, String> optionalKeys;
@ -58,7 +58,7 @@ public class FromFlatJsonVisitor<T extends StrolchRootElement> {
this.optionalKeys.addElement(bagId, paramId);
}
public void visit(T element, JsonObject jsonObject) {
public void visit(StrolchRootElement element, JsonObject jsonObject) {
Set<String> bagKeySet = element.getParameterBagKeySet();
for (String bagId : bagKeySet) {

16
li.strolch.model/src/main/java/li/strolch/model/json/ToFlatJsonVisitor.java
View File

@ -21,14 +21,24 @@ import li.strolch.utils.collections.MapOfSets;
/**
* <p>
* Maps a given {@link StrolchRootElement} to a {@link JsonObject}. All {@link Parameter Parameters} are mapped to a
* member of the {@link JsonObject}.
* member of the {@link JsonObject}, {@link ParameterBag ParameterBags} are thus removed
* </p>
*
* <p>
* To not map a {@link Parameter} add it to the {@link MapOfSets}, to ignore a whole {@link ParameterBag} then add an
* empty set with the bag id.
* To ignore {@link Parameter Parameters} or {@link ParameterBag ParameterBags} use the
* {@link #ignoreParameter(String, String)} and {@link #ignoreBag(String)} methods
* </p>
*
* <p>
* The mapping can be extended by setting hook:
* </p>
*
* <pre>
* visitor.setHook((element, jsonObject) -> {
* // do work
* });
* </pre>
*
* @author Robert von Burg <eitch@eitchnet.ch>
*/
public class ToFlatJsonVisitor<T extends StrolchRootElement> {

9
li.strolch.rest/src/main/java/li/strolch/rest/util/JsonServiceArgument.java
View File

@ -13,7 +13,14 @@ import li.strolch.service.api.ServiceArgument;
*/
public class JsonServiceArgument extends ServiceArgument {
private static final long serialVersionUID = 1L;
public String baseUrl;
/**
* the objectId - its context is defined by the service
*/
public String objectId;
/**
* The input object
*/
public JsonElement jsonElement;
}