Fixed javadoc and Java 1.8 build.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/eee3b21b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/eee3b21b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/eee3b21b Branch: refs/heads/ignite-1270 Commit: eee3b21b10a2ddbc131254fd2d077d95db9340de Parents: ca0de93 Author: Alexey Goncharuk <[email protected]> Authored: Tue Nov 24 12:35:43 2015 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Tue Nov 24 12:35:43 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/IgniteBinary.java | 6 +---- .../apache/ignite/binary/BinaryIdMapper.java | 2 +- .../apache/ignite/binary/BinarySerializer.java | 2 +- .../internal/portable/BinaryTypeImpl.java | 4 ++- .../processors/cache/CacheObjectContext.java | 26 +++++++++++++++++--- .../datastructures/GridCacheAtomicLongImpl.java | 6 ++++- .../portable/BinaryMarshallerSelfTest.java | 6 ++--- 7 files changed, 36 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/eee3b21b/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java b/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java index 5eb2670..8802c10 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java @@ -67,9 +67,7 @@ import org.jetbrains.annotations.Nullable; * String field = val.field("myFieldName"); * </pre> * Alternatively, if we have class definitions in the classpath, we may choose to work with deserialized - * typed objects at all times. In this case we do incur the deserialization cost. However, if - * {@link org.apache.ignite.marshaller.portable.BinaryMarshaller#isKeepDeserialized()} is {@code true} then Ignite will only deserialize on the first access - * and will cache the deserialized object, so it does not have to be deserialized again: + * typed objects at all times. * <pre name=code class=java> * IgniteCache<MyKey.class, MyValue.class> cache = grid.cache(null); * @@ -150,8 +148,6 @@ import org.jetbrains.annotations.Nullable; * automatically. * <h1 class="header">Configuration</h1> * By default all your objects are considered as binary and no specific configuration is needed. - * However, in some cases, like when an object is used by both Java and .Net, you may need to specify portable objects - * explicitly by calling {@link org.apache.ignite.marshaller.portable.BinaryMarshaller#setClassNames(Collection)}. * The only requirement Ignite imposes is that your object has an empty * constructor. Note, that since server side does not have to know the class definition, * you only need to list portable objects in configuration on the client side. However, if you http://git-wip-us.apache.org/repos/asf/ignite/blob/eee3b21b/modules/core/src/main/java/org/apache/ignite/binary/BinaryIdMapper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/binary/BinaryIdMapper.java b/modules/core/src/main/java/org/apache/ignite/binary/BinaryIdMapper.java index a4a18f6..9aebf85 100644 --- a/modules/core/src/main/java/org/apache/ignite/binary/BinaryIdMapper.java +++ b/modules/core/src/main/java/org/apache/ignite/binary/BinaryIdMapper.java @@ -27,7 +27,7 @@ package org.apache.ignite.binary; * actually do collide {@code BinaryIdMapper} allows to override the automatically * generated hash code IDs for the type and field names. * <p> - * Binary ID mapper can be configured for all binary objects via {@link org.apache.ignite.marshaller.portable.BinaryMarshaller#getIdMapper()} method, + * Binary ID mapper can be configured for all binary objects via {@link org.apache.ignite.configuration.BinaryConfiguration#getIdMapper()} method, * or for a specific binary type via {@link BinaryTypeConfiguration#getIdMapper()} method. */ public interface BinaryIdMapper { http://git-wip-us.apache.org/repos/asf/ignite/blob/eee3b21b/modules/core/src/main/java/org/apache/ignite/binary/BinarySerializer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/binary/BinarySerializer.java b/modules/core/src/main/java/org/apache/ignite/binary/BinarySerializer.java index 31b3d30..3a8be3e 100644 --- a/modules/core/src/main/java/org/apache/ignite/binary/BinarySerializer.java +++ b/modules/core/src/main/java/org/apache/ignite/binary/BinarySerializer.java @@ -23,7 +23,7 @@ package org.apache.ignite.binary; * cannot be changed directly. * <p> * Binary serializer can be configured for all binary objects via - * {@link org.apache.ignite.marshaller.portable.BinaryMarshaller#getSerializer()} method, or for a specific + * {@link org.apache.ignite.configuration.BinaryConfiguration#getSerializer()} method, or for a specific * binary type via {@link BinaryTypeConfiguration#getSerializer()} method. */ public interface BinarySerializer { http://git-wip-us.apache.org/repos/asf/ignite/blob/eee3b21b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryTypeImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryTypeImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryTypeImpl.java index 2630a40..5f2a91e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryTypeImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryTypeImpl.java @@ -67,7 +67,9 @@ public class BinaryTypeImpl implements BinaryType { return meta.affinityKeyFieldName(); } - /** {@inheritDoc} */ + /** + * @return Portable context. + */ public PortableContext context() { return ctx; } http://git-wip-us.apache.org/repos/asf/ignite/blob/eee3b21b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java index d49a029..b3d2d4e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java @@ -123,12 +123,21 @@ import org.apache.ignite.internal.util.typedef.F; return proc; } - /** {@inheritDoc} */ + /** + * @param o Object to unwrap. + * @param keepPortable Keep binary flag. + * @return Unwrapped object. + */ public Object unwrapPortableIfNeeded(Object o, boolean keepPortable) { return unwrapPortableIfNeeded(o, keepPortable, true); } - /** {@inheritDoc} */ + /** + * @param o Object to unwrap. + * @param keepPortable Keep binary flag. + * @param cpy Copy value flag. + * @return Unwrapped object. + */ public Object unwrapPortableIfNeeded(Object o, boolean keepPortable, boolean cpy) { if (o == null) return null; @@ -136,12 +145,21 @@ import org.apache.ignite.internal.util.typedef.F; return unwrapPortable(o, keepPortable, cpy); } - /** {@inheritDoc} */ + /** + * @param col Collection of objects to unwrap. + * @param keepPortable Keep binary flag. + * @return Unwrapped collection. + */ public Collection<Object> unwrapPortablesIfNeeded(Collection<Object> col, boolean keepPortable) { return unwrapPortablesIfNeeded(col, keepPortable, true); } - /** {@inheritDoc} */ + /** + * @param col Collection to unwrap. + * @param keepPortable Keep binary flag. + * @param cpy Copy value flag. + * @return Unwrapped collection. + */ public Collection<Object> unwrapPortablesIfNeeded(Collection<Object> col, boolean keepPortable, boolean cpy) { if (col instanceof ArrayList) return unwrapPortables((ArrayList<Object>)col, keepPortable, cpy); http://git-wip-us.apache.org/repos/asf/ignite/blob/eee3b21b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java index 4169e5e..64fbcde 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java @@ -339,7 +339,11 @@ public final class GridCacheAtomicLongImpl implements GridCacheAtomicLongEx, Ext } } - /** {@inheritDoc} */ + /** + * @param expVal Expected value. + * @param newVal New value. + * @return Old value. + */ public long compareAndSetAndGet(long expVal, long newVal) { checkRemoved(); http://git-wip-us.apache.org/repos/asf/ignite/blob/eee3b21b/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryMarshallerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryMarshallerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryMarshallerSelfTest.java index 4584575..19c40b3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryMarshallerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/BinaryMarshallerSelfTest.java @@ -795,7 +795,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest { BinaryObjectEx po1 = marshal(obj1, marsh); assertEquals(11111, po1.typeId()); - assertEquals(10, po1.field(22222)); + assertEquals((Integer)10, po1.field(22222)); assertEquals("str", po1.field(33333)); assertEquals(10, po1.<CustomMappedObject1>deserialize().val1); @@ -852,7 +852,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest { BinaryObjectEx po1 = marshal(obj1, marsh); assertEquals(11111, po1.typeId()); - assertEquals(10, po1.field(22222)); + assertEquals((Integer)10, po1.field(22222)); assertEquals("str1", po1.field(33333)); assertEquals(10, po1.<CustomMappedObject1>deserialize().val1); @@ -863,7 +863,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest { BinaryObjectEx po2 = marshal(obj2, marsh); assertEquals(44444, po2.typeId()); - assertEquals(20, po2.field(55555)); + assertEquals((Integer)20, po2.field(55555)); assertEquals("str2", po2.field(66666)); assertEquals(20, po2.<CustomMappedObject2>deserialize().val1);
