Refactoring: MagicParser -> MagicsResolver

as parsing is only one step in the transformation that it does. The second
step is applying the transpiler. Both of them together is "resolving"

Author: andrus

jjava-distro/src/main/java/org/dflib/jjava/distro/Opts.java

@@ -5,7 +5,7 @@
 
 class Opts {
 
-    // TODO: see 7205d03766c8 and c91ade8fec0cdc. A similar split method in MagicParser got altered in a few subtle
+    // TODO: see 7205d03766c8 and c91ade8fec0cdc. A similar split method in MagicsResolver got altered in a few subtle
     //  ways... Do those changes alloy here, and should we have a single splitter?
     //  7205d03766c8
     //  - if (current.length() > 0 && inQuotes) {

jjava-jupyter/src/main/java/org/dflib/jjava/jupyter/kernel/BaseKernel.java

@@ -11,7 +11,7 @@
 import org.dflib.jjava.jupyter.kernel.display.common.Url;
 import org.dflib.jjava.jupyter.kernel.history.HistoryEntry;
 import org.dflib.jjava.jupyter.kernel.history.HistoryManager;
-import org.dflib.jjava.jupyter.kernel.magic.MagicParser;
+import org.dflib.jjava.jupyter.kernel.magic.MagicsResolver;
 import org.dflib.jjava.jupyter.kernel.magic.MagicsRegistry;
 import org.dflib.jjava.jupyter.kernel.util.PathsHandler;
 import org.dflib.jjava.jupyter.kernel.util.StringStyler;
@@ -85,7 +85,7 @@ public abstract class BaseKernel {
     protected final JupyterIO io;
     protected final CommManager commManager;
     protected final Renderer renderer;
-    protected final MagicParser magicParser;
+    protected final MagicsResolver magicsResolver;
     protected final MagicsRegistry magicsRegistry;
     protected final Map<String, Extension> extensions;
     protected final boolean extensionsEnabled;
@@ -111,7 +111,7 @@ protected BaseKernel(
             JupyterIO io,
             CommManager commManager,
             Renderer renderer,
-            MagicParser magicParser,
+            MagicsResolver magicsResolver,
             MagicsRegistry magicsRegistry,
             boolean extensionsEnabled,
             StringStyler errorStyler) {
@@ -127,7 +127,7 @@ protected BaseKernel(
         this.io = Objects.requireNonNull(io);
         this.commManager = Objects.requireNonNull(commManager);
         this.renderer = Objects.requireNonNull(renderer);
-        this.magicParser = magicParser;
+        this.magicsResolver = magicsResolver;
         this.magicsRegistry = magicsRegistry;
         this.extensionsEnabled = extensionsEnabled;
         this.extensions = new ConcurrentHashMap<>();
@@ -156,8 +156,8 @@ public MagicsRegistry getMagicsRegistry() {
         return magicsRegistry;
     }
 
-    public MagicParser getMagicParser() {
-        return magicParser;
+    public MagicsResolver getMagicsResolver() {
+        return magicsResolver;
     }
 
     public JupyterIO getIO() {

jjava-jupyter/src/main/java/org/dflib/jjava/jupyter/kernel/BaseKernelBuilder.java

@@ -5,7 +5,7 @@
 import org.dflib.jjava.jupyter.kernel.history.HistoryManager;
 import org.dflib.jjava.jupyter.kernel.magic.CellMagic;
 import org.dflib.jjava.jupyter.kernel.magic.LineMagic;
-import org.dflib.jjava.jupyter.kernel.magic.MagicParser;
+import org.dflib.jjava.jupyter.kernel.magic.MagicsResolver;
 import org.dflib.jjava.jupyter.kernel.magic.MagicTranspiler;
 import org.dflib.jjava.jupyter.kernel.magic.MagicsRegistry;
 import org.dflib.jjava.jupyter.kernel.util.StringStyler;
@@ -24,7 +24,7 @@ public abstract class BaseKernelBuilder<
     protected String name;
     protected String version;
     protected Charset jupyterIOEncoding;
-    protected MagicParser magicParser;
+    protected MagicsResolver magicsResolver;
     protected MagicTranspiler magicTranspiler;
     protected HistoryManager historyManager;
     protected Boolean extensionsEnabled;
@@ -64,8 +64,8 @@ public B cellMagic(String name, CellMagic<?, ?> magic) {
         return (B) this;
     }
 
-    public B magicParser(MagicParser magicParser) {
-        this.magicParser = magicParser;
+    public B magicsResolver(MagicsResolver magicsResolver) {
+        this.magicsResolver = magicsResolver;
         return (B) this;
     }
 

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

@@ -8,7 +8,7 @@
 import java.util.stream.Collectors;
 
 /**
- * A converter (aka "transpiler") of the generic magic syntax into kernel-specific syntax (such as Java).
+ * A converter (aka "transpiler") of generic syntax of a single magic into kernel-specific syntax (such as Java).
  */
 public class MagicTranspiler {
 

…va/jupyter/kernel/magic/MagicParser.java …jupyter/kernel/magic/MagicsResolver.javajjava-jupyter/src/main/java/org/dflib/jjava/jupyter/kernel/magic/MagicParser.java renamed to jjava-jupyter/src/main/java/org/dflib/jjava/jupyter/kernel/magic/MagicsResolver.java jjava-jupyter/src/main/java/org/dflib/jjava/jupyter/kernel/magic/MagicParser.java renamed to jjava-jupyter/src/main/java/org/dflib/jjava/jupyter/kernel/magic/MagicsResolver.java

@@ -7,14 +7,15 @@
 
 /**
  * Locates line and cell magic syntax in the cell code and replaces it with code native to the underlying kernel.
+ * Code replacement happens via {@link MagicTranspiler}.
  */
-public class MagicParser {
+public class MagicsResolver {
 
     private final Pattern lineMagicPattern;
     private final Pattern cellMagicPattern;
     private final MagicTranspiler magicTranspiler;
 
-    public MagicParser(String lineMagicStart, String cellMagicStart, MagicTranspiler magicTranspiler) {
+    public MagicsResolver(String lineMagicStart, String cellMagicStart, MagicTranspiler magicTranspiler) {
         this.lineMagicPattern = Pattern.compile(lineMagicStart + "(?<args>\\w.*?)$", Pattern.MULTILINE);
         this.cellMagicPattern = Pattern.compile("^(?<argsLine>" + cellMagicStart + "(?<args>\\w.*?))\\R(?<body>(?sU).+?)$");
         this.magicTranspiler = magicTranspiler;
@@ -23,7 +24,7 @@ public MagicParser(String lineMagicStart, String cellMagicStart, MagicTranspiler
     /**
      * Replaces cell and line magics in the source with native kernel code.
      */
-    public String resolveMagics(String cellSource) {
+    public String resolve(String cellSource) {
         ParsedCellMagic parsedCell = parseCellMagic(cellSource);
         return parsedCell != null
                 ? magicTranspiler.transpileCell(parsedCell)

jjava-jupyter/src/test/java/org/dflib/jjava/jupyter/kernel/magic/MagicsArgsTest.java

@@ -22,7 +22,7 @@ public class MagicsArgsTest {
     @ParameterizedTest(name = "{index}: \"{0}\" with \"{1}\"")
     @MethodSource
     public void values(MagicsArgs schema, String args, Matcher<Map<String, List<String>>> matcher) {
-        List<String> rawArgs = MagicParser.split(args);
+        List<String> rawArgs = MagicsResolver.split(args);
         Map<String, List<String>> actual = assertDoesNotThrow(() -> schema.parse(rawArgs));
 
         assertThat(actual, matcher);
@@ -143,7 +143,7 @@ public static Stream<Arguments> values() {
     @ParameterizedTest(name = "{index}: \"{0}\" with \"{1}\"")
     @MethodSource
     public void flags(MagicsArgs schema, String args, Matcher<Map<String, List<String>>> matcher) {
-        List<String> rawArgs = MagicParser.split(args);
+        List<String> rawArgs = MagicsResolver.split(args);
         Map<String, List<String>> actual = Assertions.assertDoesNotThrow(() -> schema.parse(rawArgs));
 
         assertThat(actual, matcher);
@@ -182,7 +182,7 @@ public static Stream<Arguments> flags() {
     @ParameterizedTest(name = "{index}: \"{0}\" with \"{1}\"")
     @MethodSource
     public void keywords(MagicsArgs schema, String args, Matcher<Map<String, List<String>>> matcher) {
-        List<String> rawArgs = MagicParser.split(args);
+        List<String> rawArgs = MagicsResolver.split(args);
         Map<String, List<String>> actual = Assertions.assertDoesNotThrow(() -> schema.parse(rawArgs));
 
         assertThat(actual, matcher);
@@ -226,7 +226,7 @@ public static Stream<Arguments> keywords() {
     @ParameterizedTest(name = "{index}: \"{0}\" with \"{1}\"")
     @MethodSource
     public void flagsAndKeyWords(MagicsArgs schema, String args, Matcher<Map<String, List<String>>> matcher) {
-        List<String> rawArgs = MagicParser.split(args);
+        List<String> rawArgs = MagicsResolver.split(args);
         Map<String, List<String>> actual = Assertions.assertDoesNotThrow(() -> schema.parse(rawArgs));
 
         assertThat(actual, matcher);
@@ -246,7 +246,7 @@ public static Stream<Arguments> flagsAndKeyWords() {
     @MethodSource
     public void positionalsAndFlagsAndKeywords(MagicsArgs schema, String args,
                                                Matcher<Map<String, List<String>>> matcher) {
-        List<String> rawArgs = MagicParser.split(args);
+        List<String> rawArgs = MagicsResolver.split(args);
         Map<String, List<String>> actual = Assertions.assertDoesNotThrow(() -> schema.parse(rawArgs));
 
         assertThat(actual, matcher);
@@ -271,7 +271,7 @@ public static Stream<Arguments> positionalsAndFlagsAndKeywords() {
     @ParameterizedTest(name = "{index}: \"{0}\" with \"{1}\"")
     @MethodSource
     public void strange(MagicsArgs schema, String args, Matcher<Map<String, List<String>>> matcher) {
-        List<String> rawArgs = MagicParser.split(args);
+        List<String> rawArgs = MagicsResolver.split(args);
         Map<String, List<String>> actual = Assertions.assertDoesNotThrow(() -> schema.parse(rawArgs));
 
         assertThat(actual, matcher);
@@ -300,7 +300,7 @@ public static Stream<Arguments> strange() {
     @ParameterizedTest(name = "{index}: \"{0}\" with \"{1}\"")
     @MethodSource
     public void any_throws(MagicsArgs schema, String args) {
-        List<String> rawArgs = MagicParser.split(args);
+        List<String> rawArgs = MagicsResolver.split(args);
 
         assertThrows(MagicArgsParseException.class, () -> schema.parse(rawArgs));
     }

…upyter/kernel/magic/MagicParserTest.java …ter/kernel/magic/MagicsResolverTest.javajjava-jupyter/src/test/java/org/dflib/jjava/jupyter/kernel/magic/MagicParserTest.java renamed to jjava-jupyter/src/test/java/org/dflib/jjava/jupyter/kernel/magic/MagicsResolverTest.java jjava-jupyter/src/test/java/org/dflib/jjava/jupyter/kernel/magic/MagicParserTest.java renamed to jjava-jupyter/src/test/java/org/dflib/jjava/jupyter/kernel/magic/MagicsResolverTest.java

@@ -7,7 +7,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-public class MagicParserTest {
+public class MagicsResolverTest {
 
     @Test
     public void parseCellMagic() {
@@ -87,12 +87,12 @@ public void transpileLineMagics_startOfLineParserAllowsWhitespace() {
         assertEquals(expectedTransformedCell, transformedCell);
     }
 
-    static MagicParser inlineParser(MagicTranspiler transpiler) {
-        return new MagicParser("//%", "//%%", transpiler);
+    static MagicsResolver inlineParser(MagicTranspiler transpiler) {
+        return new MagicsResolver("//%", "//%%", transpiler);
     }
 
-    static MagicParser startOfLineParser(MagicTranspiler transpiler) {
-        return new MagicParser("^\\s*//%", "//%%", transpiler);
+    static MagicsResolver startOfLineParser(MagicTranspiler transpiler) {
+        return new MagicsResolver("^\\s*//%", "//%%", transpiler);
     }
 
     static final MagicTranspiler emptyTranspiler = new MagicTranspiler() {

jjava-kernel/src/main/java/org/dflib/jjava/kernel/JavaKernel.java

@@ -16,7 +16,7 @@
 import org.dflib.jjava.jupyter.kernel.display.DisplayData;
 import org.dflib.jjava.jupyter.kernel.display.Renderer;
 import org.dflib.jjava.jupyter.kernel.history.HistoryManager;
-import org.dflib.jjava.jupyter.kernel.magic.MagicParser;
+import org.dflib.jjava.jupyter.kernel.magic.MagicsResolver;
 import org.dflib.jjava.jupyter.kernel.magic.MagicTranspiler;
 import org.dflib.jjava.jupyter.kernel.magic.MagicsRegistry;
 import org.dflib.jjava.jupyter.kernel.util.CharPredicate;
@@ -72,7 +72,7 @@ protected JavaKernel(
             JupyterIO io,
             CommManager commManager,
             Renderer renderer,
-            MagicParser magicParser,
+            MagicsResolver magicsResolver,
             MagicsRegistry magicsRegistry,
             boolean extensionsEnabled,
             StringStyler errorStyler,
@@ -88,7 +88,7 @@ protected JavaKernel(
                 io,
                 commManager,
                 renderer,
-                magicParser,
+                magicsResolver,
                 magicsRegistry,
                 extensionsEnabled,
                 errorStyler);
@@ -231,7 +231,7 @@ private List<String> formatEvaluationInterruptedException(EvaluationInterruptedE
      */
     @Override
     public Object evalRaw(String source) {
-        return evaluator.eval(magicParser.resolveMagics(source));
+        return evaluator.eval(magicsResolver.resolve(source));
     }
 
     @Override
@@ -385,7 +385,7 @@ public JavaKernel build() {
                     buildJupyterIO(jupyterEncoding),
                     buildCommManager(),
                     buildRenderer(),
-                    buildMagicParser(magicTranspiler),
+                    buildMagicsResolver(magicTranspiler),
                     buildMagicsRegistry(),
                     buildExtensionsEnabled(),
                     buildErrorStyler(),

jjava-kernel/src/main/java/org/dflib/jjava/kernel/JavaKernelBuilder.java

@@ -3,7 +3,7 @@
 import jdk.jshell.JShell;
 import org.dflib.jjava.jupyter.kernel.BaseKernelBuilder;
 import org.dflib.jjava.jupyter.kernel.LanguageInfo;
-import org.dflib.jjava.jupyter.kernel.magic.MagicParser;
+import org.dflib.jjava.jupyter.kernel.magic.MagicsResolver;
 import org.dflib.jjava.jupyter.kernel.magic.MagicTranspiler;
 import org.dflib.jjava.kernel.execution.CodeEvaluator;
 import org.dflib.jjava.kernel.execution.JJavaExecutionControlProvider;
@@ -75,10 +75,10 @@ protected CodeEvaluator buildCodeEvaluator(JShell jShell, JJavaExecutionControlP
         return new CodeEvaluator(jShell, jShellExecControlProvider, jShellExecControlID);
     }
 
-    protected MagicParser buildMagicParser(MagicTranspiler transpiler) {
-        return magicParser != null
-                ? magicParser
-                : new MagicParser("(?<=(?:^|=))\\s*%", "%%", transpiler);
+    protected MagicsResolver buildMagicsResolver(MagicTranspiler transpiler) {
+        return magicsResolver != null
+                ? magicsResolver
+                : new MagicsResolver("(?<=(?:^|=))\\s*%", "%%", transpiler);
     }
 
     protected LanguageInfo buildLanguageInfo() {