Moved actual template parser to a separate parser package

ngobjects · Nov 20, 2024 · 4c9ec17 · 4c9ec17
1 parent 55f0062
commit 4c9ec17
Show file tree

Hide file tree

Showing 20 changed files with 40 additions and 27 deletions.
diff --git a/ng-appserver/src/main/java/ng/appserver/NGAssociationFactory.java b/ng-appserver/src/main/java/ng/appserver/NGAssociationFactory.java
@@ -2,7 +2,7 @@
 
 import java.util.Objects;
 
-import ng.appserver.templating.NGDeclaration.NGBindingValue;
+import ng.appserver.templating.parser.NGDeclaration.NGBindingValue;
 
 public class NGAssociationFactory {
 

diff --git a/ng-appserver/src/main/java/ng/appserver/NGComponentDefinition.java b/ng-appserver/src/main/java/ng/appserver/NGComponentDefinition.java
@@ -12,9 +12,9 @@
 
 import ng.appserver.NGApplication.NGElementNotFoundException;
 import ng.appserver.resources.NGResource;
-import ng.appserver.templating.NGDeclarationFormatException;
-import ng.appserver.templating.NGHTMLFormatException;
 import ng.appserver.templating.NGTemplateParserProxy;
+import ng.appserver.templating.parser.NGDeclarationFormatException;
+import ng.appserver.templating.parser.NGHTMLFormatException;
 
 /**
  * Stores information about the structure of the component.

diff --git a/ng-appserver/src/main/java/ng/appserver/templating/NGTemplateParserProxy.java b/ng-appserver/src/main/java/ng/appserver/templating/NGTemplateParserProxy.java
@@ -18,7 +18,15 @@
 import ng.appserver.elements.NGDynamicGroup;
 import ng.appserver.elements.NGHTMLBareString;
 import ng.appserver.elements.NGHTMLCommentString;
-import ng.appserver.templating.NGDeclaration.NGBindingValue;
+import ng.appserver.templating.parser.NGDeclarationFormatException;
+import ng.appserver.templating.parser.NGHTMLFormatException;
+import ng.appserver.templating.parser.NGTemplateParser;
+import ng.appserver.templating.parser.PBasicNode;
+import ng.appserver.templating.parser.PCommentNode;
+import ng.appserver.templating.parser.PGroupNode;
+import ng.appserver.templating.parser.PHTMLNode;
+import ng.appserver.templating.parser.PNode;
+import ng.appserver.templating.parser.NGDeclaration.NGBindingValue;
 import x.junk.NGElementNotFoundElement;
 import x.junk.NGErrorMessageElement;
 

diff --git a/...g/appserver/templating/NGDeclaration.java → ...rver/templating/parser/NGDeclaration.java b/...g/appserver/templating/NGDeclaration.java → ...rver/templating/parser/NGDeclaration.java
@@ -1,4 +1,4 @@
-package ng.appserver.templating;
+package ng.appserver.templating.parser;
 
 import java.util.Map;
 import java.util.Objects;

diff --git a/...plating/NGDeclarationFormatException.java → .../parser/NGDeclarationFormatException.java b/...plating/NGDeclarationFormatException.java → .../parser/NGDeclarationFormatException.java
@@ -1,4 +1,4 @@
-package ng.appserver.templating;
+package ng.appserver.templating.parser;
 
 public class NGDeclarationFormatException extends Exception {
 

diff --git a/...erver/templating/NGDeclarationParser.java → ...emplating/parser/NGDeclarationParser.java b/...erver/templating/NGDeclarationParser.java → ...emplating/parser/NGDeclarationParser.java
@@ -1,11 +1,11 @@
-package ng.appserver.templating;
+package ng.appserver.templating.parser;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.StringTokenizer;
 
-import ng.appserver.templating.NGDeclaration.NGBindingValue;
+import ng.appserver.templating.parser.NGDeclaration.NGBindingValue;
 
 public class NGDeclarationParser {
 

diff --git a/...ppserver/templating/NGDynamicHTMLTag.java → ...r/templating/parser/NGDynamicHTMLTag.java b/...ppserver/templating/NGDynamicHTMLTag.java → ...r/templating/parser/NGDynamicHTMLTag.java
@@ -1,4 +1,4 @@
-package ng.appserver.templating;
+package ng.appserver.templating.parser;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...ver/templating/NGHTMLFormatException.java → ...plating/parser/NGHTMLFormatException.java b/...ver/templating/NGHTMLFormatException.java → ...plating/parser/NGHTMLFormatException.java
@@ -1,4 +1,4 @@
-package ng.appserver.templating;
+package ng.appserver.templating.parser;
 
 public class NGHTMLFormatException extends Exception {
 

diff --git a/...ng/appserver/templating/NGHTMLParser.java → ...erver/templating/parser/NGHTMLParser.java b/...ng/appserver/templating/NGHTMLParser.java → ...erver/templating/parser/NGHTMLParser.java
@@ -1,4 +1,4 @@
-package ng.appserver.templating;
+package ng.appserver.templating.parser;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...pserver/templating/NGStringTokenizer.java → .../templating/parser/NGStringTokenizer.java b/...pserver/templating/NGStringTokenizer.java → .../templating/parser/NGStringTokenizer.java
@@ -1,4 +1,4 @@
-package ng.appserver.templating;
+package ng.appserver.templating.parser;
 
 import java.util.NoSuchElementException;
 

diff --git a/...ppserver/templating/NGTemplateParser.java → ...r/templating/parser/NGTemplateParser.java b/...ppserver/templating/NGTemplateParser.java → ...r/templating/parser/NGTemplateParser.java
@@ -1,11 +1,11 @@
-package ng.appserver.templating;
+package ng.appserver.templating.parser;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.StringTokenizer;
 
-import ng.appserver.templating.NGDeclaration.NGBindingValue;
+import ng.appserver.templating.parser.NGDeclaration.NGBindingValue;
 
 /**
  * The primary entry point for component parsing

diff --git a/...a/ng/appserver/templating/PBasicNode.java → ...pserver/templating/parser/PBasicNode.java b/...a/ng/appserver/templating/PBasicNode.java → ...pserver/templating/parser/PBasicNode.java
@@ -1,10 +1,10 @@
-package ng.appserver.templating;
+package ng.appserver.templating.parser;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
-import ng.appserver.templating.NGDeclaration.NGBindingValue;
+import ng.appserver.templating.parser.NGDeclaration.NGBindingValue;
 
 public record PBasicNode( NGDynamicHTMLTag tag ) implements PNode {
 

diff --git a/...ng/appserver/templating/PCommentNode.java → ...erver/templating/parser/PCommentNode.java b/...ng/appserver/templating/PCommentNode.java → ...erver/templating/parser/PCommentNode.java
@@ -1,4 +1,4 @@
-package ng.appserver.templating;
+package ng.appserver.templating.parser;
 
 import java.util.Objects;
 

diff --git a/...a/ng/appserver/templating/PGroupNode.java → ...pserver/templating/parser/PGroupNode.java b/...a/ng/appserver/templating/PGroupNode.java → ...pserver/templating/parser/PGroupNode.java
@@ -1,4 +1,4 @@
-package ng.appserver.templating;
+package ng.appserver.templating.parser;
 
 import java.util.List;
 import java.util.Objects;

diff --git a/...va/ng/appserver/templating/PHTMLNode.java → ...ppserver/templating/parser/PHTMLNode.java b/...va/ng/appserver/templating/PHTMLNode.java → ...ppserver/templating/parser/PHTMLNode.java
@@ -1,4 +1,4 @@
-package ng.appserver.templating;
+package ng.appserver.templating.parser;
 
 import java.util.Objects;
 

diff --git a/...n/java/ng/appserver/templating/PNode.java → ...ng/appserver/templating/parser/PNode.java b/...n/java/ng/appserver/templating/PNode.java → ...ng/appserver/templating/parser/PNode.java
@@ -1,3 +1,3 @@
-package ng.appserver.templating;
+package ng.appserver.templating.parser;
 
 public sealed interface PNode permits PBasicNode, PGroupNode, PHTMLNode, PCommentNode {}
diff --git a/ng-appserver/src/test/java/ng/appserver/templating/TestNGDynamicHTMLTag.java b/ng-appserver/src/test/java/ng/appserver/templating/TestNGDynamicHTMLTag.java
diff --git a/...r/templating/TestNGDeclarationParser.java → ...ating/parser/TestNGDeclarationParser.java b/...r/templating/TestNGDeclarationParser.java → ...ating/parser/TestNGDeclarationParser.java
@@ -1,9 +1,11 @@
-package ng.appserver.templating;
+package ng.appserver.templating.parser;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.Test;
 
+import ng.appserver.templating.parser.NGDeclarationParser;
+
 public class TestNGDeclarationParser {
 
 	@Test

diff --git a/ng-appserver/src/test/java/ng/appserver/templating/parser/TestNGDynamicHTMLTag.java b/ng-appserver/src/test/java/ng/appserver/templating/parser/TestNGDynamicHTMLTag.java
@@ -0,0 +1,5 @@
+package ng.appserver.templating.parser;
+
+public class TestNGDynamicHTMLTag {
+
+}
diff --git a/...rver/templating/TestNGTemplateParser.java → ...mplating/parser/TestNGTemplateParser.java b/...rver/templating/TestNGTemplateParser.java → ...mplating/parser/TestNGTemplateParser.java
@@ -1,10 +1,13 @@
-package ng.appserver.templating;
+package ng.appserver.templating.parser;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 
 import org.junit.jupiter.api.Test;
 
+import ng.appserver.templating.parser.NGHTMLFormatException;
+import ng.appserver.templating.parser.NGTemplateParser;
+
 public class TestNGTemplateParser {
 
 	//	@Test