feat: Add parameter to return parse tree.

decentralized-identity · May 19, 2021 · f0ddea5 · f0ddea5
1 parent 7fda509
commit f0ddea5
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 15 deletions.
diff --git a/src/main/java/foundation/identity/did/DID.java b/src/main/java/foundation/identity/did/DID.java
@@ -3,6 +3,7 @@
 import foundation.identity.did.parser.*;
 import jakarta.json.Json;
 import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
 import jakarta.json.JsonValue;
 
 import java.net.URI;
@@ -174,14 +175,25 @@ public Object visitRules(ArrayList<Rule> rules) {
 	 * Helper methods
 	 */
 
-	public JsonObject toJsonObject() {
+	public JsonObject toJsonObject(boolean addParseTree) {
+
+		JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder();
 
-		return Json.createObjectBuilder()
+		jsonObjectBuilder = jsonObjectBuilder
 				.add("method", this.getMethod() == null ? JsonValue.NULL : Json.createValue(this.getMethod()))
-				.add("methodSpecificId", this.getMethodSpecificId() == null ? JsonValue.NULL : Json.createValue(this.getMethodSpecificId()))
-				.add("parseTree", this.getParseTree() == null ? JsonValue.NULL : Json.createValue(this.getParseTree()))
-				.add("parseRuleCount", this.getParseRuleCount() == null ? JsonValue.NULL : Json.createObjectBuilder(new HashMap<String, Object>(this.getParseRuleCount())).build())
-				.build();
+				.add("methodSpecificId", this.getMethodSpecificId() == null ? JsonValue.NULL : Json.createValue(this.getMethodSpecificId()));
+
+		if (addParseTree) {
+			jsonObjectBuilder = jsonObjectBuilder
+					.add("parseTree", this.getParseTree() == null ? JsonValue.NULL : Json.createValue(this.getParseTree()))
+					.add("parseRuleCount", this.getParseRuleCount() == null ? JsonValue.NULL : Json.createObjectBuilder(new HashMap<String, Object>(this.getParseRuleCount())).build());
+		}
+
+		return jsonObjectBuilder.build();
+	}
+
+	public JsonObject toJsonObject() {
+		return toJsonObject(false);
 	}
 
 	/*
@@ -250,6 +262,6 @@ public boolean equals(Object obj) {
 	@Override
 	public String toString() {
 
-		return this.didString.toString();
+		return this.didString;
 	}
 }
diff --git a/src/main/java/foundation/identity/did/DIDURL.java b/src/main/java/foundation/identity/did/DIDURL.java
@@ -3,6 +3,7 @@
 import foundation.identity.did.parser.*;
 import jakarta.json.Json;
 import jakarta.json.JsonObject;
+import jakarta.json.JsonObjectBuilder;
 import jakarta.json.JsonValue;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.utils.URLEncodedUtils;
@@ -178,17 +179,28 @@ public Object visitRules(ArrayList<Rule> rules) {
 	 * Helper methods
 	 */
 
-	public JsonObject toJsonObject() {
+	public JsonObject toJsonObject(boolean addParseTree) {
+
+		JsonObjectBuilder jsonObjectBuilder = Json.createObjectBuilder();
 
-		return Json.createObjectBuilder()
-				.add("did", this.getDid() == null ? JsonValue.NULL : this.getDid().toJsonObject())
+		jsonObjectBuilder = jsonObjectBuilder
+				.add("did", this.getDid() == null ? JsonValue.NULL : this.getDid().toJsonObject(addParseTree))
 				.add("parameters", this.getParameters() == null ? JsonValue.NULL : Json.createObjectBuilder(new HashMap<String, Object>(this.getParameters())).build())
 				.add("path", this.getPath() == null ? JsonValue.NULL : Json.createValue(this.getPath()))
 				.add("query", this.getQuery() == null ? JsonValue.NULL : Json.createValue(this.getQuery()))
-				.add("fragment", this.getFragment() == null ? JsonValue.NULL : Json.createValue(this.getFragment()))
-				.add("parseTree", this.getParseTree() == null ? JsonValue.NULL : Json.createValue(this.getParseTree()))
-				.add("parseRuleCount", this.getParseRuleCount() == null ? JsonValue.NULL : Json.createObjectBuilder(new HashMap<String, Object>(this.getParseRuleCount())).build())
-				.build();
+				.add("fragment", this.getFragment() == null ? JsonValue.NULL : Json.createValue(this.getFragment()));
+
+		if (addParseTree) {
+			jsonObjectBuilder = jsonObjectBuilder
+					.add("parseTree", this.getParseTree() == null ? JsonValue.NULL : Json.createValue(this.getParseTree()))
+					.add("parseRuleCount", this.getParseRuleCount() == null ? JsonValue.NULL : Json.createObjectBuilder(new HashMap<String, Object>(this.getParseRuleCount())).build());
+		}
+
+		return jsonObjectBuilder.build();
+	}
+
+	public JsonObject toJsonObject() {
+		return this.toJsonObject(false);
 	}
 
 	/*
@@ -281,6 +293,6 @@ public boolean equals(Object obj) {
 	@Override
 	public String toString() {
 
-		return this.didUrlString.toString();
+		return this.didUrlString;
 	}
 }