Skip to content

Add spring boot 4 support #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jeroenvs wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add spring boot 4 support #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,10 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.release>21</maven.compiler.release>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>

<spring-boot.version>3.5.4</spring-boot.version>
<spring-boot.version>4.0.0</spring-boot.version>

<dependency-check-maven.version>12.1.9</dependency-check-maven.version>
<jacoco-maven-plugin.version>0.8.14</jacoco-maven-plugin.version>
Expand Down Expand Up @@ -121,16 +122,19 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>postgresql</artifactId>
<version>1.21.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>mysql</artifactId>
<version>1.21.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>oracle-xe</artifactId>
<version>1.21.3</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/nl/_42/jarb/autoconfigure/JarbAutoConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import nl._42.jarb.constraint.metadata.BeanConstraintService;

import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.orm.jpa.HibernatePropertiesCustomizer;
import org.springframework.boot.hibernate.autoconfigure.HibernatePropertiesCustomizer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.DependsOn;
Expand Down
14 changes: 8 additions & 6 deletions src/main/java/nl/_42/jarb/constraint/metadata/DefaultBeanConstraintDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
*/
package nl._42.jarb.constraint.metadata;

import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.Size;
import nl._42.jarb.constraint.metadata.database.BeanMetadataRepository;
import nl._42.jarb.constraint.metadata.enhance.AnnotationPropertyTypeEnhancer;
import nl._42.jarb.constraint.metadata.enhance.ClassPropertyTypeEnhancer;
Expand All @@ -19,6 +22,7 @@
import nl._42.jarb.constraint.metadata.enhance.PatternPropertyConstraintEnhancer;
import nl._42.jarb.constraint.metadata.enhance.PropertyTypeEnhancer;
import nl._42.jarb.utils.Classes;
import org.hibernate.validator.constraints.Length;

import java.math.BigDecimal;
import java.time.LocalDate;
Expand Down Expand Up @@ -82,7 +86,7 @@ private void registerDefaultEnhancers() {
}

private void registerJavaxValidationEnhancers() {
register(new LengthPropertyConstraintEnhancer<>(jakarta.validation.constraints.Size.class, (x) -> x.min(), (x) -> x.max()));
register(new LengthPropertyConstraintEnhancer<>(jakarta.validation.constraints.Size.class, Size::min, Size::max));

register(new NotNullPropertyConstraintEnhancer());
register(new NotEmptyPropertyConstraintEnhancer(jakarta.validation.constraints.NotEmpty.class));
Expand All @@ -91,12 +95,12 @@ private void registerJavaxValidationEnhancers() {
register(new PatternPropertyConstraintEnhancer());
register(new DigitsPropertyConstraintEnhancer());

register(new MinPropertyConstraintEnhancer<>(jakarta.validation.constraints.Min.class, (x) -> x.value()));
register(new MinPropertyConstraintEnhancer<>(jakarta.validation.constraints.Min.class, Min::value));
register(new MinPropertyConstraintEnhancer<>(jakarta.validation.constraints.DecimalMin.class, (x) -> new BigDecimal(x.value())));
register(new MinPropertyConstraintEnhancer<>(jakarta.validation.constraints.Positive.class, (x) -> 0));
register(new MinPropertyConstraintEnhancer<>(jakarta.validation.constraints.PositiveOrZero.class, (x) -> 0));

register(new MaxPropertyConstraintEnhancer<>(jakarta.validation.constraints.Max.class, (x) -> x.value()));
register(new MaxPropertyConstraintEnhancer<>(jakarta.validation.constraints.Max.class, Max::value));
register(new MaxPropertyConstraintEnhancer<>(jakarta.validation.constraints.DecimalMax.class, (x) -> new BigDecimal(x.value())));
register(new MaxPropertyConstraintEnhancer<>(jakarta.validation.constraints.Negative.class, (x) -> 0));
register(new MaxPropertyConstraintEnhancer<>(jakarta.validation.constraints.NegativeOrZero.class, (x) -> 0));
Expand All @@ -105,9 +109,7 @@ private void registerJavaxValidationEnhancers() {
}

private void registerHibernateValidationEnhancers() {
register(new LengthPropertyConstraintEnhancer<>(org.hibernate.validator.constraints.Length.class, (x) -> x.min(), (x) -> x.max()));
register(new NotEmptyPropertyConstraintEnhancer(org.hibernate.validator.constraints.NotEmpty.class));
register(new AnnotationPropertyTypeEnhancer(org.hibernate.validator.constraints.Email.class, "email"));
register(new LengthPropertyConstraintEnhancer<>(org.hibernate.validator.constraints.Length.class, Length::min, Length::max));
register(new AnnotationPropertyTypeEnhancer(org.hibernate.validator.constraints.CreditCardNumber.class, "credid_card"));
register(new AnnotationPropertyTypeEnhancer(org.hibernate.validator.constraints.URL.class, "url"));
}
Expand Down
32 changes: 16 additions & 16 deletions src/main/java/nl/_42/jarb/utils/orm/hibernate/HibernateJpaSchemaMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,15 @@
import org.hibernate.metamodel.mapping.AttributeMapping;
import org.hibernate.metamodel.mapping.EntityMappingType;
import org.hibernate.metamodel.mapping.ManagedMappingType;
import org.hibernate.metamodel.mapping.PluralAttributeMapping;
import org.hibernate.metamodel.mapping.internal.BasicAttributeMapping;
import org.hibernate.metamodel.mapping.internal.EmbeddedAttributeMapping;
import org.hibernate.metamodel.mapping.internal.EmbeddedCollectionPart;
import org.hibernate.metamodel.model.domain.NavigableRole;
import org.hibernate.metamodel.spi.RuntimeMetamodelsImplementor;
import org.hibernate.persister.collection.CollectionPersister;
import org.hibernate.persister.entity.AbstractEntityPersister;
import org.hibernate.persister.entity.SingleTableEntityPersister;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -60,19 +63,18 @@ private ColumnReference getColumnName(AbstractEntityPersister model, PropertyRef
}

AttributeMapping attribute = getAttribute(model, property);
if (attribute.isPluralAttributeMapping()) {
return getCollectionColumnName(model, property);
if (attribute.isPluralAttributeMapping() && attribute instanceof PluralAttributeMapping collection) {
return getCollectionColumnName(collection, property);
} else {
return getComponentColumnName(model, property);
return getComponentColumnName(attribute, property);
}
}

private ColumnReference getPropertyColumnName(AbstractEntityPersister model, String propertyName) {
String propertyTableName = model.getPropertyTableName(propertyName);
String tableName = Objects.toString(propertyTableName, model.getTableName());

String[] columnNames = model.getPropertyColumnNames(propertyName);
return new ColumnReference(tableName, columnNames[0]);
String columnName = model.getPropertyColumnNames(propertyName)[0];
String columnTableName = model.getTableNameForColumn(columnName);
String tableName = Objects.toString(columnTableName, model.getTableName());
return new ColumnReference(tableName, columnName);
}

private AttributeMapping getAttribute(AbstractEntityPersister model, PropertyReference property) {
Expand All @@ -85,18 +87,16 @@ private AttributeMapping getAttribute(AbstractEntityPersister model, PropertyRef
return attribute;
}

private ColumnReference getCollectionColumnName(AbstractEntityPersister model, PropertyReference property) {
NavigableRole role = new NavigableRole(model.getNavigableRole(), property.getParent().getPropertyName()).appendContainer("{element}");
EmbeddedCollectionPart embedded = (EmbeddedCollectionPart) metamodels.getEmbedded(role);
private ColumnReference getCollectionColumnName(PluralAttributeMapping attribute, PropertyReference property) {
EmbeddedCollectionPart embedded = (EmbeddedCollectionPart) attribute.getElementDescriptor();
AttributeMapping mapping = getAttributeMapping(embedded.getEmbeddableTypeDescriptor(), property.getSimpleName());
return getColumnName(mapping);
}

private ColumnReference getComponentColumnName(AbstractEntityPersister model, PropertyReference property) {
NavigableRole role = new NavigableRole(model.getNavigableRole(), property.getParent().getPropertyName());
EmbeddedAttributeMapping embedded = (EmbeddedAttributeMapping) metamodels.getEmbedded(role);
AttributeMapping mapping = getAttributeMapping(embedded.getMappedType(), property.getSimpleName());
return getColumnName(mapping);
private ColumnReference getComponentColumnName(AttributeMapping attribute, PropertyReference property) {
SingleTableEntityPersister type = (SingleTableEntityPersister) attribute.getDeclaringType();
var columns = type.getPropertyColumnNames(property.getPropertyName());
return new ColumnReference(type.getTableName(), columns[0]);
}

private AttributeMapping getAttributeMapping(ManagedMappingType type, String name) {
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/nl/_42/jarb/Application.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import nl._42.jarb.domain.Car;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.boot.persistence.autoconfigure.EntityScan;
import org.springframework.context.annotation.ComponentScan;

@SpringBootApplication
Expand Down
Loading