JNG-4914 cheatsheet update (#184)

* JNG-4914 update cheatsheet * JNG-4914 [Release] Updating versions * JNG-4914 [Release] Updating versions * JNG-4914 [Release] Updating versions * JNG-4914 [Release] Updating versions * JNG-4914 version update
BlackBeltTechnology · Jun 29, 2023 · 78dc16b · 78dc16b
1 parent d4fe81c
commit 78dc16b
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 10 deletions.
diff --git a/docs/.project b/docs/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>judo-tatami-jsl-docs</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/judo-tatami-jsl-jsl2psm/src/test/resources/derived/TestDerivedExpressionModel.jsl b/judo-tatami-jsl-jsl2psm/src/test/resources/derived/TestDerivedExpressionModel.jsl
@@ -54,19 +54,19 @@ entity SalesPerson {
     relation Lead lead;
     relation Lead[] leads opposite:salesPerson;
 
-    @Lazy
+    @Query
     relation Lead[] leadsBetween(Integer minLeadsBetween = 1, Integer maxLeadsBetween = 50) <= self.leads!filter(lead | lead.value > minLeadsBetween and lead.value < maxLeadsBetween);
     // self.leads!filter(lead | lead.value > input.minLeadsBetween!isDefined() ? input.minLeadsBetween : 1 and lead.value < input.maxLeadsBetween!isDefined() ? input.maxLeadsBetween : 50)
 
-    @Lazy
+    @Query
     relation Lead[] leadsOverWithMin(Integer minLeadsOverMin = 5) <= self.leadsBetween(minLeadsBetween = minLeadsOverMin , maxLeadsBetween = 100);
     // self.leads!filter(lead | lead.value > input.minLeadsOverMin!isDefined() ? input.minLeadsOverMin : 5 and lead.value < 100)
 
-    @Lazy
+    @Query
     relation Lead[] leadsOverWithMinStatic(Integer minLeadsOverMin = 5) <= staticLeadsBetween(minLeadsBetween = minLeadsOverMin, maxLeadsBetween = 100);
     // Lead!filter(lead | lead.value > input.minLeadsOverMin!isDefined() ? input.minLeadsOverMin : 5 and lead.value < 100)
 
-    @Lazy
+    @Query
     relation Lead[] leadsOverWithMinWithoutDefault(Integer minLeadsOverMin) <= self.leadsBetween(minLeadsBetween = minLeadsOverMin , maxLeadsBetween = 100);
     // self.leads!filter(lead | lead.value > input.minLeadsOverMin and lead.value < 100)
 
@@ -85,7 +85,7 @@ entity SalesPerson {
 
     field Integer value <= self.leads!size();
     field Boolean t1 <= self.leads!size() > 1;
-    @Lazy
+    @Query
     relation Lead[] leadsOverQuery(Integer limit = 100) <= self.leads!filter(lead | lead.value > limit);
     relation Lead[] leadsOver <= self.leads!filter(lead | lead.value > 100);
 

diff --git a/judo-tatami-jsl-jsl2psm/src/test/resources/derived/TestDerivedWithParametersModel.jsl b/judo-tatami-jsl-jsl2psm/src/test/resources/derived/TestDerivedWithParametersModel.jsl
@@ -22,15 +22,15 @@ query Lead[] staticLeadsBetweenAndSalesPersonLeads(Integer minLeadsBetween = 1,
 entity SalesPerson {
     relation Lead[] leads opposite:salesPerson;
 
-	@Lazy
+	@Query
     relation Lead[] leadsBetween(Integer minLeadsBetween = 1, Integer maxLeadsBetween = 50) <= self.leads!filter(lead | lead.value > minLeadsBetween and lead.value < maxLeadsBetween);
     // self.leads!filter(lead | lead.value > input.minLeadsBetween!isDefined() ? input.minLeadsBetween : 1 and lead.value < input.maxLeadsBetween!isDefined() ? input.maxLeadsBetween : 50)
 
-	@Lazy
+	@Query
     relation Lead[] leadsOverWithMin(Integer minLeadsOverMin = 5) <= self.leadsBetween(minLeadsBetween = minLeadsOverMin , maxLeadsBetween = 100);
     // self.leads!filter(lead | lead.value > input.minLeadsOverMin!isDefined() ? input.minLeadsOverMin : 5 and lead.value < 100)
 
-	@Lazy
+	@Query
     relation Lead[] leadsOverWithMinStatic(Integer minLeadsOverMin = 5) <= staticLeadsBetween(minLeadsBetween = minLeadsOverMin, maxLeadsBetween = 100);
     // Lead.leads!filter(lead | lead.value > input.minLeadsOverMin!isDefined() ? input.minLeadsOverMin : 5 and lead.value < 100)
 
@@ -47,11 +47,11 @@ entity SalesPerson {
     relation Lead[] leadsOver20Static <= staticLeadsBetween(minLeadsBetween = 20);
     // Lead!filter(lead | lead.value > 20 and lead.value < 50)
 
-	@Lazy
+	@Query
     field Integer leadsBetweenCount(Integer minLeadsBetween = 1, Integer maxLeadsBetween = 50) <= self.leads!filter(lead | lead.value > minLeadsBetween and lead.value < maxLeadsBetween)!size();
     // self.leads!filter(lead | lead.value > input.minLeadsBetween!isDefined() ? input.minLeadsBetween : 1 and lead.value < input.maxLeadsBetween!isDefined() ? input.maxLeadsBetween : 50)!size()
 
-	@Lazy
+	@Query
     field Integer leadsOverWithMinCount(Integer minLeadsOverMin = 5) <= self.leadsBetweenCount(minLeadsBetween = minLeadsOverMin, maxLeadsBetween = 100);
     // self.leads!filter(lead | lead.value > input.minLeadsOverMin!isDefined() ? input.minLeadsOverMin : 5 and lead.value < 100)!size()