MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java] migrates JShell communication from JAXB to standard serialization (IDEA-197466)

Browse Source
This commit is contained in:
Roman Shevchenko
2018-10-24 19:03:19 +02:00
parent 745c62ca60
commit 2e4ed634ae
13 changed files with 94 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
java/execution/jshell-frontend/src/com/intellij/execution/jshell/frontend/Main.java
View File

@@ -1,3 +1,4 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.execution.jshell.frontend;
import com.intellij.execution.jshell.protocol.*;
@@ -10,25 +11,18 @@ import java.util.List;
import java.util.Locale;
import java.util.function.Consumer;
/**
* @author Eugene Zhuravlev
*
* @noinspection UseOfSystemOutOrSystemErr
*/
@SuppressWarnings({"UseOfSystemOutOrSystemErr", "CallToPrintStackTrace"})
public class Main {
private static final String ARG_CLASSPATH = "--class-path";
private static final String ARG_CLASSPATH_FILE = "--@class-path";
private static final Consumer<String> NULL_CONSUMER = s -> {};
//private static Request createTestRequest() {
// return new Request(UUID.randomUUID().toString(), Request.Command.EVAL, "int a = 77;\n" +
// "int b = a + 3");
//}
public static void main(String[] args) throws Exception {
public static void main(String[] args) {
final MessageReader<Request> reader = new MessageReader<>(new BufferedInputStream(System.in), Request.class);
final MessageWriter<Response> writer = new MessageWriter<>(new BufferedOutputStream(System.out), Response.class);
final MessageWriter<Response> writer = new MessageWriter<>(new BufferedOutputStream(System.out));
try (JShell shell = JShell.create()) {
configureJShell(args, shell);
@@ -42,9 +36,7 @@ public class Main {
return;
}
final Response response = new Response();
response.setUid(request.getUid());
final Response response = new Response(request.getUid());
try {
// first, handle eval classpath if any
final List<String> cp = request.getClassPath();
@@ -53,7 +45,7 @@ public class Main {
shell.addToClasspath(path);
}
}
if (command == Request.Command.DROP_STATE) {
shell.snippets().forEach(snippet -> exportEvents(shell, shell.drop(snippet), response));
}
@@ -211,9 +203,8 @@ public class Main {
try {
return Enum.valueOf(toEnumOfClass, from.name());
}
catch (IllegalArgumentException ignored) {
}
catch (IllegalArgumentException ignored) { }
}
return Enum.valueOf(toEnumOfClass, "UNKNOWN");
}
}
}

4
java/execution/jshell-frontend/src/com/intellij/execution/jshell/frontend/Marker.java
View File

@@ -1,7 +1,7 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.execution.jshell.frontend;
/**
* @author Eugene Zhuravlev
*/
public interface Marker {
}
public interface Marker { }