Enable time literal (apache#5800)

tkobayas · Oct 2, 2024 · bcfe8fe · bcfe8fe
1 parent 5001305
commit bcfe8fe
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/...drools-drl-parser-tests/src/test/java/org/drools/drl/parser/antlr4/MiscDRLParserTest.java b/...drools-drl-parser-tests/src/test/java/org/drools/drl/parser/antlr4/MiscDRLParserTest.java
@@ -3749,9 +3749,12 @@ void lhsPatternAnnotation() {
                 "then\n" +
                 "end\n";
         PackageDescr packageDescr = parser.parse(text);
+        assertThat(parser.hasErrors()).as(parser.getErrors().toString()).isFalse();
+
         RuleDescr ruleDescr = packageDescr.getRules().get(0);
         PatternDescr patternDescr = (PatternDescr) ruleDescr.getLhs().getDescrs().get(0);
         AnnotationDescr annotationDescr = patternDescr.getAnnotations().iterator().next();
+
         assertThat(annotationDescr.getName()).isEqualTo("watch");
         assertThat(annotationDescr.getSingleValueAsString()).isEqualTo("!*, age");
     }
@@ -3770,4 +3773,24 @@ void fromNew() {
         FromDescr fromDescr = (FromDescr) patternDescr.getSource();
         assertThat(fromDescr.getDataSource().toString()).isEqualTo("new Person(\"John\", 30)");
     }
+
+    @Test
+    public void expiresWithTimeLiteralValue() {
+        String text = "package org.drools\n" +
+                "declare StockFact\n" +
+                "    @role( value = event )\n" +
+                "    @expires( value = 2s, policy = TIME_SOFT )\n" +
+                "end";
+
+        PackageDescr packageDescr = parser.parse(text);
+        assertThat(parser.hasErrors()).as(parser.getErrors().toString()).isFalse();
+
+        AnnotationDescr annotationDescr = packageDescr
+                .getTypeDeclarations().get(0)
+                .getAnnotation("expires");
+
+        assertThat(annotationDescr.getSingleValueAsString()).isEqualTo("2s");
+        assertThat(annotationDescr.getValueAsString("value")).isEqualTo("2s");
+        assertThat(annotationDescr.getValueAsString("policy")).isEqualTo("TIME_SOFT");
+    }
 }
diff --git a/drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl/parser/antlr4/DRLParser.g4 b/drools-drl/drools-drl-parser/src/main/antlr4/org/drools/drl/parser/antlr4/DRLParser.g4
@@ -321,6 +321,7 @@ drlLiteral
     | BOOL_LITERAL
     | NULL_LITERAL
     | TEXT_BLOCK // Java17
+    | TIME_INTERVAL
     ;
 
 inlineListExpression