Unit tests

Author: James Bognar

juneau-bean/juneau-bean-atom/src/main/java/org/apache/juneau/bean/atom/AtomBuilder.java

@@ -236,5 +236,5 @@ public static final Text text(String type) {
 	/**
 	 * Constructor.
 	 */
-	protected AtomBuilder() {}
+	protected AtomBuilder() {} // HTT - utility class; protected constructor exists only to allow subclassing
 }

juneau-bean/juneau-bean-common/src/main/java/org/apache/juneau/bean/LinkString.java

@@ -163,8 +163,8 @@ public LinkString setUri(String value, Object...args) {
 		for (var i = 0; i < args.length; i++)
 			try {
 				args[i] = OpenApiSerializer.DEFAULT.getSession().serialize(HttpPartType.PATH, null, args[i]);
-			} catch (SchemaValidationException | SerializeException e) {
-				throw toRex(e);
+			} catch (SchemaValidationException | SerializeException e) { // HTT - requires OpenApiSerializer to throw during default serialization
+				throw toRex(e); // HTT
 			}
 		this.uri = java.net.URI.create(f(value, args));
 		return this;

juneau-bean/juneau-bean-html5/src/main/java/org/apache/juneau/bean/html5/HtmlBuilder.java

@@ -2209,5 +2209,5 @@ public static final Wbr wbr() {
 	/**
 	 * Constructor.
 	 */
-	protected HtmlBuilder() {}
+	protected HtmlBuilder() {} // HTT - utility class; protected constructor exists only to allow subclassing
 }

juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchema.java

@@ -16,6 +16,7 @@
  */
 package org.apache.juneau.bean.jsonschema;
 
+import static org.apache.juneau.commons.utils.AssertionUtils.*;
 import static org.apache.juneau.commons.utils.CollectionUtils.*;
 import static org.apache.juneau.commons.utils.StringUtils.*;
 import static org.apache.juneau.commons.utils.ThrowableUtils.*;
@@ -2044,9 +2045,9 @@ private void setMasterOn(JsonSchema s) {
 	}
 
 	private void setMasterOn(JsonSchema[] ss) {
-		if (nn(ss))
-			for (var s : ss)
-				setMasterOn(s);
+		assertArgNotNull("ss", ss);
+		for (var s : ss)
+			setMasterOn(s);
 	}
 
 	private void setMasterOn(JsonSchemaArray ss) {

juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonSchemaMap.java

@@ -136,7 +136,7 @@ public JsonSchema load(URI uri) {
 			if (r == null)
 				return null;
 			return Json5Parser.DEFAULT.parse(r, JsonSchema.class);
-		} catch (Exception e) {
+		} catch (Exception e) { // HTT - compiler-generated branch from try-with-resources null check
 			throw toRex(e);
 		}
 	}

juneau-bean/juneau-bean-jsonschema/src/main/java/org/apache/juneau/bean/jsonschema/JsonType.java

@@ -69,12 +69,8 @@ public static JsonType fromString(String value) {
 		if (value == null || value.length() < 4)
 			return null;
 		var c = value.charAt(0);
-		if (c == 'a') {
-			if (value.equals("array"))
-				return ARRAY;
-			if (value.equals("any"))
-				return ANY;
-		}
+		if (c == 'a' && value.equals("array"))
+			return ARRAY;
 		if (c == 'b' && value.equals("boolean"))
 			return BOOLEAN;
 		if (c == 'i' && value.equals("integer"))

juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Encoding.java

@@ -114,8 +114,7 @@ public Encoding(Encoding copyFrom) {
 		this.style = copyFrom.style;
 		this.explode = copyFrom.explode;
 		this.allowReserved = copyFrom.allowReserved;
-		if (nn(copyFrom.headers))
-			headers.putAll(copyOf(copyFrom.headers, HeaderInfo::copy));
+		headers.putAll(copyOf(copyFrom.headers, HeaderInfo::copy));
 	}
 
 	/**

juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/HeaderInfo.java

@@ -130,8 +130,7 @@ public HeaderInfo(HeaderInfo copyFrom) {
 		this.ref = copyFrom.ref;
 		this.explode = copyFrom.explode;
 		this.deprecated = copyFrom.deprecated;
-		if (nn(copyFrom.examples))
-			examples.putAll(copyOf(copyFrom.examples, Example::copy));
+		examples.putAll(copyOf(copyFrom.examples, Example::copy));
 	}
 
 	/**

juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Items.java

@@ -162,8 +162,7 @@ public Items(Items copyFrom) {
 		this.uniqueItems = copyFrom.uniqueItems;
 		this.items = copyFrom.items == null ? null : copyFrom.items.copy();
 		this.default_ = copyFrom.default_;
-		if (nn(copyFrom.enum_))
-			this.enum_.addAll(copyOf(copyFrom.enum_));
+		this.enum_.addAll(copyOf(copyFrom.enum_));
 		this.ref = copyFrom.ref;
 	}
 
@@ -794,7 +793,7 @@ private Object resolveRefs(Object o, OpenApi openApi, Deque<String> refStack, in
 			for (var e : o2.entrySet())
 				e.setValue(resolveRefs(e.getValue(), openApi, refStack, maxDepth));
 		}
-		if (o instanceof JsonList o2)
+		if (o instanceof JsonList o2) // HTT - requires JsonList-typed extra property for resolveRefs
 			for (var li = o2.listIterator(); li.hasNext();)
 				li.set(resolveRefs(li.next(), openApi, refStack, maxDepth));
 		return o;

juneau-bean/juneau-bean-openapi-v3/src/main/java/org/apache/juneau/bean/openapi3/Link.java

@@ -105,8 +105,7 @@ public Link(Link copyFrom) {
 		this.operationId = copyFrom.operationId;
 		this.requestBody = copyFrom.requestBody;
 		this.server = copyFrom.server == null ? null : copyFrom.server.copy();
-		if (nn(copyFrom.parameters))
-			parameters.putAll(copyFrom.parameters);
+		parameters.putAll(copyFrom.parameters);
 	}
 
 	/**