You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/12/11 19:44:31 UTC
[3/8] ignite git commit: ignite-2065: portable -> binary renaming
(methods, javadoc and etc.)
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientBinaryMetaData.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientBinaryMetaData.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientBinaryMetaData.java
index daa056b..f1fd99c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientBinaryMetaData.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientBinaryMetaData.java
@@ -21,7 +21,7 @@ import java.util.Map;
import org.apache.ignite.internal.util.typedef.internal.S;
/**
- * Portable meta data sent from client.
+ * Binary meta data sent from client.
*/
public class GridClientBinaryMetaData {
/** */
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskRequest.java
index 3ac16f2..4977430 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientTaskRequest.java
@@ -36,7 +36,7 @@ public class GridClientTaskRequest extends GridClientAbstractMessage {
private Object arg;
/** Keep binary flag. */
- private boolean keepPortables;
+ private boolean keepBinaries;
/**
* @return Task name.
@@ -69,15 +69,15 @@ public class GridClientTaskRequest extends GridClientAbstractMessage {
/**
* @return Keep binary flag.
*/
- public boolean keepPortables() {
- return keepPortables;
+ public boolean keepBinaries() {
+ return keepBinaries;
}
/**
- * @param keepPortables Keep binary flag.
+ * @param keepBinaries Keep binary flag.
*/
- public void keepPortables(boolean keepPortables) {
- this.keepPortables = keepPortables;
+ public void keepBinaries(boolean keepBinaries) {
+ this.keepBinaries = keepBinaries;
}
/** {@inheritDoc} */
@@ -122,4 +122,4 @@ public class GridClientTaskRequest extends GridClientAbstractMessage {
@Override public String toString() {
return getClass().getSimpleName() + " [taskName=" + taskName + ", arg=" + arg + "]";
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorMimeTypes.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorMimeTypes.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorMimeTypes.java
index 1792e04..1c27ecb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorMimeTypes.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorMimeTypes.java
@@ -276,7 +276,7 @@ public class VisorMimeTypes {
mimeTypes.put("htm", "text/html");
mimeTypes.put("docm", "application/vnd.ms-word.document.macroenabled.12");
mimeTypes.put("xdssc", "application/dssc+xml");
- mimeTypes.put("pbm", "image/x-portable-bitmap");
+ mimeTypes.put("pbm", "image/x-binary-bitmap");
mimeTypes.put("fdf", "application/vnd.fdf");
mimeTypes.put("ggt", "application/vnd.geogebra.tool");
mimeTypes.put("cii", "application/vnd.anser-web-certificate-issue-initiation");
@@ -760,7 +760,7 @@ public class VisorMimeTypes {
mimeTypes.put("otf", "application/x-font-otf");
mimeTypes.put("clkx", "application/vnd.crick.clicker");
mimeTypes.put("xbd", "application/vnd.fujixerox.docuworks.binder");
- mimeTypes.put("ppm", "image/x-portable-pixmap");
+ mimeTypes.put("ppm", "image/x-binary-pixmap");
mimeTypes.put("wav", "audio/x-wav");
mimeTypes.put("ssml", "application/ssml+xml");
mimeTypes.put("p7b", "application/x-pkcs7-certificates");
@@ -808,7 +808,7 @@ public class VisorMimeTypes {
mimeTypes.put("xenc", "application/xenc+xml");
mimeTypes.put("wpl", "application/vnd.ms-wpl");
mimeTypes.put("dxf", "image/vnd.dxf");
- mimeTypes.put("pgm", "image/x-portable-graymap");
+ mimeTypes.put("pgm", "image/x-binary-graymap");
mimeTypes.put("spot", "text/vnd.in3d.spot");
mimeTypes.put("odt", "application/vnd.oasis.opendocument.text");
mimeTypes.put("azs", "application/vnd.airzip.filesecure.azs");
@@ -817,7 +817,7 @@ public class VisorMimeTypes {
mimeTypes.put("dd2", "application/vnd.oma.dd2+xml");
mimeTypes.put("semf", "application/vnd.semf");
mimeTypes.put("semd", "application/vnd.semd");
- mimeTypes.put("pnm", "image/x-portable-anymap");
+ mimeTypes.put("pnm", "image/x-binary-anymap");
mimeTypes.put("sema", "application/vnd.sema");
mimeTypes.put("wma", "audio/x-ms-wma");
mimeTypes.put("cww", "application/prs.cww");
@@ -1017,4 +1017,4 @@ public class VisorMimeTypes {
return null;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/marshaller/portable/package-info.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/portable/package-info.java b/modules/core/src/main/java/org/apache/ignite/marshaller/portable/package-info.java
deleted file mode 100644
index 90cc5e6..0000000
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/portable/package-info.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * <!-- Package description. -->
- * Contains portable marshaller API classes.
- */
-package org.apache.ignite.marshaller.portable;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetBinaryConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetBinaryConfiguration.java b/modules/core/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetBinaryConfiguration.java
index 3914c32..7c5da2f 100644
--- a/modules/core/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetBinaryConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetBinaryConfiguration.java
@@ -41,7 +41,7 @@ public class PlatformDotNetBinaryConfiguration {
/** Default serializer. */
private String dfltSerializer;
- /** Whether to cache deserialized value in IGridPortableObject */
+ /** Whether to cache deserialized value in IGridBinaryObject */
private boolean dfltKeepDeserialized = true;
/**
@@ -145,7 +145,7 @@ public class PlatformDotNetBinaryConfiguration {
/**
* Gets default keep deserialized flag. See {@link #setDefaultKeepDeserialized(boolean)} for more information.
*
- * @return Flag indicates whether to cache deserialized value in IGridPortableObject.
+ * @return Flag indicates whether to cache deserialized value in IGridBinaryObject.
*/
public boolean isDefaultKeepDeserialized() {
return dfltKeepDeserialized;
@@ -167,4 +167,4 @@ public class PlatformDotNetBinaryConfiguration {
@Override public String toString() {
return S.toString(PlatformDotNetBinaryConfiguration.class, this);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetConfiguration.java b/modules/core/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetConfiguration.java
index f323085..d31ab95 100644
--- a/modules/core/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/platform/dotnet/PlatformDotNetConfiguration.java
@@ -61,10 +61,10 @@ public class PlatformDotNetConfiguration implements PlatformConfiguration {
}
/**
- * @param portableCfg Configuration.
+ * @param binaryCfg Configuration.
*/
- public void setBinaryConfiguration(PlatformDotNetBinaryConfiguration portableCfg) {
- this.binaryCfg = portableCfg;
+ public void setBinaryConfiguration(PlatformDotNetBinaryConfiguration binaryCfg) {
+ this.binaryCfg = binaryCfg;
}
/**
@@ -94,4 +94,4 @@ public class PlatformDotNetConfiguration implements PlatformConfiguration {
@Override public String toString() {
return S.toString(PlatformDotNetConfiguration.class, this);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index 2aa0f09..d801109 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -3228,7 +3228,7 @@ class ServerImpl extends TcpDiscoveryImpl {
boolean rmtMarshCompactFooterBool = rmtMarshCompactFooter != null ? rmtMarshCompactFooter : false;
if (locMarshCompactFooterBool != rmtMarshCompactFooterBool) {
- String errMsg = "Local node's portable marshaller \"compactFooter\" property differs from " +
+ String errMsg = "Local node's binary marshaller \"compactFooter\" property differs from " +
"the same property on remote node (make sure all nodes in topology have the same value " +
"of \"compactFooter\" property) [locMarshallerCompactFooter=" + locMarshCompactFooterBool +
", rmtMarshallerCompactFooter=" + rmtMarshCompactFooterBool +
@@ -3243,7 +3243,7 @@ class ServerImpl extends TcpDiscoveryImpl {
log.debug(errMsg);
try {
- String sndMsg = "Local node's portable marshaller \"compactFooter\" property differs from " +
+ String sndMsg = "Local node's binary marshaller \"compactFooter\" property differs from " +
"the same property on remote node (make sure all nodes in topology have the same value " +
"of \"compactFooter\" property) [locMarshallerCompactFooter=" + rmtMarshCompactFooterBool +
", rmtMarshallerCompactFooter=" + locMarshCompactFooterBool +
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/jsr166/ConcurrentHashMap8.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/jsr166/ConcurrentHashMap8.java b/modules/core/src/main/java/org/jsr166/ConcurrentHashMap8.java
index b3747d7..df6afcc 100644
--- a/modules/core/src/main/java/org/jsr166/ConcurrentHashMap8.java
+++ b/modules/core/src/main/java/org/jsr166/ConcurrentHashMap8.java
@@ -3263,7 +3263,7 @@ public class ConcurrentHashMap8<K, V>
}
/**
- * Returns exportable snapshot entry for the given key and value
+ * Returns exbinary snapshot entry for the given key and value
* when write-through can't or shouldn't be used.
*/
static <K,V> AbstractMap.SimpleEntry<K,V> entryFor(K k, V v) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/resources/META-INF/classnames.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/main/resources/META-INF/classnames.properties b/modules/core/src/main/resources/META-INF/classnames.properties
index c1bac44..913320b 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -300,10 +300,10 @@ org.apache.ignite.internal.binary.BinaryObjectImpl
org.apache.ignite.internal.binary.BinaryObjectOffheapImpl
org.apache.ignite.internal.binary.BinaryReaderExImpl$Flag
org.apache.ignite.internal.binary.BinaryWriteMode
-org.apache.ignite.internal.binary.PortableContext
-org.apache.ignite.internal.binary.PortableSchema
-org.apache.ignite.internal.binary.PortableSchema$Confirmation
-org.apache.ignite.internal.binary.builder.PortableLazyMap$1$1$1
+org.apache.ignite.internal.binary.BinaryContext
+org.apache.ignite.internal.binary.BinarySchema
+org.apache.ignite.internal.binary.BinarySchema$Confirmation
+org.apache.ignite.internal.binary.builder.BinaryLazyMap$1$1$1
org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion
org.apache.ignite.internal.processors.affinity.GridAffinityAssignment
org.apache.ignite.internal.processors.affinity.GridAffinityMessage
@@ -745,14 +745,14 @@ org.apache.ignite.internal.processors.cache.local.atomic.GridLocalAtomicCache$4
org.apache.ignite.internal.processors.cache.local.atomic.GridLocalAtomicCache$5
org.apache.ignite.internal.processors.cache.local.atomic.GridLocalAtomicCache$6
org.apache.ignite.internal.processors.cache.local.atomic.GridLocalAtomicCache$9
-org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.CacheDefaultPortableAffinityKeyMapper
+org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.CacheDefaultBinaryAffinityKeyMapper
org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl$1
org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl$4
org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl$5
org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl$MetaDataEntryFilter
org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl$MetaDataPredicate
org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl$MetadataProcessor
-org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.PortableMetadataKey
+org.apache.ignite.internal.binaryorg.apache.ignite.internal.processors.cache.binary.BinaryMetadataKey
org.apache.ignite.internal.processors.cache.query.CacheQueryType
org.apache.ignite.internal.processors.cache.query.GridCacheDistributedQueryFuture$1
org.apache.ignite.internal.processors.cache.query.GridCacheDistributedQueryFuture$3
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.jar
----------------------------------------------------------------------
diff --git a/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.jar b/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.jar
new file mode 100644
index 0000000..863350d
Binary files /dev/null and b/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.jar differ
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.pom
----------------------------------------------------------------------
diff --git a/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.pom b/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.pom
new file mode 100644
index 0000000..533a3c9
--- /dev/null
+++ b/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.pom
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.ignite.binary</groupId>
+ <artifactId>test1</artifactId>
+ <version>1.1</version>
+ <description>POM was created from install:install-file</description>
+</project>
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test1/maven-metadata-local.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test1/maven-metadata-local.xml b/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test1/maven-metadata-local.xml
new file mode 100644
index 0000000..4ca5d44
--- /dev/null
+++ b/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test1/maven-metadata-local.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>org.apache.ignite.binary</groupId>
+ <artifactId>test1</artifactId>
+ <versioning>
+ <release>1.1</release>
+ <versions>
+ <version>1.1</version>
+ </versions>
+ <lastUpdated>20140806090184</lastUpdated>
+ </versioning>
+</metadata>
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.jar
----------------------------------------------------------------------
diff --git a/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.jar b/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.jar
new file mode 100644
index 0000000..ccf4ea2
Binary files /dev/null and b/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.jar differ
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.pom
----------------------------------------------------------------------
diff --git a/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.pom b/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.pom
new file mode 100644
index 0000000..2eaaeff
--- /dev/null
+++ b/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.pom
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.ignite.binary</groupId>
+ <artifactId>test2</artifactId>
+ <version>1.1</version>
+ <description>POM was created from install:install-file</description>
+</project>
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test2/maven-metadata-local.xml
----------------------------------------------------------------------
diff --git a/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test2/maven-metadata-local.xml b/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test2/maven-metadata-local.xml
new file mode 100644
index 0000000..c45c88f
--- /dev/null
+++ b/modules/core/src/test/binaries/repo/org/apache/ignite/binary/test2/maven-metadata-local.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>org.apache.ignite.binary</groupId>
+ <artifactId>test2</artifactId>
+ <versioning>
+ <release>1.1</release>
+ <versions>
+ <version>1.1</version>
+ </versions>
+ <lastUpdated>20140806090410</lastUpdated>
+ </versioning>
+</metadata>
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java
index 7d53705..943c5aa 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsAbstractSelfTest.java
@@ -34,7 +34,7 @@ import java.util.Date;
import java.util.UUID;
/**
- * Contains tests for portable object fields.
+ * Contains tests for binary object fields.
*/
public abstract class BinaryFieldsAbstractSelfTest extends GridCommonAbstractTest {
/** Marshaller. */
@@ -43,7 +43,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends GridCommonAbstractTes
/**
* Create marshaller.
*
- * @return Portable marshaller.
+ * @return Binary marshaller.
* @throws Exception If failed.
*/
protected BinaryMarshaller createMarshaller() throws Exception {
@@ -67,7 +67,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends GridCommonAbstractTes
marsh.setContext(new MarshallerContextTestImpl(null));
- IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setPortableContext", ctx, iCfg);
+ IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setBinaryContext", ctx, iCfg);
return marsh;
}
@@ -80,12 +80,12 @@ public abstract class BinaryFieldsAbstractSelfTest extends GridCommonAbstractTes
}
/**
- * Get portable context for the current marshaller.
+ * Get binary context for the current marshaller.
*
* @param marsh Marshaller.
- * @return Portable context.
+ * @return Binary context.
*/
- protected static BinaryContext portableContext(BinaryMarshaller marsh) {
+ protected static BinaryContext binaryContext(BinaryMarshaller marsh) {
GridBinaryMarshaller impl = U.field(marsh, "impl");
return impl.context();
@@ -478,7 +478,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends GridCommonAbstractTes
/**
* Get test context.
*
- * @param marsh Portable marshaller.
+ * @param marsh Binary marshaller.
* @param fieldName Field name.
* @return Test context.
* @throws Exception If failed.
@@ -486,7 +486,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends GridCommonAbstractTes
private TestContext context(BinaryMarshaller marsh, String fieldName) throws Exception {
TestObject obj = createObject();
- BinaryObjectExImpl portObj = toPortable(marsh, obj);
+ BinaryObjectExImpl portObj = toBinary(marsh, obj);
BinaryField field = portObj.type().field(fieldName);
@@ -496,7 +496,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends GridCommonAbstractTes
/**
* Get test context with nested test object.
*
- * @param marsh Portable marshaller.
+ * @param marsh Binary marshaller.
* @param fieldName Field name.
* @return Test context.
* @throws Exception If failed.
@@ -506,7 +506,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends GridCommonAbstractTes
TestObject obj = createObject();
TestOuterObject outObj = new TestOuterObject(obj);
- BinaryObjectExImpl portOutObj = toPortable(marsh, outObj);
+ BinaryObjectExImpl portOutObj = toBinary(marsh, outObj);
BinaryObjectExImpl portObj = portOutObj.field("fInner");
assert portObj != null;
@@ -526,14 +526,14 @@ public abstract class BinaryFieldsAbstractSelfTest extends GridCommonAbstractTes
}
/**
- * Convert object to portable object.
+ * Convert object to binary object.
*
* @param marsh Marshaller.
* @param obj Object.
- * @return Portable object.
+ * @return Binary object.
* @throws Exception If failed.
*/
- protected abstract BinaryObjectExImpl toPortable(BinaryMarshaller marsh, Object obj) throws Exception;
+ protected abstract BinaryObjectExImpl toBinary(BinaryMarshaller marsh, Object obj) throws Exception;
/**
* Outer test object.
@@ -696,7 +696,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends GridCommonAbstractTes
/** Object. */
public final TestObject obj;
- /** Portable object. */
+ /** Binary object. */
public final BinaryObjectExImpl portObj;
/** Field. */
@@ -706,7 +706,7 @@ public abstract class BinaryFieldsAbstractSelfTest extends GridCommonAbstractTes
* Constructor.
*
* @param obj Object.
- * @param portObj Portable object.
+ * @param portObj Binary object.
* @param field Field.
*/
public TestContext(TestObject obj, BinaryObjectExImpl portObj, BinaryField field) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsHeapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsHeapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsHeapSelfTest.java
index 0e92bf4..fceffa0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsHeapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsHeapSelfTest.java
@@ -18,13 +18,13 @@
package org.apache.ignite.internal.binary;
/**
- * Field tests for heap-based portables.
+ * Field tests for heap-based binaries.
*/
public class BinaryFieldsHeapSelfTest extends BinaryFieldsAbstractSelfTest {
/** {@inheritDoc} */
- @Override protected BinaryObjectExImpl toPortable(BinaryMarshaller marsh, Object obj) throws Exception {
+ @Override protected BinaryObjectExImpl toBinary(BinaryMarshaller marsh, Object obj) throws Exception {
byte[] bytes = marsh.marshal(obj);
- return new BinaryObjectImpl(portableContext(marsh), bytes, 0);
+ return new BinaryObjectImpl(binaryContext(marsh), bytes, 0);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsOffheapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsOffheapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsOffheapSelfTest.java
index d24d898..87cc527 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsOffheapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFieldsOffheapSelfTest.java
@@ -22,7 +22,7 @@ import org.eclipse.jetty.util.ConcurrentHashSet;
import sun.misc.Unsafe;
/**
- * Field tests for heap-based portables.
+ * Field tests for heap-based binaries.
*/
public class BinaryFieldsOffheapSelfTest extends BinaryFieldsAbstractSelfTest {
/** Unsafe instance. */
@@ -46,7 +46,7 @@ public class BinaryFieldsOffheapSelfTest extends BinaryFieldsAbstractSelfTest {
}
/** {@inheritDoc} */
- @Override protected BinaryObjectExImpl toPortable(BinaryMarshaller marsh, Object obj) throws Exception {
+ @Override protected BinaryObjectExImpl toBinary(BinaryMarshaller marsh, Object obj) throws Exception {
byte[] arr = marsh.marshal(obj);
long ptr = UNSAFE.allocateMemory(arr.length);
@@ -55,6 +55,6 @@ public class BinaryFieldsOffheapSelfTest extends BinaryFieldsAbstractSelfTest {
UNSAFE.copyMemory(arr, BYTE_ARR_OFF, null, ptr, arr.length);
- return new BinaryObjectOffheapImpl(portableContext(marsh), ptr, 0, arr.length);
+ return new BinaryObjectOffheapImpl(binaryContext(marsh), ptr, 0, arr.length);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsAbstractSelfTest.java
index 43609b8..0e3749c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsAbstractSelfTest.java
@@ -39,7 +39,7 @@ public abstract class BinaryFooterOffsetsAbstractSelfTest extends GridCommonAbst
/** Marshaller. */
protected BinaryMarshaller marsh;
- /** Portable context. */
+ /** Binary context. */
protected BinaryContext ctx;
/** {@inheritDoc} */
@@ -62,7 +62,7 @@ public abstract class BinaryFooterOffsetsAbstractSelfTest extends GridCommonAbst
marsh.setContext(new MarshallerContextTestImpl(null));
- IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setPortableContext", ctx, iCfg);
+ IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setBinaryContext", ctx, iCfg);
}
/**
@@ -127,9 +127,9 @@ public abstract class BinaryFooterOffsetsAbstractSelfTest extends GridCommonAbst
private void check(int len) throws Exception {
TestObject obj = new TestObject(len);
- BinaryObjectExImpl portObj = toPortable(marsh, obj);
+ BinaryObjectExImpl portObj = toBinary(marsh, obj);
- // 1. Test portable object content.
+ // 1. Test binary object content.
assert portObj.hasField("field1");
assert portObj.hasField("field2");
@@ -162,14 +162,14 @@ public abstract class BinaryFooterOffsetsAbstractSelfTest extends GridCommonAbst
}
/**
- * Convert object to portable object.
+ * Convert object to binary object.
*
* @param marsh Marshaller.
* @param obj Object.
- * @return Portable object.
+ * @return Binary object.
* @throws Exception If failed.
*/
- protected abstract BinaryObjectExImpl toPortable(BinaryMarshaller marsh, Object obj) throws Exception;
+ protected abstract BinaryObjectExImpl toBinary(BinaryMarshaller marsh, Object obj) throws Exception;
/**
* Test object.
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsHeapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsHeapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsHeapSelfTest.java
index 68e897e..7b3a754 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsHeapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsHeapSelfTest.java
@@ -18,11 +18,11 @@
package org.apache.ignite.internal.binary;
/**
- * Compact offsets tests for heap portable objects.
+ * Compact offsets tests for heap binary objects.
*/
public class BinaryFooterOffsetsHeapSelfTest extends BinaryFooterOffsetsAbstractSelfTest {
/** {@inheritDoc} */
- @Override protected BinaryObjectExImpl toPortable(BinaryMarshaller marsh, Object obj) throws Exception {
+ @Override protected BinaryObjectExImpl toBinary(BinaryMarshaller marsh, Object obj) throws Exception {
byte[] bytes = marsh.marshal(obj);
return new BinaryObjectImpl(ctx, bytes, 0);
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsOffheapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsOffheapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsOffheapSelfTest.java
index f0f0396..fe9ba17 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsOffheapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryFooterOffsetsOffheapSelfTest.java
@@ -22,7 +22,7 @@ import org.eclipse.jetty.util.ConcurrentHashSet;
import sun.misc.Unsafe;
/**
- * Compact offsets tests for offheap portable objects.
+ * Compact offsets tests for offheap binary objects.
*/
public class BinaryFooterOffsetsOffheapSelfTest extends BinaryFooterOffsetsAbstractSelfTest {
/** Unsafe instance. */
@@ -46,7 +46,7 @@ public class BinaryFooterOffsetsOffheapSelfTest extends BinaryFooterOffsetsAbstr
}
/** {@inheritDoc} */
- @Override protected BinaryObjectExImpl toPortable(BinaryMarshaller marsh, Object obj) throws Exception {
+ @Override protected BinaryObjectExImpl toBinary(BinaryMarshaller marsh, Object obj) throws Exception {
byte[] arr = marsh.marshal(obj);
long ptr = UNSAFE.allocateMemory(arr.length);
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
index 52fecbf..4ecad09 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
@@ -89,7 +89,7 @@ import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertNotEquals;
/**
- * Portable marshaller tests.
+ * Binary marshaller tests.
*/
@SuppressWarnings({"OverlyStrongTypeCast", "ArrayHashCode", "ConstantConditions"})
public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
@@ -632,7 +632,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testPortable() throws Exception {
+ public void testBinary() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
new BinaryTypeConfiguration(SimpleObject.class.getName()),
new BinaryTypeConfiguration(TestBinary.class.getName())
@@ -711,45 +711,45 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
new Integer(((BinaryObject)simplePo.field("enumVal")).enumOrdinal()));
assertArrayEquals(ordinals(obj.simple.enumArr), ordinals((BinaryObject[])simplePo.field("enumArr")));
assertNull(simplePo.field("simple"));
- assertNull(simplePo.field("portable"));
+ assertNull(simplePo.field("binary"));
assertNull(simplePo.field("unknown"));
- BinaryObject portablePo = po.field("_portable");
-
- assertEquals(obj.portable, portablePo.deserialize());
-
- assertEquals(obj.portable.b, (byte)portablePo.field("_b"));
- assertEquals(obj.portable.s, (short)portablePo.field("_s"));
- assertEquals(obj.portable.i, (int)portablePo.field("_i"));
- assertEquals(obj.portable.l, (long)portablePo.field("_l"));
- assertEquals(obj.portable.f, (float)portablePo.field("_f"), 0);
- assertEquals(obj.portable.d, (double)portablePo.field("_d"), 0);
- assertEquals(obj.portable.c, (char)portablePo.field("_c"));
- assertEquals(obj.portable.bool, (boolean)portablePo.field("_bool"));
- assertEquals(obj.portable.str, portablePo.field("_str"));
- assertEquals(obj.portable.uuid, portablePo.field("_uuid"));
- assertEquals(obj.portable.date, portablePo.field("_date"));
- assertEquals(obj.portable.ts, portablePo.field("_ts"));
- assertArrayEquals(obj.portable.bArr, (byte[])portablePo.field("_bArr"));
- assertArrayEquals(obj.portable.sArr, (short[])portablePo.field("_sArr"));
- assertArrayEquals(obj.portable.iArr, (int[])portablePo.field("_iArr"));
- assertArrayEquals(obj.portable.lArr, (long[])portablePo.field("_lArr"));
- assertArrayEquals(obj.portable.fArr, (float[])portablePo.field("_fArr"), 0);
- assertArrayEquals(obj.portable.dArr, (double[])portablePo.field("_dArr"), 0);
- assertArrayEquals(obj.portable.cArr, (char[])portablePo.field("_cArr"));
- assertBooleanArrayEquals(obj.portable.boolArr, (boolean[])portablePo.field("_boolArr"));
- assertArrayEquals(obj.portable.strArr, (String[])portablePo.field("_strArr"));
- assertArrayEquals(obj.portable.uuidArr, (UUID[])portablePo.field("_uuidArr"));
- assertArrayEquals(obj.portable.dateArr, (Date[])portablePo.field("_dateArr"));
- assertArrayEquals(obj.portable.objArr, (Object[])portablePo.field("_objArr"));
- assertEquals(obj.portable.col, portablePo.field("_col"));
- assertEquals(obj.portable.map, portablePo.field("_map"));
- assertEquals(new Integer(obj.portable.enumVal.ordinal()),
- new Integer(((BinaryObject)portablePo.field("_enumVal")).enumOrdinal()));
- assertArrayEquals(ordinals(obj.portable.enumArr), ordinals((BinaryObject[])portablePo.field("_enumArr")));
- assertNull(portablePo.field("_simple"));
- assertNull(portablePo.field("_portable"));
- assertNull(portablePo.field("unknown"));
+ BinaryObject binaryPo = po.field("_binary");
+
+ assertEquals(obj.binary, binaryPo.deserialize());
+
+ assertEquals(obj.binary.b, (byte)binaryPo.field("_b"));
+ assertEquals(obj.binary.s, (short)binaryPo.field("_s"));
+ assertEquals(obj.binary.i, (int)binaryPo.field("_i"));
+ assertEquals(obj.binary.l, (long)binaryPo.field("_l"));
+ assertEquals(obj.binary.f, (float)binaryPo.field("_f"), 0);
+ assertEquals(obj.binary.d, (double)binaryPo.field("_d"), 0);
+ assertEquals(obj.binary.c, (char)binaryPo.field("_c"));
+ assertEquals(obj.binary.bool, (boolean)binaryPo.field("_bool"));
+ assertEquals(obj.binary.str, binaryPo.field("_str"));
+ assertEquals(obj.binary.uuid, binaryPo.field("_uuid"));
+ assertEquals(obj.binary.date, binaryPo.field("_date"));
+ assertEquals(obj.binary.ts, binaryPo.field("_ts"));
+ assertArrayEquals(obj.binary.bArr, (byte[])binaryPo.field("_bArr"));
+ assertArrayEquals(obj.binary.sArr, (short[])binaryPo.field("_sArr"));
+ assertArrayEquals(obj.binary.iArr, (int[])binaryPo.field("_iArr"));
+ assertArrayEquals(obj.binary.lArr, (long[])binaryPo.field("_lArr"));
+ assertArrayEquals(obj.binary.fArr, (float[])binaryPo.field("_fArr"), 0);
+ assertArrayEquals(obj.binary.dArr, (double[])binaryPo.field("_dArr"), 0);
+ assertArrayEquals(obj.binary.cArr, (char[])binaryPo.field("_cArr"));
+ assertBooleanArrayEquals(obj.binary.boolArr, (boolean[])binaryPo.field("_boolArr"));
+ assertArrayEquals(obj.binary.strArr, (String[])binaryPo.field("_strArr"));
+ assertArrayEquals(obj.binary.uuidArr, (UUID[])binaryPo.field("_uuidArr"));
+ assertArrayEquals(obj.binary.dateArr, (Date[])binaryPo.field("_dateArr"));
+ assertArrayEquals(obj.binary.objArr, (Object[])binaryPo.field("_objArr"));
+ assertEquals(obj.binary.col, binaryPo.field("_col"));
+ assertEquals(obj.binary.map, binaryPo.field("_map"));
+ assertEquals(new Integer(obj.binary.enumVal.ordinal()),
+ new Integer(((BinaryObject)binaryPo.field("_enumVal")).enumOrdinal()));
+ assertArrayEquals(ordinals(obj.binary.enumArr), ordinals((BinaryObject[])binaryPo.field("_enumArr")));
+ assertNull(binaryPo.field("_simple"));
+ assertNull(binaryPo.field("_binary"));
+ assertNull(binaryPo.field("unknown"));
}
/**
@@ -859,7 +859,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @param obj Simple object.
- * @param po Portable object.
+ * @param po Binary object.
*/
private void checkSimpleObjectData(SimpleObject obj, BinaryObject po) {
assertEquals(obj.b, (byte)po.field("b"));
@@ -1343,7 +1343,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
customType4
));
- BinaryContext ctx = portableContext(marsh);
+ BinaryContext ctx = binaryContext(marsh);
assertEquals("notconfiguredclass".hashCode(), ctx.typeId("NotConfiguredClass"));
assertEquals("key".hashCode(), ctx.typeId("Key"));
@@ -1406,7 +1406,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
customType1,
customType2));
- BinaryContext ctx = portableContext(marsh);
+ BinaryContext ctx = binaryContext(marsh);
assertEquals("val".hashCode(), ctx.fieldId("key".hashCode(), "val"));
assertEquals("val".hashCode(), ctx.fieldId("nonexistentclass2".hashCode(), "val"));
@@ -1463,7 +1463,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testPortableCopy() throws Exception {
+ public void testBinaryCopy() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
new BinaryTypeConfiguration(SimpleObject.class.getName())
));
@@ -1578,7 +1578,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
// return null;
// }
// },
-// PortableException.class,
+// BinaryException.class,
// "Invalid value type for field: i"
// );
}
@@ -1586,7 +1586,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testPortableCopyString() throws Exception {
+ public void testBinaryCopyString() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
new BinaryTypeConfiguration(SimpleObject.class.getName())
));
@@ -1607,7 +1607,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testPortableCopyUuid() throws Exception {
+ public void testBinaryCopyUuid() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
new BinaryTypeConfiguration(SimpleObject.class.getName())
));
@@ -1630,7 +1630,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testPortableCopyByteArray() throws Exception {
+ public void testBinaryCopyByteArray() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
new BinaryTypeConfiguration(SimpleObject.class.getName())
));
@@ -1649,7 +1649,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
}
/**
- * @param po Portable object.
+ * @param po Binary object.
* @param fields Fields.
* @return Copy.
*/
@@ -1667,7 +1667,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testPortableCopyShortArray() throws Exception {
+ public void testBinaryCopyShortArray() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
new BinaryTypeConfiguration(SimpleObject.class.getName())
));
@@ -1688,7 +1688,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testPortableCopyIntArray() throws Exception {
+ public void testBinaryCopyIntArray() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
new BinaryTypeConfiguration(SimpleObject.class.getName())
));
@@ -1709,7 +1709,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testPortableCopyLongArray() throws Exception {
+ public void testBinaryCopyLongArray() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
new BinaryTypeConfiguration(SimpleObject.class.getName())
));
@@ -1730,7 +1730,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testPortableCopyFloatArray() throws Exception {
+ public void testBinaryCopyFloatArray() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
new BinaryTypeConfiguration(SimpleObject.class.getName())
));
@@ -1751,7 +1751,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testPortableCopyDoubleArray() throws Exception {
+ public void testBinaryCopyDoubleArray() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
new BinaryTypeConfiguration(SimpleObject.class.getName())
));
@@ -1772,7 +1772,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testPortableCopyCharArray() throws Exception {
+ public void testBinaryCopyCharArray() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
new BinaryTypeConfiguration(SimpleObject.class.getName())
));
@@ -1793,7 +1793,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testPortableCopyStringArray() throws Exception {
+ public void testBinaryCopyStringArray() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
new BinaryTypeConfiguration(SimpleObject.class.getName())
));
@@ -1814,7 +1814,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testPortableCopyObject() throws Exception {
+ public void testBinaryCopyObject() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
new BinaryTypeConfiguration(SimpleObject.class.getName())
));
@@ -1841,7 +1841,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testPortableCopyNonPrimitives() throws Exception {
+ public void testBinaryCopyNonPrimitives() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(
new BinaryTypeConfiguration(SimpleObject.class.getName())
));
@@ -1878,7 +1878,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testPortableCopyMixed() throws Exception {
+ public void testBinaryCopyMixed() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(new BinaryTypeConfiguration(SimpleObject.class.getName())));
SimpleObject obj = simpleObject();
@@ -1939,10 +1939,10 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testOffheapPortable() throws Exception {
+ public void testOffheapBinary() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(new BinaryTypeConfiguration(SimpleObject.class.getName())));
- BinaryContext ctx = portableContext(marsh);
+ BinaryContext ctx = binaryContext(marsh);
SimpleObject simpleObj = simpleObject();
@@ -2038,11 +2038,11 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
new BinaryTypeConfiguration(MySingleton.class.getName()),
new BinaryTypeConfiguration(SingletonMarker.class.getName())));
- BinaryObjectImpl portableObj = marshal(MySingleton.INSTANCE, marsh);
+ BinaryObjectImpl binaryObj = marshal(MySingleton.INSTANCE, marsh);
- assertTrue(portableObj.array().length <= 1024); // Check that big string was not serialized.
+ assertTrue(binaryObj.array().length <= 1024); // Check that big string was not serialized.
- MySingleton singleton = portableObj.deserialize();
+ MySingleton singleton = binaryObj.deserialize();
assertSame(MySingleton.INSTANCE, singleton);
}
@@ -2050,13 +2050,13 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
*
*/
- public void testReadResolveOnPortableAware() throws Exception {
+ public void testReadResolveOnBinaryAware() throws Exception {
BinaryMarshaller marsh = binaryMarshaller(Collections.singletonList(
new BinaryTypeConfiguration(MyTestClass.class.getName())));
- BinaryObjectImpl portableObj = marshal(new MyTestClass(), marsh);
+ BinaryObjectImpl binaryObj = marshal(new MyTestClass(), marsh);
- MyTestClass obj = portableObj.deserialize();
+ MyTestClass obj = binaryObj.deserialize();
assertEquals("readResolve", obj.s);
}
@@ -2065,11 +2065,11 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
* @throws Exception If ecxeption thrown.
*/
public void testDeclareReadResolveInParent() throws Exception {
- BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(new BinaryTypeConfiguration(ChildPortable.class.getName())));
+ BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(new BinaryTypeConfiguration(ChildBinary.class.getName())));
- BinaryObjectImpl portableObj = marshal(new ChildPortable(), marsh);
+ BinaryObjectImpl binaryObj = marshal(new ChildBinary(), marsh);
- ChildPortable singleton = portableObj.deserialize();
+ ChildBinary singleton = binaryObj.deserialize();
assertNotNull(singleton.s);
}
@@ -2140,7 +2140,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
BinaryMarshaller marsh = binaryMarshaller();
- try (BinaryWriterExImpl writer = new BinaryWriterExImpl(portableContext(marsh))) {
+ try (BinaryWriterExImpl writer = new BinaryWriterExImpl(binaryContext(marsh))) {
assertEquals(true, INSTANCE.isAcquired());
writer.writeString("Thread local test");
@@ -2150,7 +2150,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
assertEquals(true, INSTANCE.isAcquired());
}
- // Checking the portable marshaller.
+ // Checking the binary marshaller.
assertEquals(false, INSTANCE.isAcquired());
marsh = binaryMarshaller();
@@ -2162,12 +2162,12 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
marsh = binaryMarshaller();
// Checking the builder.
- BinaryObjectBuilder builder = new BinaryObjectBuilderImpl(portableContext(marsh),
+ BinaryObjectBuilder builder = new BinaryObjectBuilderImpl(binaryContext(marsh),
"org.gridgain.foo.bar.TestClass");
builder.setField("a", "1");
- BinaryObject portableObj = builder.build();
+ BinaryObject binaryObj = builder.build();
assertEquals(false, INSTANCE.isAcquired());
}
@@ -2273,7 +2273,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
public void testPredefinedTypeIds() throws Exception {
BinaryMarshaller marsh = binaryMarshaller();
- BinaryContext pCtx = portableContext(marsh);
+ BinaryContext pCtx = binaryContext(marsh);
Field field = pCtx.getClass().getDeclaredField("predefinedTypeNames");
@@ -2615,11 +2615,11 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
}
/**
- * @param po Portable object.
+ * @param po Binary object.
* @param off Offset.
* @return Value.
*/
- private int intFromPortable(BinaryObject po, int off) {
+ private int intFromBinary(BinaryObject po, int off) {
byte[] arr = U.field(po, "arr");
return Integer.reverseBytes(U.bytesToInt(arr, off));
@@ -2647,7 +2647,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @param obj Object.
* @param marsh Marshaller.
- * @return Portable object.
+ * @return Binary object.
*/
private <T> BinaryObjectImpl marshal(T obj, BinaryMarshaller marsh) throws IgniteCheckedException {
byte[] bytes = marsh.marshal(obj);
@@ -2665,9 +2665,9 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
* @param marsh Marshaller.
- * @return Portable context.
+ * @return Binary context.
*/
- protected BinaryContext portableContext(BinaryMarshaller marsh) {
+ protected BinaryContext binaryContext(BinaryMarshaller marsh) {
GridBinaryMarshaller impl = U.field(marsh, "impl");
return impl.context();
@@ -2731,7 +2731,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
marsh.setContext(new MarshallerContextTestImpl(null));
- IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setPortableContext", ctx, iCfg);
+ IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setBinaryContext", ctx, iCfg);
return marsh;
}
@@ -2849,7 +2849,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
}
/**
- * @return Portable object.
+ * @return Binary object.
*/
private TestBinary binaryObject() {
SimpleObject innerSimple = new SimpleObject();
@@ -2891,80 +2891,80 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
innerSimple.map.put(2, "str2");
innerSimple.map.put(3, "str3");
- TestBinary innerPortable = new TestBinary();
-
- innerPortable.b = 2;
- innerPortable.s = 2;
- innerPortable.i = 2;
- innerPortable.l = 2;
- innerPortable.f = 2.2f;
- innerPortable.d = 2.2d;
- innerPortable.c = 2;
- innerPortable.bool = true;
- innerPortable.str = "str2";
- innerPortable.uuid = UUID.randomUUID();
- innerPortable.date = new Date();
- innerPortable.ts = new Timestamp(System.currentTimeMillis());
- innerPortable.bArr = new byte[] {10, 20, 30};
- innerPortable.sArr = new short[] {10, 20, 30};
- innerPortable.iArr = new int[] {10, 20, 30};
- innerPortable.lArr = new long[] {10, 20, 30};
- innerPortable.fArr = new float[] {10.01f, 20.02f, 30.03f};
- innerPortable.dArr = new double[] {10.01d, 20.02d, 30.03d};
- innerPortable.cArr = new char[] {10, 20, 30};
- innerPortable.boolArr = new boolean[] {true, false, true};
- innerPortable.strArr = new String[] {"str10", "str20", "str30"};
- innerPortable.uuidArr = new UUID[] {UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID()};
- innerPortable.dateArr = new Date[] {new Date(44444), new Date(55555), new Date(66666)};
- innerPortable.objArr = new Object[] {UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID()};
- innerPortable.bRaw = 3;
- innerPortable.sRaw = 3;
- innerPortable.iRaw = 3;
- innerPortable.lRaw = 3;
- innerPortable.fRaw = 3.3f;
- innerPortable.dRaw = 3.3d;
- innerPortable.cRaw = 3;
- innerPortable.boolRaw = true;
- innerPortable.strRaw = "str3";
- innerPortable.uuidRaw = UUID.randomUUID();
- innerPortable.dateRaw = new Date();
- innerPortable.tsRaw = new Timestamp(System.currentTimeMillis());
- innerPortable.bArrRaw = new byte[] {11, 21, 31};
- innerPortable.sArrRaw = new short[] {11, 21, 31};
- innerPortable.iArrRaw = new int[] {11, 21, 31};
- innerPortable.lArrRaw = new long[] {11, 21, 31};
- innerPortable.fArrRaw = new float[] {11.11f, 21.12f, 31.13f};
- innerPortable.dArrRaw = new double[] {11.11d, 21.12d, 31.13d};
- innerPortable.cArrRaw = new char[] {11, 21, 31};
- innerPortable.boolArrRaw = new boolean[] {true, false, true};
- innerPortable.strArrRaw = new String[] {"str11", "str21", "str31"};
- innerPortable.uuidArrRaw = new UUID[] {UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID()};
- innerPortable.dateArrRaw = new Date[] {new Date(77777), new Date(88888), new Date(99999)};
- innerPortable.objArrRaw = new Object[] {UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID()};
- innerPortable.col = new ArrayList<>();
- innerPortable.colRaw = new ArrayList<>();
- innerPortable.map = new HashMap<>();
- innerPortable.mapRaw = new HashMap<>();
- innerPortable.enumVal = TestEnum.B;
- innerPortable.enumValRaw = TestEnum.C;
- innerPortable.enumArr = new TestEnum[] {TestEnum.B, TestEnum.C};
- innerPortable.enumArrRaw = new TestEnum[] {TestEnum.C, TestEnum.D};
-
- innerPortable.col.add("str4");
- innerPortable.col.add("str5");
- innerPortable.col.add("str6");
-
- innerPortable.map.put(4, "str4");
- innerPortable.map.put(5, "str5");
- innerPortable.map.put(6, "str6");
-
- innerPortable.colRaw.add("str7");
- innerPortable.colRaw.add("str8");
- innerPortable.colRaw.add("str9");
-
- innerPortable.mapRaw.put(7, "str7");
- innerPortable.mapRaw.put(8, "str8");
- innerPortable.mapRaw.put(9, "str9");
+ TestBinary innerBinary = new TestBinary();
+
+ innerBinary.b = 2;
+ innerBinary.s = 2;
+ innerBinary.i = 2;
+ innerBinary.l = 2;
+ innerBinary.f = 2.2f;
+ innerBinary.d = 2.2d;
+ innerBinary.c = 2;
+ innerBinary.bool = true;
+ innerBinary.str = "str2";
+ innerBinary.uuid = UUID.randomUUID();
+ innerBinary.date = new Date();
+ innerBinary.ts = new Timestamp(System.currentTimeMillis());
+ innerBinary.bArr = new byte[] {10, 20, 30};
+ innerBinary.sArr = new short[] {10, 20, 30};
+ innerBinary.iArr = new int[] {10, 20, 30};
+ innerBinary.lArr = new long[] {10, 20, 30};
+ innerBinary.fArr = new float[] {10.01f, 20.02f, 30.03f};
+ innerBinary.dArr = new double[] {10.01d, 20.02d, 30.03d};
+ innerBinary.cArr = new char[] {10, 20, 30};
+ innerBinary.boolArr = new boolean[] {true, false, true};
+ innerBinary.strArr = new String[] {"str10", "str20", "str30"};
+ innerBinary.uuidArr = new UUID[] {UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID()};
+ innerBinary.dateArr = new Date[] {new Date(44444), new Date(55555), new Date(66666)};
+ innerBinary.objArr = new Object[] {UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID()};
+ innerBinary.bRaw = 3;
+ innerBinary.sRaw = 3;
+ innerBinary.iRaw = 3;
+ innerBinary.lRaw = 3;
+ innerBinary.fRaw = 3.3f;
+ innerBinary.dRaw = 3.3d;
+ innerBinary.cRaw = 3;
+ innerBinary.boolRaw = true;
+ innerBinary.strRaw = "str3";
+ innerBinary.uuidRaw = UUID.randomUUID();
+ innerBinary.dateRaw = new Date();
+ innerBinary.tsRaw = new Timestamp(System.currentTimeMillis());
+ innerBinary.bArrRaw = new byte[] {11, 21, 31};
+ innerBinary.sArrRaw = new short[] {11, 21, 31};
+ innerBinary.iArrRaw = new int[] {11, 21, 31};
+ innerBinary.lArrRaw = new long[] {11, 21, 31};
+ innerBinary.fArrRaw = new float[] {11.11f, 21.12f, 31.13f};
+ innerBinary.dArrRaw = new double[] {11.11d, 21.12d, 31.13d};
+ innerBinary.cArrRaw = new char[] {11, 21, 31};
+ innerBinary.boolArrRaw = new boolean[] {true, false, true};
+ innerBinary.strArrRaw = new String[] {"str11", "str21", "str31"};
+ innerBinary.uuidArrRaw = new UUID[] {UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID()};
+ innerBinary.dateArrRaw = new Date[] {new Date(77777), new Date(88888), new Date(99999)};
+ innerBinary.objArrRaw = new Object[] {UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID()};
+ innerBinary.col = new ArrayList<>();
+ innerBinary.colRaw = new ArrayList<>();
+ innerBinary.map = new HashMap<>();
+ innerBinary.mapRaw = new HashMap<>();
+ innerBinary.enumVal = TestEnum.B;
+ innerBinary.enumValRaw = TestEnum.C;
+ innerBinary.enumArr = new TestEnum[] {TestEnum.B, TestEnum.C};
+ innerBinary.enumArrRaw = new TestEnum[] {TestEnum.C, TestEnum.D};
+
+ innerBinary.col.add("str4");
+ innerBinary.col.add("str5");
+ innerBinary.col.add("str6");
+
+ innerBinary.map.put(4, "str4");
+ innerBinary.map.put(5, "str5");
+ innerBinary.map.put(6, "str6");
+
+ innerBinary.colRaw.add("str7");
+ innerBinary.colRaw.add("str8");
+ innerBinary.colRaw.add("str9");
+
+ innerBinary.mapRaw.put(7, "str7");
+ innerBinary.mapRaw.put(8, "str8");
+ innerBinary.mapRaw.put(9, "str9");
TestBinary outer = new TestBinary();
@@ -2993,7 +2993,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
outer.dateArr = new Date[] {new Date(10101), new Date(20202), new Date(30303)};
outer.objArr = new Object[] {UUID.randomUUID(), UUID.randomUUID(), UUID.randomUUID()};
outer.simple = innerSimple;
- outer.portable = innerPortable;
+ outer.binary = innerBinary;
outer.bRaw = 5;
outer.sRaw = 5;
outer.iRaw = 5;
@@ -3027,7 +3027,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
outer.enumArr = new TestEnum[] {TestEnum.D, TestEnum.E};
outer.enumArrRaw = new TestEnum[] {TestEnum.E, TestEnum.A};
outer.simpleRaw = innerSimple;
- outer.portableRaw = innerPortable;
+ outer.binaryRaw = innerBinary;
outer.col.add("str10");
outer.col.add("str11");
@@ -3346,10 +3346,10 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
private SimpleObject simpleRaw;
/** */
- private TestBinary portable;
+ private TestBinary binary;
/** */
- private TestBinary portableRaw;
+ private TestBinary binaryRaw;
/** {@inheritDoc} */
@Override public void writeBinary(BinaryWriter writer) throws BinaryObjectException {
@@ -3382,7 +3382,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
writer.writeEnum("_enumVal", enumVal);
writer.writeEnumArray("_enumArr", enumArr);
writer.writeObject("_simple", simple);
- writer.writeObject("_portable", portable);
+ writer.writeObject("_binary", binary);
BinaryRawWriter raw = writer.rawWriter();
@@ -3415,7 +3415,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
raw.writeEnum(enumValRaw);
raw.writeEnumArray(enumArrRaw);
raw.writeObject(simpleRaw);
- raw.writeObject(portableRaw);
+ raw.writeObject(binaryRaw);
}
/** {@inheritDoc} */
@@ -3449,7 +3449,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
enumVal = reader.readEnum("_enumVal");
enumArr = reader.readEnumArray("_enumArr");
simple = reader.readObject("_simple");
- portable = reader.readObject("_portable");
+ binary = reader.readObject("_binary");
BinaryRawReader raw = reader.rawReader();
@@ -3482,7 +3482,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
enumValRaw = raw.readEnum();
enumArrRaw = raw.readEnumArray();
simpleRaw = raw.readObject();
- portableRaw = raw.readObject();
+ binaryRaw = raw.readObject();
}
/** {@inheritDoc} */
@@ -4089,7 +4089,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
*
*/
- public static class ChildPortable extends ParentPortable {
+ public static class ChildBinary extends ParentBinary {
}
@@ -4147,7 +4147,7 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest {
/**
*
*/
- private static class ParentPortable {
+ private static class ParentBinary {
/** */
public String s;
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderAdditionalSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderAdditionalSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderAdditionalSelfTest.java
index a1f980c..572df88 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderAdditionalSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderAdditionalSelfTest.java
@@ -106,9 +106,9 @@ public class BinaryObjectBuilderAdditionalSelfTest extends GridCommonAbstractTes
}
/**
- * @return Portables API.
+ * @return Binaries API.
*/
- protected IgniteBinary portables() {
+ protected IgniteBinary binaries() {
return grid(0).binary();
}
@@ -931,7 +931,7 @@ public class BinaryObjectBuilderAdditionalSelfTest extends GridCommonAbstractTes
mutableObj.build();
- BinaryType metadata = portables().type(GridBinaryTestClasses.TestObjectContainer.class);
+ BinaryType metadata = binaries().type(GridBinaryTestClasses.TestObjectContainer.class);
assertEquals("String", metadata.fieldTypeName("xx567"));
}
@@ -947,7 +947,7 @@ public class BinaryObjectBuilderAdditionalSelfTest extends GridCommonAbstractTes
mutableObj.build();
- BinaryType metadata = portables().type(GridBinaryTestClasses.TestObjectContainer.class);
+ BinaryType metadata = binaries().type(GridBinaryTestClasses.TestObjectContainer.class);
assertEquals("String", metadata.fieldTypeName("xx567"));
}
@@ -971,7 +971,7 @@ public class BinaryObjectBuilderAdditionalSelfTest extends GridCommonAbstractTes
mutableObj.build();
- BinaryType metadata = portables().type(c.getClass());
+ BinaryType metadata = binaries().type(c.getClass());
assertTrue(metadata.fieldNames().containsAll(Arrays.asList("intField", "intArrField", "arrField", "strField",
"colField", "mapField", "enumField", "enumArrField")));
@@ -1140,8 +1140,8 @@ public class BinaryObjectBuilderAdditionalSelfTest extends GridCommonAbstractTes
/**
*
*/
- public void testPortableObjectField() {
- GridBinaryTestClasses.TestObjectContainer container = new GridBinaryTestClasses.TestObjectContainer(toPortable(new GridBinaryTestClasses.TestObjectArrayList()));
+ public void testBinaryObjectField() {
+ GridBinaryTestClasses.TestObjectContainer container = new GridBinaryTestClasses.TestObjectContainer(toBinary(new GridBinaryTestClasses.TestObjectArrayList()));
BinaryObjectBuilderImpl wrapper = wrap(container);
@@ -1154,12 +1154,12 @@ public class BinaryObjectBuilderAdditionalSelfTest extends GridCommonAbstractTes
/**
*
*/
- public void testAssignPortableObject() {
+ public void testAssignBinaryObject() {
GridBinaryTestClasses.TestObjectContainer container = new GridBinaryTestClasses.TestObjectContainer();
BinaryObjectBuilderImpl wrapper = wrap(container);
- wrapper.setField("foo", toPortable(new GridBinaryTestClasses.TestObjectArrayList()));
+ wrapper.setField("foo", toBinary(new GridBinaryTestClasses.TestObjectArrayList()));
GridBinaryTestClasses.TestObjectContainer deserialized = wrapper.build().deserialize();
assertTrue(deserialized.foo instanceof GridBinaryTestClasses.TestObjectArrayList);
@@ -1185,7 +1185,7 @@ public class BinaryObjectBuilderAdditionalSelfTest extends GridCommonAbstractTes
GridBinaryTestClasses.TestObjectAllTypes obj = new GridBinaryTestClasses.TestObjectAllTypes();
obj.setDefaultData();
- BinaryObjectBuilderImpl wrapper = wrap(toPortable(obj));
+ BinaryObjectBuilderImpl wrapper = wrap(toBinary(obj));
wrapper.removeField("str");
@@ -1205,7 +1205,7 @@ public class BinaryObjectBuilderAdditionalSelfTest extends GridCommonAbstractTes
obj.foo = arr1;
- GridBinaryTestClasses.TestObjectContainer res = toPortable(obj).deserialize();
+ GridBinaryTestClasses.TestObjectContainer res = toBinary(obj).deserialize();
Object[] resArr = (Object[])res.foo;
@@ -1227,7 +1227,7 @@ public class BinaryObjectBuilderAdditionalSelfTest extends GridCommonAbstractTes
obj.foo = arr1;
- GridBinaryTestClasses.TestObjectContainer res = toPortable(obj).deserialize();
+ GridBinaryTestClasses.TestObjectContainer res = toBinary(obj).deserialize();
List<?> resArr = (List<?>)res.foo;
@@ -1236,18 +1236,18 @@ public class BinaryObjectBuilderAdditionalSelfTest extends GridCommonAbstractTes
/**
* @param obj Object.
- * @return Object in portable format.
+ * @return Object in binary format.
*/
- private BinaryObject toPortable(Object obj) {
- return portables().toBinary(obj);
+ private BinaryObject toBinary(Object obj) {
+ return binaries().toBinary(obj);
}
/**
* @param obj Object.
- * @return GridMutablePortableObject.
+ * @return GridMutableBinaryObject.
*/
private BinaryObjectBuilderImpl wrap(Object obj) {
- return BinaryObjectBuilderImpl.wrap(toPortable(obj));
+ return BinaryObjectBuilderImpl.wrap(toBinary(obj));
}
/**
@@ -1256,9 +1256,9 @@ public class BinaryObjectBuilderAdditionalSelfTest extends GridCommonAbstractTes
*/
private BinaryObjectBuilderImpl newWrapper(Class<?> aCls) {
CacheObjectBinaryProcessorImpl processor = (CacheObjectBinaryProcessorImpl)(
- (IgniteBinaryImpl)portables()).processor();
+ (IgniteBinaryImpl)binaries()).processor();
- return new BinaryObjectBuilderImpl(processor.portableContext(), processor.typeId(aCls.getName()),
+ return new BinaryObjectBuilderImpl(processor.binaryContext(), processor.typeId(aCls.getName()),
aCls.getSimpleName());
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderSelfTest.java
index 2a3fe53..2424fe8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderSelfTest.java
@@ -46,7 +46,7 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import sun.misc.Unsafe;
/**
- * Portable builder test.
+ * Binary builder test.
*/
@SuppressWarnings("ResultOfMethodCallIgnored")
public class BinaryObjectBuilderSelfTest extends GridCommonAbstractTest {
@@ -80,7 +80,7 @@ public class BinaryObjectBuilderSelfTest extends GridCommonAbstractTest {
bCfg.setTypeConfigurations(Arrays.asList(
new BinaryTypeConfiguration(Key.class.getName()),
new BinaryTypeConfiguration(Value.class.getName()),
- new BinaryTypeConfiguration("org.gridgain.grid.internal.util.portable.mutabletest.*"),
+ new BinaryTypeConfiguration("org.gridgain.grid.internal.util.binary.mutabletest.*"),
customTypeCfg));
cfg.setBinaryConfiguration(bCfg);
@@ -115,7 +115,7 @@ public class BinaryObjectBuilderSelfTest extends GridCommonAbstractTest {
obj.setDefaultData();
obj.enumArr = null;
- GridBinaryTestClasses.TestObjectAllTypes deserialized = builder(toPortable(obj)).build().deserialize();
+ GridBinaryTestClasses.TestObjectAllTypes deserialized = builder(toBinary(obj)).build().deserialize();
GridTestUtils.deepEquals(obj, deserialized);
}
@@ -723,7 +723,7 @@ public class BinaryObjectBuilderSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testOffheapPortable() throws Exception {
+ public void testOffheapBinary() throws Exception {
BinaryObjectBuilder builder = builder("Class");
builder.hashCode(100);
@@ -891,7 +891,7 @@ public class BinaryObjectBuilderSelfTest extends GridCommonAbstractTest {
GridBinaryTestClasses.TestObjectContainer c = new GridBinaryTestClasses.TestObjectContainer(list);
- BinaryObjectBuilderImpl builder = builder(toPortable(c));
+ BinaryObjectBuilderImpl builder = builder(toBinary(c));
builder.<List>getField("foo").add("!!!");
BinaryObject res = builder.build();
@@ -908,25 +908,25 @@ public class BinaryObjectBuilderSelfTest extends GridCommonAbstractTest {
/**
*
*/
- public void testSetPortableObject() {
- BinaryObject portableObj = builder(GridBinaryTestClasses.TestObjectContainer.class.getName())
- .setField("foo", toPortable(new GridBinaryTestClasses.TestObjectAllTypes()))
+ public void testSetBinaryObject() {
+ BinaryObject binaryObj = builder(GridBinaryTestClasses.TestObjectContainer.class.getName())
+ .setField("foo", toBinary(new GridBinaryTestClasses.TestObjectAllTypes()))
.build();
- assertTrue(portableObj.<GridBinaryTestClasses.TestObjectContainer>deserialize().foo instanceof GridBinaryTestClasses.TestObjectAllTypes);
+ assertTrue(binaryObj.<GridBinaryTestClasses.TestObjectContainer>deserialize().foo instanceof GridBinaryTestClasses.TestObjectAllTypes);
}
/**
*
*/
- public void testPlainPortableObjectCopyFrom() {
- GridBinaryTestClasses.TestObjectPlainPortable obj = new GridBinaryTestClasses.TestObjectPlainPortable(toPortable(new GridBinaryTestClasses.TestObjectAllTypes()));
+ public void testPlainBinaryObjectCopyFrom() {
+ GridBinaryTestClasses.TestObjectPlainBinary obj = new GridBinaryTestClasses.TestObjectPlainBinary(toBinary(new GridBinaryTestClasses.TestObjectAllTypes()));
- BinaryObjectBuilderImpl builder = builder(toPortable(obj));
- assertTrue(builder.getField("plainPortable") instanceof BinaryObject);
+ BinaryObjectBuilderImpl builder = builder(toBinary(obj));
+ assertTrue(builder.getField("plainBinary") instanceof BinaryObject);
- GridBinaryTestClasses.TestObjectPlainPortable deserialized = builder.build().deserialize();
- assertTrue(deserialized.plainPortable != null);
+ GridBinaryTestClasses.TestObjectPlainBinary deserialized = builder.build().deserialize();
+ assertTrue(deserialized.plainBinary != null);
}
/**
@@ -950,7 +950,7 @@ public class BinaryObjectBuilderSelfTest extends GridCommonAbstractTest {
obj.setDefaultData();
obj.enumArr = null;
- BinaryObjectBuilder builder = builder(toPortable(obj));
+ BinaryObjectBuilder builder = builder(toBinary(obj));
builder.removeField("str");
@@ -969,7 +969,7 @@ public class BinaryObjectBuilderSelfTest extends GridCommonAbstractTest {
obj.setDefaultData();
obj.enumArr = null;
- BinaryObjectBuilderImpl builder = builder(toPortable(obj));
+ BinaryObjectBuilderImpl builder = builder(toBinary(obj));
builder.getField("i_");
@@ -987,7 +987,7 @@ public class BinaryObjectBuilderSelfTest extends GridCommonAbstractTest {
outer.inner.outer = outer;
outer.foo = "a";
- BinaryObjectBuilder builder = builder(toPortable(outer));
+ BinaryObjectBuilder builder = builder(toBinary(outer));
builder.setField("foo", "b");
@@ -998,32 +998,32 @@ public class BinaryObjectBuilderSelfTest extends GridCommonAbstractTest {
}
/**
- * @return Portables.
+ * @return Binaries.
*/
- private IgniteBinary portables() {
+ private IgniteBinary binaries() {
return grid(0).binary();
}
/**
* @param obj Object.
- * @return Portable object.
+ * @return Binary object.
*/
- private BinaryObject toPortable(Object obj) {
- return portables().toBinary(obj);
+ private BinaryObject toBinary(Object obj) {
+ return binaries().toBinary(obj);
}
/**
* @return Builder.
*/
private BinaryObjectBuilder builder(String clsName) {
- return portables().builder(clsName);
+ return binaries().builder(clsName);
}
/**
* @return Builder.
*/
private BinaryObjectBuilderImpl builder(BinaryObject obj) {
- return (BinaryObjectBuilderImpl)portables().builder(obj);
+ return (BinaryObjectBuilderImpl)binaries().builder(obj);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryAffinityKeySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryAffinityKeySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryAffinityKeySelfTest.java
index 2528f17..06406e0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryAffinityKeySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryAffinityKeySelfTest.java
@@ -44,7 +44,7 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
/**
- * Test for portable object affinity key.
+ * Test for binary object affinity key.
*/
public class GridBinaryAffinityKeySelfTest extends GridCommonAbstractTest {
/** */
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java
index c48b056..e433ec0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMarshallerCtxDisabledSelfTest.java
@@ -48,7 +48,7 @@ public class GridBinaryMarshallerCtxDisabledSelfTest extends GridCommonAbstractT
BinaryContext context = new BinaryContext(BinaryCachingMetadataHandler.create(), cfg);
- IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setPortableContext", context, cfg);
+ IgniteUtils.invoke(BinaryMarshaller.class, marsh, "setBinaryContext", context, cfg);
SimpleObject simpleObj = new SimpleObject();
@@ -68,12 +68,12 @@ public class GridBinaryMarshallerCtxDisabledSelfTest extends GridCommonAbstractT
assertEquals(simpleObj, marsh.unmarshal(marsh.marshal(simpleObj), null));
- SimpleBinary simplePortable = new SimpleBinary();
+ SimpleBinary simpleBinary = new SimpleBinary();
- simplePortable.str = "portable";
- simplePortable.arr = new long[] {100, 200, 300};
+ simpleBinary.str = "binary";
+ simpleBinary.arr = new long[] {100, 200, 300};
- assertEquals(simplePortable, marsh.unmarshal(marsh.marshal(simplePortable), null));
+ assertEquals(simpleBinary, marsh.unmarshal(marsh.marshal(simpleBinary), null));
SimpleExternalizable simpleExtr = new SimpleExternalizable();
@@ -85,7 +85,7 @@ public class GridBinaryMarshallerCtxDisabledSelfTest extends GridCommonAbstractT
/**
* Marshaller context with no storage. Platform has to work in such environment as well by marshalling class name of
- * a portable object.
+ * a binary object.
*/
private static class MarshallerContextWithNoStorage extends MarshallerContextAdapter {
/** */
http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMetaDataSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMetaDataSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMetaDataSelfTest.java
index 970cbc7..5c5d6c3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMetaDataSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryMetaDataSelfTest.java
@@ -36,7 +36,7 @@ import org.apache.ignite.binary.BinaryWriter;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
/**
- * Portable meta data test.
+ * Binary meta data test.
*/
public class GridBinaryMetaDataSelfTest extends GridCommonAbstractTest {
/** */
@@ -74,9 +74,9 @@ public class GridBinaryMetaDataSelfTest extends GridCommonAbstractTest {
}
/**
- * @return Portables API.
+ * @return Binaries API.
*/
- protected IgniteBinary portables() {
+ protected IgniteBinary binaries() {
return grid().binary();
}
@@ -84,9 +84,9 @@ public class GridBinaryMetaDataSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testGetAll() throws Exception {
- portables().toBinary(new TestObject2());
+ binaries().toBinary(new TestObject2());
- Collection<BinaryType> metas = portables().types();
+ Collection<BinaryType> metas = binaries().types();
assertEquals(2, metas.size());
@@ -150,16 +150,16 @@ public class GridBinaryMetaDataSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testNoConfiguration() throws Exception {
- portables().toBinary(new TestObject3());
+ binaries().toBinary(new TestObject3());
- assertNotNull(portables().type(TestObject3.class));
+ assertNotNull(binaries().type(TestObject3.class));
}
/**
* @throws Exception If failed.
*/
public void testReflection() throws Exception {
- BinaryType meta = portables().type(TestObject1.class);
+ BinaryType meta = binaries().type(TestObject1.class);
assertNotNull(meta);
@@ -189,10 +189,10 @@ public class GridBinaryMetaDataSelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void testPortableMarshalAware() throws Exception {
- portables().toBinary(new TestObject2());
+ public void testBinaryMarshalAware() throws Exception {
+ binaries().toBinary(new TestObject2());
- BinaryType meta = portables().type(TestObject2.class);
+ BinaryType meta = binaries().type(TestObject2.class);
assertNotNull(meta);
@@ -223,13 +223,13 @@ public class GridBinaryMetaDataSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testMerge() throws Exception {
- portables().toBinary(new TestObject2());
+ binaries().toBinary(new TestObject2());
idx = 1;
- portables().toBinary(new TestObject2());
+ binaries().toBinary(new TestObject2());
- BinaryType meta = portables().type(TestObject2.class);
+ BinaryType meta = binaries().type(TestObject2.class);
assertNotNull(meta);
@@ -274,7 +274,7 @@ public class GridBinaryMetaDataSelfTest extends GridCommonAbstractTest {
obj.decVal = BigDecimal.ZERO;
obj.decArrVal = new BigDecimal[] { BigDecimal.ONE };
- BinaryObject po = portables().toBinary(obj);
+ BinaryObject po = binaries().toBinary(obj);
info(po.toString());