Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

IGNITE-2098 - Added test for java proxy. #301

Closed
wants to merge 4 commits into from
Closed

IGNITE-2098 - Added test for java proxy. #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c5dc062
IGNITE-2098 - Added test for java proxy.
agoncharuk Dec 8, 2015
d7fc1e5
Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/…
agoncharuk Dec 9, 2015
02a011f
Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/…
agoncharuk Dec 9, 2015
cc991e0
Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/…
agoncharuk Dec 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 9 additions & 5 deletions modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,12 @@
import org.apache.ignite.binary.BinarySerializer;
import org.apache.ignite.binary.Binarylizable;
import org.apache.ignite.internal.processors.cache.CacheObjectImpl;
import org.apache.ignite.internal.util.GridUnsafe;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.marshaller.MarshallerExclusions;
import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
import org.jetbrains.annotations.Nullable;
import sun.misc.Unsafe;

import static java.lang.reflect.Modifier.isStatic;
import static java.lang.reflect.Modifier.isTransient;
Expand All @@ -54,6 +56,9 @@
* Portable class descriptor.
*/
public class PortableClassDescriptor {
/** */
public static final Unsafe UNSAFE = GridUnsafe.unsafe();

/** */
private final PortableContext ctx;

Expand Down Expand Up @@ -228,7 +233,8 @@ public class PortableClassDescriptor {
break;

case OBJECT:
ctor = constructor(cls);
// Must not use constructor to honor transient fields semantics.
ctor = null;
ArrayList<BinaryFieldAccessor> fields0 = new ArrayList<>();
stableFieldsMeta = metaDataEnabled ? new HashMap<String, Integer>() : null;

Expand Down Expand Up @@ -748,10 +754,8 @@ private void postWrite(BinaryWriterExImpl writer, Object obj) {
* @throws BinaryObjectException In case of error.
*/
private Object newInstance() throws BinaryObjectException {
assert ctor != null;

try {
return ctor.newInstance();
return ctor != null ? ctor.newInstance() : UNSAFE.allocateInstance(cls);
}
catch (InstantiationException | InvocationTargetException | IllegalAccessException e) {
throw new BinaryObjectException("Failed to instantiate instance: " + cls, e);
Expand Down Expand Up @@ -799,7 +803,7 @@ private boolean initUseOptimizedMarshallerFlag() {
writeObj.getReturnType() == void.class && readObj.getReturnType() == void.class)
return true;
}
catch (NoSuchMethodException e) {
catch (NoSuchMethodException ignored) {
// No-op.
}
}
Expand Down
198 changes: 198 additions & 0 deletions modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryMarshallerSelfTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@
import java.io.ObjectOutput;
import java.io.Serializable;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.net.InetSocketAddress;
Expand Down Expand Up @@ -75,9 +77,11 @@
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.marshaller.MarshallerContextTestImpl;
import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jsr166.ConcurrentHashMap8;
import sun.misc.Unsafe;

Expand Down Expand Up @@ -2328,6 +2332,200 @@ public void testCyclicReferencesMarshalling() throws Exception {
assertTrue(res.mEntry == res.inner.mEntry);
}

/**
* @throws Exception If failed.
*/
public void testProxy() throws Exception {
BinaryMarshaller marsh = binaryMarshaller();

SomeItf inItf = (SomeItf)Proxy.newProxyInstance(
BinaryMarshallerSelfTest.class.getClassLoader(), new Class[] {SomeItf.class},
new InvocationHandler() {
private NonSerializable obj = new NonSerializable(null);

@Override public Object invoke(Object proxy, Method mtd, Object[] args) throws Throwable {
if ("hashCode".equals(mtd.getName()))
return obj.hashCode();

obj.checkAfterUnmarshalled();

return 17;
}
}
);

SomeItf outItf = marsh.unmarshal(marsh.marshal(inItf), null);

assertEquals(outItf.checkAfterUnmarshalled(), 17);
}

/**
*
*/
private static interface SomeItf {
/**
* @return Check result.
*/
int checkAfterUnmarshalled();
}

/**
* Some non-serializable class.
*/
@SuppressWarnings( {"PublicField","TransientFieldInNonSerializableClass","FieldMayBeStatic"})
private static class NonSerializableA {
/** */
private final long longVal = 0x33445566778899AAL;

/** */
protected Short shortVal = (short)0xAABB;

/** */
public String[] strArr = {"AA","BB"};

/** */
public boolean flag1 = true;

/** */
public boolean flag2;

/** */
public Boolean flag3;

/** */
public Boolean flag4 = true;

/** */
public Boolean flag5 = false;

/** */
private transient int intVal = 0xAABBCCDD;

/**
* @param strArr Array.
* @param shortVal Short value.
*/
@SuppressWarnings( {"UnusedDeclaration"})
private NonSerializableA(@Nullable String[] strArr, @Nullable Short shortVal) {
// No-op.
}

/**
* Checks correctness of the state after unmarshalling.
*/
void checkAfterUnmarshalled() {
assertEquals(longVal, 0x33445566778899AAL);

assertEquals(shortVal.shortValue(), (short)0xAABB);

assertTrue(Arrays.equals(strArr, new String[] {"AA","BB"}));

assertEquals(0, intVal);

assertTrue(flag1);
assertFalse(flag2);
assertNull(flag3);
assertTrue(flag4);
assertFalse(flag5);
}
}

/**
* Some non-serializable class.
*/
@SuppressWarnings( {"PublicField","TransientFieldInNonSerializableClass","PackageVisibleInnerClass"})
static class NonSerializableB extends NonSerializableA {
/** */
public Short shortValue = 0x1122;

/** */
public long longValue = 0x8877665544332211L;

/** */
private transient NonSerializableA[] aArr = {
new NonSerializableA(null, null),
new NonSerializableA(null, null),
new NonSerializableA(null, null)
};

/** */
protected Double doubleVal = 123.456;

/**
* Just to eliminate the default constructor.
*/
private NonSerializableB() {
super(null, null);
}

/**
* Checks correctness of the state after unmarshalling.
*/
@Override void checkAfterUnmarshalled() {
super.checkAfterUnmarshalled();

assertEquals(shortValue.shortValue(), 0x1122);

assertEquals(longValue, 0x8877665544332211L);

assertNull(aArr);

assertEquals(doubleVal, 123.456);
}
}

/**
* Some non-serializable class.
*/
@SuppressWarnings( {"TransientFieldInNonSerializableClass","PublicField"})
private static class NonSerializable extends NonSerializableB {
/** */
private int idVal = -17;

/** */
private final NonSerializableA aVal = new NonSerializableB();

/** */
private transient NonSerializableB bVal = new NonSerializableB();

/** */
private NonSerializableA[] bArr = new NonSerializableA[] {
new NonSerializableB(),
new NonSerializableA(null, null)
};

/** */
public float floatVal = 567.89F;

/**
* Just to eliminate the default constructor.
*
* @param aVal Unused.
*/
@SuppressWarnings( {"UnusedDeclaration"})
private NonSerializable(NonSerializableA aVal) {
}

/**
* Checks correctness of the state after unmarshalling.
*/
@Override void checkAfterUnmarshalled() {
super.checkAfterUnmarshalled();

assertEquals(idVal, -17);

aVal.checkAfterUnmarshalled();

assertNull(bVal);

for (NonSerializableA a : bArr) {
a.checkAfterUnmarshalled();
}

assertEquals(floatVal, 567.89F);
}
}

/**
* Object with class fields.
*/
Expand Down