You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/11/05 04:28:55 UTC
[63/66] [abbrv] ignite git commit: ignite-950-new - Renaming.
ignite-950-new - Renaming.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c61f12e2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c61f12e2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c61f12e2
Branch: refs/heads/ignite-1753-1282
Commit: c61f12e24f9ba1ec5bb6562bc1f8abc83e759743
Parents: b73334e
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Wed Nov 4 17:03:03 2015 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Wed Nov 4 17:03:03 2015 +0300
----------------------------------------------------------------------
.../main/java/org/apache/ignite/binary/BinaryObject.java | 9 ++++-----
.../java/org/apache/ignite/binary/BinaryObjectBuilder.java | 4 ++--
.../org/apache/ignite/internal/portable/BinaryObjectEx.java | 4 ++--
.../apache/ignite/internal/portable/BinaryObjectImpl.java | 2 +-
.../ignite/internal/portable/BinaryObjectOffheapImpl.java | 2 +-
.../cache/portable/CacheObjectPortableProcessorImpl.java | 2 +-
.../ignite/marshaller/portable/PortableMarshaller.java | 1 +
.../internal/portable/GridBinaryObjectBuilderSelfTest.java | 6 +++---
.../internal/portable/GridPortableMetaDataSelfTest.java | 2 +-
.../GridCacheClientNodeBinaryObjectMetadataTest.java | 6 +++---
.../portable/GridCachePortableStorePortablesSelfTest.java | 2 +-
11 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c61f12e2/modules/core/src/main/java/org/apache/ignite/binary/BinaryObject.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/binary/BinaryObject.java b/modules/core/src/main/java/org/apache/ignite/binary/BinaryObject.java
index 12a333b..f48f350 100644
--- a/modules/core/src/main/java/org/apache/ignite/binary/BinaryObject.java
+++ b/modules/core/src/main/java/org/apache/ignite/binary/BinaryObject.java
@@ -112,11 +112,10 @@ public interface BinaryObject extends Serializable, Cloneable {
/**
* Gets type information for this binary object.
*
- * @return Meta data.
+ * @return Binary object type information.
* @throws BinaryObjectException In case of error.
- * TODO ignite-950 rename to type().
*/
- public BinaryType metaData() throws BinaryObjectException;
+ public BinaryType type() throws BinaryObjectException;
/**
* Gets field value.
@@ -124,13 +123,13 @@ public interface BinaryObject extends Serializable, Cloneable {
* @param fieldName Field name.
* @return Field value.
* @throws BinaryObjectException In case of any other error.
- * TODO ignite-950 remove.
+ * TODO ignite-1282 remove.
*/
public <F> F field(String fieldName) throws BinaryObjectException;
/**
* Checks whether field is set.
- ** TODO ignite-950 remove.
+ ** TODO ignite-1282 remove.
*
* @param fieldName Field name.
* @return {@code true} if field is set.
http://git-wip-us.apache.org/repos/asf/ignite/blob/c61f12e2/modules/core/src/main/java/org/apache/ignite/binary/BinaryObjectBuilder.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/binary/BinaryObjectBuilder.java b/modules/core/src/main/java/org/apache/ignite/binary/BinaryObjectBuilder.java
index fb29331..507b0fc 100644
--- a/modules/core/src/main/java/org/apache/ignite/binary/BinaryObjectBuilder.java
+++ b/modules/core/src/main/java/org/apache/ignite/binary/BinaryObjectBuilder.java
@@ -82,7 +82,7 @@ public interface BinaryObjectBuilder {
*
* @param name Field name.
* @param val Field value (cannot be {@code null}).
- * @see BinaryObject#metaData()
+ * @see BinaryObject#type()
*/
public BinaryObjectBuilder setField(String name, Object val);
@@ -94,7 +94,7 @@ public interface BinaryObjectBuilder {
* @param name Field name.
* @param val Field value.
* @param type Field type.
- * @see BinaryObject#metaData()
+ * @see BinaryObject#type()
*/
public <T> BinaryObjectBuilder setField(String name, @Nullable T val, Class<? super T> type);
http://git-wip-us.apache.org/repos/asf/ignite/blob/c61f12e2/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectEx.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectEx.java
index bfbb997..50b9d42 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectEx.java
@@ -163,7 +163,7 @@ public abstract class BinaryObjectEx implements BinaryObject {
BinaryType meta;
try {
- meta = metaData();
+ meta = type();
}
catch (BinaryObjectException ignore) {
meta = null;
@@ -209,7 +209,7 @@ public abstract class BinaryObjectEx implements BinaryObject {
Integer idHash0 = handles.get(val);
if (idHash0 != null) { // Circular reference.
- BinaryType meta0 = po.metaData();
+ BinaryType meta0 = po.type();
assert meta0 != null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/c61f12e2/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java
index 7bf1ee8..f0f41b9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java
@@ -247,7 +247,7 @@ public final class BinaryObjectImpl extends BinaryObjectEx implements Externaliz
}
/** {@inheritDoc} */
- @Nullable @Override public BinaryType metaData() throws BinaryObjectException {
+ @Nullable @Override public BinaryType type() throws BinaryObjectException {
if (ctx == null)
throw new BinaryObjectException("PortableContext is not set for the object.");
http://git-wip-us.apache.org/repos/asf/ignite/blob/c61f12e2/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectOffheapImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectOffheapImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectOffheapImpl.java
index 6f51de1..e53e9fb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectOffheapImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectOffheapImpl.java
@@ -173,7 +173,7 @@ public class BinaryObjectOffheapImpl extends BinaryObjectEx implements Externali
}
/** {@inheritDoc} */
- @Nullable @Override public BinaryType metaData() throws BinaryObjectException {
+ @Nullable @Override public BinaryType type() throws BinaryObjectException {
if (ctx == null)
throw new BinaryObjectException("PortableContext is not set for the object.");
http://git-wip-us.apache.org/repos/asf/ignite/blob/c61f12e2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessorImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessorImpl.java
index 0adeb09..a17c56b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessorImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessorImpl.java
@@ -659,7 +659,7 @@ public class CacheObjectPortableProcessorImpl extends IgniteCacheObjectProcessor
*/
public Object affinityKey(BinaryObject po) {
try {
- BinaryType meta = po.metaData();
+ BinaryType meta = po.type();
if (meta != null) {
String affKeyFieldName = meta.affinityKeyFieldName();
http://git-wip-us.apache.org/repos/asf/ignite/blob/c61f12e2/modules/core/src/main/java/org/apache/ignite/marshaller/portable/PortableMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/portable/PortableMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/portable/PortableMarshaller.java
index 94622f5..d3e7437 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/portable/PortableMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/portable/PortableMarshaller.java
@@ -74,6 +74,7 @@ import org.jetbrains.annotations.Nullable;
* For information about Spring framework visit <a href="http://www.springframework.org/">www.springframework.org</a>
*/
public class PortableMarshaller extends AbstractMarshaller {
+ // TODO ignite-1282 Move to IgniteConfiguration.
/** Class names. */
private Collection<String> clsNames;
http://git-wip-us.apache.org/repos/asf/ignite/blob/c61f12e2/modules/core/src/test/java/org/apache/ignite/internal/portable/GridBinaryObjectBuilderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridBinaryObjectBuilderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridBinaryObjectBuilderSelfTest.java
index 1c19639..725605b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridBinaryObjectBuilderSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridBinaryObjectBuilderSelfTest.java
@@ -775,7 +775,7 @@ public class GridBinaryObjectBuilderSelfTest extends GridCommonAbstractTest {
BinaryObject po = builder.build();
- BinaryType meta = po.metaData();
+ BinaryType meta = po.type();
assertEquals("MetaTest2", meta.typeName());
assertEquals("Object", meta.fieldTypeName("objectField"));
@@ -794,7 +794,7 @@ public class GridBinaryObjectBuilderSelfTest extends GridCommonAbstractTest {
BinaryObject po = builder.build();
- BinaryType meta = po.metaData();
+ BinaryType meta = po.type();
assertEquals("MetaTest", meta.typeName());
@@ -817,7 +817,7 @@ public class GridBinaryObjectBuilderSelfTest extends GridCommonAbstractTest {
po = builder.build();
- meta = po.metaData();
+ meta = po.type();
assertEquals("MetaTest", meta.typeName());
http://git-wip-us.apache.org/repos/asf/ignite/blob/c61f12e2/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataSelfTest.java
index 98cb9cd..c0e2563 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMetaDataSelfTest.java
@@ -278,7 +278,7 @@ public class GridPortableMetaDataSelfTest extends GridCommonAbstractTest {
info(po.toString());
- BinaryType meta = po.metaData();
+ BinaryType meta = po.type();
assertNotNull(meta);
http://git-wip-us.apache.org/repos/asf/ignite/blob/c61f12e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheClientNodeBinaryObjectMetadataTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheClientNodeBinaryObjectMetadataTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheClientNodeBinaryObjectMetadataTest.java
index b842ebb..c2d0197 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheClientNodeBinaryObjectMetadataTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCacheClientNodeBinaryObjectMetadataTest.java
@@ -127,7 +127,7 @@ public class GridCacheClientNodeBinaryObjectMetadataTest extends GridCacheAbstra
BinaryObject obj = cache.get(0);
- BinaryType meta = obj.metaData();
+ BinaryType meta = obj.type();
assertNotNull(meta);
assertEquals(1, meta.fields().size());
@@ -154,7 +154,7 @@ public class GridCacheClientNodeBinaryObjectMetadataTest extends GridCacheAbstra
BinaryObject obj = cache.get(0);
- BinaryType meta = obj.metaData();
+ BinaryType meta = obj.type();
assertNotNull(meta);
assertEquals(2, meta.fields().size());
@@ -182,7 +182,7 @@ public class GridCacheClientNodeBinaryObjectMetadataTest extends GridCacheAbstra
assertEquals(Integer.valueOf(2), obj.field("f2"));
assertNull(obj.field("f1"));
- meta = obj.metaData();
+ meta = obj.type();
assertNotNull(meta);
assertEquals(2, meta.fields().size());
http://git-wip-us.apache.org/repos/asf/ignite/blob/c61f12e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableStorePortablesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableStorePortablesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableStorePortablesSelfTest.java
index 4471502..95101df 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableStorePortablesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableStorePortablesSelfTest.java
@@ -51,7 +51,7 @@ public class GridCachePortableStorePortablesSelfTest extends GridCachePortableSt
BinaryObject po = (BinaryObject)val;
- assertEquals("Value", po.metaData().typeName());
+ assertEquals("Value", po.type().typeName());
assertEquals(new Integer(idx), po.field("idx"));
}
}