SunSpecCodeGenerator: refactor, add 7xx models, use JSON input files

io.openems.common/src/io/openems/common/utils/JsonUtils.java

@@ -39,23 +39,22 @@ public class JsonUtils {
 	/**
 	 * Provide a easy way to generate a JsonArray from a list using the given
 	 * convert function to add each element.
-	 * 
+	 *
 	 * @param list    to convert
 	 * @param convert function to convert elements
 	 * @param <T>     type of an element from list
-	 * 
+	 *
 	 * @return list as JsonArray
 	 */
 	public static <T> JsonArray generateJsonArray(Collection<T> list, Function<T, JsonElement> convert) {
 		if (list == null) {
 			return null;
-		} else {
-			var jab = new JsonArrayBuilder();
-			list.forEach(element -> {
-				jab.add(convert.apply(element));
-			});
-			return jab.build();
 		}
+		var jab = new JsonArrayBuilder();
+		list.forEach(element -> {
+			jab.add(convert.apply(element));
+		});
+		return jab.build();
 	}
 
 	/**
@@ -262,10 +261,10 @@ public JsonObjectBuilder addProperty(String property, Enum<?> value) {
 
 		/**
 		 * Add a {@link ZonedDateTime} value to the {@link JsonObject}.
-		 * 
+		 *
 		 * <p>
 		 * The value gets added in the format of {@link DateTimeFormatter#ISO_INSTANT}.
-		 * 
+		 *
 		 * @param property the key
 		 * @param value    the value
 		 * @return the {@link JsonObjectBuilder}
@@ -364,10 +363,10 @@ public JsonObjectBuilder addPropertyIfNotNull(String property, Enum<?> value) {
 		/**
 		 * Add a {@link ZonedDateTime} value to the {@link JsonObject} if it is not
 		 * null.
-		 * 
+		 *
 		 * <p>
 		 * The value gets added in the format of {@link DateTimeFormatter#ISO_INSTANT}.
-		 * 
+		 *
 		 * @param property the key
 		 * @param value    the value
 		 * @return the {@link JsonObjectBuilder}
@@ -719,6 +718,19 @@ public static Optional<String> getAsOptionalString(JsonElement jElement, String
 		return Optional.ofNullable(toString(toPrimitive(toSubElement(jElement, memberName))));
 	}
 
+	/**
+	 * Gets the member of the {@link JsonElement} as {@link String} if it exists,
+	 * and the alternative value otherwise.
+	 *
+	 * @param jElement    the {@link JsonElement}
+	 * @param memberName  the name of the member
+	 * @param alternative the alternative value
+	 * @return the {@link String} value or the alternative value
+	 */
+	public static String getAsStringOrElse(JsonElement jElement, String memberName, String alternative) {
+		return getAsOptionalString(jElement, memberName).orElse(alternative);
+	}
+
 	/**
 	 * Converts a {@link JsonArray} to a String Array.
 	 *
@@ -1373,17 +1385,20 @@ public static JsonElement getAsJsonElement(Object value) {
 			 * String
 			 */
 			return new JsonPrimitive((String) value);
-		} else if (value instanceof Boolean) {
+		}
+		if (value instanceof Boolean) {
 			/*
 			 * Boolean
 			 */
 			return new JsonPrimitive((Boolean) value);
-		} else if (value instanceof Inet4Address) {
+		}
+		if (value instanceof Inet4Address) {
 			/*
 			 * Inet4Address
 			 */
 			return new JsonPrimitive(((Inet4Address) value).getHostAddress());
-		} else if (value instanceof JsonElement) {
+		}
+		if (value instanceof JsonElement) {
 			/*
 			 * JsonElement
 			 */
@@ -1497,17 +1512,20 @@ public static Object getAsType(Class<?> type, JsonElement j) throws NotImplement
 				 * Asking for an Long
 				 */
 				return j.getAsLong();
-			} else if (Boolean.class.isAssignableFrom(type)) {
+			}
+			if (Boolean.class.isAssignableFrom(type)) {
 				/*
 				 * Asking for an Boolean
 				 */
 				return j.getAsBoolean();
-			} else if (Double.class.isAssignableFrom(type)) {
+			}
+			if (Double.class.isAssignableFrom(type)) {
 				/*
 				 * Asking for an Double
 				 */
 				return j.getAsDouble();
-			} else if (String.class.isAssignableFrom(type)) {
+			}
+			if (String.class.isAssignableFrom(type)) {
 				/*
 				 * Asking for a String
 				 */
@@ -1731,7 +1749,7 @@ public static boolean isEmptyJsonArray(JsonElement j) {
 
 	/**
 	 * Check if the given {@link JsonElement} is a {@link Number}.
-	 * 
+	 *
 	 * @param j the {@link JsonElement} to check
 	 * @return true if the element is a {@link Number}, otherwise false
 	 */
@@ -1742,7 +1760,7 @@ public static boolean isNumber(JsonElement j) {
 	/**
 	 * Returns a sequential stream of the {@link JsonElement JsonElements} in the
 	 * {@link JsonArray}.
-	 * 
+	 *
 	 * @param jsonArray The {@link JsonArray}, assumed to be unmodified during use
 	 * @return a Stream of the elements
 	 */
@@ -1764,7 +1782,7 @@ private static JsonObject toJsonObject(JsonElement jElement) {
 	/**
 	 * Returns a {@link Collector} that accumulates the input elements into a new
 	 * {@link JsonObject}.
-	 * 
+	 *
 	 * @param <T>         the type of the input
 	 * @param keyMapper   the key mapper
 	 * @param valueMapper the value mapper
@@ -1785,7 +1803,7 @@ private static JsonObject toJsonObject(JsonElement jElement) {
 
 	/**
 	 * Returns a Collector that accumulates the input elements into a new JsonArray.
-	 * 
+	 *
 	 * @return a Collector which collects all the input elements into a JsonArray
 	 */
 	public static Collector<JsonElement, JsonUtils.JsonArrayBuilder, JsonArray> toJsonArray() {

io.openems.common/test/io/openems/common/utils/JsonUtilsTest.java

@@ -219,6 +219,10 @@ public void testGetAsString() throws OpenemsNamedException {
 		// -> Optional Sub-Element
 		assertEquals("value", JsonUtils.getAsOptionalString(JSON_OBJECT, "String").get());
 		assertEquals(Optional.empty(), JsonUtils.getAsOptionalString(JSON_OBJECT, "foo"));
+
+		// -> As String or Else
+		assertEquals("value", JsonUtils.getAsStringOrElse(JSON_OBJECT, "String", "alternative"));
+		assertEquals("alternative", JsonUtils.getAsStringOrElse(JSON_OBJECT, "foo", "alternative"));
 	}
 
 	@Test