Merge branch 'master' of github.com:redisson/redisson

redisson/pom.xml

@@ -439,14 +439,14 @@
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java</artifactId>
-            <version>4.27.5</version>
+            <version>4.29.3</version>
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java-util</artifactId>
-            <version>4.28.3</version>
+            <version>4.29.3</version>
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>

redisson/src/main/java/org/redisson/RedissonBitSet.java

@@ -278,6 +278,24 @@ public class RedissonBitSet extends RedissonExpirable implements RBitSet {
         return commandExecutor.readAsync(getRawName(), LongCodec.INSTANCE, RedisCommands.GETBIT, getRawName(), bitIndex);
     }
 
+    @Override
+    public boolean[] get(long... bitIndexes) {
+        return get(getAsync(bitIndexes));
+    }
+
+    @Override
+    public RFuture<boolean[]> getAsync(long... bitIndexes) {
+        Object[] indexes = new Object[bitIndexes.length * 3 + 1];
+        int j = 0;
+        indexes[j++] = getRawName();
+        for (long l : bitIndexes) {
+            indexes[j++] = "get";
+            indexes[j++] = "u1";
+            indexes[j++] = l;
+        }
+        return commandExecutor.readAsync(getRawName(), LongCodec.INSTANCE, RedisCommands.BITFIELD_BOOLEANS, indexes);
+    }
+
     @Override
     public boolean set(long bitIndex) {
         return get(setAsync(bitIndex, true));

redisson/src/main/java/org/redisson/RedissonBlockingDeque.java

@@ -151,6 +151,11 @@ public class RedissonBlockingDeque<V> extends RedissonDeque<V> implements RBlock
         return blockingQueue.pollLastFromAny(duration, count, queueNames);
     }
 
+    @Override
+    public Entry<String, V> pollLastFromAnyWithName(Duration duration, String... queueNames) throws InterruptedException {
+        return blockingQueue.pollLastFromAnyWithName(duration, queueNames);
+    }
+
     @Override
     public RFuture<Map<String, List<V>>> pollFirstFromAnyAsync(Duration duration, int count, String... queueNames) {
         return blockingQueue.pollFirstFromAnyAsync(duration, count, queueNames);
@@ -161,6 +166,11 @@ public class RedissonBlockingDeque<V> extends RedissonDeque<V> implements RBlock
         return blockingQueue.pollLastFromAnyAsync(duration, count, queueNames);
     }
 
+    @Override
+    public RFuture<Entry<String, V>> pollLastFromAnyWithNameAsync(Duration duration, String... queueNames) {
+        return blockingQueue.pollLastFromAnyWithNameAsync(duration, queueNames);
+    }
+
     @Override
     public V takeLastAndOfferFirstTo(String queueName) throws InterruptedException {
         return commandExecutor.getInterrupted(takeLastAndOfferFirstToAsync(queueName));

redisson/src/main/java/org/redisson/RedissonBlockingQueue.java

@@ -183,6 +183,20 @@ public class RedissonBlockingQueue<V> extends RedissonQueue<V> implements RBlock
         return commandExecutor.writeAsync(getRawName(), codec, RedisCommands.BLMPOP, params.toArray());
     }
 
+    @Override
+    public Entry<String, V> pollLastFromAnyWithName(Duration duration, String... queueNames) throws InterruptedException {
+        return commandExecutor.getInterrupted(pollLastFromAnyWithNameAsync(duration, queueNames));
+    }
+
+    @Override
+    public RFuture<Entry<String, V>> pollLastFromAnyWithNameAsync(Duration timeout, String... queueNames) {
+        if (timeout.toMillis() < 0) {
+            return new CompletableFutureWrapper<>((Entry) null);
+        }
+        return commandExecutor.pollFromAnyAsync(getRawName(), codec, RedisCommands.BRPOP_NAME,
+                toSeconds(timeout.toMillis(), TimeUnit.MILLISECONDS), queueNames);
+    }
+
     @Override
     public RFuture<V> pollLastAndOfferFirstToAsync(String queueName, long timeout, TimeUnit unit) {
         if (timeout < 0) {

redisson/src/main/java/org/redisson/RedissonBoundedBlockingQueue.java

@@ -235,6 +235,17 @@ public class RedissonBoundedBlockingQueue<V> extends RedissonQueue<V> implements
         return wrapTakeFuture(takeFuture);
     }
 
+    @Override
+    public Entry<String, V> pollLastFromAnyWithName(Duration timeout, String... queueNames) throws InterruptedException {
+        return commandExecutor.getInterrupted(pollLastFromAnyWithNameAsync(timeout, queueNames));
+    }
+
+    @Override
+    public RFuture<Entry<String, V>> pollLastFromAnyWithNameAsync(Duration timeout, String... queueNames) {
+        RFuture<Entry<String, V>> takeFuture = blockingQueue.pollLastFromAnyWithNameAsync(timeout, queueNames);
+        return wrapTakeFuture(takeFuture);
+    }
+
     @Override
     public Map<String, List<V>> pollFirstFromAny(Duration duration, int count, String... queueNames) {
         return get(pollFirstFromAnyAsync(duration, count, queueNames));

redisson/src/main/java/org/redisson/RedissonPriorityBlockingDeque.java

@@ -101,6 +101,16 @@ public class RedissonPriorityBlockingDeque<V> extends RedissonPriorityDeque<V> i
         throw new UnsupportedOperationException("use poll method");
     }
 
+    @Override
+    public Entry<String, V> pollLastFromAnyWithName(Duration timeout, String... queueNames) throws InterruptedException {
+        throw new UnsupportedOperationException("use poll method");
+    }
+
+    @Override
+    public RFuture<Entry<String, V>> pollLastFromAnyWithNameAsync(Duration timeout, String... queueNames) {
+        throw new UnsupportedOperationException("use poll method");
+    }
+
     @Override
     public Map<String, List<V>> pollFirstFromAny(Duration duration, int count, String... queueNames) throws InterruptedException {
         throw new UnsupportedOperationException("use poll method");

redisson/src/main/java/org/redisson/RedissonPriorityBlockingQueue.java

@@ -156,6 +156,11 @@ public class RedissonPriorityBlockingQueue<V> extends RedissonPriorityQueue<V> i
         throw new UnsupportedOperationException("use poll method");
     }
 
+    @Override
+    public Entry<String, V> pollLastFromAnyWithName(Duration timeout, String... queueNames) throws InterruptedException {
+        throw new UnsupportedOperationException("use poll method");
+    }
+
     @Override
     public RFuture<Map<String, List<V>>> pollFirstFromAnyAsync(Duration duration, int count, String... queueNames) {
         throw new UnsupportedOperationException("use poll method");
@@ -291,6 +296,11 @@ public class RedissonPriorityBlockingQueue<V> extends RedissonPriorityQueue<V> i
         throw new UnsupportedOperationException("use poll method");
     }
 
+    @Override
+    public RFuture<Entry<String, V>> pollLastFromAnyWithNameAsync(Duration timeout, String... queueNames) {
+        throw new UnsupportedOperationException("use poll method");
+    }
+
     @Override
     public RFuture<Void> putAsync(V e) {
         throw new UnsupportedOperationException("use add method");

redisson/src/main/java/org/redisson/RedissonTransferQueue.java

@@ -611,6 +611,16 @@ public class RedissonTransferQueue<V> extends RedissonExpirable implements RTran
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public Entry<String, V> pollLastFromAnyWithName(Duration timeout, String... queueNames) throws InterruptedException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public RFuture<Entry<String, V>> pollLastFromAnyWithNameAsync(Duration timeout, String... queueNames) {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public Map<String, List<V>> pollFirstFromAny(Duration duration, int count, String... queueNames) throws InterruptedException {
         throw new UnsupportedOperationException();

redisson/src/main/java/org/redisson/api/RBitSet.java

@@ -276,6 +276,14 @@ public interface RBitSet extends RExpirable, RBitSetAsync {
      */
     boolean get(long bitIndex);
     
+    /**
+     * Returns a boolean array where each element of the array corresponds to the query result of the input parameters.
+     *
+     * @param bitIndexes indexes of bit
+     * @return Returns a boolean array where each element of the array corresponds to the query result of the input parameters.
+     */
+    boolean[] get(long... bitIndexes);
+
     /**
      * Set bit to one at specified bitIndex
      * 

redisson/src/main/java/org/redisson/api/RBitSetAsync.java

@@ -275,6 +275,14 @@ public interface RBitSetAsync extends RExpirableAsync {
      */
     RFuture<Boolean> getAsync(long bitIndex);
     
+    /**
+     * Returns a boolean array where each element of the array corresponds to the query result of the input parameters.
+     *
+     * @param bitIndexes indexes of bit
+     * @return Returns a boolean array where each element of the array corresponds to the query result of the input parameters.
+     */
+    RFuture<boolean[]> getAsync(long... bitIndexes);
+
     /**
      * Set bit to one at specified bitIndex
      *

redisson/src/main/java/org/redisson/api/RBitSetReactive.java

@@ -277,6 +277,14 @@ public interface RBitSetReactive extends RExpirableReactive {
      */
     Mono<Boolean> get(long bitIndex);
     
+    /**
+     * Returns a boolean array where each element of the array corresponds to the query result of the input parameters.
+     *
+     * @param bitIndexes indexes of bit
+     * @return Returns a boolean array where each element of the array corresponds to the query result of the input parameters.
+     */
+    Mono<boolean[]> get(long... bitIndexes);
+
     /**
      * Set bit to one at specified bitIndex
      * 

redisson/src/main/java/org/redisson/api/RBitSetRx.java

@@ -279,6 +279,14 @@ public interface RBitSetRx extends RExpirableRx {
      */
     Single<Boolean> get(long bitIndex);
     
+    /**
+     * Returns a boolean array where each element of the array corresponds to the query result of the input parameters.
+     *
+     * @param bitIndexes indexes of bit
+     * @return Returns a boolean array where each element of the array corresponds to the query result of the input parameters.
+     */
+    Single<boolean[]> get(long... bitIndexes);
+
     /**
      * Set bit to one at specified bitIndex
      * 

redisson/src/main/java/org/redisson/api/RBlockingQueue.java

@@ -92,6 +92,20 @@ public interface RBlockingQueue<V> extends BlockingQueue<V>, RQueue<V>, RBlockin
      */
     Map<String, List<V>> pollLastFromAny(Duration duration, int count, String... queueNames) throws InterruptedException;
 
+    /**
+     * Retrieves and removes first available tail element of <b>any</b> queue,
+     * waiting up to the specified wait time if necessary for an element to become available
+     * in any of defined queues <b>including</b> queue itself.
+     *
+     * @param queueNames queue names. Queue name itself is always included
+     * @param timeout how long to wait before giving up, in units of
+     *        {@code unit}
+     * @return the tail of this queue, or {@code null} if the
+     *         specified waiting time elapses before an element is available
+     * @throws InterruptedException if interrupted while waiting
+     */
+    Entry<String, V> pollLastFromAnyWithName(Duration timeout, String... queueNames) throws InterruptedException;
+
     /**
      * Retrieves and removes last available tail element of this queue and adds it at the head of <code>queueName</code>,
      * waiting up to the specified wait time if necessary for an element to become available.

redisson/src/main/java/org/redisson/api/RBlockingQueueAsync.java

@@ -87,6 +87,18 @@ public interface RBlockingQueueAsync<V> extends RQueueAsync<V> {
      */
     RFuture<Map<String, List<V>>> pollLastFromAnyAsync(Duration duration, int count, String... queueNames);
 
+    /**
+     * Retrieves and removes first available tail element of <b>any</b> queue in async mode,
+     * waiting up to the specified wait time if necessary for an element to become available
+     * in any of defined queues <b>including</b> queue itself.
+     *
+     * @param queueNames - queue names. Queue name itself is always included
+     * @param timeout    how long to wait before giving up
+     * @return Future object with the tail of this queue, or {@code null} if the
+     * specified waiting time elapses before an element is available
+     */
+    RFuture<Entry<String, V>> pollLastFromAnyWithNameAsync(Duration timeout, String... queueNames);
+
     /**
      * Removes at most the given number of available elements from
      * this queue and adds them to the given collection in async mode.  A failure

redisson/src/main/java/org/redisson/api/RBlockingQueueReactive.java

@@ -61,6 +61,21 @@ public interface RBlockingQueueReactive<V> extends RQueueReactive<V> {
      */
     Mono<Entry<String, V>> pollFromAnyWithName(Duration timeout, String... queueNames);
 
+    /**
+     * Retrieves and removes first available tail element of <b>any</b> queue,
+     * waiting up to the specified wait time if necessary for an element to become available
+     * in any of defined queues <b>including</b> queue itself.
+     *
+     * @param queueNames queue names. Queue name itself is always included
+     * @param timeout how long to wait before giving up, in units of
+     *        {@code unit}
+     * @return the tail of this queue, or {@code null} if the
+     *         specified waiting time elapses before an element is available
+     * @throws InterruptedException if interrupted while waiting
+     */
+    Mono<Entry<String, V>> pollLastFromAnyWithName(Duration timeout, String... queueNames);
+
+
     /**
      * Retrieves and removes first available head elements of <b>any</b> queue,
      * waiting up to the specified wait time if necessary for an element to become available

redisson/src/main/java/org/redisson/api/RBlockingQueueRx.java

@@ -63,6 +63,20 @@ public interface RBlockingQueueRx<V> extends RQueueRx<V> {
      */
     Maybe<Entry<String, V>> pollFromAnyWithName(Duration timeout, String... queueNames) throws InterruptedException;
 
+    /**
+     * Retrieves and removes first available tail element of <b>any</b> queue,
+     * waiting up to the specified wait time if necessary for an element to become available
+     * in any of defined queues <b>including</b> queue itself.
+     *
+     * @param queueNames queue names. Queue name itself is always included
+     * @param timeout how long to wait before giving up, in units of
+     *        {@code unit}
+     * @return the tail of this queue, or {@code null} if the
+     *         specified waiting time elapses before an element is available
+     * @throws InterruptedException if interrupted while waiting
+     */
+    Maybe<Entry<String, V>> pollLastFromAnyWithName(Duration timeout, String... queueNames) throws InterruptedException;
+
     /**
      * Retrieves and removes first available head elements of <b>any</b> queue,
      * waiting up to the specified wait time if necessary for an element to become available

redisson/src/main/java/org/redisson/client/protocol/RedisCommands.java

@@ -65,6 +65,9 @@ public interface RedisCommands {
                                                     new ListFirstObjectDecoder(), new ShortReplayConvertor());
     RedisStrictCommand<Void> BITFIELD_VOID = new RedisStrictCommand<>("BITFIELD", new VoidReplayConvertor());
     
+    RedisStrictCommand<boolean[]> BITFIELD_BOOLEANS = new RedisStrictCommand<>("BITFIELD", null,
+                                                    new ArrayBooleanDecoder(), new BooleanReplayConvertor());
+
     RedisStrictCommand<Boolean> GETBIT = new RedisStrictCommand<Boolean>("GETBIT", new BooleanReplayConvertor());
     RedisStrictCommand<Long> BITS_SIZE = new RedisStrictCommand<Long>("STRLEN", new BitsSizeReplayConvertor());
     RedisStrictCommand<Long> STRLEN = new RedisStrictCommand<Long>("STRLEN");
@@ -298,7 +301,7 @@ public interface RedisCommands {
     RedisCommand<Object> BZPOPMIN_VALUE = new RedisCommand<Object>("BZPOPMIN", new ScoredSortedSetPolledObjectDecoder());
     RedisCommand<Object> BZPOPMAX_VALUE = new RedisCommand<Object>("BZPOPMAX", new ScoredSortedSetPolledObjectDecoder());
 
-    RedisCommand<Map<String, List<Object>>> BLPOP_NAME = new RedisCommand<>("BLPOP",
+    RedisCommand<org.redisson.api.Entry<String, Object>> BLPOP_NAME = new RedisCommand<>("BLPOP",
                     new ListObjectDecoder(0) {
                         @Override
                         public Object decode(List parts, State state) {
@@ -309,6 +312,17 @@ public interface RedisCommands {
                         }
                     });
 
+    RedisCommand<org.redisson.api.Entry<String, Object>> BRPOP_NAME = new RedisCommand<>("BRPOP",
+            new ListObjectDecoder(0) {
+                @Override
+                public Object decode(List parts, State state) {
+                    if (parts.isEmpty()) {
+                        return null;
+                    }
+                    return new org.redisson.api.Entry<>(parts.get(0), parts.get(1));
+                }
+            });
+
     RedisCommand<Map<String, List<Object>>> BLMPOP = new RedisCommand<>("BLMPOP",
             new ListMultiDecoder2(
                     new ObjectDecoder(StringCodec.INSTANCE.getValueDecoder()) {

redisson/src/main/java/org/redisson/client/protocol/decoder/ArrayBooleanDecoder.java

@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) 2013-2024 Nikita Koksharov
+ *
+ * Licensed 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 org.redisson.client.protocol.decoder;
+
+import org.redisson.client.handler.State;
+
+import java.util.List;
+
+/**
+ *
+ * @author seakider
+ *
+ */
+public class ArrayBooleanDecoder implements MultiDecoder<boolean[]> {
+    
+    @Override
+    public boolean[] decode(List<Object> parts, State state) {
+        if (parts.isEmpty()) {
+            return new boolean[0];
+        }
+        
+        boolean[] result = new boolean[parts.size()];
+        for (int i = 0; i < parts.size(); i++) {
+            Object part = parts.get(i);
+            if (part instanceof Boolean) {
+                result[i] = (boolean) part;
+            } else {
+                result[i] = false;
+            }
+        }
+        return result;
+    }
+}

redisson/src/main/java/org/redisson/spring/cache/CacheConfig.java

@@ -15,6 +15,7 @@
  */
 package org.redisson.spring.cache;
 
+import org.redisson.api.EvictionMode;
 import org.redisson.api.map.event.MapEntryListener;
 
 import java.io.File;
@@ -40,6 +41,8 @@ public class CacheConfig {
     
     private int maxSize;
 
+    private EvictionMode evictionMode = EvictionMode.LRU;
+
     private final List<MapEntryListener> listeners = new ArrayList<>();
 
     /**
@@ -80,7 +83,6 @@ public class CacheConfig {
         this.ttl = ttl;
     }
     
-    
     public int getMaxSize() {
         return maxSize;
     }
@@ -95,6 +97,21 @@ public class CacheConfig {
         this.maxSize = maxSize;
     }
 
+    public EvictionMode getEvictionMode() {
+        return evictionMode;
+    }
+
+    /**
+     * Set the eviction mode of the map. Superfluous elements are evicted using LRU or LFU algorithm.
+     *
+     * @param evictionMode - eviction mode (LRU, LFU)
+     * @return
+     */
+    public CacheConfig setEvictionMode(EvictionMode evictionMode) {
+        this.evictionMode = evictionMode;
+        return this;
+    }
+
     public long getMaxIdleTime() {
         return maxIdleTime;
     }

redisson/src/main/java/org/redisson/spring/cache/RedissonSpringCacheManager.java

@@ -269,7 +269,7 @@ public class RedissonSpringCacheManager implements CacheManager, ResourceLoaderA
         if (oldCache != null) {
             cache = oldCache;
         } else {
-            map.setMaxSize(config.getMaxSize());
+            map.setMaxSize(config.getMaxSize(), config.getEvictionMode());
             for (MapEntryListener listener : config.getListeners()) {
                 map.addListener(listener);
             }

redisson/src/test/java/org/redisson/RedissonBitSetReactiveTest.java

@@ -6,6 +6,8 @@ import org.redisson.api.RBitSetReactive;
 
 import java.util.BitSet;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class RedissonBitSetReactiveTest extends BaseReactiveTest {
 
     @Test
@@ -113,5 +115,16 @@ public class RedissonBitSetReactiveTest extends BaseReactiveTest {
         Assertions.assertEquals(16, sync(bs1.size()).intValue());
     }
     
+    @Test
+    public void testGetWithIndexes() {
+        RBitSetReactive bitset = redisson.getBitSet("testbitset");
+        
+        sync(bitset.set(4, 10));
+        boolean[] result = sync(bitset.get(2, 4, 7, 8));
+        assertThat(result[0]).isFalse();
+        assertThat(result[1]).isTrue();
+        assertThat(result[2]).isTrue();
+        assertThat(result[3]).isTrue();
+    }
 
 }

redisson/src/test/java/org/redisson/RedissonBitSetTest.java

@@ -210,5 +210,16 @@ public class RedissonBitSetTest extends RedisDockerTest {
         assertThat(bs1.size()).isEqualTo(16);
     }
 
+    @Test
+    public void testGetWithIndexes() {
+        RBitSet bitset = redisson.getBitSet("testbitset");
+        
+        bitset.set(4, 10);
+        boolean[] result = bitset.get(2, 4, 7, 8);
+        assertThat(result[0]).isFalse();
+        assertThat(result[1]).isTrue();
+        assertThat(result[2]).isTrue();
+        assertThat(result[3]).isTrue();
+    }
 
 }

redisson/src/test/java/org/redisson/RedissonBlockingQueueTest.java

@@ -425,6 +425,33 @@ public class RedissonBlockingQueueTest extends RedissonQueueTest {
         Assertions.assertTrue(System.currentTimeMillis() - s > 2000);
     }
 
+    @Test
+    public void testPollLastFromAnyWithName() throws InterruptedException {
+        RBlockingQueue<Integer> queue1 = redisson.getBlockingQueue("queue:polLast");
+        RBlockingQueue<Integer> queue2 = redisson.getBlockingQueue("queue:polLast1");
+        RBlockingQueue<Integer> queue3 = redisson.getBlockingQueue("queue:polLast2");
+        queue3.put(1);
+        queue3.put(2);
+        queue3.put(3);
+        queue1.put(4);
+        queue1.put(5);
+        queue1.put(6);
+        queue2.put(7);
+
+        Entry<String, Integer> r = queue1.pollLastFromAnyWithName(Duration.ofSeconds(4), "queue:polLast1", "queue:polpolLast2");
+        assertThat(r.getKey()).isEqualTo("queue:polLast");
+        assertThat(r.getValue()).isEqualTo(6);
+
+        Entry<String, Integer> r2 = queue2.pollLastFromAnyWithName(Duration.ofSeconds(4), "queue:polLast", "queue:polLast2");
+        assertThat(r2.getKey()).isEqualTo("queue:polLast1");
+        assertThat(r2.getValue()).isEqualTo(7);
+
+        Entry<String, Integer> r3 = queue2.pollLastFromAnyWithName(Duration.ofSeconds(4), "queue:polLast2", "queue:polLast");
+        assertThat(r3.getKey()).isEqualTo("queue:polLast2");
+        assertThat(r3.getValue()).isEqualTo(3);
+
+    }
+
     @Test
     public void testPollFirstFromAny() throws InterruptedException {
         RBlockingQueue<Integer> queue1 = redisson.getBlockingQueue("queue:pollany");

redisson/src/test/java/org/redisson/codec/protobuf/nativeData/Proto2AllTypes.java

@@ -211,12 +211,12 @@ public final class Proto2AllTypes {
    * Protobuf type {@code AllTypes2}
    */
   public static final class AllTypes2 extends
-      com.google.protobuf.GeneratedMessageV3 implements
+      com.google.protobuf.GeneratedMessage implements
       // @@protoc_insertion_point(message_implements:AllTypes2)
       AllTypes2OrBuilder {
   private static final long serialVersionUID = 0L;
     // Use AllTypes2.newBuilder() to construct.
-    private AllTypes2(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+    private AllTypes2(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
     }
     private AllTypes2() {
@@ -238,7 +238,7 @@ public final class Proto2AllTypes {
     }
 
     @Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return Proto2AllTypes.internal_static_org_redisson_codec_protobuf_raw_AllTypes2_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
@@ -641,7 +641,7 @@ public final class Proto2AllTypes {
         output.writeBool(13, boolType_);
       }
       if (((bitField0_ & 0x00001000) != 0)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 14, stringType_);
+        com.google.protobuf.GeneratedMessage.writeString(output, 14, stringType_);
       }
       if (((bitField0_ & 0x00002000) != 0)) {
         output.writeBytes(15, bytesType_);
@@ -710,7 +710,7 @@ public final class Proto2AllTypes {
           .computeBoolSize(13, boolType_);
       }
       if (((bitField0_ & 0x00001000) != 0)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(14, stringType_);
+        size += com.google.protobuf.GeneratedMessage.computeStringSize(14, stringType_);
       }
       if (((bitField0_ & 0x00002000) != 0)) {
         size += com.google.protobuf.CodedOutputStream
@@ -921,20 +921,20 @@ public final class Proto2AllTypes {
     }
     public static Proto2AllTypes.AllTypes2 parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
+      return com.google.protobuf.GeneratedMessage
           .parseWithIOException(PARSER, input);
     }
     public static Proto2AllTypes.AllTypes2 parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
+      return com.google.protobuf.GeneratedMessage
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
     public static Proto2AllTypes.AllTypes2 parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
+      return com.google.protobuf.GeneratedMessage
           .parseDelimitedWithIOException(PARSER, input);
     }
 
@@ -942,20 +942,20 @@ public final class Proto2AllTypes {
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
+      return com.google.protobuf.GeneratedMessage
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static Proto2AllTypes.AllTypes2 parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
+      return com.google.protobuf.GeneratedMessage
           .parseWithIOException(PARSER, input);
     }
     public static Proto2AllTypes.AllTypes2 parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
+      return com.google.protobuf.GeneratedMessage
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -975,7 +975,7 @@ public final class Proto2AllTypes {
 
     @Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -983,7 +983,7 @@ public final class Proto2AllTypes {
      * Protobuf type {@code AllTypes2}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:AllTypes2)
         Proto2AllTypes.AllTypes2OrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -992,7 +992,7 @@ public final class Proto2AllTypes {
       }
 
       @Override
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return Proto2AllTypes.internal_static_org_redisson_codec_protobuf_raw_AllTypes2_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -1005,7 +1005,7 @@ public final class Proto2AllTypes {
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
 
       }
@@ -2141,7 +2141,7 @@ public final class Proto2AllTypes {
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_org_redisson_codec_protobuf_raw_AllTypes2_descriptor;
   private static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_org_redisson_codec_protobuf_raw_AllTypes2_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
@@ -2171,7 +2171,7 @@ public final class Proto2AllTypes {
     internal_static_org_redisson_codec_protobuf_raw_AllTypes2_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_org_redisson_codec_protobuf_raw_AllTypes2_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
         internal_static_org_redisson_codec_protobuf_raw_AllTypes2_descriptor,
         new String[] { "DoubleType", "FloatType", "Int32Type", "Int64Type", "Uint32Type", "Uint64Type", "Sint32Type", "Sint64Type", "Fixed32Type", "Fixed64Type", "Sfixed32Type", "Sfixed64Type", "BoolType", "StringType", "BytesType", });
   }

redisson/src/test/java/org/redisson/codec/protobuf/nativeData/Proto3AllTypes.java

@@ -146,12 +146,12 @@ public final class Proto3AllTypes {
    * Protobuf type {@code org.redisson.codec.protobuf.raw.AllTypes3}
    */
   public static final class AllTypes3 extends
-      com.google.protobuf.GeneratedMessageV3 implements
+      com.google.protobuf.GeneratedMessage implements
       // @@protoc_insertion_point(message_implements:org.redisson.codec.protobuf.raw.AllTypes3)
       AllTypes3OrBuilder {
   private static final long serialVersionUID = 0L;
     // Use AllTypes3.newBuilder() to construct.
-    private AllTypes3(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+    private AllTypes3(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
     }
     private AllTypes3() {
@@ -173,7 +173,7 @@ public final class Proto3AllTypes {
     }
 
     @Override
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return Proto3AllTypes.internal_static_org_redisson_codec_protobuf_raw_AllTypes3_fieldAccessorTable
           .ensureFieldAccessorsInitialized(
@@ -471,8 +471,8 @@ public final class Proto3AllTypes {
       if (boolType_ != false) {
         output.writeBool(13, boolType_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(stringType_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 14, stringType_);
+      if (!com.google.protobuf.GeneratedMessage.isStringEmpty(stringType_)) {
+        com.google.protobuf.GeneratedMessage.writeString(output, 14, stringType_);
       }
       if (!bytesType_.isEmpty()) {
         output.writeBytes(15, bytesType_);
@@ -545,8 +545,8 @@ public final class Proto3AllTypes {
         size += com.google.protobuf.CodedOutputStream
           .computeBoolSize(13, boolType_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(stringType_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(14, stringType_);
+      if (!com.google.protobuf.GeneratedMessage.isStringEmpty(stringType_)) {
+        size += com.google.protobuf.GeneratedMessage.computeStringSize(14, stringType_);
       }
       if (!bytesType_.isEmpty()) {
         size += com.google.protobuf.CodedOutputStream
@@ -692,20 +692,20 @@ public final class Proto3AllTypes {
     }
     public static Proto3AllTypes.AllTypes3 parseFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
+      return com.google.protobuf.GeneratedMessage
           .parseWithIOException(PARSER, input);
     }
     public static Proto3AllTypes.AllTypes3 parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
+      return com.google.protobuf.GeneratedMessage
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
     public static Proto3AllTypes.AllTypes3 parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
+      return com.google.protobuf.GeneratedMessage
           .parseDelimitedWithIOException(PARSER, input);
     }
 
@@ -713,20 +713,20 @@ public final class Proto3AllTypes {
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
+      return com.google.protobuf.GeneratedMessage
           .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
     }
     public static Proto3AllTypes.AllTypes3 parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
+      return com.google.protobuf.GeneratedMessage
           .parseWithIOException(PARSER, input);
     }
     public static Proto3AllTypes.AllTypes3 parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
-      return com.google.protobuf.GeneratedMessageV3
+      return com.google.protobuf.GeneratedMessage
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
@@ -746,7 +746,7 @@ public final class Proto3AllTypes {
 
     @Override
     protected Builder newBuilderForType(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
       Builder builder = new Builder(parent);
       return builder;
     }
@@ -754,7 +754,7 @@ public final class Proto3AllTypes {
      * Protobuf type {@code org.redisson.codec.protobuf.raw.AllTypes3}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
         // @@protoc_insertion_point(builder_implements:org.redisson.codec.protobuf.raw.AllTypes3)
         Proto3AllTypes.AllTypes3OrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
@@ -763,7 +763,7 @@ public final class Proto3AllTypes {
       }
 
       @Override
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return Proto3AllTypes.internal_static_org_redisson_codec_protobuf_raw_AllTypes3_fieldAccessorTable
             .ensureFieldAccessorsInitialized(
@@ -776,7 +776,7 @@ public final class Proto3AllTypes {
       }
 
       private Builder(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
         super(parent);
 
       }
@@ -1792,7 +1792,7 @@ public final class Proto3AllTypes {
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_org_redisson_codec_protobuf_raw_AllTypes3_descriptor;
   private static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_org_redisson_codec_protobuf_raw_AllTypes3_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
@@ -1823,7 +1823,7 @@ public final class Proto3AllTypes {
     internal_static_org_redisson_codec_protobuf_raw_AllTypes3_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_org_redisson_codec_protobuf_raw_AllTypes3_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
         internal_static_org_redisson_codec_protobuf_raw_AllTypes3_descriptor,
         new String[] { "DoubleType", "FloatType", "Int32Type", "Int64Type", "Uint32Type", "Uint64Type", "Sint32Type", "Sint64Type", "Fixed32Type", "Fixed64Type", "Sfixed32Type", "Sfixed64Type", "BoolType", "StringType", "BytesType", });
   }