[GitHub] zentol closed pull request #6854: [FLINK-10547] Remove LegacyCLI

[GitBox <gi...@apache.org>]

zentol closed pull request #6854: [FLINK-10547] Remove LegacyCLI
URL: https://github.com/apache/flink/pull/6854
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/flink-clients/src/main/java/org/apache/flink/client/cli/LegacyCLI.java b/flink-clients/src/main/java/org/apache/flink/client/cli/LegacyCLI.java
deleted file mode 100644
index 761929dbacf..00000000000
--- a/flink-clients/src/main/java/org/apache/flink/client/cli/LegacyCLI.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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
- *
- *     http://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.apache.flink.client.cli;
-
-import org.apache.flink.client.deployment.ClusterSpecification;
-import org.apache.flink.client.deployment.LegacyStandaloneClusterDescriptor;
-import org.apache.flink.client.deployment.StandaloneClusterId;
-import org.apache.flink.configuration.Configuration;
-import org.apache.flink.util.FlinkException;
-
-import org.apache.commons.cli.CommandLine;
-
-import javax.annotation.Nullable;
-
-/**
- * The CLI which is used for interaction with the legacy standalone clusters.
- */
-public class LegacyCLI extends AbstractCustomCommandLine<StandaloneClusterId> {
-
-	public LegacyCLI(Configuration configuration) {
-		super(configuration);
-	}
-
-	@Override
-	public boolean isActive(CommandLine commandLine) {
-		// always active because we can try to read a JobManager address from the config
-		return true;
-	}
-
-	@Override
-	public String getId() {
-		return "legacy";
-	}
-
-	@Override
-	public LegacyStandaloneClusterDescriptor createClusterDescriptor(
-			CommandLine commandLine) throws FlinkException {
-		final Configuration effectiveConfiguration = applyCommandLineOptionsToConfiguration(commandLine);
-
-		return new LegacyStandaloneClusterDescriptor(effectiveConfiguration);
-	}
-
-	@Override
-	@Nullable
-	public StandaloneClusterId getClusterId(CommandLine commandLine) {
-		return StandaloneClusterId.getInstance();
-	}
-
-	@Override
-	public ClusterSpecification getClusterSpecification(CommandLine commandLine) {
-		return new ClusterSpecification.ClusterSpecificationBuilder().createClusterSpecification();
-	}
-}
diff --git a/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendPackageProgramTest.java b/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendPackageProgramTest.java
index e9c62f9028f..48c88912034 100644
--- a/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendPackageProgramTest.java
+++ b/flink-clients/src/test/java/org/apache/flink/client/cli/CliFrontendPackageProgramTest.java
@@ -71,7 +71,7 @@ public void setup() throws Exception {
 		final Configuration configuration = new Configuration();
 		frontend = new CliFrontend(
 			configuration,
-			Collections.singletonList(new LegacyCLI(configuration)));
+			Collections.singletonList(new DefaultCLI(configuration)));
 	}
 
 	@Test
diff --git a/flink-clients/src/test/java/org/apache/flink/client/cli/DefaultCLITest.java b/flink-clients/src/test/java/org/apache/flink/client/cli/DefaultCLITest.java
index 6c13368c5fc..8402b7e1120 100644
--- a/flink-clients/src/test/java/org/apache/flink/client/cli/DefaultCLITest.java
+++ b/flink-clients/src/test/java/org/apache/flink/client/cli/DefaultCLITest.java
@@ -34,7 +34,7 @@
 import static org.junit.Assert.assertThat;
 
 /**
- * Tests for the {@link LegacyCLI}.
+ * Tests for the {@link DefaultCLI}.
  */
 public class DefaultCLITest extends CliFrontendTestBase {
 


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services