Fix the broken due to thechanges from the upstream JDI impl class Con…

…nectorImpl
Jinbo Wang (testforstephen) · Apr 30, 2021 · Apr 30, 2021 · Apr 30, 2021 · Apr 30, 2021 · db8c5fdcb9fe1294538c4da0db343ff1a27638cf
commit db8c5fdcb9fe1294538c4da0db343ff1a27638cf
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.microsoft.java</groupId>
         <artifactId>java-debug-parent</artifactId>
-        <version>0.31.0</version>
+        <version>0.31.1</version>
     </parent>
     <artifactId>com.microsoft.java.debug.core</artifactId>
     <packaging>jar</packaging>

@@ -6,6 +6,6 @@
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry exported="true" kind="lib" path="lib/rxjava-2.1.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/reactive-streams-1.0.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/com.microsoft.java.debug.core-0.31.0.jar" sourcepath="/com.microsoft.java.debug.core"/>
+	<classpathentry exported="true" kind="lib" path="lib/com.microsoft.java.debug.core-0.31.1.jar" sourcepath="/com.microsoft.java.debug.core"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Java Debug Server Plugin
 Bundle-SymbolicName: com.microsoft.java.debug.plugin;singleton:=true
-Bundle-Version: 0.31.0
+Bundle-Version: 0.31.1
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: com.microsoft.java.debug.plugin.internal.JavaDebuggerServerPlugin
@@ -25,4 +25,4 @@ Bundle-ClassPath: lib/commons-io-2.5.jar,
  .,
  lib/rxjava-2.1.1.jar,
  lib/reactive-streams-1.0.0.jar,
- lib/com.microsoft.java.debug.core-0.31.0.jar
+ lib/com.microsoft.java.debug.core-0.31.1.jar
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.microsoft.java</groupId>
         <artifactId>java-debug-parent</artifactId>
-        <version>0.31.0</version>
+        <version>0.31.1</version>
     </parent>
     <artifactId>com.microsoft.java.debug.plugin</artifactId>
     <packaging>eclipse-plugin</packaging>
@@ -45,7 +45,7 @@
                         <artifactItem>
                             <groupId>com.microsoft.java</groupId>
                             <artifactId>com.microsoft.java.debug.core</artifactId>
-                            <version>0.31.0</version>
+                            <version>0.31.1</version>
                         </artifactItem>
                     </artifactItems>
                 </configuration>

@@ -44,11 +44,11 @@ public AdvancedLaunchingConnector(VirtualMachineManagerImpl virtualMachineManage
     public Map<String, Argument> defaultArguments() {
         Map<String, Argument> defaultArgs = super.defaultArguments();
 
-        Argument cwdArg = new AdvancedStringArgumentImpl(DebugUtility.CWD, "Current working directory", DebugUtility.CWD, false);
+        Argument cwdArg = new JDIStringArgumentImpl(DebugUtility.CWD, "Current working directory", DebugUtility.CWD, false);
         cwdArg.setValue(null);
         defaultArgs.put(DebugUtility.CWD, cwdArg);
 
-        Argument envArg = new AdvancedStringArgumentImpl(DebugUtility.ENV, "Environment variables", DebugUtility.ENV, false);
+        Argument envArg = new JDIStringArgumentImpl(DebugUtility.ENV, "Environment variables", DebugUtility.ENV, false);
         envArg.setValue(null);
         defaultArgs.put(DebugUtility.ENV, envArg);
 
@@ -117,11 +117,81 @@ private static String[] constructLaunchCommand(Map<String, ? extends Argument> l
         return DebugUtility.parseArguments(execString.toString()).toArray(new String[0]);
     }
 
-    class AdvancedStringArgumentImpl extends StringArgumentImpl implements StringArgument {
-        private static final long serialVersionUID = 1L;
+    static abstract class JDIArgumentImpl implements Argument {
+        private static final long serialVersionUID = 8850533280769854833L;
+        private String fName;
+        private String fDescription;
+        private String fLabel;
+        private boolean fMustSpecify;
+
+        protected JDIArgumentImpl(String name, String description, String label,
+                boolean mustSpecify) {
+            fName = name;
+            fLabel = label;
+            fDescription = description;
+            fMustSpecify = mustSpecify;
+        }
+
+        @Override
+        public String name() {
+            return fName;
+        }
+
+        @Override
+        public String description() {
+            return fDescription;
+        }
+
+        @Override
+        public String label() {
+            return fLabel;
+        }
+
+        @Override
+        public boolean mustSpecify() {
+            return fMustSpecify;
+        }
+
+        @Override
+        public abstract String value();
+
+        @Override
+        public abstract void setValue(String value);
+
+        @Override
+        public abstract boolean isValid(String value);
 
-        protected AdvancedStringArgumentImpl(String name, String description, String label, boolean mustSpecify) {
+        @Override
+        public abstract String toString();
+        }
+
+    static class JDIStringArgumentImpl extends JDIArgumentImpl implements StringArgument {
+        private static final long serialVersionUID = 6009335074727417445L;
+        private String fValue;
+
+        protected JDIStringArgumentImpl(String name, String description,
+                String label, boolean mustSpecify) {
             super(name, description, label, mustSpecify);
         }
+
+        @Override
+        public String value() {
+            return fValue;
+        }
+
+        @Override
+        public void setValue(String value) {
+            fValue = value;
+        }
+
+        @Override
+        public boolean isValid(String value) {
+            return true;
+        }
+
+        @Override
+        public String toString() {
+            return fValue;
+        }
     }
 }
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <bundle id="com.microsoft.java.debug.plugin" version="0.31.0">
+   <bundle id="com.microsoft.java.debug.plugin" version="0.31.1">
    <category name="javadebug" />
    </bundle>
    <category-def name="javadebug" label="Java Debug Server"/>

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.microsoft.java</groupId>
         <artifactId>java-debug-parent</artifactId>
-        <version>0.31.0</version>
+        <version>0.31.1</version>
     </parent>
 	<artifactId>com.microsoft.java.debug.repository</artifactId>
 	<packaging>eclipse-repository</packaging>

@@ -6,7 +6,7 @@
     <name>${base.name} :: Parent</name>
     <description>The Java Debug Server is an implementation of Visual Studio Code (VSCode) Debug Protocol. It can be used in Visual Studio Code to debug Java programs.</description>
     <url>https://github.com/Microsoft/java-debug</url>
-    <version>0.31.0</version>
+    <version>0.31.1</version>
     <packaging>pom</packaging>
     <properties>
         <base.name>Java Debug Server for Visual Studio Code</base.name>