This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit c1a45492ee23261bd6316accf45cf84786830730
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Thu Mar 30 14:46:59 2023 +0100
Upgrade Quarkus to 3.0.0.CR1
---
docs/antora.yml | 2 +-
.../quarkus/component/grpc/deployment/GrpcProcessor.java | 14 +++++++++++++-
pom.xml | 6 +++---
3 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index cc57ac4945..840f286e8b 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -30,7 +30,7 @@ asciidoc:
# Project versions
camel-version: 4.0.0-M2 # replace ${camel.version}
camel-docs-version: ""
- quarkus-version: 3.0.0.Beta1 # replace ${quarkus.version}
+ quarkus-version: 3.0.0.CR1 # replace ${quarkus.version}
graalvm-version: 22.3.0 # replace ${graalvm.version}
graalvm-docs-version: 22.3
min-maven-version: 3.8.2 # replace ${min-maven-version}
diff --git
a/extensions/grpc/deployment/src/main/java/org/apache/camel/quarkus/component/grpc/deployment/GrpcProcessor.java
b/extensions/grpc/deployment/src/main/java/org/apache/camel/quarkus/component/grpc/deployment/GrpcProcessor.java
index 8d2657c404..df49f64a04 100644
---
a/extensions/grpc/deployment/src/main/java/org/apache/camel/quarkus/component/grpc/deployment/GrpcProcessor.java
+++
b/extensions/grpc/deployment/src/main/java/org/apache/camel/quarkus/component/grpc/deployment/GrpcProcessor.java
@@ -19,6 +19,7 @@ package org.apache.camel.quarkus.component.grpc.deployment;
import java.lang.reflect.Modifier;
import java.util.Collection;
import java.util.List;
+import java.util.Optional;
import io.grpc.BindableService;
import io.grpc.stub.AbstractAsyncStub;
@@ -102,6 +103,7 @@ class GrpcProcessor {
if (!Modifier.isAbstract(service.flags())) {
continue;
}
+
if (service.name().withoutPackagePrefix().startsWith("Mutiny")) {
/* The generate-code goal of quarkus-maven-plugin generates
also Mutiny service that we do not use
* Not skipping it here results in randomly registering the
Mutiny one or the right one.
@@ -110,6 +112,15 @@ class GrpcProcessor {
continue;
}
+ Optional<String> asyncServiceInterface = service.interfaceNames()
+ .stream()
+ .map(DotName::toString)
+ .filter(className -> className.endsWith("AsyncService"))
+ .findFirst();
+ if (asyncServiceInterface.isEmpty()) {
+ continue;
+ }
+
String superClassName = service.name().toString();
String generatedClassName = superClassName +
"QuarkusMethodHandler";
@@ -156,7 +167,8 @@ class GrpcProcessor {
// Override service methods that the gRPC component is
interested in
// E.g methods with one or two parameters where one is of type
StreamObserver
- List<MethodInfo> methods = service.methods();
+ ClassInfo asyncServiceClassInfo =
index.getClassByName(asyncServiceInterface.get());
+ List<MethodInfo> methods = asyncServiceClassInfo.methods();
for (MethodInfo method : methods) {
if (isCandidateServiceMethod(method)) {
String[] params = method.parameters()
diff --git a/pom.xml b/pom.xml
index 0f1e0b5dd6..83ec388c71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
<quarkiverse-mybatis.version>2.0.0.CR2</quarkiverse-mybatis.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/
-->
<quarkiverse-pooled-jms.version>2.0.0.CR2</quarkiverse-pooled-jms.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/messaginghub/quarkus-pooled-jms-parent/
-->
<quarkiverse-tika.version>1.0.3</quarkiverse-tika.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/tika/quarkus-tika-parent/ -->
- <quarkus.version>3.0.0.Beta1</quarkus.version><!--
https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
+ <quarkus.version>3.0.0.CR1</quarkus.version><!--
https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
<quarkus-hazelcast-client.version>3.0.0</quarkus-hazelcast-client.version><!--
https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ -->
<quarkus-qpid-jms.version>2.0.0.Alpha3</quarkus-qpid-jms.version><!--
https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
@@ -82,7 +82,7 @@
<cassandra-driver-test.version>3.7.1</cassandra-driver-test.version><!-- Keep
in sync with testcontainers instead of Debezium bom -->
<bouncycastle.version>1.72</bouncycastle.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version} dep:org.bouncycastle:bcprov-jdk18on
-->
<brotli.version>0.1.2</brotli.version>
- <caffeine.version>3.1.1</caffeine.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version}
dep:com.github.ben-manes.caffeine:caffeine -->
+ <caffeine.version>3.1.5</caffeine.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version}
dep:com.github.ben-manes.caffeine:caffeine -->
<commons-beanutils.version>${commons-beanutils-version}</commons-beanutils.version>
<commons-cli.version>1.4</commons-cli.version><!-- keep in sync with
Quarkus, via quarkus-bootstrap-core -->
<commons-collections.version>3.2.2</commons-collections.version><!--
used by hbase, should be pretty stable as commons-collections are not developed
actively anymore -->
@@ -102,7 +102,7 @@
<google-cloud-pubsub-bom.version>1.121.0</google-cloud-pubsub-bom.version><!--
@sync com.google.cloud:google-cloud-bom:${google-cloud-bom.version}
dep:com.google.cloud:google-cloud-pubsub-bom -->
<google-cloud-pubsub.version>1.121.0</google-cloud-pubsub.version><!--
@sync
com.google.cloud:google-cloud-pubsub-bom:${google-cloud-pubsub-bom.version}
dep:com.google.cloud:google-cloud-pubsub -->
<graalvm.version>22.3.0</graalvm.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.sdk:graal-sdk -->
- <grpc.version>1.53.0</grpc.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
+ <grpc.version>1.54.0</grpc.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
<hapi.version>${hapi-version}</hapi.version>
<hapi-base.version>${hapi-base-version}</hapi-base.version>
<hapi-fhir.version>${hapi-fhir-version}</hapi-fhir.version>
