Last meeting notes applied.

Signed-off-by: Tomáš Kraus <[email protected]>

Author: Tomáš Kraus

docs/src/main/asciidoc/includes/data.adoc

@@ -155,7 +155,7 @@ represents the type of the entity's primary key attribute. Composite primary key
 
 The `Data.GenericRepository` interface is extended by additional interfaces that add specific features:
 
-[cols=2*]
+[cols="20%,80%"]
 |===
 |Interface |Description
 
@@ -341,7 +341,7 @@ Method arguments are consumed in the same order as the condition keywords appear
 
 Criteria modifiers:
 
-[cols=2*]
+[cols="10%,90%"]
 |===
 |Keyword |Description
 
@@ -429,16 +429,16 @@ Supported condition keywords:
 |The property value is `false`. Requires `boolean` or `Boolean` property.
 |===
 
-An example method that returns all entities whose `age` attribute is greater than the provided value:
+An example repository method with criteria:
 
 [source,java]
 ----
-include::{sourcedir}/includes/data/PetRepositorySnippets.java[tag=qbmn_criteria_method, indent=0]
+include::{sourcedir}/includes/data/PetRepositorySnippets.java[tag=qbmn_criteria_methods, indent=0]
 ----
 
 Logical operators:
 
-[cols=2*]
+[cols="10%,90%"]
 |===
 |Keyword |Description
 
@@ -449,6 +449,13 @@ Logical operators:
 |Logical OR
 |===
 
+An example repository method with criteria and logical operator:
+
+[source,java]
+----
+include::{sourcedir}/includes/data/PetRepositorySnippets.java[tag=qbmn_multiple_criteria_methods, indent=0]
+----
+
 NOTE: In JPQL, operator precedence places `AND` above `OR` as defined in Jakarta Persistence 3.1, section 4.6.6.
       The same rule applies to SQL.
 
@@ -461,7 +468,7 @@ keywords, so only the last keyword is optional.
 
 Ordering keywords:
 
-[cols=2*]
+[cols="10%,90%"]
 |===
 |Keyword |Description
 
@@ -519,7 +526,7 @@ The `PageRequest` argument defines the page size and the page index, starting fr
 
 Returned page content types:
 
-[cols=2*]
+[cols="10%,90%"]
 |===
 |Name |Description
 
@@ -620,89 +627,62 @@ Helidon JTA Transaction support, such as Narayana, may be provided at runtime to
 
 If JTA transaction support is not provided, Helidon Data runtime will use `RESOURCE_LOCAL` transaction type.
 
-=== Transaction Types
+=== Transaction Types and Annotations
 
 The `Tx` class defines several ways how transactional support can be applied to transactional method executions.
 Those ways are defined in `Tx.Type` enum.
+The `Tx` class also defines annotations that can be used to mark methods for transactional execution
+based on `Tx.Type` enum.
 
-==== Transaction Type Enum
-The `Tx.Type` enum is used to describe the possible ways in which transactional support must be applied
-to transactional method executions.
-
-===== Enum Values and Their Meanings
-
-The Type enum has six values, each representing a different transactional behavior:
-
-[cols=2*]
+[cols=3*]
 |===
-|Name |Description
+|Enum |Annotation |Description
 
 |`MANDATORY`
+|`@Mandatory`
 |A transaction must already be in effect when a method executes. If called outside a transaction
  context, a `TxException` is thrown. If called inside a transaction context, method execution continues
  under that context.
 
 |`NEW`
+|`@New`
 |A new transaction is started when a method executes. If called outside a transaction context, a new
  transaction is begun. If called inside a transaction context, the current transaction is suspended, a new
  transaction is begun, and the method execution continues inside this new transaction context.
 
 |`NEVER`
+|`@Never`
 |No transaction must be in effect when a method executes. If called outside a transaction context, method
  execution continues outside a transaction context. If called inside a transaction context, a `TxException`
  is thrown.
 
 |`REQUIRED`
+|`@Required`
 |A transaction will be in effect when a method executes. If called outside a transaction context,
  a new transaction is begun. If called inside a transaction context, method execution continues inside
  that transaction context.
 
 |`SUPPORTED`
+|`@Supported`
 |A transaction may optionally be in effect when a method executes. If called outside a transaction
  context, method execution continues outside a transaction context. If called inside a transaction context,
  method execution continues inside that transaction context.
 
 |`UNSUPPORTED`
+|`@Unsupported`
 |No transaction will be in effect when a method executes. If called outside a transaction context, method
  execution continues outside a transaction context. If called inside a transaction context, the current
  transaction is suspended, method execution continues outside a transaction context, and the previously
  suspended transaction is resumed after method execution completes.
 |===
 
-=== Transaction Annotations
-
-The `Tx` class defines several annotations that can be used to mark methods for transactional execution:
-
-[cols=2*]
-|===
-|Annotation |Description
-
-|`@Mandatory`
-|Indicates that a method will be executed with a managed transaction of type `MANDATORY`.
-
-|`@New`
-|Indicates that a method will be executed with a managed transaction of type `NEW`.
-
-|`@Never`
-|Indicates that a method will be executed with a managed transaction of type `NEVER`.
-
-|`@Required`
-|Indicates that a method will be executed with a managed transaction of type `REQUIRED`.
-
-|`@Supported`
-|Indicates that a method will be executed with a managed transaction of type `SUPPORTED`.
-
-|`@Unsupported`
-|Indicates that a method will be executed with a managed transaction of type `UNSUPPORTED`.
-|===
-
 === Transaction Methods
 
 The `Tx` class provides several methods for executing tasks within a transaction:
 
-[cols=2*]
+[cols="20%,80%"]
 |===
-|Annotation |Description
+|Method |Description
 
 |`transaction(Callable<T> task)`
 |Executes a task with a managed transaction of type `REQUIRED`.

docs/src/main/java/io/helidon/docs/includes/data/PetRepositorySnippets.java

@@ -35,9 +35,20 @@ public interface PetRepositorySnippets extends Data.GenericRepository<Pet, Integ
     long longCountByName(String name);
     // end::qbmn_method[]
 
-    // tag::qbmn_criteria_method[]
+    // tag::qbmn_criteria_methods[]
+    // Returns Keeper entity with keepr.name matching provided name
+    // or throws an exception when no such entity exists
+    Keeper getByName(String name);
+    // Returns list of Keeper entities with keepr.age > provided age value
     List<Keeper> listByAgeGreaterThan(int age);
-    // end::qbmn_criteria_method[]
+    // Checks whether at least one entity with keepr.age between provided
+    // min and max values exists
+    boolean existsByAgeBetween(int min, int max);
+    // end::qbmn_criteria_methods[]
+
+    // tag::qbmn_multiple_criteria_methods[]
+    Optional<Keeper> findByNameAndAge(String name, int age);
+    // end::qbmn_multiple_criteria_methods[]
 
     // tag::qbmn_sort_method[]
     List<Keeper> listAllOrderByAgeAscName();