IGNITE-28264 Extract enum from message class, use serializer to encode and decode the enum (#12916)

Author: sergey-chugunov-1985

modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java

@@ -68,7 +68,7 @@
 import org.apache.ignite.internal.processors.authentication.UserManagementOperationFinishedMessage;
 import org.apache.ignite.internal.processors.authentication.UserManagementOperationFinishedMessageSerializer;
 import org.apache.ignite.internal.processors.cache.CacheEntryPredicateAdapter;
-import org.apache.ignite.internal.processors.cache.CacheEntryPredicateAdapterMarshallableSerializer;
+import org.apache.ignite.internal.processors.cache.CacheEntryPredicateAdapterSerializer;
 import org.apache.ignite.internal.processors.cache.CacheEvictionEntry;
 import org.apache.ignite.internal.processors.cache.CacheEvictionEntrySerializer;
 import org.apache.ignite.internal.processors.cache.CacheInvokeDirectResult;
@@ -477,7 +477,7 @@ public GridIoMessageFactory(Marshaller marsh, ClassLoader clsLdr) {
         factory.register(95, DataStreamerEntry::new, new DataStreamerEntrySerializer());
         factory.register(96, CacheContinuousQueryEntry::new, new CacheContinuousQueryEntryMarshallableSerializer(marsh, clsLdr));
         factory.register(97, CacheEvictionEntry::new, new CacheEvictionEntrySerializer());
-        factory.register(98, CacheEntryPredicateAdapter::new, new CacheEntryPredicateAdapterMarshallableSerializer(marsh, clsLdr));
+        factory.register(98, CacheEntryPredicateAdapter::new, new CacheEntryPredicateAdapterSerializer());
         factory.register(100, IgniteTxEntry::new, new IgniteTxEntrySerializer());
         factory.register(101, TxEntryValueHolder::new, new TxEntryValueHolderSerializer());
         factory.register(102, CacheVersionedValue::new, new CacheVersionedValueSerializer());

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateAdapter.java

@@ -23,28 +23,20 @@
 import org.apache.ignite.internal.Order;
 import org.apache.ignite.internal.util.tostring.GridToStringInclude;
 import org.apache.ignite.internal.util.typedef.internal.CU;
-import org.apache.ignite.marshaller.Marshaller;
-import org.apache.ignite.plugin.extensions.communication.MarshallableMessage;
 import org.jetbrains.annotations.Nullable;
 
 /** A unified container for common, typical cache entry predicates. */
-public class CacheEntryPredicateAdapter implements CacheEntryPredicate, MarshallableMessage {
+public class CacheEntryPredicateAdapter implements CacheEntryPredicate {
     /** */
     private static final long serialVersionUID = 4647110502545358709L;
 
-    /** */
-    public static final CacheEntryPredicateAdapter ALWAYS_FALSE = new CacheEntryPredicateAdapter(PredicateType.ALWAYS_FALSE);
-
     /** */
     protected transient boolean locked;
 
     /** */
     @GridToStringInclude
-    private PredicateType type;
-
-    /** Type value serialization holder. */
     @Order(0)
-    protected transient byte code;
+    CacheEntryPredicateType type;
 
     /** */
     @GridToStringInclude
@@ -53,20 +45,19 @@ public class CacheEntryPredicateAdapter implements CacheEntryPredicate, Marshall
 
     /** */
     public CacheEntryPredicateAdapter() {
-        type = PredicateType.OTHER;
+        type = CacheEntryPredicateType.OTHER;
     }
 
     /** */
-    public CacheEntryPredicateAdapter(PredicateType type) {
+    public CacheEntryPredicateAdapter(CacheEntryPredicateType type) {
         assert type != null;
 
         this.type = type;
     }
 
     /** */
     public CacheEntryPredicateAdapter(@Nullable CacheObject val) {
-        type = PredicateType.VALUE;
-        code = 1;
+        type = CacheEntryPredicateType.VALUE;
 
         this.val = val;
     }
@@ -77,7 +68,7 @@ public CacheEntryPredicateAdapter(@Nullable CacheObject val) {
     }
 
     /** */
-    public PredicateType type() {
+    public CacheEntryPredicateType type() {
         return type;
     }
 
@@ -130,93 +121,14 @@ public PredicateType type() {
 
     /** {@inheritDoc} */
     @Override public void finishUnmarshal(GridCacheContext ctx, ClassLoader ldr) throws IgniteCheckedException {
-        if (type == PredicateType.VALUE)
+        if (type == CacheEntryPredicateType.VALUE)
             val.finishUnmarshal(ctx.cacheObjectContext(), ldr);
     }
 
     /** {@inheritDoc} */
     @Override public void prepareMarshal(GridCacheContext ctx) throws IgniteCheckedException {
-        if (type == PredicateType.VALUE)
+        if (type == CacheEntryPredicateType.VALUE)
             val.prepareMarshal(ctx.cacheObjectContext());
     }
 
-    /** */
-    public byte code() {
-        return code;
-    }
-
-    /** */
-    public void code(byte code) {
-        this.code = code;
-    }
-
-    /** {@inheritDoc} */
-    @Override public void prepareMarshal(Marshaller marsh) throws IgniteCheckedException {
-        switch (type) {
-            case OTHER:
-                code = 0;
-                break;
-
-            case VALUE:
-                code = 1;
-                break;
-
-            case HAS_VALUE:
-                code = 2;
-                break;
-
-            case HAS_NO_VALUE:
-                code = 3;
-                break;
-
-            case ALWAYS_FALSE:
-                code = 4;
-                break;
-
-            default:
-                throw new IllegalArgumentException("Unknown cache entry predicate type: " + type);
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override public void finishUnmarshal(Marshaller marsh, ClassLoader clsLdr) throws IgniteCheckedException {
-        switch (code) {
-            case 0:
-                type = PredicateType.OTHER;
-                break;
-
-            case 1:
-                type = PredicateType.VALUE;
-                break;
-
-            case 2:
-                type = PredicateType.HAS_VALUE;
-                break;
-
-            case 3:
-                type = PredicateType.HAS_NO_VALUE;
-                break;
-
-            case 4:
-                type = PredicateType.ALWAYS_FALSE;
-                break;
-
-            default:
-                throw new IllegalArgumentException("Unknown cache entry predicate type code: " + code);
-        }
-    }
-
-    /** Common predicate type. */
-    public enum PredicateType {
-        /** Other custom predicate. */
-        OTHER,
-        /** Entry has certain equal value. */
-        VALUE,
-        /** Entry has any value. */
-        HAS_VALUE,
-        /** Entry has no value. */
-        HAS_NO_VALUE,
-        /** Is always false. */
-        ALWAYS_FALSE
-    }
 }

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateType.java

@@ -0,0 +1,44 @@
+/*
+ * 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 org.apache.ignite.internal.processors.cache;
+
+/**
+ * Type of {@link CacheEntryPredicateAdapter}.
+ */
+public enum CacheEntryPredicateType {
+    /**
+     * Predicate that entry has specified value.
+     */
+    VALUE,
+    /**
+     * Predicate that entry has any value.
+     */
+    HAS_VALUE,
+    /**
+     * Predicate that entry has no value.
+     */
+    HAS_NO_VALUE,
+    /**
+     * Predicate that is always {@code false}.
+     */
+    ALWAYS_FALSE,
+    /**
+     * Any other predicate.
+     */
+    OTHER
+}

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java

@@ -1201,7 +1201,7 @@ public boolean putIfAbsentFilter(@Nullable CacheEntryPredicate[] p) {
 
         for (CacheEntryPredicate p0 : p) {
             if ((p0 instanceof CacheEntryPredicateAdapter) &&
-                ((CacheEntryPredicateAdapter)p0).type() == CacheEntryPredicateAdapter.PredicateType.HAS_NO_VALUE)
+                ((CacheEntryPredicateAdapter)p0).type() == CacheEntryPredicateType.HAS_NO_VALUE)
                 return true;
         }
 
@@ -1212,14 +1212,14 @@ public boolean putIfAbsentFilter(@Nullable CacheEntryPredicate[] p) {
      * @return No value filter.
      */
     public CacheEntryPredicate noVal() {
-        return new CacheEntryPredicateAdapter(CacheEntryPredicateAdapter.PredicateType.HAS_NO_VALUE);
+        return new CacheEntryPredicateAdapter(CacheEntryPredicateType.HAS_NO_VALUE);
     }
 
     /**
      * @return Has value filter.
      */
     public CacheEntryPredicate hasVal() {
-        return new CacheEntryPredicateAdapter(CacheEntryPredicateAdapter.PredicateType.HAS_VALUE);
+        return new CacheEntryPredicateAdapter(CacheEntryPredicateType.HAS_VALUE);
     }
 
     /**

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java

@@ -245,7 +245,9 @@ public static boolean cheatCache(int id) {
     private static final CacheEntryPredicate[] EMPTY_FILTER0 = new CacheEntryPredicate[0];
 
     /** */
-    private static final CacheEntryPredicate[] ALWAYS_FALSE0_ARR = new CacheEntryPredicate[] {CacheEntryPredicateAdapter.ALWAYS_FALSE};
+    private static final CacheEntryPredicate[] ALWAYS_FALSE0_ARR = new CacheEntryPredicate[] {
+        new CacheEntryPredicateAdapter(CacheEntryPredicateType.ALWAYS_FALSE)
+    };
 
     /** Read filter. */
     public static final IgnitePredicate<IgniteTxEntry> READ_FILTER = new P1<IgniteTxEntry>() {

modules/core/src/test/java/org/apache/ignite/internal/managers/communication/CacheEntryPredicateAdapterMessageTest.java

@@ -38,7 +38,6 @@
 import org.apache.ignite.internal.TransactionsMXBeanImplTest;
 import org.apache.ignite.internal.codegen.IgniteDataTransferObjectProcessorTest;
 import org.apache.ignite.internal.codegen.MessageProcessorTest;
-import org.apache.ignite.internal.managers.communication.CacheEntryPredicateAdapterMessageTest;
 import org.apache.ignite.internal.managers.communication.CompressedMessageTest;
 import org.apache.ignite.internal.managers.communication.DefaultEnumMapperTest;
 import org.apache.ignite.internal.managers.communication.ErrorMessageSelfTest;
@@ -150,7 +149,6 @@
 
     MessageProcessorTest.class,
     ErrorMessageSelfTest.class,
-    CacheEntryPredicateAdapterMessageTest.class,
     DefaultEnumMapperTest.class,
     IgniteDataTransferObjectProcessorTest.class,
     CompressedMessageTest.class