You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2023/03/29 07:08:06 UTC
[camel-quarkus] branch quarkus-main updated (a1a3b7380d -> 0316142ecf)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
discard a1a3b7380d Upgrade Quarkus to 3.0.0.CR1
new 0316142ecf Upgrade Quarkus to 3.0.0.CR1
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (a1a3b7380d)
\
N -- N -- N refs/heads/quarkus-main (0316142ecf)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../quarkus/component/grpc/deployment/GrpcProcessor.java | 14 +++++++++++++-
pom.xml | 2 +-
2 files changed, 14 insertions(+), 2 deletions(-)
[camel-quarkus] 01/01: Upgrade Quarkus to 3.0.0.CR1
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 0316142ecfc5ff39645935fe510ca09de13ebd8a
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Mar 22 17:09:39 2023 +0000
Upgrade Quarkus to 3.0.0.CR1
---
docs/antora.yml | 2 +-
.../quarkus/component/grpc/deployment/GrpcProcessor.java | 14 +++++++++++++-
pom.xml | 4 ++--
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index cc57ac4945..25e569f825 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: 999-SNAPSHOT # 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..6e97c8ff1d 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>999-SNAPSHOT</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/ -->
@@ -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>