Skip to content

Commit

Permalink
Fixes quarkusio#4520
Browse files Browse the repository at this point in the history
  • Loading branch information
@kenfinnigan
kenfinnigan committed Oct 29, 2019
1 parent d171c19 commit 3aee9de
Show file tree
Hide file tree
Showing 14 changed files with 321 additions and 255 deletions.
2 changes: 1 addition & 1 deletion bom/runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<microprofile-context-propagation.version>1.0.1</microprofile-context-propagation.version>
<microprofile-opentracing-api.version>1.3.1</microprofile-opentracing-api.version>
<microprofile-reactive-streams-operators.version>1.0</microprofile-reactive-streams-operators.version>
<microprofile-rest-client.version>1.3.3</microprofile-rest-client.version>
<microprofile-rest-client.version>1.3.4</microprofile-rest-client.version>
<smallrye-config.version>1.3.9</smallrye-config.version>
<smallrye-health.version>2.1.0</smallrye-health.version>
<smallrye-metrics.version>2.2.0</smallrye-metrics.version>
Expand Down
2 changes: 1 addition & 1 deletion build-parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<microprofile-metrics-api.version>2.1.0</microprofile-metrics-api.version>
<microprofile-fault-tolerance-api.version>2.0.2</microprofile-fault-tolerance-api.version>
<microprofile-reactive-messaging-api.version>1.0</microprofile-reactive-messaging-api.version>
<microprofile-rest-client-api.version>1.2.1</microprofile-rest-client-api.version>
<microprofile-rest-client-api.version>1.3.4</microprofile-rest-client-api.version>
<microprofile-open-api.version>1.1.2</microprofile-open-api.version>
<microprofile-opentracing-api.version>1.3.1</microprofile-opentracing-api.version>
<microprofile-context-propagation.version>1.0.1</microprofile-context-propagation.version>
Expand Down
94 changes: 60 additions & 34 deletions ...client/deployment/src/main/java/io/quarkus/restclient/deployment/RestClientProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,33 +138,9 @@ void processInterfaces(CombinedIndexBuildItem combinedIndexBuildItem,
Set<Type> returnTypes = new HashSet<>();

IndexView index = combinedIndexBuildItem.getIndex();
for (AnnotationInstance annotation : index.getAnnotations(PATH)) {
AnnotationTarget target = annotation.target();
ClassInfo theInfo;
if (target.kind() == AnnotationTarget.Kind.CLASS) {
theInfo = target.asClass();
} else if (target.kind() == AnnotationTarget.Kind.METHOD) {
theInfo = target.asMethod().declaringClass();
} else {
continue;
}

if (!isRestClientInterface(index, theInfo)) {
continue;
}

interfaces.put(theInfo.name(), theInfo);

// Find Return types
for (MethodInfo method : theInfo.methods()) {
Type type = method.returnType();
if (!type.name().toString().contains("java.lang")) {
if (!returnTypes.contains(type)) {
returnTypes.add(type);
}
}
}
}
findInterfaces(index, interfaces, returnTypes, REGISTER_REST_CLIENT);
findInterfaces(index, interfaces, returnTypes, PATH);

if (interfaces.isEmpty()) {
return;
Expand Down Expand Up @@ -207,16 +183,17 @@ public void register(RegistrationContext registrationContext) {
// The spec is not clear whether we should add superinterfaces too - let's keep aligned with SmallRye for now
configurator.addType(restClientName);
configurator.addQualifier(REST_CLIENT);
final ScopeInfo scope = computeDefaultScope(config, entry);
final String configPrefix = computeConfigPrefix(restClientName.toString(), entry.getValue());
final ScopeInfo scope = computeDefaultScope(config, entry, configPrefix);
configurator.scope(scope);
configurator.creator(m -> {
// return new RestClientBase(proxyType, baseUri).create();
ResultHandle interfaceHandle = m.loadClass(restClientName.toString());
ResultHandle baseUriHandle = m.load(getAnnotationParameter(entry.getValue(), "baseUri"));
ResultHandle configKeyHandle = m.load(getAnnotationParameter(entry.getValue(), "configKey"));
ResultHandle configPrefixHandle = m.load(configPrefix);
ResultHandle baseHandle = m.newInstance(
MethodDescriptor.ofConstructor(RestClientBase.class, Class.class, String.class, String.class),
interfaceHandle, baseUriHandle, configKeyHandle);
interfaceHandle, baseUriHandle, configPrefixHandle);
ResultHandle ret = m.invokeVirtualMethod(
MethodDescriptor.ofMethod(RestClientBase.class, "create", Object.class), baseHandle);
m.returnValue(ret);
Expand All @@ -232,13 +209,62 @@ public void register(RegistrationContext registrationContext) {
restClientRecorder.setSslEnabled(sslNativeConfig.isEnabled());
}

private ScopeInfo computeDefaultScope(Config config, Map.Entry<DotName, ClassInfo> entry) {
DotName restClientName = entry.getKey();
private void findInterfaces(IndexView index, Map<DotName, ClassInfo> interfaces, Set<Type> returnTypes,
DotName annotationToFind) {
for (AnnotationInstance annotation : index.getAnnotations(annotationToFind)) {
AnnotationTarget target = annotation.target();
ClassInfo theInfo;
if (target.kind() == AnnotationTarget.Kind.CLASS) {
theInfo = target.asClass();
} else if (target.kind() == AnnotationTarget.Kind.METHOD) {
theInfo = target.asMethod().declaringClass();
} else {
continue;
}

if (!isRestClientInterface(index, theInfo)) {
continue;
}

interfaces.put(theInfo.name(), theInfo);

// Find Return types
processInterfaceReturnTypes(theInfo, returnTypes);
for (Type interfaceType : theInfo.interfaceTypes()) {
ClassInfo interfaceClassInfo = index.getClassByName(interfaceType.name());
if (interfaceClassInfo != null) {
processInterfaceReturnTypes(interfaceClassInfo, returnTypes);
}
}
}
}

private void processInterfaceReturnTypes(ClassInfo classInfo, Set<Type> returnTypes) {
for (MethodInfo method : classInfo.methods()) {
Type type = method.returnType();
if (!type.name().toString().contains("java.lang")) {
if (!returnTypes.contains(type)) {
returnTypes.add(type);
}
}
}
}

private String computeConfigPrefix(String interfaceName, ClassInfo classInfo) {
String propertyPrefixFromAnnotation = getAnnotationParameter(classInfo, "configKey");

if (propertyPrefixFromAnnotation != null && !propertyPrefixFromAnnotation.isEmpty()) {
return propertyPrefixFromAnnotation;
}

return interfaceName;
}

private ScopeInfo computeDefaultScope(Config config, Map.Entry<DotName, ClassInfo> entry, String configPrefix) {
// Initialize a default @Dependent scope as per the spec
ScopeInfo scopeInfo = BuiltinScope.DEPENDENT.getInfo();
final String REST_SCOPE_FORMAT = "%s/" + RestClientBase.MP_REST + "/scope";
final Optional<String> scopeConfig = config
.getOptionalValue(String.format(REST_SCOPE_FORMAT, restClientName.toString()), String.class);
.getOptionalValue(String.format(RestClientBase.REST_SCOPE_FORMAT, configPrefix), String.class);
if (scopeConfig.isPresent()) {
final DotName scope = DotName.createSimple(scopeConfig.get());
final BuiltinScope builtinScope = BuiltinScope.from(scope);
Expand All @@ -247,7 +273,7 @@ private ScopeInfo computeDefaultScope(Config config, Map.Entry<DotName, ClassInf
} else {
log.warn(String.format(
"Unsupported default scope %s provided for rest client %s. Defaulting to @Dependent.",
scope, restClientName));
scope, entry.getKey()));
}
} else {
final Set<DotName> annotations = entry.getValue().annotations().keySet();
Expand Down
Loading

0 comments on commit 3aee9de

Please sign in to comment.