Magic return values are suppressed #110

Author: andrus

RELEASE-NOTES.md

@@ -5,6 +5,7 @@
 * #102 Eval startup snippets explicitly
 * #105 Exploding classpath
 * #107 "java.class.path" uses an incorrect separator
+* #110 Magic return values are suppressed
 
 ## 1.0-a6
 

jjava-jupyter/src/main/java/org/dflib/jjava/jupyter/kernel/magic/MagicTranspiler.java

@@ -15,8 +15,8 @@ public class MagicTranspiler {
     private static final Pattern UNESCAPED_QUOTE = Pattern.compile("(?<!\\\\)\"");
 
     // generated code templates
-    private static final String CELL_CALL_TEMPLATE = BaseNotebookStatics.class.getName() + ".cellMagic(%s,java.util.List.of(%s),%s);{};";
-    private static final String LINE_CALL_TEMPLATE = BaseNotebookStatics.class.getName() + ".lineMagic(%s,java.util.List.of(%s));{};";
+    private static final String CELL_CALL_TEMPLATE = BaseNotebookStatics.class.getName() + ".cellMagic(%s,java.util.List.of(%s),%s);";
+    private static final String LINE_CALL_TEMPLATE = BaseNotebookStatics.class.getName() + ".lineMagic(%s,java.util.List.of(%s));";
     private static final String DECODE_TEMPLATE = "new String(java.util.Base64.getDecoder().decode(\"%s\"))";
 
     public String transpileCell(ParsedCellMagic magic) {

jjava-kernel/src/main/java/org/dflib/jjava/kernel/magics/ClasspathMagic.java

@@ -8,16 +8,16 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-public class ClasspathMagic implements LineMagic<String, JavaKernel> {
+public class ClasspathMagic implements LineMagic<Void, JavaKernel> {
 
     @Override
-    public String eval(JavaKernel kernel, List<String> args) {
+    public Void eval(JavaKernel kernel, List<String> args) {
         String classpath = args.stream()
                 .flatMap(a -> PathsHandler.resolveGlobs(a).stream())
                 .map(p -> p.toAbsolutePath().toString())
                 .collect(Collectors.joining(File.pathSeparator));
 
         kernel.addToClasspath(classpath);
-        return classpath;
+        return null;
     }
 }

jjava-kernel/src/main/java/org/dflib/jjava/kernel/magics/JarsMagic.java

@@ -11,7 +11,7 @@
 public class JarsMagic extends ClasspathMagic {
 
     @Override
-    public String eval(JavaKernel kernel, List<String> args) {
+    public Void eval(JavaKernel kernel, List<String> args) {
         System.err.println("'%jars' magic is deprecated and will be removed in the future versions of JJava. " +
                 "A more generic '%classpath' should be used in its place.");
         return super.eval(kernel, args);

jjava-maven/src/main/java/org/dflib/jjava/maven/magics/AddMavenDependencyMagic.java

@@ -16,7 +16,7 @@ public AddMavenDependencyMagic(MavenDependencyResolver mavenResolver) {
     }
 
     @Override
-    public List<String> eval(JavaKernel kernel, List<String> args) {
+    public Void eval(JavaKernel kernel, List<String> args) {
         System.err.println("'%addMavenDependency' magic is deprecated and will be removed in the future versions of JJava. " +
                 "'%maven' should be used in its place.");
         return super.eval(kernel, args);

jjava-maven/src/main/java/org/dflib/jjava/maven/magics/LoadFromPomCellMagic.java

@@ -33,7 +33,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-public class LoadFromPomCellMagic implements CellMagic<List<String>, JavaKernel> {
+public class LoadFromPomCellMagic implements CellMagic<Void, JavaKernel> {
 
     private final MavenDependencyResolver mavenResolver;
 
@@ -42,7 +42,7 @@ public LoadFromPomCellMagic(MavenDependencyResolver mavenResolver) {
     }
 
     @Override
-    public List<String> eval(JavaKernel kernel, List<String> args, String body) throws Exception {
+    public Void eval(JavaKernel kernel, List<String> args, String body) throws Exception {
         String rawPom = solidifyPartialPOM(body);
         File tempPomPath = File.createTempFile("jjava-maven-", ".pom").getAbsoluteFile();
         try {
@@ -54,10 +54,11 @@ public List<String> eval(JavaKernel kernel, List<String> args, String body) thro
                     .collect(Collectors.toList());
 
             kernel.addToClasspath(PathsHandler.joinStringPaths(deps));
-            return deps;
         } finally {
             tempPomPath.delete();
         }
+
+        return null;
     }
 
     private String solidifyPartialPOM(String rawIn) throws ParserConfigurationException, IOException, SAXException, TransformerException {

jjava-maven/src/main/java/org/dflib/jjava/maven/magics/LoadFromPomLineMagic.java

@@ -11,7 +11,7 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-public class LoadFromPomLineMagic implements LineMagic<List<String>, JavaKernel> {
+public class LoadFromPomLineMagic implements LineMagic<Void, JavaKernel> {
 
     private final MavenDependencyResolver mavenResolver;
 
@@ -20,7 +20,7 @@ public LoadFromPomLineMagic(MavenDependencyResolver mavenResolver) {
     }
 
     @Override
-    public List<String> eval(JavaKernel kernel, List<String> args) {
+    public Void eval(JavaKernel kernel, List<String> args) {
         if (args.isEmpty()) {
             throw new IllegalArgumentException("Loading from POM requires at least the path to the POM file");
         }
@@ -40,6 +40,6 @@ public List<String> eval(JavaKernel kernel, List<String> args) {
                 .collect(Collectors.toList());
 
         kernel.addToClasspath(PathsHandler.joinStringPaths(deps));
-        return deps;
+        return null;
     }
 }

jjava-maven/src/main/java/org/dflib/jjava/maven/magics/MavenMagic.java

@@ -10,7 +10,7 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-public class MavenMagic implements LineMagic<List<String>, JavaKernel> {
+public class MavenMagic implements LineMagic<Void, JavaKernel> {
 
     private final MavenDependencyResolver mavenResolver;
 
@@ -19,7 +19,7 @@ public MavenMagic(MavenDependencyResolver mavenResolver) {
     }
 
     @Override
-    public List<String> eval(JavaKernel kernel, List<String> args) {
+    public Void eval(JavaKernel kernel, List<String> args) {
         MagicsArgs schema = MagicsArgs.builder()
                 .varargs("deps")
                 .keyword("from")
@@ -35,6 +35,6 @@ public List<String> eval(JavaKernel kernel, List<String> args) {
 
         kernel.addToClasspath(PathsHandler.joinStringPaths(deps));
 
-        return deps;
+        return null;
     }
 }