Skip to content

Commit 92c434d

Browse files
dreab8sebersole
dreab8
authored and
sebersole
committed
HHH-18520 Upgrade to hibernate-models 0.9.0
1 parent 3c1b5c7 commit 92c434d

File tree

272 files changed

+1508
-2659
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

272 files changed

+1508
-2659
lines changed

‎hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AccessJpaAnnotation.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,12 @@
77
package org.hibernate.boot.models.annotations.internal;
88

99
import java.lang.annotation.Annotation;
10+
import java.util.Map;
1011

11-
import org.hibernate.boot.models.JpaAnnotations;
1212
import org.hibernate.models.spi.SourceModelBuildingContext;
1313

14-
import org.jboss.jandex.AnnotationInstance;
15-
1614
import jakarta.persistence.Access;
1715

18-
import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJandexValue;
19-
2016
@SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" })
2117
@jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor")
2218
public class AccessJpaAnnotation implements Access {
@@ -39,8 +35,8 @@ public AccessJpaAnnotation(Access annotation, SourceModelBuildingContext modelCo
3935
/**
4036
* Used in creating annotation instances from Jandex variant
4137
*/
42-
public AccessJpaAnnotation(AnnotationInstance annotation, SourceModelBuildingContext modelContext) {
43-
this.value = extractJandexValue( annotation, JpaAnnotations.ACCESS, "value", modelContext );
38+
public AccessJpaAnnotation(Map<String, Object> attributeValues, SourceModelBuildingContext modelContext) {
39+
this.value = (jakarta.persistence.AccessType) attributeValues.get( "value" );
4440
}
4541

4642
@Override

‎hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyAnnotation.java‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,12 @@
77
package org.hibernate.boot.models.annotations.internal;
88

99
import java.lang.annotation.Annotation;
10+
import java.util.Map;
1011

1112
import org.hibernate.annotations.Any;
12-
import org.hibernate.boot.models.HibernateAnnotations;
1313
import org.hibernate.boot.models.annotations.spi.AttributeMarker;
1414
import org.hibernate.models.spi.SourceModelBuildingContext;
1515

16-
import org.jboss.jandex.AnnotationInstance;
17-
18-
import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJandexValue;
19-
2016
@SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" })
2117
@jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor")
2218
public class AnyAnnotation implements Any, AttributeMarker, AttributeMarker.Fetchable, AttributeMarker.Optionalable {
@@ -42,9 +38,9 @@ public AnyAnnotation(Any annotation, SourceModelBuildingContext modelContext) {
4238
/**
4339
* Used in creating annotation instances from Jandex variant
4440
*/
45-
public AnyAnnotation(AnnotationInstance annotation, SourceModelBuildingContext modelContext) {
46-
this.fetch = extractJandexValue( annotation, HibernateAnnotations.ANY, "fetch", modelContext );
47-
this.optional = extractJandexValue( annotation, HibernateAnnotations.ANY, "optional", modelContext );
41+
public AnyAnnotation(Map<String, Object> attributeValues, SourceModelBuildingContext modelContext) {
42+
this.fetch = (jakarta.persistence.FetchType) attributeValues.get( "fetch" );
43+
this.optional = (boolean) attributeValues.get( "optional" );
4844
}
4945

5046
@Override

‎hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyDiscriminatorAnnotation.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,11 @@
77
package org.hibernate.boot.models.annotations.internal;
88

99
import java.lang.annotation.Annotation;
10+
import java.util.Map;
1011

1112
import org.hibernate.annotations.AnyDiscriminator;
12-
import org.hibernate.boot.models.HibernateAnnotations;
1313
import org.hibernate.models.spi.SourceModelBuildingContext;
1414

15-
import org.jboss.jandex.AnnotationInstance;
16-
17-
import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJandexValue;
18-
1915
@SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" })
2016
@jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor")
2117
public class AnyDiscriminatorAnnotation implements AnyDiscriminator {
@@ -38,8 +34,8 @@ public AnyDiscriminatorAnnotation(AnyDiscriminator annotation, SourceModelBuildi
3834
/**
3935
* Used in creating annotation instances from Jandex variant
4036
*/
41-
public AnyDiscriminatorAnnotation(AnnotationInstance annotation, SourceModelBuildingContext modelContext) {
42-
this.value = extractJandexValue( annotation, HibernateAnnotations.ANY_DISCRIMINATOR, "value", modelContext );
37+
public AnyDiscriminatorAnnotation(Map<String, Object> attributeValues, SourceModelBuildingContext modelContext) {
38+
this.value = (jakarta.persistence.DiscriminatorType) attributeValues.get( "value" );
4339
}
4440

4541
@Override

‎hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyDiscriminatorValueAnnotation.java‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,11 @@
77
package org.hibernate.boot.models.annotations.internal;
88

99
import java.lang.annotation.Annotation;
10+
import java.util.Map;
1011

1112
import org.hibernate.annotations.AnyDiscriminatorValue;
12-
import org.hibernate.boot.models.HibernateAnnotations;
1313
import org.hibernate.models.spi.SourceModelBuildingContext;
1414

15-
import org.jboss.jandex.AnnotationInstance;
16-
17-
import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJandexValue;
18-
1915
@SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" })
2016
@jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor")
2117
public class AnyDiscriminatorValueAnnotation implements AnyDiscriminatorValue {
@@ -39,19 +35,9 @@ public AnyDiscriminatorValueAnnotation(AnyDiscriminatorValue annotation, SourceM
3935
/**
4036
* Used in creating annotation instances from Jandex variant
4137
*/
42-
public AnyDiscriminatorValueAnnotation(AnnotationInstance annotation, SourceModelBuildingContext modelContext) {
43-
this.discriminator = extractJandexValue(
44-
annotation,
45-
HibernateAnnotations.ANY_DISCRIMINATOR_VALUE,
46-
"discriminator",
47-
modelContext
48-
);
49-
this.entity = extractJandexValue(
50-
annotation,
51-
HibernateAnnotations.ANY_DISCRIMINATOR_VALUE,
52-
"entity",
53-
modelContext
54-
);
38+
public AnyDiscriminatorValueAnnotation(Map<String, Object> attributeValues, SourceModelBuildingContext modelContext) {
39+
this.discriminator = (String) attributeValues.get( "discriminator" );
40+
this.entity = (Class<?>) attributeValues.get( "entity" );
5541
}
5642

5743
@Override

‎hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyDiscriminatorValuesAnnotation.java‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,15 @@
66
*/
77
package org.hibernate.boot.models.annotations.internal;
88

9+
import java.lang.annotation.Annotation;
10+
import java.util.Map;
11+
912
import org.hibernate.annotations.AnyDiscriminatorValue;
13+
import org.hibernate.annotations.AnyDiscriminatorValues;
1014
import org.hibernate.boot.models.HibernateAnnotations;
1115
import org.hibernate.boot.models.annotations.spi.RepeatableContainer;
1216
import org.hibernate.models.spi.SourceModelBuildingContext;
1317

14-
import org.jboss.jandex.AnnotationInstance;
15-
16-
import java.lang.annotation.Annotation;
17-
18-
import org.hibernate.annotations.AnyDiscriminatorValues;
19-
20-
import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJandexValue;
2118
import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJdkValue;
2219

2320
@SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" })
@@ -49,13 +46,8 @@ public AnyDiscriminatorValuesAnnotation(
4946
/**
5047
* Used in creating annotation instances from Jandex variant
5148
*/
52-
public AnyDiscriminatorValuesAnnotation(AnnotationInstance annotation, SourceModelBuildingContext modelContext) {
53-
this.value = extractJandexValue(
54-
annotation,
55-
HibernateAnnotations.ANY_DISCRIMINATOR_VALUES,
56-
"value",
57-
modelContext
58-
);
49+
public AnyDiscriminatorValuesAnnotation(Map<String, Object> attributeValues, SourceModelBuildingContext modelContext) {
50+
this.value = (AnyDiscriminatorValue[]) attributeValues.get( "value" );
5951
}
6052

6153
@Override

‎hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeTypeAnnotation.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,11 @@
77
package org.hibernate.boot.models.annotations.internal;
88

99
import java.lang.annotation.Annotation;
10+
import java.util.Map;
1011

1112
import org.hibernate.boot.internal.AnyKeyType;
12-
import org.hibernate.boot.models.XmlAnnotations;
1313
import org.hibernate.models.spi.SourceModelBuildingContext;
1414

15-
import org.jboss.jandex.AnnotationInstance;
16-
17-
import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJandexValue;
18-
1915
@SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" })
2016
@jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor")
2117
public class AnyKeTypeAnnotation implements AnyKeyType {
@@ -37,8 +33,8 @@ public AnyKeTypeAnnotation(AnyKeyType annotation, SourceModelBuildingContext mod
3733
/**
3834
* Used in creating annotation instances from Jandex variant
3935
*/
40-
public AnyKeTypeAnnotation(AnnotationInstance annotation, SourceModelBuildingContext modelContext) {
41-
this.value = extractJandexValue( annotation, XmlAnnotations.ANY_KEY_TYPE, "value", modelContext );
36+
public AnyKeTypeAnnotation(Map<String, Object> attributeValues, SourceModelBuildingContext modelContext) {
37+
this.value = (String) attributeValues.get( "value" );
4238
}
4339

4440
@Override

‎hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJavaClassAnnotation.java‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,11 @@
77
package org.hibernate.boot.models.annotations.internal;
88

99
import java.lang.annotation.Annotation;
10+
import java.util.Map;
1011

1112
import org.hibernate.annotations.AnyKeyJavaClass;
1213
import org.hibernate.models.spi.SourceModelBuildingContext;
1314

14-
import org.jboss.jandex.AnnotationInstance;
15-
16-
import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJandexValue;
17-
1815
@SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" })
1916
@jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor")
2017
public class AnyKeyJavaClassAnnotation implements AnyKeyJavaClass {
@@ -36,13 +33,8 @@ public AnyKeyJavaClassAnnotation(AnyKeyJavaClass annotation, SourceModelBuilding
3633
/**
3734
* Used in creating annotation instances from Jandex variant
3835
*/
39-
public AnyKeyJavaClassAnnotation(AnnotationInstance annotation, SourceModelBuildingContext modelContext) {
40-
this.value = extractJandexValue(
41-
annotation,
42-
org.hibernate.boot.models.HibernateAnnotations.ANY_KEY_JAVA_CLASS,
43-
"value",
44-
modelContext
45-
);
36+
public AnyKeyJavaClassAnnotation(Map<String, Object> attributeValues, SourceModelBuildingContext modelContext) {
37+
this.value = (Class<?>) attributeValues.get( "value" );
4638
}
4739

4840
@Override

‎hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJavaTypeAnnotation.java‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,12 @@
77
package org.hibernate.boot.models.annotations.internal;
88

99
import java.lang.annotation.Annotation;
10+
import java.util.Map;
1011

1112
import org.hibernate.annotations.AnyKeyJavaType;
1213
import org.hibernate.models.spi.SourceModelBuildingContext;
1314
import org.hibernate.type.descriptor.java.BasicJavaType;
1415

15-
import org.jboss.jandex.AnnotationInstance;
16-
17-
import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJandexValue;
18-
1916
@SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" })
2017
@jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor")
2118
public class AnyKeyJavaTypeAnnotation implements AnyKeyJavaType {
@@ -37,13 +34,8 @@ public AnyKeyJavaTypeAnnotation(AnyKeyJavaType annotation, SourceModelBuildingCo
3734
/**
3835
* Used in creating annotation instances from Jandex variant
3936
*/
40-
public AnyKeyJavaTypeAnnotation(AnnotationInstance annotation, SourceModelBuildingContext modelContext) {
41-
this.value = extractJandexValue(
42-
annotation,
43-
org.hibernate.boot.models.HibernateAnnotations.ANY_KEY_JAVA_TYPE,
44-
"value",
45-
modelContext
46-
);
37+
public AnyKeyJavaTypeAnnotation(Map<String, Object> attributeValues, SourceModelBuildingContext modelContext) {
38+
this.value = (Class<? extends BasicJavaType<?>>) attributeValues.get( "value" );
4739
}
4840

4941
@Override

‎hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJdbcTypeAnnotation.java‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,12 @@
77
package org.hibernate.boot.models.annotations.internal;
88

99
import java.lang.annotation.Annotation;
10+
import java.util.Map;
1011

1112
import org.hibernate.annotations.AnyKeyJdbcType;
1213
import org.hibernate.models.spi.SourceModelBuildingContext;
1314
import org.hibernate.type.descriptor.jdbc.JdbcType;
1415

15-
import org.jboss.jandex.AnnotationInstance;
16-
17-
import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJandexValue;
18-
1916
@SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" })
2017
@jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor")
2118
public class AnyKeyJdbcTypeAnnotation implements AnyKeyJdbcType {
@@ -37,13 +34,8 @@ public AnyKeyJdbcTypeAnnotation(AnyKeyJdbcType annotation, SourceModelBuildingCo
3734
/**
3835
* Used in creating annotation instances from Jandex variant
3936
*/
40-
public AnyKeyJdbcTypeAnnotation(AnnotationInstance annotation, SourceModelBuildingContext modelContext) {
41-
this.value = extractJandexValue(
42-
annotation,
43-
org.hibernate.boot.models.HibernateAnnotations.ANY_KEY_JDBC_TYPE,
44-
"value",
45-
modelContext
46-
);
37+
public AnyKeyJdbcTypeAnnotation(Map<String, Object> attributeValues, SourceModelBuildingContext modelContext) {
38+
this.value = (Class<? extends JdbcType>) attributeValues.get( "value" );
4739
}
4840

4941
@Override

‎hibernate-core/src/main/java/org/hibernate/boot/models/annotations/internal/AnyKeyJdbcTypeCodeAnnotation.java‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,11 @@
77
package org.hibernate.boot.models.annotations.internal;
88

99
import java.lang.annotation.Annotation;
10+
import java.util.Map;
1011

1112
import org.hibernate.annotations.AnyKeyJdbcTypeCode;
1213
import org.hibernate.models.spi.SourceModelBuildingContext;
1314

14-
import org.jboss.jandex.AnnotationInstance;
15-
16-
import static org.hibernate.boot.models.internal.OrmAnnotationHelper.extractJandexValue;
17-
1815
@SuppressWarnings({ "ClassExplicitlyAnnotation", "unused" })
1916
@jakarta.annotation.Generated("org.hibernate.orm.build.annotations.ClassGeneratorProcessor")
2017
public class AnyKeyJdbcTypeCodeAnnotation implements AnyKeyJdbcTypeCode {
@@ -36,13 +33,8 @@ public AnyKeyJdbcTypeCodeAnnotation(AnyKeyJdbcTypeCode annotation, SourceModelBu
3633
/**
3734
* Used in creating annotation instances from Jandex variant
3835
*/
39-
public AnyKeyJdbcTypeCodeAnnotation(AnnotationInstance annotation, SourceModelBuildingContext modelContext) {
40-
this.value = extractJandexValue(
41-
annotation,
42-
org.hibernate.boot.models.HibernateAnnotations.ANY_KEY_JDBC_TYPE_CODE,
43-
"value",
44-
modelContext
45-
);
36+
public AnyKeyJdbcTypeCodeAnnotation(Map<String, Object> attributeValues, SourceModelBuildingContext modelContext) {
37+
this.value = (int) attributeValues.get( "value" );
4638
}
4739

4840
@Override

0 commit comments

Comments
 (0)