Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion documentation/src/main/asciidoc/introduction/Advanced.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ Furthermore, the link:{doc-javadoc-url}org/hibernate/annotations/ValueGeneration
[NOTE]
// .The older APIs are still available in Hibernate 6
====
These APIs are new in Hibernate 6, and supersede the classic `IdentifierGenerator` interface and `@GenericGenerator` annotation from older versions of Hibernate.
These APIs were new in Hibernate 6, and supersede the classic `IdentifierGenerator` interface and `@GenericGenerator` annotation from older versions of Hibernate.
However, the older APIs are still available and custom ``IdentifierGenerator``s written for older versions of Hibernate continue to work in Hibernate 6.
====

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ First, add the following dependency to your project:
org.hibernate.orm:hibernate-core:{version}
----

Where `{version}` is the version of Hibernate you're using.
Where `{version}` is the version of Hibernate you're using, `{fullVersion}`, for example.

You'll also need to add a dependency for the JDBC
driver for your database.
Expand Down Expand Up @@ -307,7 +307,7 @@ The properties you really do need to get started are these three:
[IMPORTANT]
// .You don't need `hibernate.dialect` anymore!
====
In Hibernate 6, you don't need to specify `hibernate.dialect`.
Since Hibernate 6, you don't need to specify `hibernate.dialect`.
The correct Hibernate SQL `Dialect` will be determined for you automatically.
The only reason to specify this property is if you're using a custom user-written `Dialect` class.

Expand Down Expand Up @@ -509,7 +509,7 @@ So, if you're working with SQL Server, you might need to force Hibernate to use
| `hibernate.use_nationalized_character_data` | Use `nchar` and `nvarchar` instead of `char` and `varchar`
|===

On the other hand, if only _some_ columns store nationalized data, use the `@Nationalized` annotation to indicate fields of your entities which map these columns.
On the other hand, if only _some_ columns store nationalized data, use the link:{doc-javadoc-url}org/hibernate/annotations/Nationalized.html[`@Nationalized`] annotation to indicate fields of your entities which map these columns.

[TIP]
// .Configuring SQL Server to use UTF-8 by default
Expand Down
4 changes: 2 additions & 2 deletions documentation/src/main/asciidoc/introduction/Entities.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ Hibernate slightly extends this list with the following types:
| Additional date/time types | `java.time` | `Duration`, `ZoneId`, `ZoneOffset`, and even `ZonedDateTime`
| JDBC LOB types | `java.sql` | `Blob`, `Clob`, `NClob`
| Java class object | `java.lang` | `Class`
| Miscellaneous types | `java.util` | `Currency`, `URL`, `TimeZone`
| Miscellaneous types | `java.util` | `Currency`, `Locale`, `URL`, `TimeZone`
|====

The `@Basic` annotation explicitly specifies that an attribute is basic, but it's often not needed, since attributes are assumed basic by default.
Expand Down Expand Up @@ -807,7 +807,7 @@ The types defined by the JDBC specification are enumerated by the integer type c
Each JDBC type is an abstraction of a commonly-available type in SQL.
For example, `Types.VARCHAR` represents the SQL type `VARCHAR` (or `VARCHAR2` on Oracle).

Since Hibernate understands more SQL types than JDBC, there's an extended list of integer type codes in the class `org.hibernate.type.SqlTypes`.
Since Hibernate understands more SQL types than JDBC, there's an extended list of integer type codes in the class link:{doc-javadoc-url}org/hibernate/type/SqlTypes.html[`org.hibernate.type.SqlTypes`].
For example, `SqlTypes.GEOMETRY` represents the spatial data type `GEOMETRY`.
****

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -799,7 +799,7 @@ Of course, we could construct a HQL query by string concatenation, but this is a

.HQL is implemented in terms of criteria objects
****
Actually, in Hibernate 6, every HQL query is compiled to a criteria query before being translated to SQL.
Actually, since Hibernate 6, every HQL query is compiled to a criteria query before being translated to SQL.
This ensures that the semantics of HQL and criteria queries are identical.
****

Expand Down
10 changes: 5 additions & 5 deletions documentation/src/main/asciidoc/introduction/Introduction.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ For example:
| `org.hibernate.Cache` | `javax.persistence.Cache`
| `@org.hibernate.annotations.NamedQuery` | `@javax.persistence.NamedQuery`
| `@org.hibernate.annotations.Cache` | `@javax.persistence.Cacheable`
| `org.hibernate.relational.SchemaManager` | `jakarta.persistence.SchemaManager`
|===

Typically, the Hibernate-native APIs offer something a little extra that's missing in JPA, so this isn't exactly a _flaw_.
Expand All @@ -103,7 +104,7 @@ If you're completely new to Hibernate and JPA, you might already be wondering ho
Well, typically, our persistence-related code comes in two layers:

. a representation of our data model in Java, which takes the form of a set of annotated entity classes, and
. a larger number of functions which interact with Hibernate's APIs to perform the persistence operations associated with your various transactions.
. a larger number of functions which interact with Hibernate's APIs to perform the persistence operations associated with our various transactions.

The first part, the data or "domain" model, is usually easier to write, but doing a great and very clean job of it will strongly affect your success in the second part.

Expand Down Expand Up @@ -157,15 +158,15 @@ dependencies {
implementation 'org.hibernate.orm:hibernate-core:{fullVersion}'

// Hibernate Validator
implementation 'org.hibernate.validator:hibernate-validator:8.0.0.Final'
implementation 'org.hibernate.validator:hibernate-validator:8.0.1.Final'
implementation 'org.glassfish:jakarta.el:4.0.2'

// Agroal connection pool
implementation 'org.hibernate.orm:hibernate-agroal:{fullVersion}'
implementation 'io.agroal:agroal-pool:2.1'

// logging via Log4j
implementation 'org.apache.logging.log4j:log4j-core:2.20.0'
implementation 'org.apache.logging.log4j:log4j-core:2.24.1'

// Hibernate Processor
annotationProcessor 'org.hibernate.orm:hibernate-processor:{fullVersion}'
Expand All @@ -175,7 +176,7 @@ dependencies {
//annotationProcessor 'org.hibernate:query-validator:2.0-SNAPSHOT'

// H2 database
runtimeOnly 'com.h2database:h2:2.1.214'
runtimeOnly 'com.h2database:h2:2.3.232'
}
----

Expand Down Expand Up @@ -790,7 +791,6 @@ This "test" is one which many people like to run even in production, when the sy

It's now time to begin our journey toward actually _understanding_ the code we saw earlier.

This introduction will guide you through the basic tasks involved in developing a program that uses Hibernate for persistence:
This introduction will guide you through the basic tasks involved in developing a program that uses Hibernate for persistence:

1. configuring and bootstrapping Hibernate, and obtaining an instance of `SessionFactory` or `EntityManagerFactory`,
Expand Down
Loading