http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55c7c9fa/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerExtSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerExtSelfTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerExtSelfTest.java index 94a7523..d9fd1ca 100644 --- a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerExtSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerExtSelfTest.java @@ -17,6 +17,7 @@ package org.apache.ignite.marshaller.optimized; +import org.apache.ignite.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.marshaller.*; import org.apache.ignite.testframework.junits.common.*; @@ -35,6 +36,9 @@ public class OptimizedMarshallerExtSelfTest extends OptimizedMarshallerSelfTest private static ConcurrentHashMap<Integer, OptimizedObjectMetadata> META_BUF = new ConcurrentHashMap<>(); /** */ + private static OptimizedMarshallerIndexingHandler idxHandler; + + /** */ private static final OptimizedMarshallerMetaHandler META_HANDLER = new OptimizedMarshallerMetaHandler() { @Override public void addMeta(int typeId, OptimizedObjectMetadata meta) { META_BUF.putIfAbsent(typeId, meta); @@ -45,9 +49,17 @@ public class OptimizedMarshallerExtSelfTest extends OptimizedMarshallerSelfTest } }; - /** {@inheritDoc} */ - @Override protected Marshaller marshaller() { - return new InternalMarshaller(false); + /** + * @throws Exception + */ + private void setupIndexingHandler() throws Exception { + Field field = marsh.getClass().getDeclaredField("idxHandler"); + + field.setAccessible(true); + + idxHandler = (OptimizedMarshallerIndexingHandler)field.get(marsh); + + idxHandler.setMetaHandler(META_HANDLER); } /** @@ -56,9 +68,11 @@ public class OptimizedMarshallerExtSelfTest extends OptimizedMarshallerSelfTest public void testHasField() throws Exception { META_BUF.clear(); - OptimizedMarshallerExt marsh = (OptimizedMarshallerExt)OptimizedMarshallerExtSelfTest.marsh; + setupIndexingHandler(); - assertTrue(marsh.enableFieldsIndexing(TestObject.class)); + OptimizedMarshaller marsh = (OptimizedMarshaller)OptimizedMarshallerExtSelfTest.marsh; + + assertTrue(idxHandler.enableFieldsIndexingForClass(TestObject.class)); assertEquals(1, META_BUF.size()); @@ -78,9 +92,11 @@ public class OptimizedMarshallerExtSelfTest extends OptimizedMarshallerSelfTest public void testReadField() throws Exception { META_BUF.clear(); - OptimizedMarshallerExt marsh = (OptimizedMarshallerExt)OptimizedMarshallerExtSelfTest.marsh; + setupIndexingHandler(); + + OptimizedMarshaller marsh = (OptimizedMarshaller)OptimizedMarshallerExtSelfTest.marsh; - assertTrue(marsh.enableFieldsIndexing(TestObject.class)); + assertTrue(idxHandler.enableFieldsIndexingForClass(TestObject.class)); assertEquals(1, META_BUF.size()); TestObject testObj = new TestObject("World", 50); @@ -99,7 +115,7 @@ public class OptimizedMarshallerExtSelfTest extends OptimizedMarshallerSelfTest assertEquals(testObj.o2, o2); // Add metadata for the enclosed object. - assertTrue(marsh.enableFieldsIndexing(TestObject2.class)); + assertTrue(idxHandler.enableFieldsIndexingForClass(TestObject2.class)); assertEquals(2, META_BUF.size()); arr = marsh.marshal(testObj); @@ -128,9 +144,11 @@ public class OptimizedMarshallerExtSelfTest extends OptimizedMarshallerSelfTest public void testHandles() throws Exception { META_BUF.clear(); - OptimizedMarshallerExt marsh = (OptimizedMarshallerExt)OptimizedMarshallerExtSelfTest.marsh; + setupIndexingHandler(); + + OptimizedMarshaller marsh = (OptimizedMarshaller)OptimizedMarshallerExtSelfTest.marsh; - assertTrue(marsh.enableFieldsIndexing(SelfLinkObject.class)); + assertTrue(idxHandler.enableFieldsIndexingForClass(SelfLinkObject.class)); assertEquals(1, META_BUF.size()); SelfLinkObject selfLinkObject = new SelfLinkObject(); @@ -160,13 +178,15 @@ public class OptimizedMarshallerExtSelfTest extends OptimizedMarshallerSelfTest public void testMarshalAware() throws Exception { META_BUF.clear(); - OptimizedMarshallerExt marsh = (OptimizedMarshallerExt)OptimizedMarshallerExtSelfTest.marsh; + setupIndexingHandler(); - assertTrue(marsh.enableFieldsIndexing(TestMarshalAware.class)); - assertTrue(marsh.enableFieldsIndexing(AnotherMarshalAware.class)); + OptimizedMarshaller marsh = (OptimizedMarshaller)OptimizedMarshallerExtSelfTest.marsh; + + assertTrue(idxHandler.enableFieldsIndexingForClass(TestMarshalAware.class)); + assertTrue(idxHandler.enableFieldsIndexingForClass(AnotherMarshalAware.class)); assertEquals(0, META_BUF.size()); - assertTrue(marsh.enableFieldsIndexing(TestObject2.class)); + assertTrue(idxHandler.enableFieldsIndexingForClass(TestObject2.class)); assertEquals(1, META_BUF.size()); TestMarshalAware test = new TestMarshalAware(100, "MarshalAware"); @@ -219,29 +239,6 @@ public class OptimizedMarshallerExtSelfTest extends OptimizedMarshallerSelfTest assertEquals(test.aware.arr[i], test2.aware.arr[i]); } - private static class InternalMarshaller extends OptimizedMarshallerExt { - /** - * Constructor. - */ - public InternalMarshaller() { - } - - /** - * Constructor. - * @param requireSer Requires serialiazable. - */ - public InternalMarshaller(boolean requireSer) { - super(requireSer); - - super.setMetadataHandler(META_HANDLER); - } - - /** {@inheritDoc} */ - @Override public void setMetadataHandler(OptimizedMarshallerMetaHandler metaHandler) { - // No-op - } - } - /** */ private static class TestObject2 { /** */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55c7c9fa/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedObjectStreamSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedObjectStreamSelfTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedObjectStreamSelfTest.java index 5f16a22..1cf3ba4 100644 --- a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedObjectStreamSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedObjectStreamSelfTest.java @@ -1022,7 +1022,7 @@ public class OptimizedObjectStreamSelfTest extends GridCommonAbstractTest { try { out = OptimizedObjectStreamRegistry.out(); - out.context(clsMap, CTX, null, true); + out.context(clsMap, CTX, null, true, null); out.writeObject(obj); @@ -1030,7 +1030,7 @@ public class OptimizedObjectStreamSelfTest extends GridCommonAbstractTest { in = OptimizedObjectStreamRegistry.in(); - in.context(clsMap, CTX, null, getClass().getClassLoader()); + in.context(clsMap, CTX, null, getClass().getClassLoader(), null); in.in().bytes(arr, arr.length); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55c7c9fa/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java index 929bdf5..68ae64b 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java @@ -232,8 +232,7 @@ public class IgniteTestResources { Marshaller marsh; if (marshallerName == null) - //marsh = new OptimizedMarshaller(); - marsh = new OptimizedMarshallerExt(); + marsh = new OptimizedMarshaller(); else { try { Class<? extends Marshaller> cls = (Class<? extends Marshaller>)Class.forName(marshallerName); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55c7c9fa/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOptimizedMarshallerExtQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOptimizedMarshallerExtQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOptimizedMarshallerExtQuerySelfTest.java index 5791b37..24c2146 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOptimizedMarshallerExtQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOptimizedMarshallerExtQuerySelfTest.java @@ -30,7 +30,7 @@ import java.util.*; import static org.apache.ignite.cache.CacheMode.*; /** - * Tests queries with {@link OptimizedMarshallerExt} enabled. + * Tests queries with {@link OptimizedMarshaller} enabled. */ public class IgniteCacheOptimizedMarshallerExtQuerySelfTest extends GridCacheAbstractSelfTest { /** {@inheritDoc} */ @@ -39,17 +39,6 @@ public class IgniteCacheOptimizedMarshallerExtQuerySelfTest extends GridCacheAbs } /** {@inheritDoc} */ - @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { - IgniteConfiguration cfg = super.getConfiguration(gridName); - - OptimizedMarshallerExt marsh = new OptimizedMarshallerExt(false); - - cfg.setMarshaller(marsh); - - return cfg; - } - - /** {@inheritDoc} */ @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { CacheConfiguration ccfg = super.cacheConfiguration(gridName); @@ -238,7 +227,7 @@ public class IgniteCacheOptimizedMarshallerExtQuerySelfTest extends GridCacheAbs personQryFields.put("name", String.class); personQryFields.put("salary", Integer.class); - personQryFields.put("address", Object.class); + personQryFields.put("address", Address.class); personQryFields.put("address.zip", Integer.class); personMeta.setQueryFields(personQryFields);
