Merge pull request #1014: [proto] bump proto to 4.x

Author: je-ik

buildSrc/src/main/groovy/cz.o2.proxima.java-conventions.gradle

@@ -38,7 +38,7 @@ def junit4_version = "4.13.2"
 def lombok_version = "1.18.28"
 def log4j_version = "2.19.0"
 def mockito_version = "5.3.0"
-def protobuf_version = "3.25.5"
+def protobuf_version = "4.33.2"
 def scala_version = "2.12"
 def spark_version = "3.1.2"
 def slf4j_version = "2.0.7"

direct/io-cassandra/build.gradle

@@ -23,6 +23,7 @@ def cassandra_version = "4.18.1"
 dependencies {
   api project(':proxima-core')
   api project(':proxima-direct-core')
+  implementation "cz.o2.proxima:proxima-vendor:${project.version}"
   implementation project(path: ':proxima-io-serialization', configuration: "shadowJar")
   implementation libraries.slf4j_api;
   intoShadow "org.apache.cassandra:java-driver-core:${cassandra_version}"

direct/io-cassandra/src/main/java/cz/o2/proxima/direct/io/cassandra/CacheableCqlFactory.java

@@ -22,7 +22,7 @@
 import cz.o2.proxima.core.repository.EntityDescriptor;
 import cz.o2.proxima.core.storage.StreamElement;
 import cz.o2.proxima.core.storage.UriUtil;
-import cz.o2.proxima.io.serialization.shaded.com.google.common.base.Strings;
+import cz.o2.proxima.internal.com.google.common.base.Strings;
 import java.net.URI;
 import java.util.Collections;
 import java.util.LinkedHashMap;

direct/io-cassandra/src/main/java/cz/o2/proxima/direct/io/cassandra/CassandraDBAccessor.java

@@ -37,9 +37,9 @@
 import cz.o2.proxima.direct.core.batch.BatchLogReader;
 import cz.o2.proxima.direct.core.batch.ObserveHandle;
 import cz.o2.proxima.direct.core.randomaccess.RandomAccessReader;
-import cz.o2.proxima.io.serialization.shaded.com.google.common.annotations.VisibleForTesting;
-import cz.o2.proxima.io.serialization.shaded.com.google.common.base.Preconditions;
-import cz.o2.proxima.io.serialization.shaded.com.google.common.base.Strings;
+import cz.o2.proxima.internal.com.google.common.annotations.VisibleForTesting;
+import cz.o2.proxima.internal.com.google.common.base.Preconditions;
+import cz.o2.proxima.internal.com.google.common.base.Strings;
 import java.io.ObjectStreamException;
 import java.net.InetSocketAddress;
 import java.net.URI;

direct/io-cassandra/src/main/java/cz/o2/proxima/direct/io/cassandra/DateToLongConverter.java

@@ -15,7 +15,7 @@
  */
 package cz.o2.proxima.direct.io.cassandra;
 
-import cz.o2.proxima.io.serialization.shaded.com.google.common.base.Strings;
+import cz.o2.proxima.internal.com.google.common.base.Strings;
 import java.util.Date;
 import javax.annotation.Nullable;
 import lombok.extern.slf4j.Slf4j;

direct/io-cassandra/src/main/java/cz/o2/proxima/direct/io/cassandra/DefaultCqlFactory.java

@@ -26,9 +26,9 @@
 import cz.o2.proxima.core.storage.StreamElement;
 import cz.o2.proxima.direct.core.randomaccess.KeyValue;
 import cz.o2.proxima.direct.core.randomaccess.RandomOffset;
+import cz.o2.proxima.internal.com.google.common.base.Preconditions;
 import cz.o2.proxima.io.serialization.proto.Serialization;
 import cz.o2.proxima.io.serialization.proto.Serialization.Cell;
-import cz.o2.proxima.io.serialization.shaded.com.google.common.base.Preconditions;
 import cz.o2.proxima.io.serialization.shaded.com.google.protobuf.ByteString;
 import java.io.IOException;
 import java.io.Serializable;

direct/io-cassandra/src/test/java/cz/o2/proxima/direct/io/cassandra/CassandraDBAccessorTest.java

@@ -45,7 +45,7 @@
 import cz.o2.proxima.direct.core.batch.ObserveHandle;
 import cz.o2.proxima.direct.core.randomaccess.KeyValue;
 import cz.o2.proxima.direct.core.randomaccess.RandomAccessReader;
-import cz.o2.proxima.io.serialization.shaded.com.google.common.collect.ImmutableMap;
+import cz.o2.proxima.internal.com.google.common.collect.ImmutableMap;
 import cz.o2.proxima.typesafe.config.ConfigFactory;
 import java.io.IOException;
 import java.net.InetSocketAddress;

direct/transaction-manager/src/test/java/cz/o2/proxima/direct/transaction/manager/TransactionLogObserverTest.java

@@ -17,7 +17,6 @@
 
 import static org.junit.Assert.*;
 
-import com.google.common.collect.ImmutableMap;
 import cz.o2.proxima.core.repository.EntityAwareAttributeDescriptor.Wildcard;
 import cz.o2.proxima.core.repository.EntityDescriptor;
 import cz.o2.proxima.core.repository.Repository;
@@ -32,6 +31,7 @@
 import cz.o2.proxima.direct.core.transaction.ClientTransactionManager;
 import cz.o2.proxima.direct.core.transaction.ServerTransactionManager;
 import cz.o2.proxima.direct.core.transaction.TransactionResourceManager;
+import cz.o2.proxima.internal.com.google.common.collect.ImmutableMap;
 import cz.o2.proxima.internal.com.google.common.collect.Iterables;
 import cz.o2.proxima.internal.com.google.common.collect.Lists;
 import cz.o2.proxima.internal.com.google.common.collect.Sets;

scheme/proto/src/test/java/cz/o2/proxima/scheme/proto/ProtoSerializerFactoryTest.java

@@ -17,7 +17,6 @@
 
 import static org.junit.Assert.*;
 
-import com.google.common.collect.Iterables;
 import com.google.protobuf.ByteString;
 import cz.o2.proxima.core.repository.AttributeDescriptor;
 import cz.o2.proxima.core.repository.EntityAwareAttributeDescriptor.Wildcard;
@@ -41,6 +40,7 @@
 import cz.o2.proxima.core.util.Optionals;
 import cz.o2.proxima.core.util.Pair;
 import cz.o2.proxima.internal.com.google.common.collect.ImmutableMap;
+import cz.o2.proxima.internal.com.google.common.collect.Iterables;
 import cz.o2.proxima.internal.com.google.common.collect.Sets;
 import cz.o2.proxima.scheme.proto.ProtoSerializerFactory.TransactionProtoSerializer;
 import cz.o2.proxima.scheme.proto.test.Scheme.Event;