Skip to content
This repository was archived by the owner on Feb 23, 2023. It is now read-only.

Commit b6ca768

Browse files
sdeleuzesdeleuze
committed
Rename Flag to TypeAccess and rename values
Closes gh-1317
1 parent 2ce93e4 commit b6ca768

File tree

136 files changed

+647
-641
lines changed

Some content is hidden

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

136 files changed

+647
-641
lines changed

‎spring-aot-test/src/main/java/org/springframework/aot/test/context/bootstrap/generator/TestContextConfigurationDescriptor.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
import org.springframework.aot.context.bootstrap.generator.infrastructure.nativex.NativeConfigurationRegistry;
2626
import org.springframework.context.support.GenericApplicationContext;
27-
import org.springframework.nativex.hint.Flag;
27+
import org.springframework.nativex.hint.TypeAccess;
2828
import org.springframework.test.context.MergedContextConfiguration;
2929
import org.springframework.test.context.TestContextBootstrapper;
3030

@@ -66,7 +66,7 @@ GenericApplicationContext parseTestContext() {
6666
*/
6767
void contributeNativeConfiguration(NativeConfigurationRegistry nativeConfigurationRegistry) {
6868
nativeConfigurationRegistry.reflection().forType(this.testContextBootstrapperType)
69-
.withFlags(Flag.allDeclaredConstructors);
69+
.withAccess(TypeAccess.DECLARED_CONSTRUCTORS);
7070
}
7171

7272
/**

‎spring-aot-test/src/test/java/org/springframework/aot/test/context/bootstrap/generator/TestContextAotProcessorTests.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.springframework.aot.test.samples.simple.SimpleSpringTests;
3232
import org.springframework.boot.test.context.SpringBootTestContextBootstrapper;
3333
import org.springframework.nativex.domain.reflect.ClassDescriptor;
34-
import org.springframework.nativex.hint.Flag;
34+
import org.springframework.nativex.hint.TypeAccess;
3535

3636
import static org.assertj.core.api.Assertions.assertThat;
3737

@@ -111,7 +111,7 @@ void processRegisterReflectionForContextLoadersMappingMethod() {
111111
assertThat(methodDescriptor.getName()).isEqualTo("getContextLoaders");
112112
assertThat(methodDescriptor.getParameterTypes()).isEmpty();
113113
});
114-
assertThat(descriptor.getFlags()).isNull();
114+
assertThat(descriptor.getAccess()).isNull();
115115
assertThat(descriptor.getFields()).isNull();
116116
});
117117
}
@@ -127,14 +127,14 @@ void processRegisterReflectionForContextInitializerClassName() {
127127
void processRegisterReflectionForSpringBootTestContextBootstrapper() {
128128
ContextBootstrapStructure structure = this.tester.process(SampleApplicationTests.class);
129129
assertThat(structure).hasClassDescriptor(SpringBootTestContextBootstrapper.class.getName(),
130-
(descriptor) -> assertThat(descriptor.getFlags()).containsOnly(Flag.allDeclaredConstructors));
130+
(descriptor) -> assertThat(descriptor.getAccess()).containsOnly(TypeAccess.DECLARED_CONSTRUCTORS));
131131
}
132132

133133
@Test
134134
void processRegisterReflectionForSliceTestContextBootstrapper() {
135135
ContextBootstrapStructure structure = this.tester.process(SampleJdbcTests.class);
136136
assertThat(structure).hasClassDescriptor("org.springframework.boot.test.autoconfigure.jdbc.JdbcTestContextBootstrapper",
137-
(descriptor) -> assertThat(descriptor.getFlags()).containsOnly(Flag.allDeclaredConstructors));
137+
(descriptor) -> assertThat(descriptor.getAccess()).containsOnly(TypeAccess.DECLARED_CONSTRUCTORS));
138138
}
139139

140140
private Consumer<ClassDescriptor> assertContextInitializerMetadata() {
@@ -143,7 +143,7 @@ private Consumer<ClassDescriptor> assertContextInitializerMetadata() {
143143
assertThat(methodDescriptor.getName()).isEqualTo("<init>");
144144
assertThat(methodDescriptor.getParameterTypes()).isEmpty();
145145
});
146-
assertThat(descriptor.getFlags()).isNull();
146+
assertThat(descriptor.getAccess()).isNull();
147147
assertThat(descriptor.getFields()).isNull();
148148
};
149149
}

‎spring-aot-test/src/test/java/org/springframework/aot/test/context/bootstrap/generator/TestContextConfigurationDescriptorTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.springframework.aot.test.samples.app.slice.SampleJdbcTests;
2727
import org.springframework.boot.test.context.SpringBootTestContextBootstrapper;
2828
import org.springframework.context.support.GenericApplicationContext;
29-
import org.springframework.nativex.hint.Flag;
29+
import org.springframework.nativex.hint.TypeAccess;
3030
import org.springframework.test.context.MergedContextConfiguration;
3131
import org.springframework.test.context.cache.DefaultCacheAwareContextLoaderDelegate;
3232
import org.springframework.test.context.support.DefaultBootstrapContext;
@@ -65,7 +65,7 @@ void contributeNativeConfigurationRegisterTestContextBootstrapper() {
6565
descriptor.contributeNativeConfiguration(registry);
6666
assertThat(registry.reflection().toClassDescriptors()).singleElement().satisfies((classDescriptor) -> {
6767
assertThat(classDescriptor.getName()).isEqualTo(SpringBootTestContextBootstrapper.class.getName());
68-
assertThat(classDescriptor.getFlags()).containsOnly(Flag.allDeclaredConstructors);
68+
assertThat(classDescriptor.getAccess()).containsOnly(TypeAccess.DECLARED_CONSTRUCTORS);
6969
assertThat(classDescriptor.getFields()).isNull();
7070
assertThat(classDescriptor.getMethods()).isNull();
7171
});

‎spring-aot/src/main/java/org/springframework/aot/context/bootstrap/generator/infrastructure/nativex/DefaultNativeReflectionEntry.java

+14-14
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import org.springframework.nativex.domain.reflect.ClassDescriptor;
3737
import org.springframework.nativex.domain.reflect.FieldDescriptor;
3838
import org.springframework.nativex.domain.reflect.MethodDescriptor;
39-
import org.springframework.nativex.hint.Flag;
39+
import org.springframework.nativex.hint.TypeAccess;
4040
import org.springframework.util.LinkedMultiValueMap;
4141
import org.springframework.util.MultiValueMap;
4242

@@ -119,23 +119,23 @@ public Set<Field> getFields() {
119119
@Override
120120
protected ClassDescriptor initializerClassDescriptor() {
121121
ClassDescriptor descriptor = ClassDescriptor.of(this.type);
122-
registerIfNecessary(this.constructors, Flag.allDeclaredConstructors, Flag.allPublicConstructors,
122+
registerIfNecessary(this.constructors, TypeAccess.DECLARED_CONSTRUCTORS, TypeAccess.PUBLIC_CONSTRUCTORS,
123123
(constructor) -> descriptor.addMethodDescriptor(toMethodDescriptor(constructor)));
124-
registerIfNecessary(this.queriedConstructors, Flag.queryAllDeclaredConstructors, Flag.queryAllPublicConstructors,
124+
registerIfNecessary(this.queriedConstructors, TypeAccess.QUERY_DECLARED_CONSTRUCTORS, TypeAccess.QUERY_PUBLIC_CONSTRUCTORS,
125125
(constructor) -> descriptor.addQueriedMethodDescriptor(toMethodDescriptor(constructor)));
126-
registerIfNecessary(this.methods, Flag.allDeclaredMethods, Flag.allPublicMethods,
126+
registerIfNecessary(this.methods, TypeAccess.DECLARED_METHODS, TypeAccess.PUBLIC_METHODS,
127127
(method) -> descriptor.addMethodDescriptor(toMethodDescriptor(method)));
128-
registerIfNecessary(this.queriedMethods, Flag.queryAllDeclaredMethods, Flag.queryAllPublicMethods,
128+
registerIfNecessary(this.queriedMethods, TypeAccess.QUERY_DECLARED_METHODS, TypeAccess.QUERY_PUBLIC_METHODS,
129129
(method) -> descriptor.addQueriedMethodDescriptor(toMethodDescriptor(method)));
130-
registerFieldIfNecessary(this.fields, Flag.allDeclaredFields, Flag.allPublicFields,
130+
registerFieldIfNecessary(this.fields, TypeAccess.DECLARED_FIELDS, TypeAccess.PUBLIC_FIELDS,
131131
(field) -> descriptor.addFieldDescriptor(toFieldDescriptor(field.getKey(), field.getValue())));
132132
return descriptor;
133133
}
134134

135-
private void registerFieldIfNecessary(MultiValueMap<Field, FieldAccess> members, Flag allFlag,
136-
Flag publicFlag, Consumer<Entry<Field, List<FieldAccess>>> memberConsumer) {
137-
if (!getFlags().contains(allFlag)) {
138-
boolean checkVisibility = getFlags().contains(publicFlag);
135+
private void registerFieldIfNecessary(MultiValueMap<Field, FieldAccess> members, TypeAccess allAccess,
136+
TypeAccess publicAccess, Consumer<Entry<Field, List<FieldAccess>>> memberConsumer) {
137+
if (!getAccess().contains(allAccess)) {
138+
boolean checkVisibility = getAccess().contains(publicAccess);
139139
for (Entry<Field, List<FieldAccess>> member : members.entrySet()) {
140140
if (!checkVisibility || !Modifier.isPublic(member.getKey().getModifiers())) {
141141
memberConsumer.accept(member);
@@ -150,9 +150,9 @@ private void registerFieldIfNecessary(MultiValueMap<Field, FieldAccess> members,
150150
}
151151
}
152152

153-
private <T extends Member> void registerIfNecessary(Iterable<T> members, Flag allFlag,
154-
Flag publicFlag, Consumer<T> memberConsumer) {
155-
registerIfNecessary(members, allFlag, publicFlag,
153+
private <T extends Member> void registerIfNecessary(Iterable<T> members, TypeAccess allAccess,
154+
TypeAccess publicAccess, Consumer<T> memberConsumer) {
155+
registerIfNecessary(members, allAccess, publicAccess,
156156
(member) -> Modifier.isPublic(member.getModifiers()), memberConsumer);
157157
}
158158

@@ -172,7 +172,7 @@ public String toString() {
172172
.add("type=" + this.type).add("constructors=" + this.constructors)
173173
.add("methods=" + this.methods).add("fields=" + this.fields)
174174
.add("queriedConstructors=" + this.queriedConstructors).add("queriedMethods=" + this.queriedMethods)
175-
.add("flags=" + getFlags()).toString();
175+
.add("access=" + getAccess()).toString();
176176
}
177177

178178
public enum FieldAccess {

‎spring-aot/src/main/java/org/springframework/aot/context/bootstrap/generator/infrastructure/nativex/GeneratedCodeNativeReflectionEntry.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.springframework.nativex.domain.reflect.ClassDescriptor;
3535
import org.springframework.nativex.domain.reflect.FieldDescriptor;
3636
import org.springframework.nativex.domain.reflect.MethodDescriptor;
37-
import org.springframework.nativex.hint.Flag;
37+
import org.springframework.nativex.hint.TypeAccess;
3838

3939
/**
4040
* A {@link NativeReflectionEntry} for generated code.
@@ -73,16 +73,16 @@ public static Builder of(ClassName className) {
7373
protected ClassDescriptor initializerClassDescriptor() {
7474
ClassDescriptor descriptor = ClassDescriptor.of(toFullyQualifiedClassName(this.type));
7575
registerIfNecessary(this.methods.stream().filter(MethodSpec::isConstructor),
76-
Flag.allDeclaredConstructors, Flag.allPublicConstructors,
76+
TypeAccess.DECLARED_CONSTRUCTORS, TypeAccess.PUBLIC_CONSTRUCTORS,
7777
(constructor) -> descriptor.addMethodDescriptor(toMethodDescriptor(constructor)));
7878
registerIfNecessary(this.queriedMethods.stream().filter(MethodSpec::isConstructor),
79-
Flag.queryAllDeclaredConstructors, Flag.queryAllPublicConstructors,
79+
TypeAccess.QUERY_DECLARED_CONSTRUCTORS, TypeAccess.QUERY_PUBLIC_CONSTRUCTORS,
8080
(constructor) -> descriptor.addQueriedMethodDescriptor(toMethodDescriptor(constructor)));
8181
registerIfNecessary(this.methods.stream().filter(Predicate.not(MethodSpec::isConstructor)),
82-
Flag.allDeclaredMethods, Flag.allPublicMethods,
82+
TypeAccess.DECLARED_METHODS, TypeAccess.PUBLIC_METHODS,
8383
(method) -> descriptor.addMethodDescriptor(toMethodDescriptor(method)));
8484
registerIfNecessary(this.queriedMethods.stream().filter(Predicate.not(MethodSpec::isConstructor)),
85-
Flag.queryAllDeclaredMethods, Flag.queryAllPublicMethods,
85+
TypeAccess.QUERY_DECLARED_METHODS, TypeAccess.QUERY_PUBLIC_METHODS,
8686
(method) -> descriptor.addQueriedMethodDescriptor(toMethodDescriptor(method)));
8787
registerFieldsIfNecessary(this.fields, (field) -> descriptor.addFieldDescriptor(toFieldDescriptor(field)));
8888
return descriptor;
@@ -114,14 +114,14 @@ private static String toFullyQualifiedClassName(ClassName className) {
114114
return sb.toString();
115115
}
116116

117-
private void registerIfNecessary(Stream<MethodSpec> methods, Flag allFlag,
118-
Flag publicFlag, Consumer<MethodSpec> memberConsumer) {
119-
registerIfNecessary(methods.collect(Collectors.toList()), allFlag, publicFlag,
117+
private void registerIfNecessary(Stream<MethodSpec> methods, TypeAccess allAccess,
118+
TypeAccess publicAccess, Consumer<MethodSpec> memberConsumer) {
119+
registerIfNecessary(methods.collect(Collectors.toList()), allAccess, publicAccess,
120120
(method) -> method.hasModifier(Modifier.PUBLIC), memberConsumer);
121121
}
122122

123123
private void registerFieldsIfNecessary(Iterable<FieldSpec> fields, Consumer<FieldSpec> memberConsumer) {
124-
registerIfNecessary(fields, Flag.allDeclaredFields, Flag.allPublicFields,
124+
registerIfNecessary(fields, TypeAccess.DECLARED_FIELDS, TypeAccess.PUBLIC_FIELDS,
125125
(field) -> field.hasModifier(Modifier.PUBLIC), memberConsumer);
126126
}
127127

‎spring-aot/src/main/java/org/springframework/aot/context/bootstrap/generator/infrastructure/nativex/NativeReflectionEntry.java

+17-17
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
import org.springframework.nativex.domain.reflect.ClassDescriptor;
2727
import org.springframework.nativex.domain.reflect.ConditionDescriptor;
28-
import org.springframework.nativex.hint.Flag;
28+
import org.springframework.nativex.hint.TypeAccess;
2929

3030
/**
3131
* Describe the need for reflection for a particular type.
@@ -39,21 +39,21 @@
3939
*/
4040
public abstract class NativeReflectionEntry {
4141

42-
private final Set<Flag> flags;
42+
private final Set<TypeAccess> access;
4343

4444
private final String conditionalOnTypeReachable;
4545

4646
protected NativeReflectionEntry(Builder<?, ?> builder) {
47-
this.flags = Collections.unmodifiableSet(builder.flags);
47+
this.access = Collections.unmodifiableSet(builder.access);
4848
this.conditionalOnTypeReachable = builder.conditionalOnTypeReachable;
4949
}
5050

5151
/**
52-
* Return the {@link Flag flags} to set.
53-
* @return the flags to set
52+
* Return the {@link TypeAccess access} to set.
53+
* @return the access to set
5454
*/
55-
public Set<Flag> getFlags() {
56-
return this.flags;
55+
public Set<TypeAccess> getAccess() {
56+
return this.access;
5757
}
5858

5959
/**
@@ -65,16 +65,16 @@ public ClassDescriptor toClassDescriptor() {
6565
if (this.conditionalOnTypeReachable != null) {
6666
descriptor.setCondition(new ConditionDescriptor(this.conditionalOnTypeReachable));
6767
}
68-
descriptor.setFlags(this.flags);
68+
descriptor.setAccess(this.access);
6969
return descriptor;
7070
}
7171

7272
protected abstract ClassDescriptor initializerClassDescriptor();
7373

74-
protected <T> void registerIfNecessary(Iterable<T> members, Flag allFlag,
75-
Flag publicFlag, Predicate<T> isPublicMember, Consumer<T> memberConsumer) {
76-
if (!this.flags.contains(allFlag)) {
77-
boolean checkVisibility = this.flags.contains(publicFlag);
74+
protected <T> void registerIfNecessary(Iterable<T> members, TypeAccess allAccess,
75+
TypeAccess publicAccess, Predicate<T> isPublicMember, Consumer<T> memberConsumer) {
76+
if (!this.access.contains(allAccess)) {
77+
boolean checkVisibility = this.access.contains(publicAccess);
7878
for (T member : members) {
7979
if (!checkVisibility || !isPublicMember.test(member)) {
8080
memberConsumer.accept(member);
@@ -85,17 +85,17 @@ protected <T> void registerIfNecessary(Iterable<T> members, Flag allFlag,
8585

8686
public abstract static class Builder<B extends Builder<B, T>, T extends NativeReflectionEntry> {
8787

88-
private final Set<Flag> flags = new LinkedHashSet<>();
88+
private final Set<TypeAccess> access = new LinkedHashSet<>();
8989

9090
protected String conditionalOnTypeReachable;
9191

9292
/**
93-
* Set the specified {@link Flag flags}.
94-
* @param flags the flags to set
93+
* Set the specified {@link TypeAccess access}.
94+
* @param access the access to set
9595
* @return this for method chaining
9696
*/
97-
public B withFlags(Flag... flags) {
98-
this.flags.addAll(Arrays.asList(flags));
97+
public B withAccess(TypeAccess... access) {
98+
this.access.addAll(Arrays.asList(access));
9999
return self();
100100
}
101101

‎spring-aot/src/main/java/org/springframework/aot/context/bootstrap/generator/nativex/FrameworkAnnotationsBeanNativeConfigurationProcessor.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.springframework.core.annotation.MergedAnnotation;
3030
import org.springframework.core.annotation.MergedAnnotations;
3131
import org.springframework.core.annotation.MergedAnnotations.SearchStrategy;
32-
import org.springframework.nativex.hint.Flag;
32+
import org.springframework.nativex.hint.TypeAccess;
3333
import org.springframework.stereotype.Component;
3434
import org.springframework.stereotype.Indexed;
3535

@@ -58,7 +58,7 @@ public void process(BeanInstanceDescriptor descriptor, NativeConfigurationRegist
5858

5959
private void registerAnnotations(ReflectionConfiguration reflectionConfiguration, MergedAnnotations annotations) {
6060
annotations.stream().filter(this::isRuntimeFrameworkAnnotation).forEach((ann) ->
61-
reflectionConfiguration.forType(ann.getType()).withFlags(Flag.allDeclaredMethods));
61+
reflectionConfiguration.forType(ann.getType()).withAccess(TypeAccess.DECLARED_METHODS));
6262
}
6363

6464
protected boolean isRuntimeFrameworkAnnotation(MergedAnnotation<?> annotation) {

‎spring-aot/src/main/java/org/springframework/aot/context/bootstrap/generator/nativex/HintsBeanNativeConfigurationProcessor.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ private void findAndRegisterRelevantNativeHints(Class<?> beanType, NativeConfigu
9393
AccessDescriptor value = entry.getValue();
9494
Integer accessBits = value.getAccessBits();
9595
if (accessBits != 0) {
96-
reflectionConfiguration.forType(keyClass).withFlags(AccessBits.getFlags(accessBits));
96+
reflectionConfiguration.forType(keyClass).withAccess(AccessBits.getAccess(accessBits));
9797
}
9898
if ((accessBits & AccessBits.RESOURCE) != 0) {
9999
if (keyClass.isArray()) {
@@ -180,7 +180,7 @@ private void findAndRegisterRelevantNativeHints(Class<?> beanType, NativeConfigu
180180
AccessDescriptor value = entry.getValue();
181181
Integer accessBits = value.getAccessBits();
182182
if (accessBits != 0) {
183-
jniConfiguration.forType(keyClass).withFlags(AccessBits.getFlags(accessBits));
183+
jniConfiguration.forType(keyClass).withAccess(AccessBits.getAccess(accessBits));
184184
}
185185
for (MethodDescriptor methodDescriptor : value.getMethodDescriptors()) {
186186
Executable method = methodDescriptor.findOnClass(keyClass);

‎spring-aot/src/main/java/org/springframework/aot/factories/DefaultFactoriesCodeContributor.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.springframework.aot.build.context.BuildContext;
2424
import org.springframework.nativex.AotOptions;
2525
import org.springframework.nativex.domain.reflect.ClassDescriptor;
26-
import org.springframework.nativex.hint.Flag;
26+
import org.springframework.nativex.hint.TypeAccess;
2727
import org.springframework.util.ClassUtils;
2828

2929
/**
@@ -94,7 +94,7 @@ private boolean passesFilterCheck(BuildContext context, SpringFactory factory) {
9494

9595
private void generateReflectionMetadata(String factoryClassName, BuildContext context) {
9696
ClassDescriptor factoryDescriptor = ClassDescriptor.of(factoryClassName);
97-
factoryDescriptor.setFlag(Flag.allDeclaredConstructors);
97+
factoryDescriptor.setAccess(TypeAccess.DECLARED_CONSTRUCTORS);
9898
context.describeReflection(reflect -> reflect.add(factoryDescriptor));
9999
}
100100

‎spring-aot/src/main/java/org/springframework/aot/factories/NoArgConstructorFactoriesCodeContributor.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
import org.springframework.aot.build.context.BuildContext;
2222
import org.springframework.beans.BeanUtils;
2323
import org.springframework.nativex.domain.reflect.ClassDescriptor;
24-
import org.springframework.nativex.hint.Flag;
25-
import org.springframework.util.ClassUtils;
24+
import org.springframework.nativex.hint.TypeAccess;
2625

2726
import com.squareup.javapoet.ClassName;
2827

@@ -60,7 +59,7 @@ public void contribute(SpringFactory factory, CodeGenerator code, BuildContext c
6059

6160
private void generateReflectionMetadata(String factoryClassName, BuildContext context) {
6261
ClassDescriptor factoryDescriptor = ClassDescriptor.of(factoryClassName);
63-
factoryDescriptor.setFlag(Flag.allDeclaredConstructors);
62+
factoryDescriptor.setAccess(TypeAccess.DECLARED_CONSTRUCTORS);
6463
context.describeReflection(reflect -> reflect.add(factoryDescriptor));
6564
}
6665

‎spring-aot/src/main/java/org/springframework/aot/factories/PrivateFactoriesCodeContributor.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
import org.springframework.aot.build.context.BuildContext;
2828
import org.springframework.beans.BeanUtils;
29-
import org.springframework.nativex.hint.Flag;
29+
import org.springframework.nativex.hint.TypeAccess;
3030
import org.springframework.util.ClassUtils;
3131
import org.springframework.util.StringUtils;
3232

@@ -95,7 +95,7 @@ private String generateMethodName(Class<?> factory) {
9595

9696
private void generateReflectionMetadata(String factoryClassName, BuildContext context) {
9797
org.springframework.nativex.domain.reflect.ClassDescriptor factoryDescriptor = org.springframework.nativex.domain.reflect.ClassDescriptor.of(factoryClassName);
98-
factoryDescriptor.setFlag(Flag.allDeclaredConstructors);
98+
factoryDescriptor.setAccess(TypeAccess.DECLARED_CONSTRUCTORS);
9999
context.describeReflection(reflect -> reflect.add(factoryDescriptor));
100100
}
101101

‎spring-aot/src/main/java/org/springframework/aot/nativex/ConfigurationContributor.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
import org.springframework.nativex.domain.proxies.JdkProxyDescriptor;
4848
import org.springframework.nativex.domain.reflect.ClassDescriptor;
4949
import org.springframework.nativex.domain.reflect.ReflectionDescriptor;
50-
import org.springframework.nativex.hint.Flag;
50+
import org.springframework.nativex.hint.TypeAccess;
5151
import org.springframework.nativex.support.ConfigurationCollector;
5252
import org.springframework.nativex.support.SpringAnalyzer;
5353
import org.springframework.nativex.type.TypeSystem;
@@ -144,10 +144,10 @@ private void processBuildTimeClassProxyRequests(BuildContext context, Configurat
144144
if (!classProxyNames.isEmpty()) {
145145
for (String classProxyName : classProxyNames) {
146146
ClassDescriptor classDescriptor = ClassDescriptor.of(classProxyName);
147-
classDescriptor.setFlag(Flag.allDeclaredConstructors);
147+
classDescriptor.setAccess(TypeAccess.DECLARED_CONSTRUCTORS);
148148
// TODO [build time proxies] not all proxy variants will need method access - depends on what
149149
// it is for - perhaps surface access bit configuration in the classproxyhint to allow flexibility?
150-
classDescriptor.setFlag(Flag.allDeclaredMethods);
150+
classDescriptor.setAccess(TypeAccess.DECLARED_METHODS);
151151
reflectionDescriptor.add(classDescriptor);
152152
}
153153
configurationCollector.addReflectionDescriptor(reflectionDescriptor, false);

0 commit comments

Comments
 (0)