Skip to content

Commit 00f25e7

Browse files
sebersolesebersole
committed
Minor, miscellaneous stuff
1 parent 10a7869 commit 00f25e7

File tree

10 files changed

+42
-63
lines changed

10 files changed

+42
-63
lines changed

‎hibernate-models-bytebuddy/src/main/java/org/hibernate/models/bytebuddy/internal/AnnotationDescriptorRegistryImpl.java

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎hibernate-models-bytebuddy/src/main/java/org/hibernate/models/bytebuddy/internal/ByteBuddyModelContextImpl.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import org.hibernate.models.bytebuddy.spi.ValueConverter;
1212
import org.hibernate.models.bytebuddy.spi.ValueExtractor;
1313
import org.hibernate.models.internal.AbstractModelBuildingContext;
14+
import org.hibernate.models.internal.AnnotationDescriptorRegistryStandard;
1415
import org.hibernate.models.internal.MutableAnnotationDescriptorRegistry;
1516
import org.hibernate.models.internal.MutableClassDetailsRegistry;
1617
import org.hibernate.models.internal.SimpleClassLoading;
@@ -34,7 +35,7 @@ public class ByteBuddyModelContextImpl
3435
private final TypePool typePool;
3536

3637
private final ClassDetailsRegistryImpl classDetailsRegistry;
37-
private final AnnotationDescriptorRegistryImpl descriptorRegistry;
38+
private final AnnotationDescriptorRegistryStandard descriptorRegistry;
3839

3940
private final Map<ValueTypeDescriptor, ValueConverter> valueConverters = new HashMap<>();
4041
private final Map<ValueTypeDescriptor, ValueExtractor> valueExtractors = new HashMap<>();
@@ -54,7 +55,7 @@ public ByteBuddyModelContextImpl(
5455
this.typePool = typePool;
5556

5657
this.classDetailsRegistry = new ClassDetailsRegistryImpl( this );
57-
this.descriptorRegistry = new AnnotationDescriptorRegistryImpl( this );
58+
this.descriptorRegistry = new AnnotationDescriptorRegistryStandard( this );
5859

5960
primeRegistries( registryPrimer );
6061
}
@@ -76,7 +77,7 @@ public MutableAnnotationDescriptorRegistry getAnnotationDescriptorRegistry() {
7677

7778
@Override
7879
public StorableContext toStorableForm() {
79-
return new StorableContextImpl( classDetailsRegistry.getClassDetailsMap(), descriptorRegistry.getDescriptorMap() );
80+
return new StorableContextImpl( classDetailsRegistry.classDetailsMap(), descriptorRegistry.descriptorMap() );
8081
}
8182

8283
@Override

‎hibernate-models-bytebuddy/src/main/java/org/hibernate/models/bytebuddy/internal/ClassDetailsRegistryImpl.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*/
55
package org.hibernate.models.bytebuddy.internal;
66

7-
import java.util.Map;
87

98
import org.hibernate.models.UnknownClassException;
109
import org.hibernate.models.internal.AbstractClassDetailsRegistry;
@@ -46,8 +45,4 @@ protected ClassDetails createClassDetails(String name) {
4645
throw new UnknownClassException( "Unable to resolve ClassDetails for `" + name + "`" );
4746
}
4847

49-
protected Map<String, ClassDetails> getClassDetailsMap() {
50-
return classDetailsMap;
51-
}
52-
5348
}

‎hibernate-models-jandex/src/main/java/org/hibernate/models/jandex/internal/JandexAnnotationDescriptorRegistry.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@
44
*/
55
package org.hibernate.models.jandex.internal;
66

7-
import java.lang.annotation.Annotation;
8-
import java.util.Map;
9-
107
import org.hibernate.models.internal.AnnotationDescriptorRegistryStandard;
11-
import org.hibernate.models.spi.AnnotationDescriptor;
128
import org.hibernate.models.spi.SourceModelBuildingContext;
139

1410
/**
@@ -18,8 +14,4 @@ public class JandexAnnotationDescriptorRegistry extends AnnotationDescriptorRegi
1814
public JandexAnnotationDescriptorRegistry(SourceModelBuildingContext modelBuildingContext) {
1915
super( modelBuildingContext );
2016
}
21-
22-
public Map<Class<? extends Annotation>, AnnotationDescriptor<? extends Annotation>> getDescriptorMap() {
23-
return descriptorMap;
24-
}
2517
}

‎hibernate-models-jandex/src/main/java/org/hibernate/models/jandex/internal/JandexClassDetailsRegistry.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
*/
55
package org.hibernate.models.jandex.internal;
66

7-
import java.util.Map;
8-
97
import org.hibernate.models.UnknownClassException;
108
import org.hibernate.models.internal.AbstractClassDetailsRegistry;
119
import org.hibernate.models.internal.jdk.JdkBuilders;
@@ -56,8 +54,4 @@ protected ClassDetails createClassDetails(String name) {
5654

5755
throw new UnknownClassException( "Unable to resolve ClassDetails for `" + name + "`" );
5856
}
59-
60-
protected Map<String, ClassDetails> getClassDetailsMap() {
61-
return classDetailsMap;
62-
}
6357
}

‎hibernate-models-jandex/src/main/java/org/hibernate/models/jandex/internal/JandexModelContextImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,6 @@ public <V> JandexValueExtractor<V> getJandexValueExtractor(ValueTypeDescriptor<V
102102

103103
@Override
104104
public StorableContext toStorableForm() {
105-
return new StorableContextImpl( classDetailsRegistry.getClassDetailsMap(), descriptorRegistry.getDescriptorMap() );
105+
return new StorableContextImpl( classDetailsRegistry.classDetailsMap(), descriptorRegistry.descriptorMap() );
106106
}
107107
}

‎hibernate-models/src/main/java/org/hibernate/models/internal/AbstractAnnotationDescriptorRegistry.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import java.lang.annotation.Annotation;
88
import java.lang.annotation.Repeatable;
9+
import java.util.Collections;
910
import java.util.Map;
1011
import java.util.concurrent.ConcurrentHashMap;
1112

@@ -51,4 +52,16 @@ public <A extends Annotation> AnnotationDescriptor<A> getContainedRepeatableDesc
5152
public <A extends Annotation> AnnotationDescriptor<A> getContainedRepeatableDescriptor(Class<A> containerJavaType) {
5253
return getContainedRepeatableDescriptor( getDescriptor( containerJavaType ) );
5354
}
55+
56+
public Map<Class<? extends Annotation>, AnnotationDescriptor<? extends Annotation>> descriptorMap() {
57+
return descriptorMap;
58+
}
59+
60+
public Map<Class<? extends Annotation>, AnnotationDescriptor<? extends Annotation>> getDescriptorMap() {
61+
return Collections.unmodifiableMap( descriptorMap );
62+
}
63+
64+
public Map<AnnotationDescriptor<? extends Annotation>, AnnotationDescriptor<? extends Annotation>> getRepeatableByContainerMap() {
65+
return Collections.unmodifiableMap( repeatableByContainerMap );
66+
}
5467
}

‎hibernate-models/src/main/java/org/hibernate/models/internal/AbstractClassDetailsRegistry.java

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package org.hibernate.models.internal;
66

77
import java.util.ArrayList;
8+
import java.util.Collections;
89
import java.util.List;
910
import java.util.Map;
1011
import java.util.concurrent.ConcurrentHashMap;
@@ -13,7 +14,14 @@
1314
import org.hibernate.models.spi.ClassDetails;
1415
import org.hibernate.models.spi.SourceModelBuildingContext;
1516

17+
import static org.hibernate.models.spi.ClassDetails.CLASS_CLASS_DETAILS;
18+
import static org.hibernate.models.spi.ClassDetails.OBJECT_CLASS_DETAILS;
19+
import static org.hibernate.models.spi.ClassDetails.VOID_CLASS_DETAILS;
20+
import static org.hibernate.models.spi.ClassDetails.VOID_OBJECT_CLASS_DETAILS;
21+
1622
/**
23+
* Base ClassDetailsRegistry implementation support
24+
*
1725
* @author Steve Ebersole
1826
*/
1927
public abstract class AbstractClassDetailsRegistry implements MutableClassDetailsRegistry {
@@ -36,10 +44,10 @@ protected AbstractClassDetailsRegistry(
3644
this.subTypeClassDetailsMap = subTypeClassDetailsMap;
3745
this.context = context;
3846

39-
classDetailsMap.put( ClassDetails.OBJECT_CLASS_DETAILS.getName(), ClassDetails.OBJECT_CLASS_DETAILS );
40-
classDetailsMap.put( ClassDetails.CLASS_CLASS_DETAILS.getName(), ClassDetails.CLASS_CLASS_DETAILS );
41-
classDetailsMap.put( ClassDetails.VOID_CLASS_DETAILS.getName(), ClassDetails.VOID_CLASS_DETAILS );
42-
classDetailsMap.put( ClassDetails.VOID_OBJECT_CLASS_DETAILS.getName(), ClassDetails.VOID_OBJECT_CLASS_DETAILS );
47+
classDetailsMap.put( CLASS_CLASS_DETAILS.getName(), CLASS_CLASS_DETAILS );
48+
classDetailsMap.put( OBJECT_CLASS_DETAILS.getClassName(), OBJECT_CLASS_DETAILS );
49+
classDetailsMap.put( VOID_CLASS_DETAILS.getClassName(), VOID_CLASS_DETAILS );
50+
classDetailsMap.put( VOID_OBJECT_CLASS_DETAILS.getClassName(), VOID_OBJECT_CLASS_DETAILS );
4351
}
4452

4553
@Override
@@ -156,4 +164,15 @@ protected ClassDetails createClassDetails(String name, ClassDetailsCreator creat
156164
}
157165
}
158166

167+
public Map<String, ClassDetails> classDetailsMap() {
168+
return classDetailsMap;
169+
}
170+
171+
public Map<String, ClassDetails> getClassDetailsMap() {
172+
return Collections.unmodifiableMap( classDetailsMap );
173+
}
174+
175+
public Map<String, List<ClassDetails>> getSubTypeClassDetailsMap() {
176+
return Collections.unmodifiableMap( subTypeClassDetailsMap );
177+
}
159178
}

‎hibernate-models/src/main/java/org/hibernate/models/internal/AnnotationDescriptorRegistryStandard.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ public AnnotationDescriptorRegistryStandard(SourceModelBuildingContext modelBuil
2626
this.modelBuildingContext = modelBuildingContext;
2727
}
2828

29-
protected SourceModelBuildingContext getModelBuildingContext() {
30-
return modelBuildingContext;
31-
}
32-
3329
public void register(AnnotationDescriptor<?> descriptor) {
3430
MODELS_ANNOTATION_LOGGER.tracef( "Registering AnnotationDescriptor - %s", descriptor );
3531
descriptorMap.put( descriptor.getAnnotationType(), descriptor );

‎hibernate-models/src/main/java/org/hibernate/models/internal/ClassDetailsRegistryStandard.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77

88
import org.hibernate.models.internal.jdk.JdkBuilders;
9-
import org.hibernate.models.spi.ClassDetails;
109
import org.hibernate.models.spi.ClassDetailsBuilder;
1110
import org.hibernate.models.spi.SourceModelBuildingContext;
1211

@@ -16,8 +15,7 @@
1615
* @author Steve Ebersole
1716
*/
1817
public class ClassDetailsRegistryStandard
19-
extends AbstractClassDetailsRegistry
20-
implements MutableClassDetailsRegistry {
18+
extends AbstractClassDetailsRegistry {
2119
private final ClassDetailsBuilder classDetailsBuilder;
2220

2321
public ClassDetailsRegistryStandard(SourceModelBuildingContext context) {
@@ -27,10 +25,6 @@ public ClassDetailsRegistryStandard(SourceModelBuildingContext context) {
2725
public ClassDetailsRegistryStandard(ClassDetailsBuilder classDetailsBuilder, SourceModelBuildingContext context) {
2826
super( context );
2927
this.classDetailsBuilder = classDetailsBuilder;
30-
31-
classDetailsMap.put( ClassDetails.VOID_CLASS_DETAILS.getClassName(), ClassDetails.VOID_CLASS_DETAILS );
32-
classDetailsMap.put( ClassDetails.VOID_OBJECT_CLASS_DETAILS.getClassName(), ClassDetails.VOID_OBJECT_CLASS_DETAILS );
33-
classDetailsMap.put( ClassDetails.OBJECT_CLASS_DETAILS.getClassName(), ClassDetails.OBJECT_CLASS_DETAILS );
3428
}
3529

3630
@Override

0 commit comments

Comments
 (0)