Added AppBootSchemaVersion tests and updated controller.

Author: Corneil du Plessis

.settings.xml

@@ -20,6 +20,14 @@
 				<activeByDefault>true</activeByDefault>
 			</activation>
 			<repositories>
+				<repository>
+					<id>maven-central</id>
+					<name>Maven Central</name>
+					<url>https://repo.maven.apache.org/maven2</url>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</repository>
 				<repository>
 					<id>spring-snapshots</id>
 					<name>Spring Snapshots</name>
@@ -37,15 +45,23 @@
 					</snapshots>
 				</repository>
 				<repository>
+					<id>spring-releases</id>
+					<name>Spring Releases</name>
+					<url>https://repo.spring.io/libs-release</url>
+					<snapshots>
+						<enabled>true</enabled>
+					</snapshots>
+				</repository>
+			</repositories>
+			<pluginRepositories>
+				<pluginRepository>
 					<id>maven-central</id>
 					<name>Maven Central</name>
 					<url>https://repo.maven.apache.org/maven2</url>
 					<snapshots>
 						<enabled>false</enabled>
 					</snapshots>
-				</repository>
-			</repositories>
-			<pluginRepositories>
+				</pluginRepository>
 				<pluginRepository>
 					<id>spring-snapshots</id>
 					<name>Spring Snapshots</name>
@@ -62,14 +78,6 @@
 						<enabled>false</enabled>
 					</snapshots>
 				</pluginRepository>
-				<pluginRepository>
-					<id>maven-central</id>
-					<name>Maven Central</name>
-					<url>https://repo.maven.apache.org/maven2</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</pluginRepository>
 			</pluginRepositories>
 			<distributionManagement>
 				<repository>

spring-cloud-dataflow-core/pom.xml

@@ -32,6 +32,10 @@
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-annotations</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-keyvalue</artifactId>

spring-cloud-dataflow-core/src/main/java/org/springframework/cloud/dataflow/core/AppBootSchemaVersion.java

@@ -18,6 +18,9 @@
 
 import java.util.Arrays;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
 /**
  * Defines the possible schema versions that currently map to Spring {@code "Boot"}. A registered application can only support one schema version.
  *
@@ -26,6 +29,8 @@
  * @author Chris Bono
  * @author Corneil du Plessis
  */
+@JsonSerialize(using = AppBootSchemaVersionSerializer.class)
+@JsonDeserialize(using = AppBootSchemaVersionDeserializer.class)
 public enum AppBootSchemaVersion {
 
 	BOOT2("2"),

spring-cloud-dataflow-core/src/main/java/org/springframework/cloud/dataflow/core/AppBootSchemaVersionDeserializer.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright 2023 the original author or authors.
+ *
+ * Licensed 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
+ *
+ *      https://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.springframework.cloud.dataflow.core;
+
+import java.io.IOException;
+
+import com.fasterxml.jackson.core.JacksonException;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+
+/**
+ * Deserialize AppBootSchemaVersion with Jackson
+ * @author Corneil du Plessis
+ */
+public class AppBootSchemaVersionDeserializer extends StdDeserializer<AppBootSchemaVersion> {
+	public AppBootSchemaVersionDeserializer() {
+		super(AppBootSchemaVersion.class);
+	}
+
+	public AppBootSchemaVersionDeserializer(Class<?> vc) {
+		super(vc);
+	}
+
+	@Override
+	public AppBootSchemaVersion deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JacksonException {
+		String value = jsonParser.getValueAsString();
+		return value != null ? AppBootSchemaVersion.fromBootVersion(value) : null;
+	}
+}

spring-cloud-dataflow-core/src/main/java/org/springframework/cloud/dataflow/core/AppBootSchemaVersionSerializer.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2023 the original author or authors.
+ *
+ * Licensed 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
+ *
+ *      https://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.springframework.cloud.dataflow.core;
+
+import java.io.IOException;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
+
+/**
+ * Serialize AppBootSchemaVersion with Jackson
+ * @author Corneil du Plessis
+ */
+public class AppBootSchemaVersionSerializer extends StdSerializer<AppBootSchemaVersion> {
+	public AppBootSchemaVersionSerializer() {
+		super(AppBootSchemaVersion.class);
+	}
+
+	protected AppBootSchemaVersionSerializer(Class<AppBootSchemaVersion> t) {
+		super(t);
+	}
+
+	@Override
+	public void serialize(AppBootSchemaVersion appBootSchemaVersion, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
+		if(appBootSchemaVersion != null) {
+			jsonGenerator.writeString(appBootSchemaVersion.getBootVersion());
+		} else {
+			jsonGenerator.writeNull();
+		}
+	}
+}

…l/converter/AppBootVersionConverter.java …taflow/core/AppBootVersionConverter.javaspring-cloud-dataflow-shell-core/src/main/java/org/springframework/cloud/dataflow/shell/converter/AppBootVersionConverter.java renamed to spring-cloud-dataflow-core/src/main/java/org/springframework/cloud/dataflow/core/AppBootVersionConverter.java spring-cloud-dataflow-shell-core/src/main/java/org/springframework/cloud/dataflow/shell/converter/AppBootVersionConverter.java renamed to spring-cloud-dataflow-core/src/main/java/org/springframework/cloud/dataflow/core/AppBootVersionConverter.java

@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.dataflow.shell.converter;
+package org.springframework.cloud.dataflow.core;
 
-import org.springframework.cloud.dataflow.core.AppBootSchemaVersion;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.stereotype.Component;
 
 /**
  * Converts strings to {@link AppBootSchemaVersion}
  *
  * @author Chris Bono
+ * @author Corneil du Plessis
  */
 @Component
 public class AppBootVersionConverter implements Converter<String, AppBootSchemaVersion> {

spring-cloud-dataflow-core/src/main/java/org/springframework/cloud/dataflow/core/AppRegistration.java

@@ -21,6 +21,8 @@
 import java.util.Objects;
 
 import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
 import javax.persistence.Lob;
 import javax.persistence.Table;
 import javax.persistence.Transient;
@@ -74,6 +76,12 @@ public class AppRegistration extends AbstractEntity implements Comparable<AppReg
 	 */
 	private Boolean defaultVersion = false;
 
+	/**
+	 * Boot version to identify Task / Batch Schema.
+	 */
+	@Enumerated(EnumType.STRING)
+	private AppBootSchemaVersion bootVersion;
+
 	@Transient
 	private HashSet<String> versions;
 
@@ -124,6 +132,21 @@ public AppRegistration(String name, ApplicationType type, String version, URI ur
 		this.metadataUri = metadataUri;
 	}
 
+	/**
+	 * Construct an {@code AppRegistration} object.
+	 *
+	 * @param name app name
+	 * @param type app type
+	 * @param version app version
+	 * @param uri URI for the app resource
+	 * @param metadataUri URI for the app metadata resource
+	 * @param schemaTargetName The name of the SchemaVersionTarget. Null means the default entry.
+	 */
+	public AppRegistration(String name, ApplicationType type, String version, URI uri, URI metadataUri, AppBootSchemaVersion bootVersion) {
+		this(name,type,version,uri,metadataUri);
+		this.bootVersion = bootVersion;
+	}
+
 	/**
 	 * @return the name of the app
 	 */
@@ -176,6 +199,14 @@ public void setMetadataUri(URI metadataUri) {
 		this.metadataUri = metadataUri;
 	}
 
+	public AppBootSchemaVersion getBootVersion() {
+		return bootVersion == null ? AppBootSchemaVersion.defaultVersion() : bootVersion;
+	}
+
+	public void setBootVersion(AppBootSchemaVersion bootVersion) {
+		this.bootVersion = bootVersion;
+	}
+
 	public Boolean isDefaultVersion() {
 		return this.defaultVersion;
 	}
@@ -196,7 +227,8 @@ public void setVersions(HashSet<String> versions) {
 	public String toString() {
 		return "AppRegistration{" + "name='" + this.getName() + '\'' + ", type='" + this.getType()
 				+ '\'' + ", version='" + this.getVersion() + '\'' + ", uri=" + this.getUri()
-				+ ", metadataUri=" + this.getMetadataUri() + '}';
+				+ ", metadataUri=" + this.getMetadataUri() +
+				", bootVersion=\'" + this.getBootVersion().getBootVersion() + '}';
 	}
 
 	@Override

spring-cloud-dataflow-registry/src/main/java/org/springframework/cloud/dataflow/registry/service/AppRegistryService.java

@@ -18,6 +18,7 @@
 import java.net.URI;
 import java.util.List;
 
+import org.springframework.cloud.dataflow.core.AppBootSchemaVersion;
 import org.springframework.cloud.dataflow.core.AppRegistration;
 import org.springframework.cloud.dataflow.core.ApplicationType;
 import org.springframework.cloud.dataflow.registry.support.NoSuchAppRegistrationException;
@@ -69,9 +70,10 @@ public interface AppRegistryService {
 	 * @param version Version of the AppRegistration to save
 	 * @param uri Resource uri of the AppRegistration to save
 	 * @param metadataUri metadata of the AppRegistration to save
+	 * @param bootVersion Spring Boot schema version indicating Task 2, Batch 4 or Task 3, Batch 5
 	 * @return the saved AppRegistration
 	 */
-	AppRegistration save(String name, ApplicationType type, String version, URI uri, URI metadataUri);
+	AppRegistration save(String name, ApplicationType type, String version, URI uri, URI metadataUri, AppBootSchemaVersion bootVersion);
 
 	/**
 	 * Deletes an {@link AppRegistration}. If the {@link AppRegistration} does not exist, a