Revert "Add checksum feature to about controller"

This reverts commit 49de3ab.

Author: markpollack

spring-cloud-dataflow-docs/src/main/asciidoc/configuration.adoc

@@ -1167,36 +1167,14 @@ then add to the generated Maven pom file the MetricWriter implementation you
 want to use.  The documentation on the Data Flow Metrics project pages provides
 the additional information you need to get started.
 
-== About Configuration
-The Spring Cloud Data Flow About Restful API result contains a link to the jars
-and the sha1 and or sha256 checksum values for each of the Data Flow components (i.e.
-the Spring Cloud Data Flow Shell). These links are configurable and by default,
-they  refer to jars that are stored at Maven Central. However
-since you may be running behind a firewall you may wish to point to a local
-repository. These links are configured via the following properties:
-
-* spring.cloud.dataflow.version-info.implementation-url - link to the Spring
-Cloud Data Flow Server-<implementation> (implementation can be
-cloud-foundry, kubernetes, local, etc) jar file.
-* spring.cloud.dataflow.version-info.core-url - link to the Spring Cloud Data
-Flow Core pom.
-* spring.cloud.dataflow.version-info.dashboard-url - link to the Spring Cloud
-Data Flow UI jar.
-* spring.cloud.dataflow.version-info.shell-url - link to the Spring Cloud Data
-Flow Shell jar.
-
-There are reserved values (surrounded by curly braces) that you can insert into
-the url that will make sure that the links are up to date:
-
-* implementation - inserts the type of Data Flow (Cloud Foundry, Kubernetes, Local, etc).
-* repository - if using a build-snapshot, milestone or release candidate of
-Data Flow, the repository will refer to repo-spring-io repository else it will
-refer to Maven Central.
-* version - Will insert this version of the jar/pom.
-
-For example:
-`https://myrepository/org/springframework/cloud/{implementation}/{version}/{implementation}-{version}.jar`
-would produce
-`https://myrepository/org/springframework/cloud/spring-cloud-dataflow-server-local/1.2.3.RELEASE/spring-cloud-dataflow-server-local-1.2.3.RELEASE.jar`
-if you were using the 1.2.3.RELEASE version of the Spring Cloud Data Flow Local Server.
+
+
+
+
+
+
+
+
+
+
 

spring-cloud-dataflow-rest-resource/src/main/java/org/springframework/cloud/dataflow/rest/resource/about/Dependency.java

@@ -16,133 +16,43 @@
 
 package org.springframework.cloud.dataflow.rest.resource.about;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-
 /**
  * Holds dependency information of a lbrary used by Spring Cloud Dataflow.
  *
  * @author Gunnar Hillert
- * @author Glenn Renfro
  */
-
 public class Dependency {
 
 	private String name;
 
 	private String version;
 
-	@JsonInclude(JsonInclude.Include.NON_NULL)
-	private String checksumSha1;
-
-	@JsonInclude(JsonInclude.Include.NON_NULL)
-	private String checksumSha256;
-
-	private String url;
-
 	/**
 	 * Default constructor for serialization frameworks.
 	 */
 	public Dependency() {
 	}
 
-	public Dependency(String name, String version, String checksumsha1,
-			String checksumsha256, String url) {
+	public Dependency(String name, String version) {
 		super();
 		this.name = name;
 		this.version = version;
-		this.checksumSha1 = checksumsha1;
-		this.checksumSha256 = checksumsha256;
-		this.url = url;
 	}
 
-	/**
-	 * Retrieve the current name for the {@link Dependency}
-
-	 * @return the name for the {@link Dependency}
-	 */
 	public String getName() {
 		return name;
 	}
 
-	/**
-	 * Establish the name for the {@link Dependency}.
-	 *
-	 * @param name {@link String} representing the name.
-	 */
 	public void setName(String name) {
 		this.name = name;
 	}
 
-	/**
-	 * Retrieve the current version for the {@link Dependency}
-	 *
-	 * @return the version for the {@link Dependency}
-	 */
 	public String getVersion() {
 		return version;
 	}
 
-	/**
-	 * Establish the version for the {@link Dependency}.
-	 *
-	 * @param version {@link String} representing the version.
-	 */
 	public void setVersion(String version) {
 		this.version = version;
 	}
 
-	/**
-	 * Retrieve the current checksumSha1 for the {@link Dependency}
-	 *
-	 * @return the checksumSha1 for the {@link Dependency}
-	 */
-	public String getChecksumSha1() {
-		return checksumSha1;
-	}
-
-	/**
-	 * Establish the checksumSha1 for the {@link Dependency}.
-	 *
-	 * @param checksumSha1 {@link String} representing the checksumSha1.
-	 */
-	public void setChecksumSha1(String checksumSha1)
-	{
-		this.checksumSha1 = checksumSha1;
-	}
-
-	/**
-	 * Retrieve the current url for the {@link Dependency}
-	 *
-	 * @return the url for the {@link Dependency}
-	 */
-	public String getUrl() {
-		return url;
-	}
-
-	/**
-	 * Establish the url for the {@link Dependency}.
-	 *
-	 * @param url {@link String} representing the url.
-	 */
-	public void setUrl(String url) {
-		this.url = url;
-	}
-
-	/**
-	 * Retrieve the current checksumSha256 for the {@link Dependency}
-	 *
-	 * @return the checksumSha256 for the {@link Dependency}
-	 */
-	public String getChecksumSha256() {
-		return checksumSha256;
-	}
-
-	/**
-	 * Establish the checksumSha1256 for the {@link Dependency}.
-	 *
-	 * @param checksumSha256 {@link String} representing the checksumSha256.
-	 */
-	public void setChecksumSha256(String checksumSha256) {
-		this.checksumSha256 = checksumSha256;
-	}
 }

spring-cloud-dataflow-rest-resource/src/main/java/org/springframework/cloud/dataflow/rest/resource/about/VersionInfo.java

@@ -20,93 +20,42 @@
  * Provides version information about core libraries used.
  *
  * @author Gunnar Hillert
- * @author Glenn Renfro
  */
 public class VersionInfo {
 
-	private Dependency implementationDependency = new Dependency();
+	private Dependency implementation = new Dependency();
 
-	private Dependency coreDependency = new Dependency();
+	private Dependency core = new Dependency();
 
-	private Dependency dashboardDependency = new Dependency();
-
-	private Dependency shellDependency = new Dependency();
+	private Dependency dashboard = new Dependency();
 
 	/**
 	 * Default constructor for serialization frameworks.
 	 */
 	public VersionInfo() {
 	}
 
-	/**
-	 * Retrieves the current {@link Dependency} for the implementation.
-	 *
-	 * @return {@link Dependency} instance containing Implementation information.
-	 */
-	public Dependency getImplementationDependency() {
-		return implementationDependency;
+	public Dependency getCore() {
+		return core;
 	}
 
-	/**
-	 * Establish the {@link Dependency} for the implementation.
-	 *
-	 * @param implementationDependency the {@link Dependency} instance for the implementation.
-	 */
-	public void setImplementationDependency(Dependency implementationDependency) {
-		this.implementationDependency = implementationDependency;
+	public void setCore(Dependency core) {
+		this.core = core;
 	}
 
-	/**
-	 * Retrieves the current {@link Dependency} for the core Data Flow instance.
-	 *
-	 * @return {@link Dependency} instance containing core Data Flow information.
-	 */
-	public Dependency getCoreDependency() {
-		return coreDependency;
+	public Dependency getImplementation() {
+		return implementation;
 	}
 
-	/**
-	 * Establish the {@link Dependency} for the Data Flow core.
-	 *
-	 * @param coreDependency the {@link Dependency} instance for the Data Flow core.
-	 */
-	public void setCoreDependency(Dependency coreDependency) {
-		this.coreDependency = coreDependency;
+	public void setImplementation(Dependency implementation) {
+		this.implementation = implementation;
 	}
 
-	/**
-	 * Retrieves the current {@link Dependency} for the Data Flow UI instance.
-	 *
-	 * @return {@link Dependency} instance containing Data Flow UI information.
-	 */
-	public Dependency getDashboardDependency() {
-		return dashboardDependency;
+	public Dependency getDashboard() {
+		return dashboard;
 	}
 
-	/**
-	 * Establish the {@link Dependency} for the dashboard.
-	 *
-	 * @param dashboardDependency the {@link Dependency} instance for the dashboard.
-	 */
-	public void setDashboardDependency(Dependency dashboardDependency) {
-		this.dashboardDependency = dashboardDependency;
-	}
-
-	/**
-	 * Retrieves the current {@link Dependency} for the shell instance.
-	 *
-	 * @return {@link Dependency} instance containing shell information.
-	 */
-	public Dependency getShellDependency() {
-		return shellDependency;
-	}
-
-	/**
-	 * Establish the {@link Dependency} for the shell.
-	 *
-	 * @param shellDependency the {@link Dependency} instance for the shell.
-	 */
-	public void setShellDependency(Dependency shellDependency) {
-		this.shellDependency = shellDependency;
+	public void setDashboard(Dependency dashboard) {
+		this.dashboard = dashboard;
 	}
 }