[incubator-kie-drools-5988] [new-parser] Merge dev-new-parser to main

- new parser is disabled by default
apache · Jun 11, 2024 · 7da9750 · 7da9750
1 parent aaef430
commit 7da9750
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 10 deletions.
diff --git a/.github/workflows/pr-downstream.yml b/.github/workflows/pr-downstream.yml
@@ -33,7 +33,6 @@ on:
 
 jobs:
   kogito-downstream-build:
-    if false: # Temporally disabled because downstream build doesn't work with the feature branch dev-new-parser
     concurrency:
       group: pr-${{ matrix.job_name }}_${{ matrix.os }}_${{ matrix.java-version }}_${{ matrix.maven-version }}_${{ github.head_ref }}
       cancel-in-progress: true

diff --git a/.github/workflows/pr-drools-ansible.yml b/.github/workflows/pr-drools-ansible.yml
@@ -33,7 +33,6 @@ on:
 
 jobs:
   drools-ansible:
-    if false: # Temporally disabled because downstream build doesn't work with the feature branch dev-new-parser
     concurrency:
       group: pr-drools_ansible_${{ matrix.os }}_${{ matrix.java-version }}_${{ matrix.maven-version }}_${{ github.head_ref }}
       cancel-in-progress: true

diff --git a/drools-drl/drools-drl-parser-tests/src/test/resources/logback-test.xml b/drools-drl/drools-drl-parser-tests/src/test/resources/logback-test.xml
@@ -9,6 +9,7 @@
 
   <logger name="org.kie" level="warn"/>
   <logger name="org.drools" level="warn"/>
+  <logger name="org.drools.drl.parser.DrlParser" level="debug"/>
 
   <root level="warn">
     <appender-ref ref="consoleAppender" />

diff --git a/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/DrlParser.java b/drools-drl/drools-drl-parser/src/main/java/org/drools/drl/parser/DrlParser.java
@@ -53,6 +53,7 @@ public class DrlParser {
 
     // TODO: REMOVE THIS GENERIC MESSAGE ASAP
     private static final String     GENERIC_ERROR_MESSAGE = "Unexpected exception raised while parsing. This is a bug. Please contact the Development team :\n";
+    private static final String     DEBUG_PARSER_LOG = "parse : ANTLR4_PARSER_ENABLED = {}";
     private final List<DroolsError> results               = new ArrayList<>();
     private List<DroolsSentence>    editorSentences       = null;
     private Location                location              = new Location( Location.LOCATION_UNKNOWN );
@@ -61,8 +62,8 @@ public class DrlParser {
 
     public static final String ANTLR4_PARSER_ENABLED_PROPERTY = "drools.drl.antlr4.parser.enabled";
 
-    // TODO: temporarily removed 'final' for testing purposes. This should be final
-    public static boolean ANTLR4_PARSER_ENABLED = Boolean.parseBoolean(System.getProperty(ANTLR4_PARSER_ENABLED_PROPERTY, "true")); // default is true
+    // temporarily removed 'final' for testing purposes. This should be final when the feature gets stable
+    public static boolean ANTLR4_PARSER_ENABLED = Boolean.parseBoolean(System.getProperty(ANTLR4_PARSER_ENABLED_PROPERTY, "false")); // default is false
 
     public static final LanguageLevelOption DEFAULT_LANGUAGE_LEVEL = LanguageLevelOption.DRL6;
     private final LanguageLevelOption languageLevel;
@@ -83,7 +84,7 @@ public PackageDescr parse(final Resource resource, final String text) throws Dro
 
     public PackageDescr parse(final boolean isEditor,
                               final String text) throws DroolsParserException {
-        System.out.println("### parse : ANTLR4_PARSER_ENABLED = " + ANTLR4_PARSER_ENABLED);
+        LOG.debug(DEBUG_PARSER_LOG, ANTLR4_PARSER_ENABLED);
         if (ANTLR4_PARSER_ENABLED) {
             // new parser based on antlr4
             return compileWithAntlr4Parser(parser -> parser.parse(new StringReader(text)));
@@ -96,7 +97,7 @@ public PackageDescr parse(final boolean isEditor,
 
     public PackageDescr parse(final boolean isEditor,
                               final Reader reader) throws DroolsParserException {
-        System.out.println("### parse : ANTLR4_PARSER_ENABLED = " + ANTLR4_PARSER_ENABLED);
+        LOG.debug(DEBUG_PARSER_LOG, ANTLR4_PARSER_ENABLED);
         if (ANTLR4_PARSER_ENABLED) {
             // new parser based on antlr4
             return compileWithAntlr4Parser(parser -> parser.parse(reader));
@@ -185,7 +186,7 @@ public PackageDescr parse(final boolean isEditor,
                               final InputStream is) throws DroolsParserException, IOException {
         this.resource = resource;
         String encoding = resource instanceof InternalResource ? ((InternalResource) resource).getEncoding() : null;
-        System.out.println("### parse : ANTLR4_PARSER_ENABLED = " + ANTLR4_PARSER_ENABLED);
+        LOG.debug(DEBUG_PARSER_LOG, ANTLR4_PARSER_ENABLED);
         if (ANTLR4_PARSER_ENABLED) {
             // new parser based on antlr4
             return compileWithAntlr4Parser(parser -> parser.parse(is, encoding));

diff --git a/drools-model/drools-model-codegen/src/test/resources/logback-test.xml b/drools-model/drools-model-codegen/src/test/resources/logback-test.xml
@@ -36,6 +36,7 @@
   <!--<logger name="org.drools.model.codegen.execmodel.generator.expressiontyper" level="debug"/>-->
 <!--    <logger name="org.drools.model.codegen.execmodel" level="debug"/>-->
   <logger name="org.drools.ancompiler" level="info"/>
+<!--  <logger name="org.drools.drl.parser.DrlParser" level="debug"/>-->
 
   <root level="warn">
     <appender-ref ref="consoleAppender" />

diff --git a/drools-test-coverage/test-compiler-integration/src/test/resources/logback-test.xml b/drools-test-coverage/test-compiler-integration/src/test/resources/logback-test.xml
@@ -34,6 +34,7 @@
 <!--     <logger name="org.drools.core.management" level="debug"/> -->
 <!--    <logger name="org.drools.modelcompiler.builder" level="debug"/>-->
 <!--    <logger name="org.drools.ancompiler" level="debug"/>-->
+<!--    <logger name="org.drools.drl.parser.DrlParser" level="debug"/>-->
 
     <root level="warn">
         <appender-ref ref="consoleAppender" />

diff --git a/pom.xml b/pom.xml
@@ -273,10 +273,10 @@
     </profile>
 
     <profile>
-      <id>disableNewParser</id>
+      <id>enableNewParser</id>
       <activation>
         <property>
-          <name>disableNewParser</name>
+          <name>enableNewParser</name>
         </property>
       </activation>
       <build>
@@ -286,7 +286,8 @@
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
               <systemPropertyVariables>
-                <drools.drl.antlr4.parser.enabled>false</drools.drl.antlr4.parser.enabled>
+                <!-- false by default. Activate this profile when you test the new parser -->
+                <drools.drl.antlr4.parser.enabled>true</drools.drl.antlr4.parser.enabled>
               </systemPropertyVariables>
             </configuration>
           </plugin>