[ignite-3] branch ignite-13618 updated: Get rid of Javapoet dependency.

[am...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

amashenkov pushed a commit to branch ignite-13618
in repository https://gitbox.apache.org/repos/asf/ignite-3.git


The following commit(s) were added to refs/heads/ignite-13618 by this push:
     new 7eb81a9  Get rid of Javapoet dependency.
7eb81a9 is described below

commit 7eb81a95290a5e8c577bcbd7dc7615f376bc6f12
Author: Andrew Mashenkov <an...@gmail.com>
AuthorDate: Mon Jan 25 15:47:42 2021 +0300

    Get rid of Javapoet dependency.
---
 .../schema/marshaller/JavaSerializerTest.java      | 46 ++++++++++++----------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/modules/commons/src/test/java/org/apache/ignite/internal/schema/marshaller/JavaSerializerTest.java b/modules/commons/src/test/java/org/apache/ignite/internal/schema/marshaller/JavaSerializerTest.java
index 3c1bd7e..265acf8 100644
--- a/modules/commons/src/test/java/org/apache/ignite/internal/schema/marshaller/JavaSerializerTest.java
+++ b/modules/commons/src/test/java/org/apache/ignite/internal/schema/marshaller/JavaSerializerTest.java
@@ -306,34 +306,40 @@ public class JavaSerializerTest {
     @ParameterizedTest
     @MethodSource("serializerFactoryProvider")
     public void testClassLoader(SerializerFactory factory) throws SerializationException {
-        Thread.currentThread().setContextClassLoader(new DynamicClassLoader(getClass().getClassLoader()));
+        final ClassLoader loader = Thread.currentThread().getContextClassLoader();
+        try {
+            Thread.currentThread().setContextClassLoader(new DynamicClassLoader(getClass().getClassLoader()));
 
-        Column[] keyCols = new Column[] {
-            new Column("key", LONG, false)
-        };
+            Column[] keyCols = new Column[] {
+                new Column("key", LONG, false)
+            };
 
-        Column[] valCols = new Column[] {
-            new Column("col0", LONG, false),
-            new Column("col1", LONG, false),
-            new Column("col2", LONG, false),
-        };
+            Column[] valCols = new Column[] {
+                new Column("col0", LONG, false),
+                new Column("col1", LONG, false),
+                new Column("col2", LONG, false),
+            };
 
-        SchemaDescriptor schema = new SchemaDescriptor(1, new Columns(keyCols), new Columns(valCols));
+            SchemaDescriptor schema = new SchemaDescriptor(1, new Columns(keyCols), new Columns(valCols));
 
-        final Class<?> valClass = createGeneratedObjectClass(long.class);
-        final ObjectFactory<?> objFactory = new ObjectFactory<>(valClass);
+            final Class<?> valClass = createGeneratedObjectClass(long.class);
+            final ObjectFactory<?> objFactory = new ObjectFactory<>(valClass);
 
-        final Long key = rnd.nextLong();
+            final Long key = rnd.nextLong();
 
-        Serializer serializer = factory.create(schema, key.getClass(), valClass);
+            Serializer serializer = factory.create(schema, key.getClass(), valClass);
 
-        byte[] bytes = serializer.serialize(key, objFactory.create());
+            byte[] bytes = serializer.serialize(key, objFactory.create());
 
-        Object key1 = serializer.deserializeKey(bytes);
-        Object val1 = serializer.deserializeValue(bytes);
+            Object key1 = serializer.deserializeKey(bytes);
+            Object val1 = serializer.deserializeValue(bytes);
 
-        assertTrue(key.getClass().isInstance(key1));
-        assertTrue(valClass.isInstance(val1));
+            assertTrue(key.getClass().isInstance(key1));
+            assertTrue(valClass.isInstance(val1));
+        }
+        finally {
+            Thread.currentThread().setContextClassLoader(loader);
+        }
     }
 
     /**
@@ -429,7 +435,7 @@ public class JavaSerializerTest {
 
         return ClassGenerator.classGenerator(Thread.currentThread().getContextClassLoader())
             .fakeLineNumbers(true)
-            .runAsmVerifier(true) // Field of primitive type signature check fails.
+//            .runAsmVerifier(true) // Field of primitive type signature check fails.
             .dumpRawBytecode(true)
             .defineClass(classDef, Object.class);
     }