IGNITE-28819 Thin client implementation extraction

.github/workflows/commit-check.yml

@@ -104,7 +104,7 @@ jobs:
 
       - name: Check javadocs.
         run : |
-          ./mvnw -DskipTests install -pl modules/tools,modules/codegen -B -V && ./mvnw initialize -Pjavadoc -B -V
+          ./mvnw -DskipTests install -pl modules/tools,modules/commons,modules/codegen -B -V && ./mvnw initialize -Pjavadoc -B -V
 
   check-dotnet:
     name: Сheck .NET code

assembly/dependencies-apache-ignite-lgpl.xml

@@ -119,6 +119,8 @@
                 <exclude>${project.groupId}:ignite-binary-api</exclude>
                 <exclude>${project.groupId}:ignite-binary-impl</exclude>
                 <exclude>${project.groupId}:ignite-thin-client-api</exclude>
+                <exclude>${project.groupId}:ignite-thin-client-impl</exclude>
+                <exclude>${project.groupId}:ignite-nio</exclude>
                 <exclude>${project.groupId}:ignite-clients</exclude>
                 <exclude>${project.groupId}:ignite-spring</exclude>
                 <exclude>${project.groupId}:ignite-tools</exclude>

assembly/dependencies-apache-ignite-slim.xml

@@ -119,6 +119,8 @@
                 <exclude>${project.groupId}:ignite-binary-api</exclude>
                 <exclude>${project.groupId}:ignite-binary-impl</exclude>
                 <exclude>${project.groupId}:ignite-thin-client-api</exclude>
+                <exclude>${project.groupId}:ignite-thin-client-impl</exclude>
+                <exclude>${project.groupId}:ignite-nio</exclude>
                 <exclude>${project.groupId}:ignite-clients</exclude>
                 <exclude>${project.groupId}:ignite-spring</exclude>
                 <exclude>${project.groupId}:ignite-tools</exclude>

assembly/dependencies-apache-ignite.xml

@@ -120,6 +120,8 @@
                 <exclude>${project.groupId}:ignite-binary-api</exclude>
                 <exclude>${project.groupId}:ignite-binary-impl</exclude>
                 <exclude>${project.groupId}:ignite-thin-client-api</exclude>
+                <exclude>${project.groupId}:ignite-thin-client-impl</exclude>
+                <exclude>${project.groupId}:ignite-nio</exclude>
                 <exclude>${project.groupId}:ignite-clients</exclude>
                 <exclude>${project.groupId}:ignite-spring</exclude>
                 <exclude>${project.groupId}:ignite-tools</exclude>

modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java

@@ -27,6 +27,7 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.lang.reflect.Array;
+import java.lang.reflect.Field;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -62,22 +63,31 @@
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.IgniteCommonsSystemProperties;
 import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteLogger;
 import org.apache.ignite.binary.BinaryCollectionFactory;
+import org.apache.ignite.binary.BinaryIdMapper;
 import org.apache.ignite.binary.BinaryInvalidTypeException;
 import org.apache.ignite.binary.BinaryMapFactory;
+import org.apache.ignite.binary.BinaryNameMapper;
 import org.apache.ignite.binary.BinaryObject;
 import org.apache.ignite.binary.BinaryObjectException;
+import org.apache.ignite.binary.BinarySerializer;
 import org.apache.ignite.binary.BinaryType;
+import org.apache.ignite.binary.BinaryTypeConfiguration;
 import org.apache.ignite.binary.Binarylizable;
+import org.apache.ignite.cache.affinity.AffinityKeyMapped;
+import org.apache.ignite.configuration.BinaryConfiguration;
 import org.apache.ignite.internal.binary.streams.BinaryInputStream;
 import org.apache.ignite.internal.binary.streams.BinaryOutputStream;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
 import org.apache.ignite.internal.util.CommonUtils;
 import org.apache.ignite.internal.util.MutableSingletonList;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.T2;
 import org.apache.ignite.internal.util.typedef.internal.A;
 import org.apache.ignite.lang.IgniteBiTuple;
 import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.logger.NullLogger;
 import org.apache.ignite.marshaller.Marshallers;
 import org.apache.ignite.platform.PlatformType;
 import org.jetbrains.annotations.Nullable;
@@ -167,6 +177,10 @@ TreeSet.class, new BinaryTreeSetWriteReplacer()
     public static boolean FIELDS_SORTED_ORDER =
         IgniteCommonsSystemProperties.getBoolean(IgniteCommonsSystemProperties.IGNITE_BINARY_SORT_OBJECT_FIELDS);
 
+    /** For tests. */
+    @SuppressWarnings("PublicField")
+    public static boolean useTestBinaryCtx;
+
     /** Field type names. */
     private static final String[] FIELD_TYPE_NAMES;
 
@@ -3091,4 +3105,193 @@ public EnumType(int typeId, @Nullable String clsName) {
             this.clsName = clsName;
         }
     }
+
+    /**
+     * @param cls Class to get affinity field for.
+     * @return Affinity field name or {@code null} if field name was not found.
+     */
+    public static String affinityFieldName(Class cls) {
+        for (; cls != Object.class && cls != null; cls = cls.getSuperclass()) {
+            for (Field f : cls.getDeclaredFields()) {
+                if (f.getAnnotation(AffinityKeyMapped.class) != null)
+                    return f.getName();
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Creates a binary context with default (empty) configuration for the given marshaller.
+     *
+     * @param marsh Binary marshaller (may be {@code null}).
+     * @return Binary context instance.
+     */
+    public static BinaryContext binaryContext(BinaryMarshaller marsh) {
+        return binaryContext(
+            cachingMetadataHandler(),
+            marsh,
+            null,
+            null,
+            new BinaryConfiguration(),
+            Collections.emptyMap(),
+            BinaryUtils::affinityFieldName,
+            NullLogger.INSTANCE
+        );
+    }
+
+    /**
+     * Creates a binary context from explicit values.
+     *
+     * @param metaHnd Binary metadata handler.
+     * @param marsh Binary marshaller.
+     * @param igniteInstanceName Ignite instance name.
+     * @param classLoader Class loader.
+     * @param binCfg Binary configuration.
+     * @param affFlds Affinity fields by type name.
+     * @param affFldNameProvider Affinity field name provider.
+     * @param log Logger.
+     * @return Binary context instance.
+     */
+    public static BinaryContext binaryContext(
+        BinaryMetadataHandler metaHnd,
+        BinaryMarshaller marsh,
+        @Nullable String igniteInstanceName,
+        @Nullable ClassLoader classLoader,
+        BinaryConfiguration binCfg,
+        Map<String, String> affFlds,
+        Function<Class<?>, String> affFldNameProvider,
+        IgniteLogger log
+    ) {
+        return useTestBinaryCtx
+            ? new TestBinaryContext(
+                metaHnd,
+                marsh,
+                igniteInstanceName,
+                classLoader,
+                binCfg.getSerializer(),
+                binCfg.getIdMapper(),
+                binCfg.getNameMapper(),
+                binCfg.getTypeConfigurations(),
+                affFlds,
+                binCfg.isCompactFooter(),
+                affFldNameProvider,
+                log
+            )
+            : new BinaryContext(
+                metaHnd,
+                marsh,
+                igniteInstanceName,
+                classLoader,
+                binCfg.getSerializer(),
+                binCfg.getIdMapper(),
+                binCfg.getNameMapper(),
+                binCfg.getTypeConfigurations(),
+                affFlds,
+                binCfg.isCompactFooter(),
+                affFldNameProvider,
+                log
+            );
+    }
+
+    /** */
+    @SuppressWarnings("PublicInnerClass")
+    public static class TestBinaryContext extends BinaryContext {
+        /** */
+        private List<TestBinaryContextListener> listeners;
+
+        /** */
+        public TestBinaryContext(
+            BinaryMetadataHandler metaHnd,
+            @Nullable BinaryMarshaller marsh,
+            @Nullable String igniteInstanceName,
+            @Nullable ClassLoader clsLdr,
+            @Nullable BinarySerializer dfltSerializer,
+            @Nullable BinaryIdMapper idMapper,
+            @Nullable BinaryNameMapper nameMapper,
+            @Nullable Collection<BinaryTypeConfiguration> typeCfgs,
+            Map<String, String> affFlds,
+            boolean compactFooter,
+            Function<Class<?>, String> affFldNameProvider,
+            IgniteLogger log
+        ) {
+            super(
+                metaHnd,
+                marsh,
+                igniteInstanceName,
+                clsLdr,
+                dfltSerializer,
+                idMapper,
+                nameMapper,
+                typeCfgs,
+                affFlds,
+                compactFooter,
+                affFldNameProvider,
+                log
+            );
+        }
+
+
+        /** {@inheritDoc} */
+        @Nullable @Override public BinaryType metadata(int typeId) throws BinaryObjectException {
+            BinaryType metadata = super.metadata(typeId);
+
+            if (listeners != null) {
+                for (TestBinaryContextListener listener : listeners)
+                    listener.onAfterMetadataRequest(typeId, metadata);
+            }
+
+            return metadata;
+        }
+
+        /** {@inheritDoc} */
+        @Override public void updateMetadata(int typeId, BinaryMetadata meta, boolean failIfUnregistered) throws BinaryObjectException {
+            if (listeners != null) {
+                for (TestBinaryContextListener listener : listeners)
+                    listener.onBeforeMetadataUpdate(typeId, meta);
+            }
+
+            super.updateMetadata(typeId, meta, failIfUnregistered);
+        }
+
+        /** */
+        public interface TestBinaryContextListener {
+            /**
+             * @param typeId Type id.
+             * @param type Type.
+             */
+            void onAfterMetadataRequest(int typeId, BinaryType type);
+
+            /**
+             * @param typeId Type id.
+             * @param metadata Metadata.
+             */
+            void onBeforeMetadataUpdate(int typeId, BinaryMetadata metadata);
+        }
+
+        /** @param lsnr Listener. */
+        public void addListener(TestBinaryContextListener lsnr) {
+            if (listeners == null)
+                listeners = new ArrayList<>();
+
+            if (!listeners.contains(lsnr))
+                listeners.add(lsnr);
+        }
+
+        /** */
+        public void clearAllListener() {
+            if (listeners != null)
+                listeners.clear();
+        }
+    }
+
+    /**
+     * Represents the given cache version as an {@link IgniteUuid}.
+     *
+     * @param ver Cache version.
+     * @return Version represented as {@code IgniteUuid}.
+     */
+    public static IgniteUuid asIgniteUuid(GridCacheVersion ver) {
+        return new IgniteUuid(new UUID(ver.topologyVersion(), ver.nodeOrderAndDrIdRaw()), ver.order());
+    }
 }

modules/core/src/main/java/org/apache/ignite/marshaller/MarshallerUtils.java → modules/binary/api/src/main/java/org/apache/ignite/marshaller/MarshallerUtils.java

@@ -26,19 +26,16 @@
 import java.io.InputStreamReader;
 import java.io.ObjectInputFilter;
 import java.net.URL;
-import java.util.Collection;
 import java.util.Enumeration;
 import java.util.Objects;
 import java.util.function.Consumer;
 import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteCommonsSystemProperties;
 import org.apache.ignite.IgniteException;
-import org.apache.ignite.IgniteSystemProperties;
 import org.apache.ignite.internal.ClassSet;
-import org.apache.ignite.plugin.PluginProvider;
-import org.jetbrains.annotations.Nullable;
 
-import static org.apache.ignite.IgniteSystemProperties.IGNITE_ENABLE_OBJECT_INPUT_FILTER_AUTOCONFIGURATION;
-import static org.apache.ignite.IgniteSystemProperties.IGNITE_MARSHALLER_BLACKLIST;
+import static org.apache.ignite.IgniteCommonsSystemProperties.IGNITE_ENABLE_OBJECT_INPUT_FILTER_AUTOCONFIGURATION;
+import static org.apache.ignite.IgniteCommonsSystemProperties.IGNITE_MARSHALLER_BLACKLIST;
 
 /**
  * Utility marshaller methods.
@@ -81,7 +78,7 @@ public static IgniteMarshallerClassFilter classNameFilter(ClassLoader clsLdr) th
      * @throws IgniteCheckedException if autoconfiguration failed.
      */
     public static void autoconfigureObjectInputFilter(IgniteMarshallerClassFilter clsFilter) throws IgniteCheckedException {
-        if (!IgniteSystemProperties.getBoolean(IGNITE_ENABLE_OBJECT_INPUT_FILTER_AUTOCONFIGURATION, true))
+        if (!IgniteCommonsSystemProperties.getBoolean(IGNITE_ENABLE_OBJECT_INPUT_FILTER_AUTOCONFIGURATION, true))
             return;
 
         synchronized (MUX) {
@@ -116,7 +113,7 @@ else if (objFilter instanceof IgniteObjectInputFilter) {
     private static ClassSet classWhiteList(ClassLoader clsLdr) throws IgniteCheckedException {
         ClassSet clsSet = null;
 
-        String fileName = IgniteSystemProperties.getString(IgniteSystemProperties.IGNITE_MARSHALLER_WHITELIST);
+        String fileName = IgniteCommonsSystemProperties.getString(IgniteCommonsSystemProperties.IGNITE_MARSHALLER_WHITELIST);
 
         if (fileName != null) {
             clsSet = new ClassSet();
@@ -139,7 +136,7 @@ private static ClassSet classBlackList(ClassLoader clsLdr) throws IgniteCheckedE
 
         addClassNames(DEFAULT_BLACKLIST_CLS_NAMES_FILE, clsSet, clsLdr);
 
-        String blackListFileName = IgniteSystemProperties.getString(IGNITE_MARSHALLER_BLACKLIST);
+        String blackListFileName = IgniteCommonsSystemProperties.getString(IGNITE_MARSHALLER_BLACKLIST);
 
         if (blackListFileName != null)
             addClassNames(blackListFileName, clsSet, clsLdr);
@@ -197,11 +194,9 @@ private static void addClassNames(
      * Find all system class names (for JDK or Ignite classes) and process them with a given consumer.
      *
      * @param ldr Class loader.
-     * @param plugins Plugins.
      * @param proc Class processor (class name consumer).
      */
-    public static void processSystemClasses(ClassLoader ldr, @Nullable Collection<PluginProvider> plugins,
-        Consumer<String> proc) throws IOException {
+    public static void processSystemClasses(ClassLoader ldr, Consumer<String> proc) throws IOException {
         Enumeration<URL> urls = ldr.getResources(CLS_NAMES_FILE);
 
         boolean foundClsNames = false;
@@ -223,16 +218,6 @@ public static void processSystemClasses(ClassLoader ldr, @Nullable Collection<Pl
                 "[file=" + JDK_CLS_NAMES_FILE + ", ldr=" + ldr + ']');
 
         processResource(jdkClsNames, proc);
-
-        if (plugins != null && !plugins.isEmpty()) {
-            for (PluginProvider plugin : plugins) {
-                Enumeration<URL> pluginUrls = ldr.getResources("META-INF/" + plugin.name().toLowerCase()
-                    + ".classnames.properties");
-
-                while (pluginUrls.hasMoreElements())
-                    processResource(pluginUrls.nextElement(), proc);
-            }
-        }
     }
 
     /**
@@ -242,7 +227,7 @@ public static void processSystemClasses(ClassLoader ldr, @Nullable Collection<Pl
      * @param proc Class processor (class name consumer).
      * @throws IOException In case of error.
      */
-    private static void processResource(URL url, Consumer<String> proc) throws IOException {
+    public static void processResource(URL url, Consumer<String> proc) throws IOException {
         try (BufferedReader rdr = new BufferedReader(new InputStreamReader(url.openStream()))) {
             String line;
 

modules/bom/pom.xml

@@ -186,6 +186,16 @@
                 <artifactId>ignite-thin-client-api</artifactId>
                 <version>${revision}</version>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>ignite-thin-client-impl</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>ignite-nio</artifactId>
+                <version>${revision}</version>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>ignite-codegen</artifactId>