Revert "Add tests for shell 'app register' commands"

This reverts commit 95114a3.

Author: onobc

spring-cloud-dataflow-shell-core/src/main/java/org/springframework/cloud/dataflow/shell/command/AppRegistryCommands.java

@@ -182,10 +182,10 @@ public String unregister(
 
 		List<AppRegistrationResource> appRegistrations = findAllAppsByNameAndType(name, type);
 		Optional<AppRegistrationResource> defaultApp = appRegistrations.stream()
-				.filter(AppRegistrationResource::getDefaultVersion).findFirst();
+				.filter(a -> a.getDefaultVersion() == true).findFirst();
 
 		if (!CollectionUtils.isEmpty(appRegistrations) && !defaultApp.isPresent()) {
-			String appVersions = appRegistrations.stream().map(AppRegistrationResource::getVersion)
+			String appVersions = appRegistrations.stream().map(app -> app.getVersion())
 					.collect(Collectors.joining(", ", "(", ")"));
 			return String.format("Successfully unregistered application '%s' with type '%s'. " +
 					"Please select new default version from: %s", name, type, appVersions);
@@ -240,7 +240,7 @@ public String defaultApplication(
 	public String register(
 			@ShellOption(value = { "", "--name" }, help = "the name for the registered application") String name,
 			@ShellOption(help = "the type for the registered application", valueProvider = EnumValueProvider.class) ApplicationType type,
-			@ShellOption(value = { "-b", "--bootVersion" }, help = "the boot version to use for the registered application", defaultValue = ShellOption.NULL) AppBootSchemaVersion bootVersion,
+			@ShellOption(value = { "-bv", "--bootVersion" }, help = "the boot version to use for the registered application", defaultValue = ShellOption.NULL) AppBootSchemaVersion bootVersion,
 			@ShellOption(help = "URI for the application artifact") String uri,
 			@ShellOption(value = { "-m", "--metadata-uri", "--metadataUri"}, help = "Metadata URI for the application artifact", defaultValue = ShellOption.NULL) String metadataUri,
 			@ShellOption(help = "force update if application is already registered (only if not in use)", defaultValue = "false") boolean force) {
@@ -275,7 +275,7 @@ public Object list(
 			List<String> column = mappings.get(appRegistration.getType());
 			String value = appRegistration.getName();
 			if (application != null) {
-				String version = StringUtils.hasLength(appRegistration.getVersion()) ?  ("-" + appRegistration.getVersion()) : "";
+				String version = StringUtils.isEmpty(appRegistration.getVersion()) ? "" : "-"+appRegistration.getVersion();
 				value = value + version;
 				if (appRegistration.getDefaultVersion()) {
 					value = String.format("> %s <", value);
@@ -333,7 +333,7 @@ public String importFromResource(
 			try {
 				Resource resource = this.resourceLoader.getResource(uri);
 				Properties applications = PropertiesLoaderUtils.loadProperties(resource);
-				PagedModel<AppRegistrationResource> registered;
+				PagedModel<AppRegistrationResource> registered = null;
 				try {
 					registered = appRegistryOperations().registerAll(applications, force);
 				}

spring-cloud-dataflow-shell-core/src/main/java/org/springframework/cloud/dataflow/shell/converter/AppBootSchemaVersionConverter.java

@@ -32,14 +32,15 @@
 import org.springframework.cloud.skipper.client.SkipperClient;
 import org.springframework.context.ApplicationContext;
 import org.springframework.shell.Shell;
-import org.springframework.test.util.TestSocketUtils;
 import org.springframework.util.AlternativeJdkIdGenerator;
 import org.springframework.util.IdGenerator;
+import org.springframework.util.SocketUtils;
 
 /**
  * Base class for shell integration tests. This class sets up and tears down the
  * infrastructure required for executing shell tests - in particular, the Data Flow
  * server.
+ *
  * Extensions of this class may obtain instances of command templates. For example, call
  * {@link #stream} to obtain a {@link StreamCommandTemplate} in order to perform stream
  * operations.
@@ -67,7 +68,7 @@ public abstract class AbstractShellIntegrationTest {
 	/**
 	 * TCP port for the server.
 	 */
-	private static final int serverPort = TestSocketUtils.findAvailableTcpPort();
+	private static final int serverPort = SocketUtils.findAvailableTcpPort();
 
 	/**
 	 * Application context for server application.
@@ -106,30 +107,39 @@ public abstract class AbstractShellIntegrationTest {
 	@BeforeClass
 	public static void startUp() {
 		if (applicationContext == null) {
-			shutdownAfterRun = Boolean.parseBoolean(System.getProperty(SHUTDOWN_AFTER_RUN, "false"));
-			int randomPort = TestSocketUtils.findAvailableTcpPort();
+			if (System.getProperty(SHUTDOWN_AFTER_RUN) != null) {
+				shutdownAfterRun = Boolean.getBoolean(SHUTDOWN_AFTER_RUN);
+			}
+
+			SpringApplication application = new SpringApplicationBuilder(TestConfig.class).build();
+
+			int randomPort = SocketUtils.findAvailableTcpPort();
 			String dataFlowUri = String.format("--dataflow.uri=http://localhost:%s", serverPort);
 			String dataSourceUrl = String.format("jdbc:h2:tcp://localhost:%s/mem:dataflow", randomPort);
-			SpringApplication application = new SpringApplicationBuilder(TestConfig.class).build();
 			applicationContext = application.run(String.format("--server.port=%s", serverPort), dataFlowUri,
 					"--spring.jmx.default-domain=" + System.currentTimeMillis(), "--spring.jmx.enabled=false",
 					"--security.basic.enabled=false", "--spring.main.show_banner=false",
 					"--spring.cloud.config.enabled=false",
 					"--spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration,org.springframework.boot.autoconfigure.security.servlet.SecurityFilterAutoConfiguration,org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration,org.springframework.boot.autoconfigure.session.SessionAutoConfiguration,org.springframework.cloud.deployer.spi.cloudfoundry.CloudFoundryDeployerAutoConfiguration,org.springframework.cloud.deployer.spi.kubernetes.KubernetesAutoConfiguration",
 					"--spring.datasource.url=" + dataSourceUrl,
 					"--spring.cloud.dataflow.features.schedules-enabled=true");
+
 			Shell shell = applicationContext.getBean(Shell.class);
+
 			skipperClient = applicationContext.getBean(SkipperClient.class);
 			commandRunner = new ShellCommandRunner(shell);
 		}
 	}
 
 	@AfterClass
 	public static void shutdown() {
-		if (shutdownAfterRun && applicationContext != null) {
-			logger.info("Stopping Data Flow Server");
-			SpringApplication.exit(applicationContext);
-			applicationContext = null;
+		if (shutdownAfterRun) {
+			if (applicationContext != null) {
+				logger.info("Stopping Data Flow Server");
+				SpringApplication.exit(applicationContext);
+
+				applicationContext = null;
+			}
 		}
 	}
 
@@ -187,14 +197,6 @@ protected JobCommandTemplate job() {
 		return new JobCommandTemplate(commandRunner);
 	}
 
-	/**
-	 * Gets the configured shell command runner.
-	 * @return the configured shell command runner
-	 */
-	protected ShellCommandRunner commandRunner() {
-		return commandRunner;
-	}
-
 	/**
 	 * Return a unique random name for stream/task testing.
 	 *
@@ -219,3 +221,4 @@ protected String generateUniqueStreamOrTaskName() {
 	}
 
 }
+