diff --git a/dependencies/pom.xml b/dependencies/pom.xml index cc8c1d3e252..9e2b2bc756a 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -53,12 +53,12 @@ 1.34.1 1.33.3 2.3.3 - 3.21.7 + 4.27.3 23.1.0 18.6 18.3 2.9.0 - 1.60.0 + 1.65.1 32.0.1-jre 2.2.220 1.3 diff --git a/grpc/core/src/main/java/module-info.java b/grpc/core/src/main/java/module-info.java index f2866601099..930d44df09a 100644 --- a/grpc/core/src/main/java/module-info.java +++ b/grpc/core/src/main/java/module-info.java @@ -28,7 +28,6 @@ requires transitive io.grpc.stub; requires transitive com.google.protobuf; requires transitive io.grpc.protobuf; - requires transitive io.grpc.protobuf.lite; exports io.helidon.grpc.core; } diff --git a/microprofile/grpc/server/src/main/java/module-info.java b/microprofile/grpc/server/src/main/java/module-info.java index 71e2659d08f..c01fcb3b9d5 100644 --- a/microprofile/grpc/server/src/main/java/module-info.java +++ b/microprofile/grpc/server/src/main/java/module-info.java @@ -39,7 +39,6 @@ requires io.helidon.webserver.grpc; requires io.grpc; - requires io.grpc.protobuf.lite; requires com.google.protobuf; requires microprofile.health.api; diff --git a/webserver/grpc/src/main/java/io/helidon/webserver/grpc/ProtoMarshaller.java b/webserver/grpc/src/main/java/io/helidon/webserver/grpc/ProtoMarshaller.java index a3733e82db6..4908f2c8880 100644 --- a/webserver/grpc/src/main/java/io/helidon/webserver/grpc/ProtoMarshaller.java +++ b/webserver/grpc/src/main/java/io/helidon/webserver/grpc/ProtoMarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, 2023 Oracle and/or its affiliates. + * Copyright (c) 2022, 2024 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,9 +19,9 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import com.google.protobuf.MessageLite; +import com.google.protobuf.Message; import io.grpc.MethodDescriptor; -import io.grpc.protobuf.lite.ProtoLiteUtils; +import io.grpc.protobuf.ProtoUtils; final class ProtoMarshaller { private static final Map, MethodDescriptor.Marshaller> CACHE = new ConcurrentHashMap<>(); @@ -35,12 +35,12 @@ static MethodDescriptor.Marshaller get(Class clazz) { if (result != null) { return result; } - // i may create it twice, but that should not really matter + // it may create it twice, but that should not really matter try { java.lang.reflect.Method getDefaultInstance = clazz.getDeclaredMethod("getDefaultInstance"); - MessageLite instance = (MessageLite) getDefaultInstance.invoke(clazz); + Message instance = (Message) getDefaultInstance.invoke(clazz); - result = (MethodDescriptor.Marshaller) ProtoLiteUtils.marshaller(instance); + result = (MethodDescriptor.Marshaller) ProtoUtils.marshaller(instance); MethodDescriptor.Marshaller current = (MethodDescriptor.Marshaller) CACHE.putIfAbsent(clazz, result); return current == null ? result : current; } catch (ReflectiveOperationException e) {