[flink] 23/24: WIP: investigate breaking

[kkloudas]

This is an automated email from the ASF dual-hosted git repository.

kkloudas pushed a commit to branch executors
in repository https://gitbox.apache.org/repos/asf/flink.git

commit 1ab0228a1c3a57509f4532551eaef4a522a62433
Author: Kostas Kloudas <kklou...@gmail.com>
AuthorDate: Mon Nov 11 20:10:33 2019 +0100

    WIP: investigate breaking
---
 .../src/main/java/org/apache/flink/client/cli/CliFrontend.java      | 6 +++---
 .../org/apache/flink/client/cli/CliFrontendPackageProgramTest.java  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/flink-clients/src/main/java/org/apache/flink/client/cli/CliFrontend.java 
b/flink-clients/src/main/java/org/apache/flink/client/cli/CliFrontend.java
index 780eadd..f37a29a 100644
--- a/flink-clients/src/main/java/org/apache/flink/client/cli/CliFrontend.java
+++ b/flink-clients/src/main/java/org/apache/flink/client/cli/CliFrontend.java
@@ -669,7 +669,7 @@ public class CliFrontend {
                        final ProgramOptions runOptions,
                        final ExecutionConfigAccessor executionParameters) 
throws FileNotFoundException, ProgramInvocationException {
                String[] programArgs = runOptions.getProgramArgs();
-               URL jarFilePath = executionParameters.getJarFilePaths().get(0);
+               String jarFilePath = runOptions.getJarFilePath();
                List<URL> classpaths = executionParameters.getClasspaths();
 
                // Get assembler class
@@ -710,8 +710,8 @@ public class CliFrontend {
         * @return The JAR file
         * @throws FileNotFoundException The JAR file does not exist.
         */
-       private File getJarFile(URL jarFilePath) throws FileNotFoundException {
-               File jarFile = new File(jarFilePath.getPath());
+       private File getJarFile(String jarFilePath) throws 
FileNotFoundException {
+               File jarFile = new File(jarFilePath);
                // Check if JAR file exists
                if (!jarFile.exists()) {
                        throw new FileNotFoundException("JAR file does not 
exist: " + jarFile);
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 772cd33..2fc8594 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
@@ -81,7 +81,7 @@ public class CliFrontendPackageProgramTest extends TestLogger 
{
        public void testNonExistingJarFile() throws Exception {
                ProgramOptions programOptions = mock(ProgramOptions.class);
                ExecutionConfigAccessor executionOptions = 
mock(ExecutionConfigAccessor.class);
-               
when(executionOptions.getJarFilePaths()).thenReturn(Collections.singletonList(new
 URL("file:///some/none/existing/path")));
+               
when(programOptions.getJarFilePath()).thenReturn("file:///some/none/existing/path");
 
                try {
                        frontend.buildProgram(programOptions, executionOptions);
@@ -96,7 +96,7 @@ public class CliFrontendPackageProgramTest extends TestLogger 
{
        public void testFileNotJarFile() throws Exception {
                ProgramOptions programOptions = mock(ProgramOptions.class);
                ExecutionConfigAccessor executionOptions = 
mock(ExecutionConfigAccessor.class);
-               
when(executionOptions.getJarFilePaths()).thenReturn(Collections.singletonList(getNonJarFilePath()));
+               
when(programOptions.getJarFilePath()).thenReturn(getNonJarFilePath().getPath());
 
                try {
                        frontend.buildProgram(programOptions, executionOptions);