update chapter on Hibernate Processor for H7

Signed-off-by: Gavin King <[email protected]>

documentation/src/main/asciidoc/introduction/Advanced.adoc

@@ -66,7 +66,7 @@ class User {
 }
 ----
 
-Here, as usual, `example_.BY_REGION` is generated by the Metamodel Generator, and is just a constant with the value `"ByRegion"`.
+Here, as usual, `example_.BY_REGION` is generated by Hibernate Processor, and is just a constant with the value `"ByRegion"`.
 
 If the `@Filter` annotation does not explicitly specify a restriction, the default restriction given by the `@FilterDef` will be applied to the entity.
 But an entity is free to override the default condition.
@@ -1081,7 +1081,7 @@ class Author {
 }
 ----
 
-Here, once again, `Book_.PROFILE_EAGER_BOOK` is generated by the Metamodel Generator, and is just a constant with the value `"EagerBook"`.
+Here, once again, `Book_.PROFILE_EAGER_BOOK` is generated by Hibernate Processor, and is just a constant with the value `"EagerBook"`.
 
 For collections, we may even request subselect fetching:
 

documentation/src/main/asciidoc/introduction/Entities.adoc

@@ -1018,8 +1018,8 @@ class Publisher {
 The `Publisher.books` field is called the _unowned_ side of the association.
 
 Now, we passionately _hate_ the stringly-typed `mappedBy` reference to the owning side of the association.
-Thankfully, the <<metamodel-generator, Metamodel Generator>> gives us a way to make it a
-bit more typesafe:
+Thankfully, the <<metamodel-generator, Hibernate Processor>> gives us a way to make it a
+bit more type safe:
 
 [[mapped-by-metamodel]]
 [source,java]

documentation/src/main/asciidoc/introduction/Generator.adoc

@@ -1,19 +1,19 @@
 [[generator]]
 == Compile-time tooling
 
-The Metamodel Generator is a standard part of JPA.
+The _static metamodel generator_ is a standard part of JPA.
 // It's an annotation processor that produces a statically-typed metamodel of the entity classes in a Java program.
-We've actually already seen its handiwork in the code examples <<main-jpa,earlier>>: it's the author of the class `Book_`, which contains the static metamodel of the <<book,entity class>> `Book`.
+We've actually already seen its handiwork in the code examples <<main-hibernate,earlier>>: it's the author of the class `Book_`, which contains the static metamodel of the <<book,entity class>> `Book`.
 
 [[metamodel-generator]]
-.The Metamodel Generator
+.Hibernate Processor
 ****
 
 :generator: https://hibernate.org/orm/tooling/
 :generator-guide: {doc-user-guide-url}#tooling-modelgen
 
-Hibernate's {generator}[Metamodel Generator] is an annotation processor that produces what JPA calls a _static metamodel_.
-That is, it produces a typed model of the persistent classes in our program, giving us a type-safe way to refer to their attributes in Java code.
+{generator}[Hibernate Processor], the annotation processor formerly known as the Metamodel Generator, began its life as a code generator for what JPA calls a _static metamodel_.
+That is, it produces a typed model of the persistent classes in our program, giving us a type safe way to refer to their attributes in Java code.
 In particular, it lets us specify <<entity-graph,entity graphs>> and <<criteria-queries,criteria queries>> in a completely type-safe way.
 
 The history behind this thing is quite interesting.
@@ -25,20 +25,21 @@ And all the explicit generic types made user code quite verbose and difficult to
 For years, Gavin counted this as one of his more embarrassing missteps.
 
 But time has been kind to the static metamodel.
-In 2023, all Java compilers, build tools, and IDEs have robust support for annotation processing, and Java's local type inference (the `var` keyword) eliminates the verbose generic types.
+By now, all Java compilers, build tools, and IDEs have robust support for annotation processing, and Java's local type inference (the `var` keyword) eliminates the verbose generic types.
 JPA's `CriteriaBuilder` and `EntityGraph` APIs are still not quite perfect, but the imperfections aren't related to static type safety or annotation processing.
 The static metamodel itself is undeniably useful and elegant.
 
-And so now, in Hibernate 6.3, we're finally ready to go new places with the Metamodel Generator.
-And it turns out that there's quite a lot of unlocked potential there.
+And it turns out that there was quite a lot of unlocked potential there.
+Since Hibernate 6.3 the Processor has started taking on a much bigger role.
+Today, it even contains a complete implementation of the Jakarta Data specification.
 
-Now, you still don't have to use the Metamodel Generator with Hibernate—the APIs we just mentioned still also accept plain strings—but we find that it works well with Gradle and integrates smoothly with our IDE, and the advantage in type-safety is compelling.
+Now, you still don't have to use the Hibernate Processor with Hibernate—the APIs we just mentioned still also accept plain strings—but we find that it works well with Gradle and integrates smoothly with our IDE, and the advantage in type-safety is compelling.
 ****
 
 [TIP]
 ====
 We've already seen how to set up the annotation processor in the <<hello-hibernate,Gradle build>> we saw earlier.
-For more details on how to integrate the Metamodel Generator, check out the {generator-guide}[Static Metamodel Generator] section in the User Guide.
+For more details on how to integrate the Hibernate Processor, check out the {generator-guide}[Static Metamodel Generator] section in the User Guide.
 ====
 
 Here's an example of the sort of code that's generated for an entity class, as mandated by the JPA specification:
@@ -100,12 +101,9 @@ For each attribute of the entity, the `Book_` class has:
 1. a `String`-valued constant like `TITLE` , and
 2. a typesafe reference like `title` to a metamodel object of type `Attribute`.
 
-We've already been using metamodel references like `Book_.authors` and `Book.AUTHORS` in the previous chapters.
-So now let's see what else the Metamodel Generator can do for us.
-
 [TIP]
 ====
-The Metamodel Generator provides _statically-typed_ access to elements of the JPA `Metamodel`. But the `Metamodel` is also accessible in a "reflective" way, via the `EntityManagerFactory`.
+Hibernate Processor allows _statically-typed_ access to elements of the JPA `Metamodel`. But the `Metamodel` is also accessible in a "reflective" way, via the `EntityManagerFactory`.
 
 [source,java]
 ----
@@ -118,16 +116,21 @@ This is very useful for writing generic code in frameworks or libraries.
 For example, you could use it to create your own criteria query API.
 ====
 
-Automatic generation of _finder methods_ and _query methods_ is a new feature of Hibernate's implementation of the Metamodel Generator, and an extension to the functionality defined by the JPA specification.
-In this chapter, we're going to explore these features.
+We've already been using metamodel references like `Book_.authors` and `Book.AUTHORS` in the previous chapters.
+So now let's see what else Hibernate Processor can do for us.
 
-[CAUTION]
+[NOTE]
 ====
-The functionality described in the rest of this chapter depends on the use of the annotations described in <<entities>>.
-The Metamodel Generator is not currently able to generate finder methods and query methods for entities declared completely in XML, and it's not able to validate HQL which queries such entities.
-(On the other hand, the <<object-relational-mapping,O/R mappings>> may be specified in XML, since they're not needed by the Metamodel Generator.)
+The functionality we're about to describe was developed before Jakarta Data took on its current shape, and directly triggered the apocalypse which lead to the final form of the specification.
+Therefore, there's massive overlap between the functionality described in this chapter, and the functionality available via the Jakarta Data annotations.
+On the other hand, Jakarta Data can't do _everything_ described below, and in particular it doesn't yet come with built-in support for stateful persistence contexts or reactive sessions.
+
+We've therefore opted _not_ to rewrite this chapter in a Jakarta Data-centric way, and instead refer you to link:{doc-data-repositories-url}[Introducing Hibernate Data Repositories].
 ====
 
+Automatic generation of _finder methods_ and _query methods_ is a relatively new feature of Hibernate Processor, and an extension to the functionality defined by the JPA specification.
+In this chapter, we're going to explore these features.
+
 We're going to meet three different kinds of generated method:
 
 - a _<<generated-named-queries,named query method>>_ has its signature and implementation generated directly from a `@NamedQuery` annotation,
@@ -141,8 +144,15 @@ We're also going to see two ways that these methods can be called:
 
 To whet our appetites, let's see how this works for a `@NamedQuery`.
 
+[CAUTION]
+====
+The functionality described in the rest of this chapter depends on the use of the annotations described in <<entities>>.
+Hibernate Processor is not currently able to generate finder methods and query methods for entities declared completely in XML, and it's not able to validate HQL which queries such entities.
+(On the other hand, the <<object-relational-mapping,O/R mappings>> may be specified in XML, since they're not needed by the Processor.)
+====
+
 [[generated-named-queries]]
-=== Named queries and the Metamodel Generator
+=== Named queries and Hibernate Processor
 
 The very simplest way to generate a query method is to put a `@NamedQuery` annotation anywhere we like, with a `name` beginning with the magical character `#`.
 
@@ -157,7 +167,7 @@ Let's just stick it on the `Book` class:
 public class Book { ... }
 ----
 
-Now the Metamodel Generator adds the following method declaration to the metamodel class `Book_`.
+Now the Processor adds the following method declaration to the metamodel class `Book_`.
 
 [source,java]
 .Generated Code
@@ -187,7 +197,7 @@ Now, this is quite nice, but it's a bit inflexible in various ways, and so this
 === Generated query methods
 
 The principal problem with generating the query method straight from the `@NamedQuery` annotation is that it doesn't let us explicitly specify the return type or parameter list.
-In the case we just saw, the Metamodel Generator does a reasonable job of inferring the query return type and parameter types, but we're often going to need a bit more control.
+In the case we just saw, Hibernate Processor does a reasonable job of inferring the query return type and parameter types, but we're often going to need a bit more control.
 
 The solution is to write down the signature of the query method _explicitly_, as an abstract method in Java.
 We'll need a place to put this method, and since our `Book` entity isn't an abstract class, we'll just introduce a new interface for this purpose:
@@ -228,7 +238,7 @@ public abstract class Queries_ {
 
 ----
 
-Notice that the signature differs just slightly from the one we wrote down in the `Queries` interface: the Metamodel Generator has prepended a parameter accepting `EntityManager` to the parameter list.
+Notice that the signature differs just slightly from the one we wrote down in the `Queries` interface: the Processor has prepended a parameter accepting `EntityManager` to the parameter list.
 
 If we want to explicitly specify the name and type of this parameter, we may declare it explicitly:
 
@@ -240,28 +250,28 @@ interface Queries {
 }
 ----
 
-The Metamodel Generator defaults to using `EntityManager` as the session type, but other types are allowed:
+Hibernate Processor defaults to using `EntityManager` as the session type, but other types are allowed:
 
 - `Session`,
 - `StatelessSession`, or
 - `Mutiny.Session` from Hibernate Reactive.
 
 The real value of all this is in the checks which can now be done at compile time.
-The Metamodel Generator verifies that the parameters of our abstract method declaration match the parameters of the HQL query, for example:
+Hibernate Processor verifies that the parameters of our abstract method declaration match the parameters of the HQL query, for example:
 
 - for a named parameter `:alice`, there must be a method parameter named `alice` with exactly the same type, or
 - for an ordinal parameter `?2`, the second method parameter must have exactly the same type.
 
 The query must also be syntactically legal and semantically well-typed, that is, the entities, attributes, and functions referenced in the query must actually exist and have compatible types.
-The Metamodel Generator determines this by inspecting the annotations of the entity classes at compile time.
+Hibernate Processor determines this by inspecting the annotations of the entity classes at compile time.
 
 [NOTE]
 ====
 The `@CheckHQL` annotation which instructs Hibernate to validate named queries is _not_ necessary for query methods annotated `@HQL`.
 ====
 
 The `@HQL` annotation has a friend named `@SQL` which lets us specify a query written in native SQL instead of in HQL.
-In this case there's a lot less the Metamodel Generator can do to check that the query is legal and well-typed.
+In this case there's a lot less the Processor can do to check that the query is legal and well-typed.
 
 We imagine you're wondering whether a `static` method is really the right thing to use here.
 
@@ -290,7 +300,7 @@ interface Queries {
 
 Here we've used `EntityManager` as the session type, but other types are allowed, as we saw above.
 
-Now the Metamodel Generator does something a bit different:
+Now Hibernate Processor does something a bit different:
 
 [source,java]
 .Generated Code
@@ -750,5 +760,5 @@ The Query Validator works in `javac`, Gradle, Maven, and the Eclipse Java Compil
 
 [CAUTION]
 ====
-Unlike the Metamodel Generator, which is a completely bog-standard Java annotation processor based on only standard Java APIs, the Query Validator makes use of internal compiler APIs in `javac` and `ecj`. This means it can't be guaranteed to work in every Java compiler. The current release is known to work in JDK 11 and above, though JDK 15 or above is preferred.
+Unlike Hibernate Processor, which is a completely bog-standard Java annotation processor based on only standard Java APIs, the Query Validator makes use of internal compiler APIs in `javac` and `ecj`. This means it can't be guaranteed to work in every Java compiler. The current release is known to work in JDK 11 and above, though JDK 15 or above is preferred.
 ====

documentation/src/main/asciidoc/introduction/Interacting.adoc

@@ -520,7 +520,7 @@ This results in a SQL query with _four_ ``left outer join``s.
 
 [NOTE]
 ====
-In the code examples above, The classes `Book_` and `Author_` are generated by the <<metamodel-generator,JPA Metamodel Generator>> we saw earlier.
+In the code examples above, The classes `Book_` and `Author_` are generated by <<metamodel-generator,Hibernate Processor>>, as we saw earlier.
 They let us refer to attributes of our model in a completely type-safe way.
 We'll use them again, below, when we talk about <<criteria-queries>>.
 ====
@@ -859,7 +859,7 @@ query.select(book).where(where)
     .orderBy(builder.asc(book.get(Book_.title)));
 ----
 
-Here, as before, the classes `Book_` and `Author_` are generated by Hibernate's <<metamodel-generator,JPA Metamodel Generator>>.
+Here, as before, the classes `Book_` and `Author_` are generated by <<metamodel-generator,Hibernate Processor>>.
 
 [NOTE]
 // .Injection attacks and criteria queries
@@ -1270,7 +1270,7 @@ List<Book> books =
             .getResultList()
 ----
 
-Here, `BookQueries_.QUERY_10_BOOKS_BY_TITLE` is a constant with value `"10BooksByTitle"`, generated by the Metamodel Generator.
+Here, `BookQueries_.QUERY_10_BOOKS_BY_TITLE` is a constant with value `"10BooksByTitle"`, generated by the Hibernate Processor.
 
 Note that the code which executes the named query is not aware of whether the query was written in HQL or in native SQL, making it slightly easier to change and optimize the query later.
 
@@ -1280,7 +1280,7 @@ Note that the code which executes the named query is not aware of whether the qu
 
 It's nice to have our queries checked at startup time.
 It's even better to have them checked at compile time.
-In <<organizing-persistence>>, we mentioned that the Metamodel Generator can do that for us, with the help of the `@CheckHQL` annotation, and we presented that as a reason to use `@NamedQuery`.
+In <<organizing-persistence>>, we mentioned that the Hibernate Processor can do that for us, with the help of the `@CheckHQL` annotation, and we presented that as a reason to use `@NamedQuery`.
 
 But actually, Hibernate has a separate <<query-validator,Query Validator>> capable of performing compile-time validation of HQL query strings that occur as arguments to `createQuery()` and friends.
 If we use the Query Validator, there's not much advantage to the use of named queries.
@@ -1352,7 +1352,7 @@ Book book =
             .load();
 ----
 
-Notice that this code fragment is completely typesafe, again thanks to the <<metamodel-generator,Metamodel Generator>>.
+Notice that this code fragment is completely typesafe, again thanks to <<metamodel-generator,Hibernate Processor>>.
 
 [[jdbc]]
 === Interacting directly with JDBC

documentation/src/main/asciidoc/introduction/Introduction.adoc

@@ -430,6 +430,7 @@ If you're new to Hibernate, frameworks which wrap JPA are quite likely to make y
 We prefer a _bottom-up_ approach to organizing our code.
 We like to start thinking about methods and functions, not about architectural layers and container-managed objects.
 
+.Rethinking the persistence layer
 ****
 When we wrote _An Introduction to Hibernate 6_, the predecessor of this document, we broke with a long practice of remaining agnostic in debates over application architecture.
 Into the vacuum created by our agnosticism had poured a wealth of advice which tended to encourage over-engineering and violation of the First Commandment of software engineering: _Don't Repeat Yourself._
@@ -638,7 +639,7 @@ Alternatively, if CDI isn't available, we may directly instantiate the generated
 The Jakarta Data specification now formalizes this approach using standard annotations, and our implementation of this specification, Hibernate Data Repositories, is built into Hibernate Processor.
 You probably already have it available in your program.
 
-Unlike other repository frameworks, Hibernate Data Repositories offers something that plain JPA simply doesn’t have: full compile-time type safety for your queries. To learn more, please refer to _Introducing Hibernate Data Repositories._
+Unlike other repository frameworks, Hibernate Data Repositories offers something that plain JPA simply doesn’t have: full compile-time type safety for your queries. To learn more, please refer to link:{doc-data-repositories-url}[Introducing Hibernate Data Repositories].
 ====
 
 Now that we have a rough picture of what our persistence logic might look like, it's natural to ask how we should test our code.