Revert "Added AppBootSchemaVersion tests and updated controller."

This reverts commit 693423f.

Author: onobc

.settings.xml

@@ -20,14 +20,6 @@
 				<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>
@@ -45,23 +37,15 @@
 					</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>
-				</pluginRepository>
+				</repository>
+			</repositories>
+			<pluginRepositories>
 				<pluginRepository>
 					<id>spring-snapshots</id>
 					<name>Spring Snapshots</name>
@@ -78,6 +62,14 @@
 						<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,10 +32,6 @@
 			<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,9 +18,6 @@
 
 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.
  *
@@ -29,8 +26,6 @@
  * @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

@@ -21,8 +21,6 @@
 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;
@@ -76,12 +74,6 @@ 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;
 
@@ -132,21 +124,6 @@ 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
 	 */
@@ -199,14 +176,6 @@ 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;
 	}
@@ -227,8 +196,7 @@ 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() +
-				", bootVersion=\'" + this.getBootVersion().getBootVersion() + '}';
+				+ ", metadataUri=" + this.getMetadataUri() + '}';
 	}
 
 	@Override

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

@@ -18,7 +18,6 @@
 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;
@@ -70,10 +69,9 @@ 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, AppBootSchemaVersion bootVersion);
+	AppRegistration save(String name, ApplicationType type, String version, URI uri, URI metadataUri);
 
 	/**
 	 * Deletes an {@link AppRegistration}. If the {@link AppRegistration} does not exist, a