You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tz...@apache.org on 2021/02/25 02:27:41 UTC
[flink-statefun] branch master updated (21fd255 -> ed73ce7)
This is an automated email from the ASF dual-hosted git repository.
tzulitai pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink-statefun.git.
from 21fd255 [FLINK-21276] [legal] Mention Protobuf BSD license in statefun-sdk-java
add dfe5a58 [FLINK-21483] [build] Remove spotbugs plugin
add 1c40147 [FLINK-21491] Introduce statefun-shaded
new ed73ce7 [FLINK-21491] [sdk] Depend on statefun-protocol-shaded in Java SDK
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:
pom.xml | 31 +-----
statefun-sdk-java/pom.xml | 92 +----------------
.../flink/statefun/sdk/java/ApiExtension.java | 2 +-
.../apache/flink/statefun/sdk/java/TypeName.java | 2 +-
.../apache/flink/statefun/sdk/java/ValueSpec.java | 2 +-
.../handler/ConcurrentRequestReplyHandler.java | 2 +-
.../statefun/sdk/java/io/KafkaEgressMessage.java | 2 +-
.../statefun/sdk/java/io/KinesisEgressMessage.java | 2 +-
.../statefun/sdk/java/message/MessageBuilder.java | 2 +-
.../statefun/sdk/java/slice/ByteStringSlice.java | 2 +-
.../statefun/sdk/java/slice/SliceProtobufUtil.java | 10 +-
.../flink/statefun/sdk/java/slice/Slices.java | 4 +-
.../storage/ConcurrentAddressScopedStorage.java | 2 +-
.../flink/statefun/sdk/java/types/Types.java | 8 +-
.../sdk/java/slice/SliceProtobufUtilTest.java | 2 +-
.../ConcurrentAddressScopedStorageTest.java | 2 +-
.../sdk/java/storage/StateValueContextsTest.java | 2 +-
.../sdk/java/types/SanityPrimitiveTypeTest.java | 2 +-
statefun-shaded/pom.xml | 96 ++++++++++++++++++
statefun-shaded/statefun-protobuf-shaded/pom.xml | 109 +++++++++++++++++++++
.../com/google/protobuf/MoreByteStrings.java | 2 +-
.../statefun-protocol-shaded}/pom.xml | 81 ++++++++-------
tools/maven/spotbugs-exclude.xml | 108 --------------------
23 files changed, 281 insertions(+), 286 deletions(-)
create mode 100644 statefun-shaded/pom.xml
create mode 100644 statefun-shaded/statefun-protobuf-shaded/pom.xml
rename {statefun-sdk-java/src/main/java => statefun-shaded/statefun-protobuf-shaded/src/main/java/org/apache/flink/statefun/sdk/shaded}/com/google/protobuf/MoreByteStrings.java (95%)
copy {statefun-flink/statefun-flink-io => statefun-shaded/statefun-protocol-shaded}/pom.xml (62%)
delete mode 100644 tools/maven/spotbugs-exclude.xml
[flink-statefun] 01/01: [FLINK-21491] [sdk] Depend on
statefun-protocol-shaded in Java SDK
Posted by tz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tzulitai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-statefun.git
commit ed73ce72652366b37c2cbfd23c949612a40dcb6c
Author: Tzu-Li (Gordon) Tai <tz...@apache.org>
AuthorDate: Thu Feb 25 00:21:05 2021 +0800
[FLINK-21491] [sdk] Depend on statefun-protocol-shaded in Java SDK
This closes #202.
---
statefun-sdk-java/pom.xml | 92 +---------------------
.../java/com/google/protobuf/MoreByteStrings.java | 39 ---------
.../flink/statefun/sdk/java/ApiExtension.java | 2 +-
.../apache/flink/statefun/sdk/java/TypeName.java | 2 +-
.../apache/flink/statefun/sdk/java/ValueSpec.java | 2 +-
.../handler/ConcurrentRequestReplyHandler.java | 2 +-
.../statefun/sdk/java/io/KafkaEgressMessage.java | 2 +-
.../statefun/sdk/java/io/KinesisEgressMessage.java | 2 +-
.../statefun/sdk/java/message/MessageBuilder.java | 2 +-
.../statefun/sdk/java/slice/ByteStringSlice.java | 2 +-
.../statefun/sdk/java/slice/SliceProtobufUtil.java | 10 +--
.../flink/statefun/sdk/java/slice/Slices.java | 4 +-
.../storage/ConcurrentAddressScopedStorage.java | 2 +-
.../flink/statefun/sdk/java/types/Types.java | 8 +-
.../sdk/java/slice/SliceProtobufUtilTest.java | 2 +-
.../ConcurrentAddressScopedStorageTest.java | 2 +-
.../sdk/java/storage/StateValueContextsTest.java | 2 +-
.../sdk/java/types/SanityPrimitiveTypeTest.java | 2 +-
18 files changed, 28 insertions(+), 151 deletions(-)
diff --git a/statefun-sdk-java/pom.xml b/statefun-sdk-java/pom.xml
index f58829a..e621e2c 100644
--- a/statefun-sdk-java/pom.xml
+++ b/statefun-sdk-java/pom.xml
@@ -31,14 +31,10 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>statefun-sdk-protos</artifactId>
+ <artifactId>statefun-protocol-shaded</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>com.google.protobuf</groupId>
- <artifactId>protobuf-java</artifactId>
- <version>${protobuf.version}</version>
- </dependency>
+
<!-- test dependencies -->
<dependency>
<groupId>junit</groupId>
@@ -53,101 +49,21 @@ under the License.
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
- <!--
- The following plugin is executed in the generated-sources phase,
- and is responsible to extract the additional *.proto files located
- at statefun-sdk-protos.jar.
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.flink</groupId>
- <artifactId>statefun-sdk-protos</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <outputDirectory>${additional-sources.dir}</outputDirectory>
- <includes>sdk/*.proto,types/*.proto,io/*.proto</includes>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!--
- The following plugin invokes protoc to generate Java classes out of the *.proto
- definitions located at: (1) src/main/protobuf (2) ${additional-sources.dir}.
- -->
- <plugin>
- <groupId>com.github.os72</groupId>
- <artifactId>protoc-jar-maven-plugin</artifactId>
- <version>${protoc-jar-maven-plugin.version}</version>
- <executions>
- <execution>
- <id>generate-protobuf-sources</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <includeStdTypes>true</includeStdTypes>
- <protocVersion>${protobuf.version}</protocVersion>
- <cleanOutputFolder>true</cleanOutputFolder>
- <inputDirectories>
- <inputDirectory>src/main/protobuf</inputDirectory>
- <inputDirectory>${additional-sources.dir}</inputDirectory>
- </inputDirectories>
- <outputDirectory>${basedir}/target/generated-sources/protoc-jar</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <!--
- The following plugin will shade com.google.protobuf under org.apache.flink.statefun.sdk.shaded.
- -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
- <id>shade-protobuf</id>
+ <id>uber-jar</id>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
- <artifactSet>
- <includes combine.children="append">
- <include>com.google.protobuf:protobuf-java</include>
- </includes>
- </artifactSet>
- <relocations combine.children="append">
- <relocation>
- <pattern>com.google.protobuf</pattern>
- <shadedPattern>org.apache.flink.statefun.sdk.shaded.com.google.protobuf
- </shadedPattern>
- </relocation>
- </relocations>
- <filters>
- <filter>
- <artifact>com.google.protobuf:protobuf-java</artifact>
- <excludes>
- <exclude>google/**</exclude>
- </excludes>
- </filter>
- </filters>
</configuration>
</execution>
</executions>
diff --git a/statefun-sdk-java/src/main/java/com/google/protobuf/MoreByteStrings.java b/statefun-sdk-java/src/main/java/com/google/protobuf/MoreByteStrings.java
deleted file mode 100644
index 9c4269e..0000000
--- a/statefun-sdk-java/src/main/java/com/google/protobuf/MoreByteStrings.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.protobuf;
-
-import java.nio.ByteBuffer;
-
-public class MoreByteStrings {
-
- public static ByteString wrap(byte[] bytes) {
- return ByteString.wrap(bytes);
- }
-
- public static ByteString wrap(byte[] bytes, int offset, int len) {
- return ByteString.wrap(bytes, offset, len);
- }
-
- public static ByteString wrap(ByteBuffer buffer) {
- return ByteString.wrap(buffer);
- }
-
- public static ByteString concat(ByteString first, ByteString second) {
- return first.concat(second);
- }
-}
diff --git a/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/ApiExtension.java b/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/ApiExtension.java
index 2d4ebe4..8009b55 100644
--- a/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/ApiExtension.java
+++ b/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/ApiExtension.java
@@ -18,8 +18,8 @@
package org.apache.flink.statefun.sdk.java;
-import com.google.protobuf.ByteString;
import org.apache.flink.statefun.sdk.java.annotations.Internal;
+import org.apache.flink.statefun.sdk.shaded.com.google.protobuf.ByteString;
@Internal
public final class ApiExtension {
diff --git a/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/TypeName.java b/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/TypeName.java
index ff7fde5..c30bc83 100644
--- a/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/TypeName.java
+++ b/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/TypeName.java
@@ -17,9 +17,9 @@
*/
package org.apache.flink.statefun.sdk.java;
-import com.google.protobuf.ByteString;
import java.io.Serializable;
import java.util.Objects;
+import org.apache.flink.statefun.sdk.shaded.com.google.protobuf.ByteString;
/**
* This class represents the type of a {@code StatefulFunction}, consisting of a namespace of the
diff --git a/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/ValueSpec.java b/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/ValueSpec.java
index d62d2b7..5665b39 100644
--- a/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/ValueSpec.java
+++ b/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/ValueSpec.java
@@ -18,11 +18,11 @@
package org.apache.flink.statefun.sdk.java;
-import com.google.protobuf.ByteString;
import java.time.Duration;
import java.util.Objects;
import org.apache.flink.statefun.sdk.java.types.Type;
import org.apache.flink.statefun.sdk.java.types.Types;
+import org.apache.flink.statefun.sdk.shaded.com.google.protobuf.ByteString;
public final class ValueSpec<T> {
diff --git a/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/handler/ConcurrentRequestReplyHandler.java b/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/handler/ConcurrentRequestReplyHandler.java
index 7397525..80dc3ad 100644
--- a/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/handler/ConcurrentRequestReplyHandler.java
+++ b/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/handler/ConcurrentRequestReplyHandler.java
@@ -20,7 +20,6 @@ package org.apache.flink.statefun.sdk.java.handler;
import static org.apache.flink.statefun.sdk.java.handler.MoreFutures.applySequentially;
import static org.apache.flink.statefun.sdk.java.handler.ProtoUtils.sdkAddressFromProto;
-import com.google.protobuf.ByteString;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -40,6 +39,7 @@ import org.apache.flink.statefun.sdk.java.storage.StateValueContexts;
import org.apache.flink.statefun.sdk.reqreply.generated.FromFunction;
import org.apache.flink.statefun.sdk.reqreply.generated.ToFunction;
import org.apache.flink.statefun.sdk.reqreply.generated.TypedValue;
+import org.apache.flink.statefun.sdk.shaded.com.google.protobuf.ByteString;
/**
* A threadsafe {@linkplain RequestReplyHandler}. This handler lifecycle is bound to the entire
diff --git a/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/io/KafkaEgressMessage.java b/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/io/KafkaEgressMessage.java
index c55b582..9debb30 100644
--- a/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/io/KafkaEgressMessage.java
+++ b/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/io/KafkaEgressMessage.java
@@ -17,7 +17,6 @@
*/
package org.apache.flink.statefun.sdk.java.io;
-import com.google.protobuf.ByteString;
import java.util.Objects;
import org.apache.flink.statefun.sdk.egress.generated.KafkaProducerRecord;
import org.apache.flink.statefun.sdk.java.ApiExtension;
@@ -29,6 +28,7 @@ import org.apache.flink.statefun.sdk.java.slice.SliceProtobufUtil;
import org.apache.flink.statefun.sdk.java.types.Type;
import org.apache.flink.statefun.sdk.java.types.TypeSerializer;
import org.apache.flink.statefun.sdk.reqreply.generated.TypedValue;
+import org.apache.flink.statefun.sdk.shaded.com.google.protobuf.ByteString;
public final class KafkaEgressMessage {
diff --git a/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/io/KinesisEgressMessage.java b/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/io/KinesisEgressMessage.java
index 000bb59..e9faf65 100644
--- a/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/io/KinesisEgressMessage.java
+++ b/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/io/KinesisEgressMessage.java
@@ -17,7 +17,6 @@
*/
package org.apache.flink.statefun.sdk.java.io;
-import com.google.protobuf.ByteString;
import java.util.Objects;
import org.apache.flink.statefun.sdk.egress.generated.KinesisEgressRecord;
import org.apache.flink.statefun.sdk.java.ApiExtension;
@@ -29,6 +28,7 @@ import org.apache.flink.statefun.sdk.java.slice.SliceProtobufUtil;
import org.apache.flink.statefun.sdk.java.types.Type;
import org.apache.flink.statefun.sdk.java.types.TypeSerializer;
import org.apache.flink.statefun.sdk.reqreply.generated.TypedValue;
+import org.apache.flink.statefun.sdk.shaded.com.google.protobuf.ByteString;
public final class KinesisEgressMessage {
diff --git a/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/message/MessageBuilder.java b/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/message/MessageBuilder.java
index cd9f738..4a24957 100644
--- a/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/message/MessageBuilder.java
+++ b/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/message/MessageBuilder.java
@@ -17,7 +17,6 @@
*/
package org.apache.flink.statefun.sdk.java.message;
-import com.google.protobuf.ByteString;
import java.util.Objects;
import org.apache.flink.statefun.sdk.java.Address;
import org.apache.flink.statefun.sdk.java.ApiExtension;
@@ -28,6 +27,7 @@ import org.apache.flink.statefun.sdk.java.types.Type;
import org.apache.flink.statefun.sdk.java.types.TypeSerializer;
import org.apache.flink.statefun.sdk.java.types.Types;
import org.apache.flink.statefun.sdk.reqreply.generated.TypedValue;
+import org.apache.flink.statefun.sdk.shaded.com.google.protobuf.ByteString;
public final class MessageBuilder {
private final TypedValue.Builder builder;
diff --git a/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/slice/ByteStringSlice.java b/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/slice/ByteStringSlice.java
index c28aa58..63bb46f 100644
--- a/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/slice/ByteStringSlice.java
+++ b/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/slice/ByteStringSlice.java
@@ -17,11 +17,11 @@
*/
package org.apache.flink.statefun.sdk.java.slice;
-import com.google.protobuf.ByteString;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.ByteBuffer;
import java.util.Objects;
+import org.apache.flink.statefun.sdk.shaded.com.google.protobuf.ByteString;
final class ByteStringSlice implements Slice {
private final ByteString byteString;
diff --git a/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/slice/SliceProtobufUtil.java b/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/slice/SliceProtobufUtil.java
index 2a87b5b..8cfa0ed 100644
--- a/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/slice/SliceProtobufUtil.java
+++ b/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/slice/SliceProtobufUtil.java
@@ -17,12 +17,12 @@
*/
package org.apache.flink.statefun.sdk.java.slice;
-import com.google.protobuf.ByteString;
-import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.Message;
-import com.google.protobuf.MoreByteStrings;
-import com.google.protobuf.Parser;
import org.apache.flink.statefun.sdk.java.annotations.Internal;
+import org.apache.flink.statefun.sdk.shaded.com.google.protobuf.ByteString;
+import org.apache.flink.statefun.sdk.shaded.com.google.protobuf.InvalidProtocolBufferException;
+import org.apache.flink.statefun.sdk.shaded.com.google.protobuf.Message;
+import org.apache.flink.statefun.sdk.shaded.com.google.protobuf.MoreByteStrings;
+import org.apache.flink.statefun.sdk.shaded.com.google.protobuf.Parser;
@Internal
public final class SliceProtobufUtil {
diff --git a/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/slice/Slices.java b/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/slice/Slices.java
index 7f42291..dcfee2a 100644
--- a/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/slice/Slices.java
+++ b/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/slice/Slices.java
@@ -17,10 +17,10 @@
*/
package org.apache.flink.statefun.sdk.java.slice;
-import com.google.protobuf.ByteString;
-import com.google.protobuf.MoreByteStrings;
import java.io.InputStream;
import java.nio.ByteBuffer;
+import org.apache.flink.statefun.sdk.shaded.com.google.protobuf.ByteString;
+import org.apache.flink.statefun.sdk.shaded.com.google.protobuf.MoreByteStrings;
public final class Slices {
private Slices() {}
diff --git a/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/storage/ConcurrentAddressScopedStorage.java b/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/storage/ConcurrentAddressScopedStorage.java
index d692c13..181ec4e 100644
--- a/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/storage/ConcurrentAddressScopedStorage.java
+++ b/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/storage/ConcurrentAddressScopedStorage.java
@@ -20,7 +20,6 @@ package org.apache.flink.statefun.sdk.java.storage;
import static org.apache.flink.statefun.sdk.java.storage.StateValueContexts.StateValueContext;
-import com.google.protobuf.ByteString;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@@ -37,6 +36,7 @@ import org.apache.flink.statefun.sdk.java.types.TypeSerializer;
import org.apache.flink.statefun.sdk.reqreply.generated.FromFunction;
import org.apache.flink.statefun.sdk.reqreply.generated.FromFunction.PersistedValueMutation;
import org.apache.flink.statefun.sdk.reqreply.generated.TypedValue;
+import org.apache.flink.statefun.sdk.shaded.com.google.protobuf.ByteString;
@Internal
public final class ConcurrentAddressScopedStorage implements AddressScopedStorage {
diff --git a/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/types/Types.java b/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/types/Types.java
index daa4fbf..8c68954 100644
--- a/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/types/Types.java
+++ b/statefun-sdk-java/src/main/java/org/apache/flink/statefun/sdk/java/types/Types.java
@@ -20,10 +20,6 @@ package org.apache.flink.statefun.sdk.java.types;
import static org.apache.flink.statefun.sdk.java.slice.SliceProtobufUtil.parseFrom;
import static org.apache.flink.statefun.sdk.java.slice.SliceProtobufUtil.toSlice;
-import com.google.protobuf.ByteString;
-import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.MoreByteStrings;
-import com.google.protobuf.WireFormat;
import java.util.Collections;
import java.util.EnumSet;
import java.util.Set;
@@ -31,6 +27,10 @@ import org.apache.flink.statefun.sdk.java.TypeName;
import org.apache.flink.statefun.sdk.java.slice.Slice;
import org.apache.flink.statefun.sdk.java.slice.SliceProtobufUtil;
import org.apache.flink.statefun.sdk.java.slice.Slices;
+import org.apache.flink.statefun.sdk.shaded.com.google.protobuf.ByteString;
+import org.apache.flink.statefun.sdk.shaded.com.google.protobuf.InvalidProtocolBufferException;
+import org.apache.flink.statefun.sdk.shaded.com.google.protobuf.MoreByteStrings;
+import org.apache.flink.statefun.sdk.shaded.com.google.protobuf.WireFormat;
import org.apache.flink.statefun.sdk.types.generated.BooleanWrapper;
import org.apache.flink.statefun.sdk.types.generated.DoubleWrapper;
import org.apache.flink.statefun.sdk.types.generated.FloatWrapper;
diff --git a/statefun-sdk-java/src/test/java/org/apache/flink/statefun/sdk/java/slice/SliceProtobufUtilTest.java b/statefun-sdk-java/src/test/java/org/apache/flink/statefun/sdk/java/slice/SliceProtobufUtilTest.java
index 85f21c2..dcb4f5c 100644
--- a/statefun-sdk-java/src/test/java/org/apache/flink/statefun/sdk/java/slice/SliceProtobufUtilTest.java
+++ b/statefun-sdk-java/src/test/java/org/apache/flink/statefun/sdk/java/slice/SliceProtobufUtilTest.java
@@ -19,7 +19,7 @@ package org.apache.flink.statefun.sdk.java.slice;
import static org.junit.Assert.assertSame;
-import com.google.protobuf.ByteString;
+import org.apache.flink.statefun.sdk.shaded.com.google.protobuf.ByteString;
import org.junit.Test;
public class SliceProtobufUtilTest {
diff --git a/statefun-sdk-java/src/test/java/org/apache/flink/statefun/sdk/java/storage/ConcurrentAddressScopedStorageTest.java b/statefun-sdk-java/src/test/java/org/apache/flink/statefun/sdk/java/storage/ConcurrentAddressScopedStorageTest.java
index 0afaa02..15fe136 100644
--- a/statefun-sdk-java/src/test/java/org/apache/flink/statefun/sdk/java/storage/ConcurrentAddressScopedStorageTest.java
+++ b/statefun-sdk-java/src/test/java/org/apache/flink/statefun/sdk/java/storage/ConcurrentAddressScopedStorageTest.java
@@ -22,7 +22,6 @@ import static org.apache.flink.statefun.sdk.java.storage.StateValueContexts.Stat
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
-import com.google.protobuf.ByteString;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -32,6 +31,7 @@ import org.apache.flink.statefun.sdk.java.ValueSpec;
import org.apache.flink.statefun.sdk.java.types.Type;
import org.apache.flink.statefun.sdk.reqreply.generated.ToFunction;
import org.apache.flink.statefun.sdk.reqreply.generated.TypedValue;
+import org.apache.flink.statefun.sdk.shaded.com.google.protobuf.ByteString;
import org.junit.Test;
public class ConcurrentAddressScopedStorageTest {
diff --git a/statefun-sdk-java/src/test/java/org/apache/flink/statefun/sdk/java/storage/StateValueContextsTest.java b/statefun-sdk-java/src/test/java/org/apache/flink/statefun/sdk/java/storage/StateValueContextsTest.java
index a9c3902..2aa178a 100644
--- a/statefun-sdk-java/src/test/java/org/apache/flink/statefun/sdk/java/storage/StateValueContextsTest.java
+++ b/statefun-sdk-java/src/test/java/org/apache/flink/statefun/sdk/java/storage/StateValueContextsTest.java
@@ -23,7 +23,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.Is.is;
import static org.hamcrest.core.IsCollectionContaining.hasItem;
-import com.google.protobuf.ByteString;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -34,6 +33,7 @@ import org.apache.flink.statefun.sdk.java.types.Type;
import org.apache.flink.statefun.sdk.java.types.Types;
import org.apache.flink.statefun.sdk.reqreply.generated.ToFunction;
import org.apache.flink.statefun.sdk.reqreply.generated.TypedValue;
+import org.apache.flink.statefun.sdk.shaded.com.google.protobuf.ByteString;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.hamcrest.Matchers;
diff --git a/statefun-sdk-java/src/test/java/org/apache/flink/statefun/sdk/java/types/SanityPrimitiveTypeTest.java b/statefun-sdk-java/src/test/java/org/apache/flink/statefun/sdk/java/types/SanityPrimitiveTypeTest.java
index 90f4ca1..73650e8 100644
--- a/statefun-sdk-java/src/test/java/org/apache/flink/statefun/sdk/java/types/SanityPrimitiveTypeTest.java
+++ b/statefun-sdk-java/src/test/java/org/apache/flink/statefun/sdk/java/types/SanityPrimitiveTypeTest.java
@@ -19,12 +19,12 @@ package org.apache.flink.statefun.sdk.java.types;
import static org.junit.Assert.assertEquals;
-import com.google.protobuf.InvalidProtocolBufferException;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.util.concurrent.ThreadLocalRandom;
import org.apache.flink.statefun.sdk.java.slice.Slice;
import org.apache.flink.statefun.sdk.java.slice.Slices;
+import org.apache.flink.statefun.sdk.shaded.com.google.protobuf.InvalidProtocolBufferException;
import org.apache.flink.statefun.sdk.types.generated.BooleanWrapper;
import org.apache.flink.statefun.sdk.types.generated.IntWrapper;
import org.apache.flink.statefun.sdk.types.generated.LongWrapper;