ignite-2065: portable -> binary renaming (methods, javadoc and etc.)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/10b83fb8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/10b83fb8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/10b83fb8 Branch: refs/heads/master Commit: 10b83fb852e67ab904453034c1d187d1e7f4f36f Parents: 1f2af31 Author: ashutak <ashu...@gridgain.com> Authored: Fri Dec 11 21:43:33 2015 +0300 Committer: ashutak <ashu...@gridgain.com> Committed: Fri Dec 11 21:43:33 2015 +0300 ---------------------------------------------------------------------- .../examples/CacheClientBinaryExampleTest.java | 6 +- .../ComputeClientBinaryExampleTest.java | 4 +- .../testsuites/IgniteExamplesSelfTestSuite.java | 2 +- .../client/impl/ClientCacheFlagsCodecTest.java | 8 +- .../src/test/resources/spring-server-node.xml | 8 +- .../test/resources/spring-server-ssl-node.xml | 8 +- modules/core/pom.xml | 4 +- .../java/org/apache/ignite/IgniteBinary.java | 124 +++---- .../java/org/apache/ignite/IgniteCache.java | 8 +- .../org/apache/ignite/binary/BinaryReader.java | 4 +- .../affinity/AffinityNodeHashResolver.java | 6 +- .../configuration/BinaryConfiguration.java | 4 +- .../ignite/internal/IgniteNodeAttributes.java | 4 +- .../internal/binary/BinaryClassDescriptor.java | 30 +- .../ignite/internal/binary/BinaryContext.java | 14 +- .../internal/binary/BinaryEnumObjectImpl.java | 2 +- .../internal/binary/BinaryFieldAccessor.java | 16 +- .../ignite/internal/binary/BinaryFieldImpl.java | 2 +- .../internal/binary/BinaryMarshaller.java | 6 +- .../ignite/internal/binary/BinaryMetadata.java | 4 +- .../internal/binary/BinaryMetadataHandler.java | 2 +- .../internal/binary/BinaryObjectExImpl.java | 4 +- .../internal/binary/BinaryObjectImpl.java | 8 +- .../binary/BinaryObjectOffheapImpl.java | 4 +- .../internal/binary/BinaryReaderExImpl.java | 20 +- .../ignite/internal/binary/BinarySchema.java | 2 +- .../internal/binary/BinarySchemaRegistry.java | 2 +- .../ignite/internal/binary/BinaryTypeImpl.java | 4 +- .../ignite/internal/binary/BinaryUtils.java | 104 +++--- .../ignite/internal/binary/BinaryWriteMode.java | 8 +- .../internal/binary/BinaryWriterExImpl.java | 20 +- .../internal/binary/GridBinaryMarshaller.java | 10 +- .../binary/builder/BinaryBuilderEnum.java | 6 +- .../binary/builder/BinaryBuilderReader.java | 22 +- .../binary/builder/BinaryBuilderSerializer.java | 10 +- .../builder/BinaryEnumArrayLazyValue.java | 4 +- .../binary/builder/BinaryLazyArrayList.java | 2 +- .../internal/binary/builder/BinaryLazyMap.java | 2 +- .../builder/BinaryObjectArrayLazyValue.java | 4 +- .../binary/builder/BinaryObjectBuilderImpl.java | 14 +- .../binary/builder/BinaryPlainBinaryObject.java | 14 +- .../internal/binary/builder/package-info.java | 2 +- .../ignite/internal/binary/package-info.java | 2 +- .../streams/BinaryAbstractInputStream.java | 2 +- .../streams/BinaryAbstractOutputStream.java | 2 +- .../binary/streams/BinaryAbstractStream.java | 2 +- .../binary/streams/BinaryHeapInputStream.java | 2 +- .../binary/streams/BinaryHeapOutputStream.java | 2 +- .../binary/streams/BinaryInputStream.java | 2 +- .../streams/BinaryOffheapInputStream.java | 2 +- .../streams/BinaryOffheapOutputStream.java | 2 +- .../binary/streams/BinaryOutputStream.java | 2 +- .../internal/binary/streams/BinaryStream.java | 2 +- .../internal/binary/streams/package-info.java | 2 +- .../internal/client/GridClientCacheFlag.java | 10 +- .../internal/client/GridClientCompute.java | 4 +- .../client/GridClientConfiguration.java | 4 +- .../client/impl/GridClientComputeImpl.java | 20 +- .../impl/connection/GridClientConnection.java | 6 +- .../GridClientConnectionManagerAdapter.java | 6 +- .../connection/GridClientNioTcpConnection.java | 34 +- .../CacheDefaultBinaryAffinityKeyMapper.java | 4 +- .../processors/cache/CacheInvokeEntry.java | 10 +- .../processors/cache/CacheLazyEntry.java | 28 +- .../processors/cache/CacheObjectContext.java | 68 ++-- .../processors/cache/CacheOperationContext.java | 12 +- .../processors/cache/GridCacheAdapter.java | 100 +++--- .../cache/GridCacheConcurrentMap.java | 2 +- .../processors/cache/GridCacheContext.java | 36 +- .../processors/cache/GridCacheEntryEx.java | 8 +- .../processors/cache/GridCacheEventManager.java | 24 +- .../processors/cache/GridCacheMapEntry.java | 54 +-- .../cache/GridCacheOffheapSwapEntry.java | 4 +- .../processors/cache/GridCacheProxyImpl.java | 2 +- .../processors/cache/GridCacheReturn.java | 10 +- .../processors/cache/IgniteCacheProxy.java | 36 +- .../processors/cache/IgniteInternalCache.java | 48 +-- .../cache/binary/BinaryMetadataKey.java | 2 +- .../CacheDefaultBinaryAffinityKeyMapper.java | 4 +- .../cache/binary/CacheObjectBinaryContext.java | 16 +- .../binary/CacheObjectBinaryProcessor.java | 14 +- .../binary/CacheObjectBinaryProcessorImpl.java | 132 ++++---- .../cache/binary/IgniteBinaryImpl.java | 8 +- .../processors/cache/binary/package-info.java | 2 +- .../CacheDataStructuresManager.java | 6 +- .../distributed/GridDistributedLockRequest.java | 2 +- .../dht/CacheDistributedGetFutureAdapter.java | 10 +- .../distributed/dht/GridDhtCacheAdapter.java | 8 +- .../cache/distributed/dht/GridDhtGetFuture.java | 4 +- .../dht/GridPartitionedGetFuture.java | 14 +- .../dht/GridPartitionedSingleGetFuture.java | 12 +- .../dht/atomic/GridDhtAtomicCache.java | 26 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 4 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 4 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 4 +- .../dht/colocated/GridDhtColocatedCache.java | 36 +- .../distributed/near/GridNearAtomicCache.java | 10 +- .../distributed/near/GridNearCacheAdapter.java | 10 +- .../distributed/near/GridNearGetFuture.java | 22 +- .../near/GridNearTransactionalCache.java | 12 +- .../cache/distributed/near/GridNearTxLocal.java | 6 +- .../local/atomic/GridLocalAtomicCache.java | 74 ++--- .../query/GridCacheDistributedQueryManager.java | 8 +- .../cache/query/GridCacheQueryAdapter.java | 32 +- .../query/GridCacheQueryFutureAdapter.java | 4 +- .../cache/query/GridCacheQueryManager.java | 64 ++-- .../cache/query/GridCacheQueryRequest.java | 22 +- .../continuous/CacheContinuousQueryEvent.java | 8 +- .../cache/store/CacheOsStoreManager.java | 8 +- .../cache/store/CacheStoreManager.java | 10 +- .../store/GridCacheStoreManagerAdapter.java | 18 +- .../transactions/IgniteTxLocalAdapter.java | 44 +-- .../cache/transactions/IgniteTxLocalEx.java | 6 +- .../cacheobject/IgniteCacheObjectProcessor.java | 16 +- .../IgniteCacheObjectProcessorImpl.java | 6 +- .../processors/cacheobject/NoOpBinary.java | 2 +- .../datastreamer/DataStreamerEntry.java | 6 +- .../platform/PlatformAbstractPredicate.java | 6 +- .../platform/PlatformAbstractTarget.java | 14 +- .../processors/platform/PlatformContext.java | 4 +- .../platform/PlatformContextImpl.java | 6 +- .../platform/PlatformNoopProcessor.java | 4 +- .../processors/platform/PlatformProcessor.java | 8 +- .../platform/PlatformProcessorImpl.java | 34 +- .../platform/cache/PlatformCache.java | 28 +- .../cache/PlatformCacheEntryFilterImpl.java | 2 +- .../cache/PlatformCacheEntryProcessorImpl.java | 10 +- .../PlatformCachePartialUpdateException.java | 12 +- .../callback/PlatformCallbackGateway.java | 8 +- .../callback/PlatformCallbackUtils.java | 6 +- .../cluster/PlatformClusterNodeFilterImpl.java | 2 +- .../platform/compute/PlatformCompute.java | 12 +- .../datastreamer/PlatformDataStreamer.java | 10 +- .../PlatformStreamReceiverImpl.java | 16 +- .../dotnet/PlatformDotNetCacheStore.java | 12 +- .../PlatformDotNetConfigurationClosure.java | 2 +- .../dotnet/PlatformDotNetServiceImpl.java | 8 +- .../events/PlatformEventFilterListenerImpl.java | 2 +- .../messaging/PlatformMessageFilterImpl.java | 2 +- .../services/PlatformAbstractService.java | 26 +- .../platform/services/PlatformService.java | 6 +- .../platform/services/PlatformServices.java | 26 +- .../query/GridQueryCacheObjectsIterator.java | 14 +- .../processors/query/GridQueryProcessor.java | 72 ++-- .../message/GridClientBinaryMetaData.java | 2 +- .../client/message/GridClientTaskRequest.java | 14 +- .../internal/visor/util/VisorMimeTypes.java | 10 +- .../marshaller/portable/package-info.java | 22 -- .../PlatformDotNetBinaryConfiguration.java | 6 +- .../dotnet/PlatformDotNetConfiguration.java | 8 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 4 +- .../java/org/jsr166/ConcurrentHashMap8.java | 2 +- .../resources/META-INF/classnames.properties | 12 +- .../ignite/binary/test1/1.1/test1-1.1.jar | Bin 0 -> 2548 bytes .../ignite/binary/test1/1.1/test1-1.1.pom | 9 + .../binary/test1/maven-metadata-local.xml | 12 + .../ignite/binary/test2/1.1/test2-1.1.jar | Bin 0 -> 1361 bytes .../ignite/binary/test2/1.1/test2-1.1.pom | 9 + .../binary/test2/maven-metadata-local.xml | 12 + .../binary/BinaryFieldsAbstractSelfTest.java | 30 +- .../binary/BinaryFieldsHeapSelfTest.java | 6 +- .../binary/BinaryFieldsOffheapSelfTest.java | 6 +- .../BinaryFooterOffsetsAbstractSelfTest.java | 14 +- .../binary/BinaryFooterOffsetsHeapSelfTest.java | 4 +- .../BinaryFooterOffsetsOffheapSelfTest.java | 4 +- .../binary/BinaryMarshallerSelfTest.java | 330 +++++++++---------- .../BinaryObjectBuilderAdditionalSelfTest.java | 38 +-- .../binary/BinaryObjectBuilderSelfTest.java | 50 +-- .../binary/GridBinaryAffinityKeySelfTest.java | 2 +- ...GridBinaryMarshallerCtxDisabledSelfTest.java | 12 +- .../binary/GridBinaryMetaDataSelfTest.java | 30 +- .../binary/GridBinaryWildcardsSelfTest.java | 126 +++---- .../mutabletest/GridBinaryTestClasses.java | 12 +- .../BinaryFieldsHeapNonCompactSelfTest.java | 2 +- .../BinaryFieldsOffheapNonCompactSelfTest.java | 2 +- ...naryFooterOffsetsHeapNonCompactSelfTest.java | 2 +- ...yFooterOffsetsOffheapNonCompactSelfTest.java | 2 +- .../BinaryObjectBuilderNonCompactSelfTest.java | 2 +- .../GridCacheOffHeapTieredAbstractSelfTest.java | 8 +- .../GridCacheOnCopyFlagAbstractSelfTest.java | 6 +- .../processors/cache/GridCacheTestEntryEx.java | 8 +- .../GridBinaryCacheEntryMemorySizeSelfTest.java | 2 +- ...ryDuplicateIndexObjectsAbstractSelfTest.java | 20 +- ...naryObjectsAbstractDataStreamerSelfTest.java | 2 +- ...aryObjectsAbstractMultiThreadedSelfTest.java | 10 +- .../GridCacheBinaryObjectsAbstractSelfTest.java | 56 ++-- .../GridCacheBinaryStoreAbstractSelfTest.java | 4 +- .../GridCacheBinaryStoreBinariesSelfTest.java | 10 +- .../GridCacheBinaryStoreObjectsSelfTest.java | 2 +- ...ntNodeBinaryObjectMetadataMultinodeTest.java | 28 +- ...CacheClientNodeBinaryObjectMetadataTest.java | 2 +- .../GridDataStreamerImplSelfTest.java | 22 +- ...BinaryObjectsAtomicNearDisabledSelfTest.java | 2 +- .../GridCacheBinaryObjectsAtomicSelfTest.java | 2 +- ...yObjectsPartitionedNearDisabledSelfTest.java | 2 +- ...idCacheBinaryObjectsPartitionedSelfTest.java | 2 +- ...dCacheOffHeapTieredAtomicBinarySelfTest.java | 2 +- .../GridCacheOffHeapTieredBinarySelfTest.java | 2 +- ...fHeapTieredEvictionAtomicBinarySelfTest.java | 12 +- ...acheOffHeapTieredEvictionBinarySelfTest.java | 12 +- ...ridCacheBinaryObjectsReplicatedSelfTest.java | 2 +- .../GridCacheBinaryObjectsLocalSelfTest.java | 2 +- .../platform/PlatformComputeEchoTask.java | 20 +- .../session/GridSessionCheckpointSelfTest.java | 2 +- .../junits/IgniteTestResources.java | 2 +- .../IgniteBinaryCacheFullApiTestSuite.java | 2 +- .../testsuites/IgniteBinaryCacheTestSuite.java | 8 +- .../IgniteBinaryObjectsCacheTestSuite3.java | 2 +- .../IgniteBinaryObjectsTestSuite.java | 2 +- .../ignite/binary/test1/1.1/test1-1.1.jar | Bin 2548 -> 0 bytes .../ignite/binary/test1/1.1/test1-1.1.pom | 9 - .../binary/test1/maven-metadata-local.xml | 12 - .../ignite/binary/test2/1.1/test2-1.1.jar | Bin 1361 -> 0 bytes .../ignite/binary/test2/1.1/test2-1.1.pom | 9 - .../binary/test2/maven-metadata-local.xml | 12 - .../processors/query/h2/IgniteH2Indexing.java | 10 +- .../h2/twostep/GridReduceQueryExecutor.java | 8 +- ...niteCacheP2pUnmarshallingQueryErrorTest.java | 14 +- .../IgniteBinaryCacheQueryTestSuite.java | 8 +- parent/pom.xml | 12 +- 220 files changed, 1630 insertions(+), 1652 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/examples/src/test/java/org/apache/ignite/examples/CacheClientBinaryExampleTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java/org/apache/ignite/examples/CacheClientBinaryExampleTest.java b/examples/src/test/java/org/apache/ignite/examples/CacheClientBinaryExampleTest.java index d5f8cc0..01be0bc 100644 --- a/examples/src/test/java/org/apache/ignite/examples/CacheClientBinaryExampleTest.java +++ b/examples/src/test/java/org/apache/ignite/examples/CacheClientBinaryExampleTest.java @@ -27,20 +27,20 @@ import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest; public class CacheClientBinaryExampleTest extends GridAbstractExamplesTest { /** {@inheritDoc} */ @Override protected String defaultConfig() { - return "examples/config/portable/example-ignite-portable.xml"; + return "examples/config/binary/example-ignite-binary.xml"; } /** * @throws Exception If failed. */ - public void testPortablePutGetExample() throws Exception { + public void testBinaryPutGetExample() throws Exception { CacheClientBinaryPutGetExample.main(new String[] {}); } /** * @throws Exception If failed. */ - public void testPortableQueryExample() throws Exception { + public void testBinaryQueryExample() throws Exception { CacheClientBinaryQueryExample.main(new String[] {}); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/examples/src/test/java/org/apache/ignite/examples/ComputeClientBinaryExampleTest.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java/org/apache/ignite/examples/ComputeClientBinaryExampleTest.java b/examples/src/test/java/org/apache/ignite/examples/ComputeClientBinaryExampleTest.java index bdba7c3..5dcad62 100644 --- a/examples/src/test/java/org/apache/ignite/examples/ComputeClientBinaryExampleTest.java +++ b/examples/src/test/java/org/apache/ignite/examples/ComputeClientBinaryExampleTest.java @@ -25,13 +25,13 @@ import org.apache.ignite.testframework.junits.common.GridAbstractExamplesTest; public class ComputeClientBinaryExampleTest extends GridAbstractExamplesTest { /** {@inheritDoc} */ @Override protected String defaultConfig() { - return "examples/config/portable/example-ignite-portable.xml"; + return "examples/config/binary/example-ignite-binary.xml"; } /** * @throws Exception If failed. */ - public void testPortableTaskExecutionExample() throws Exception { + public void testBinaryTaskExecutionExample() throws Exception { ComputeClientBinaryTaskExecutionExample.main(new String[] {}); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java b/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java index 54fa8a3..fcf9be9 100644 --- a/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java +++ b/examples/src/test/java/org/apache/ignite/testsuites/IgniteExamplesSelfTestSuite.java @@ -88,7 +88,7 @@ public class IgniteExamplesSelfTestSuite extends TestSuite { suite.addTest(new TestSuite(MemcacheRestExamplesMultiNodeSelfTest.class)); suite.addTest(new TestSuite(MonteCarloExamplesMultiNodeSelfTest.class)); - // Portable. + // Binary. suite.addTest(new TestSuite(CacheClientBinaryExampleTest.class)); suite.addTest(new TestSuite(ComputeClientBinaryExampleTest.class)); http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java index bd7ca71..22e9a25 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java @@ -26,7 +26,7 @@ import org.apache.ignite.internal.client.impl.connection.GridClientConnection; import org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheCommandHandler; import org.apache.ignite.internal.util.typedef.F; -import static org.apache.ignite.internal.client.GridClientCacheFlag.KEEP_PORTABLES; +import static org.apache.ignite.internal.client.GridClientCacheFlag.KEEP_BINARIES; /** * Tests conversions between GridClientCacheFlag. @@ -37,7 +37,7 @@ public class ClientCacheFlagsCodecTest extends TestCase { */ public void testEncodingDecodingFullness() { for (GridClientCacheFlag f : GridClientCacheFlag.values()) { - if (f == KEEP_PORTABLES) + if (f == KEEP_BINARIES) continue; int bits = GridClientConnection.encodeCacheFlags(Collections.singleton(f)); @@ -71,8 +71,8 @@ public class ClientCacheFlagsCodecTest extends TestCase { boolean out = GridCacheCommandHandler.parseCacheFlags(bits); - int length = flagSet.contains(KEEP_PORTABLES) ? flagSet.size() - 1 : flagSet.size(); + int length = flagSet.contains(KEEP_BINARIES) ? flagSet.size() - 1 : flagSet.size(); assertEquals(length > 0, out); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/clients/src/test/resources/spring-server-node.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/resources/spring-server-node.xml b/modules/clients/src/test/resources/spring-server-node.xml index 176f0d5..f52640b 100644 --- a/modules/clients/src/test/resources/spring-server-node.xml +++ b/modules/clients/src/test/resources/spring-server-node.xml @@ -123,12 +123,12 @@ </bean> </property> - <property name="portableEnabled" value="true"/> + <property name="binaryEnabled" value="true"/> <property name="typeMetadata"> <list> <bean class="org.apache.ignite.cache.CacheTypeMetadata"> - <property name="valueType" value="GridPortablePerson"/> + <property name="valueType" value="GridBinaryPerson"/> <property name="ascendingFields"> <map> <entry key="age" value="java.lang.Integer"/> @@ -146,7 +146,7 @@ </property> </bean> <bean class="org.apache.ignite.cache.CacheTypeMetadata"> - <property name="valueType" value="GridImplicitPortablePerson"/> + <property name="valueType" value="GridImplicitBinaryPerson"/> <property name="ascendingFields"> <map> <entry key="age" value="java.lang.Integer"/> @@ -159,7 +159,7 @@ </property> </bean> <bean class="org.apache.ignite.cache.CacheTypeMetadata"> - <property name="valueType" value="GridNoDefPortablePerson"/> + <property name="valueType" value="GridNoDefBinaryPerson"/> <property name="ascendingFields"> <map> <entry key="age" value="java.lang.Integer"/> http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/clients/src/test/resources/spring-server-ssl-node.xml ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/resources/spring-server-ssl-node.xml b/modules/clients/src/test/resources/spring-server-ssl-node.xml index ceaab53..073ac65 100644 --- a/modules/clients/src/test/resources/spring-server-ssl-node.xml +++ b/modules/clients/src/test/resources/spring-server-ssl-node.xml @@ -125,12 +125,12 @@ </bean> </property> - <property name="portableEnabled" value="true"/> + <property name="binaryEnabled" value="true"/> <property name="typeMetadata"> <list> <bean class="org.apache.ignite.cache.CacheTypeMetadata"> - <property name="valueType" value="GridPortablePerson"/> + <property name="valueType" value="GridBinaryPerson"/> <property name="ascendingFields"> <map> <entry key="age" value="java.lang.Integer"/> @@ -148,7 +148,7 @@ </property> </bean> <bean class="org.apache.ignite.cache.CacheTypeMetadata"> - <property name="valueType" value="GridImplicitPortablePerson"/> + <property name="valueType" value="GridImplicitBinaryPerson"/> <property name="ascendingFields"> <map> <entry key="age" value="java.lang.Integer"/> @@ -161,7 +161,7 @@ </property> </bean> <bean class="org.apache.ignite.cache.CacheTypeMetadata"> - <property name="valueType" value="GridNoDefPortablePerson"/> + <property name="valueType" value="GridNoDefBinaryPerson"/> <property name="ascendingFields"> <map> <entry key="age" value="java.lang.Integer"/> http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/pom.xml ---------------------------------------------------------------------- diff --git a/modules/core/pom.xml b/modules/core/pom.xml index e4e975e..065082d 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -36,8 +36,8 @@ <repositories> <repository> - <id>ignite-portables-test-repo</id> - <url>file://${basedir}/src/test/portables/repo</url> + <id>ignite-binaries-test-repo</id> + <url>file://${basedir}/src/test/binaries/repo</url> </repository> </repositories> http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java b/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java index 2f68e7a..450cf70 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java @@ -32,11 +32,11 @@ import org.apache.ignite.binary.BinaryObject; import org.jetbrains.annotations.Nullable; /** - * Defines portable objects functionality. With portable objects you are able to: + * Defines binary objects functionality. With binary objects you are able to: * <ul> * <li>Seamlessly interoperate between Java, .NET, and C++.</li> - * <li>Make any object portable with zero code change to your existing code.</li> - * <li>Nest portable objects within each other.</li> + * <li>Make any object binary with zero code change to your existing code.</li> + * <li>Nest binary objects within each other.</li> * <li>Automatically handle {@code circular} or {@code null} references.</li> * <li>Automatically convert collections and maps between Java, .NET, and C++.</li> * <li> @@ -45,24 +45,24 @@ import org.jetbrains.annotations.Nullable; * </li> * <li>Avoid need to have concrete class definitions on the server side.</li> * <li>Dynamically change structure of the classes without having to restart the cluster.</li> - * <li>Index into portable objects for querying purposes.</li> + * <li>Index into binary objects for querying purposes.</li> * </ul> - * <h1 class="header">Working With Portables Directly</h1> - * Once an object is defined as portable, - * Ignite will always store it in memory in the portable (i.e. binary) format. - * User can choose to work either with the portable format or with the deserialized form + * <h1 class="header">Working With Binaries Directly</h1> + * Once an object is defined as binary, + * Ignite will always store it in memory in the binary (i.e. binary) format. + * User can choose to work either with the binary format or with the deserialized form * (assuming that class definitions are present in the classpath). * <p> - * To work with the portable format directly, user should create a special cache projection + * To work with the binary format directly, user should create a special cache projection * using IgniteCache.withKeepBinary() method and then retrieve individual fields as needed: * <pre name=code class=java> - * IgniteCache<PortableObject, PortableObject> prj = cache.withKeepBinary(); + * IgniteCache<BinaryObject, BinaryObject> prj = cache.withKeepBinary(); * - * // Convert instance of MyKey to portable format. - * // We could also use PortableBuilder to create the key in portable format directly. - * PortableObject key = grid.binary().toBinary(new MyKey()); + * // Convert instance of MyKey to binary format. + * // We could also use BinaryBuilder to create the key in binary format directly. + * BinaryObject key = grid.binary().toBinary(new MyKey()); * - * PortableObject val = prj.get(key); + * BinaryObject val = prj.get(key); * * String field = val.field("myFieldName"); * </pre> @@ -76,14 +76,14 @@ import org.jetbrains.annotations.Nullable; * // Normal java getter. * String fieldVal = val.getMyFieldName(); * </pre> - * If we used, for example, one of the automatically handled portable types for a key, like integer, - * and still wanted to work with binary portable format for values, then we would declare cache projection + * If we used, for example, one of the automatically handled binary types for a key, like integer, + * and still wanted to work with binary binary format for values, then we would declare cache projection * as follows: * <pre name=code class=java> - * IgniteCache<Integer.class, PortableObject> prj = cache.withKeepBinary(); + * IgniteCache<Integer.class, BinaryObject> prj = cache.withKeepBinary(); * </pre> - * <h1 class="header">Automatic Portable Types</h1> - * Note that only portable classes are converted to {@link org.apache.ignite.binary.BinaryObject} format. Following + * <h1 class="header">Automatic Binary Types</h1> + * Note that only binary classes are converted to {@link org.apache.ignite.binary.BinaryObject} format. Following * classes are never converted (e.g., {@link #toBinary(Object)} method will return original * object, and instances of these classes will be stored in cache without changes): * <ul> @@ -96,74 +96,74 @@ import org.jetbrains.annotations.Nullable; * <li>Enums and array of enums</li> * <li> * Maps, collections and array of objects (but objects inside - * them will still be converted if they are portable) + * them will still be converted if they are binary) * </li> * </ul> * <h1 class="header">Working With Maps and Collections</h1> - * All maps and collections in the portable objects are serialized automatically. When working + * All maps and collections in the binary objects are serialized automatically. When working * with different platforms, e.g. C++ or .NET, Ignite will automatically pick the most * adequate collection or map in either language. For example, {@link ArrayList} in Java will become * {@code List} in C#, {@link LinkedList} in Java is {@link LinkedList} in C#, {@link HashMap} * in Java is {@code Dictionary} in C#, and {@link TreeMap} in Java becomes {@code SortedDictionary} * in C#, etc. - * <h1 class="header">Building Portable Objects</h1> - * Ignite comes with {@link org.apache.ignite.binary.BinaryObjectBuilder} which allows to build portable objects dynamically: + * <h1 class="header">Building Binary Objects</h1> + * Ignite comes with {@link org.apache.ignite.binary.BinaryObjectBuilder} which allows to build binary objects dynamically: * <pre name=code class=java> - * PortableBuilder builder = Ignition.ignite().binary().builder(); + * BinaryBuilder builder = Ignition.ignite().binary().builder(); * * builder.typeId("MyObject"); * * builder.stringField("fieldA", "A"); * build.intField("fieldB", "B"); * - * PortableObject portableObj = builder.build(); + * BinaryObject binaryObj = builder.build(); * </pre> * For the cases when class definition is present * in the class path, it is also possible to populate a standard POJO and then - * convert it to portable format, like so: + * convert it to binary format, like so: * <pre name=code class=java> * MyObject obj = new MyObject(); * * obj.setFieldA("A"); * obj.setFieldB(123); * - * PortableObject portableObj = Ignition.ignite().binary().toBinary(obj); + * BinaryObject binaryObj = Ignition.ignite().binary().toBinary(obj); * </pre> - * NOTE: you don't need to convert typed objects to portable format before storing + * NOTE: you don't need to convert typed objects to binary format before storing * them in cache, Ignite will do that automatically. - * <h1 class="header">Portable Metadata</h1> - * Even though Ignite portable protocol only works with hash codes for type and field names - * to achieve better performance, Ignite provides metadata for all portable types which + * <h1 class="header">Binary Metadata</h1> + * Even though Ignite binary protocol only works with hash codes for type and field names + * to achieve better performance, Ignite provides metadata for all binary types which * can be queried ar runtime via any of the {@link IgniteBinary#type(Class)} - * methods. Having metadata also allows for proper formatting of {@code PortableObject#toString()} method, - * even when portable objects are kept in binary format only, which may be necessary for audit reasons. + * methods. Having metadata also allows for proper formatting of {@code BinaryObject#toString()} method, + * even when binary objects are kept in binary format only, which may be necessary for audit reasons. * <h1 class="header">Dynamic Structure Changes</h1> - * Since objects are always cached in the portable binary format, server does not need to + * Since objects are always cached in the binary binary format, server does not need to * be aware of the class definitions. Moreover, if class definitions are not present or not - * used on the server, then clients can continuously change the structure of the portable + * used on the server, then clients can continuously change the structure of the binary * objects without having to restart the cluster. For example, if one client stores a * certain class with fields A and B, and another client stores the same class with - * fields B and C, then the server-side portable object will have the fields A, B, and C. - * As the structure of a portable object changes, the new fields become available for SQL queries + * fields B and C, then the server-side binary object will have the fields A, B, and C. + * As the structure of a binary object changes, the new fields become available for SQL queries * automatically. * <h1 class="header">Configuration</h1> * By default all your objects are considered as binary and no specific configuration is needed. * The only requirement Ignite imposes is that your object has an empty * constructor. Note, that since server side does not have to know the class definition, - * you only need to list portable objects in configuration on the client side. However, if you - * list them on the server side as well, then you get the ability to deserialize portable objects + * you only need to list binary objects in configuration on the client side. However, if you + * list them on the server side as well, then you get the ability to deserialize binary objects * into concrete types on the server as well as on the client. * <p> - * Here is an example of portable configuration (note that star (*) notation is supported): + * Here is an example of binary configuration (note that star (*) notation is supported): * <pre name=code class=xml> * ... - * <!-- Explicit portable objects configuration. --> + * <!-- Explicit binary objects configuration. --> * <property name="marshaller"> - * <bean class="org.apache.ignite.marshaller.portable.PortableMarshaller"> + * <bean class="org.apache.ignite.marshaller.binary.BinaryMarshaller"> * <property name="classNames"> * <list> - * <value>my.package.for.portable.objects.*</value> - * <value>org.apache.ignite.examples.client.portable.Employee</value> + * <value>my.package.for.binary.objects.*</value> + * <value>org.apache.ignite.examples.client.binary.Employee</value> * </list> * </property> * </bean> @@ -174,7 +174,7 @@ import org.jetbrains.annotations.Nullable; * <pre name=code class=java> * IgniteConfiguration cfg = new IgniteConfiguration(); * - * PortableMarshaller marsh = new PortableMarshaller(); + * BinaryMarshaller marsh = new BinaryMarshaller(); * * marsh.setClassNames(Arrays.asList( * Employee.class.getName(), @@ -183,7 +183,7 @@ import org.jetbrains.annotations.Nullable; * * cfg.setMarshaller(marsh); * </pre> - * You can also specify class name for a portable object via {@link org.apache.ignite.binary.BinaryTypeConfiguration}. + * You can also specify class name for a binary object via {@link org.apache.ignite.binary.BinaryTypeConfiguration}. * Do it in case if you need to override other configuration properties on per-type level, like * ID-mapper, or serializer. * <h1 class="header">Custom Affinity Keys</h1> @@ -191,15 +191,15 @@ import org.jetbrains.annotations.Nullable; * storing objects in cache. For example, if you are caching {@code Employee} object with * {@code Organization}, and want to colocate employees with organization they work for, * so you can process them together, you need to specify an alternate affinity key. - * With portable objects you would have to do it as following: + * With binary objects you would have to do it as following: * <pre name=code class=xml> * <property name="marshaller"> - * <bean class="org.gridgain.grid.marshaller.portable.PortableMarshaller"> + * <bean class="org.gridgain.grid.marshaller.binary.BinaryMarshaller"> * ... * <property name="typeConfigurations"> * <list> - * <bean class="org.apache.ignite.binary.PortableTypeConfiguration"> - * <property name="className" value="org.apache.ignite.examples.client.portable.EmployeeKey"/> + * <bean class="org.apache.ignite.binary.BinaryTypeConfiguration"> + * <property name="className" value="org.apache.ignite.examples.client.binary.EmployeeKey"/> * <property name="affinityKeyFieldName" value="organizationId"/> * </bean> * </list> @@ -212,19 +212,19 @@ import org.jetbrains.annotations.Nullable; * Serialization and deserialization works out-of-the-box in Ignite. However, you can provide your own custom * serialization logic by optionally implementing {@link org.apache.ignite.binary.Binarylizable} interface, like so: * <pre name=code class=java> - * public class Address implements PortableMarshalAware { + * public class Address implements BinaryMarshalAware { * private String street; * private int zip; * - * // Empty constructor required for portable deserialization. + * // Empty constructor required for binary deserialization. * public Address() {} * - * @Override public void writeBinary(PortableWriter writer) throws PortableException { + * @Override public void writeBinary(BinaryWriter writer) throws BinaryException { * writer.writeString("street", street); * writer.writeInt("zip", zip); * } * - * @Override public void readBinary(PortableReader reader) throws PortableException { + * @Override public void readBinary(BinaryReader reader) throws BinaryException { * street = reader.readString("street"); * zip = reader.readInt("zip"); * } @@ -255,7 +255,7 @@ import org.jetbrains.annotations.Nullable; * ID-mapper may be provided either globally in {@link org.apache.ignite.configuration.BinaryConfiguration}, * or for a specific type via {@link org.apache.ignite.binary.BinaryTypeConfiguration} instance. * <h1 class="header">Query Indexing</h1> - * Portable objects can be indexed for querying by specifying index fields in + * Binary objects can be indexed for querying by specifying index fields in * {@link org.apache.ignite.cache.CacheTypeMetadata} inside of specific * {@link org.apache.ignite.configuration.CacheConfiguration} instance, * like so: @@ -273,7 +273,7 @@ import org.jetbrains.annotations.Nullable; * <map> * <entry key="name" value="java.lang.String"/> * - * <!-- Nested portable objects can also be indexed. --> + * <!-- Nested binary objects can also be indexed. --> * <entry key="address.zip" value="java.lang.Integer"/> * </map> * </property> @@ -302,20 +302,20 @@ public interface IgniteBinary { public <T> T toBinary(@Nullable Object obj) throws BinaryObjectException; /** - * Creates new portable builder. + * Creates new binary builder. * * @param typeName Type name. - * @return Newly portable builder. + * @return Newly binary builder. */ public BinaryObjectBuilder builder(String typeName) throws BinaryObjectException; /** - * Creates portable builder initialized by existing portable object. + * Creates binary builder initialized by existing binary object. * - * @param portableObj Portable object to initialize builder. - * @return Portable builder. + * @param binaryObj Binary object to initialize builder. + * @return Binary builder. */ - public BinaryObjectBuilder builder(BinaryObject portableObj) throws BinaryObjectException; + public BinaryObjectBuilder builder(BinaryObject binaryObj) throws BinaryObjectException; /** * Gets metadata for provided class. http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/IgniteCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java index 3376abc..f98d50a 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java @@ -138,7 +138,7 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS * so keys and values will be returned from cache API methods without changes. Therefore, * signature of the cache can contain only following types: * <ul> - * <li><code>org.apache.ignite.binary.PortableObject</code> for portable classes</li> + * <li><code>org.apache.ignite.binary.BinaryObject</code> for binary classes</li> * <li>All primitives (byte, int, ...) and there boxed versions (Byte, Integer, ...)</li> * <li>Arrays of primitives (byte[], int[], ...)</li> * <li>{@link String} and array of {@link String}s</li> @@ -148,7 +148,7 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS * <li>Enums and array of enums</li> * <li> * Maps, collections and array of objects (but objects inside - * them will still be converted if they are portable) + * them will still be converted if they are binary) * </li> * </ul> * <p> @@ -158,7 +158,7 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS * <pre> * IgniteCache<Integer, BinaryObject> prj = cache.withKeepBinary(); * - * // Value is not deserialized and returned in portable format. + * // Value is not deserialized and returned in binary format. * BinaryObject po = prj.get(1); * </pre> * <p> @@ -166,7 +166,7 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS * if default marshaller is used. * If not, this method is no-op and will return current cache. * - * @return New cache instance for portable objects. + * @return New cache instance for binary objects. */ public <K1, V1> IgniteCache<K1, V1> withKeepBinary(); http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/binary/BinaryReader.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/binary/BinaryReader.java b/modules/core/src/main/java/org/apache/ignite/binary/BinaryReader.java index be7a156..93a9469 100644 --- a/modules/core/src/main/java/org/apache/ignite/binary/BinaryReader.java +++ b/modules/core/src/main/java/org/apache/ignite/binary/BinaryReader.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.UUID; /** - * Reader for portable objects used in {@link Binarylizable} implementations. + * Reader for binary objects used in {@link Binarylizable} implementations. * Useful for the cases when user wants a fine-grained control over serialization. * <p> * Note that Ignite never writes full strings for field or type names. Instead, @@ -286,4 +286,4 @@ public interface BinaryReader { * @return Raw reader. */ public BinaryRawReader rawReader(); -} \ 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/cache/affinity/AffinityNodeHashResolver.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeHashResolver.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeHashResolver.java index c879da6..fb5b039 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeHashResolver.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityNodeHashResolver.java @@ -29,8 +29,8 @@ import org.apache.ignite.configuration.IgniteConfiguration; * will help to map keys to the same nodes whenever possible. * <p> * Note that on case clients exist they will query this object from the server and use it for affinity calculation. - * Therefore you must ensure that server and clients can marshal and unmarshal this object in portable format, - * i.e. all parties have object class(es) configured as portable. + * Therefore you must ensure that server and clients can marshal and unmarshal this object in binary format, + * i.e. all parties have object class(es) configured as binary. * * @deprecated Use {@link IgniteConfiguration#setConsistentId(Serializable)} instead. */ @@ -44,4 +44,4 @@ public interface AffinityNodeHashResolver extends Serializable { */ @Deprecated public Object resolve(ClusterNode node); -} \ 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/configuration/BinaryConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/BinaryConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/BinaryConfiguration.java index 6d8f918..1151245 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/BinaryConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/BinaryConfiguration.java @@ -44,7 +44,7 @@ public class BinaryConfiguration { private boolean compactFooter = DFLT_COMPACT_FOOTER; /** - * Sets class names of portable objects explicitly. + * Sets class names of binary objects explicitly. * * @param clsNames Class names. */ @@ -112,7 +112,7 @@ public class BinaryConfiguration { /** * Get whether to write footers in compact form. When enabled, Ignite will not write fields metadata - * when serializing objects, because internally {@code PortableMarshaller} already distribute metadata inside + * when serializing objects, because internally {@code BinaryMarshaller} already distribute metadata inside * cluster. This increases serialization performance. * <p> * <b>WARNING!</b> This mode should be disabled when already serialized data can be taken from some external http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java index 946b686..ba04403 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteNodeAttributes.java @@ -141,8 +141,8 @@ public final class IgniteNodeAttributes { /** Node consistent id. */ public static final String ATTR_NODE_CONSISTENT_ID = ATTR_PREFIX + ".consistent.id"; - /** Portable protocol version. */ - public static final String ATTR_PORTABLE_PROTO_VER = ATTR_PREFIX + ".portable.proto.ver"; + /** Binary protocol version. */ + public static final String ATTR_BINARY_PROTO_VER = ATTR_PREFIX + ".binary.proto.ver"; /** * Enforces singleton. http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java index 0c3275e..4a93bf6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java @@ -53,7 +53,7 @@ import static java.lang.reflect.Modifier.isStatic; import static java.lang.reflect.Modifier.isTransient; /** - * Portable class descriptor. + * Binary class descriptor. */ public class BinaryClassDescriptor { /** */ @@ -167,9 +167,9 @@ public class BinaryClassDescriptor { mode = BinaryWriteMode.EXCLUSION; else { if (cls == BinaryEnumObjectImpl.class) - mode = BinaryWriteMode.PORTABLE_ENUM; + mode = BinaryWriteMode.BINARY_ENUM; else - mode = serializer != null ? BinaryWriteMode.PORTABLE : BinaryUtils.mode(cls); + mode = serializer != null ? BinaryWriteMode.BINARY : BinaryUtils.mode(cls); } switch (mode) { @@ -210,9 +210,9 @@ public class BinaryClassDescriptor { case OBJECT_ARR: case COL: case MAP: - case PORTABLE_OBJ: + case BINARY_OBJ: case ENUM: - case PORTABLE_ENUM: + case BINARY_ENUM: case ENUM_ARR: case CLASS: case EXCLUSION: @@ -223,7 +223,7 @@ public class BinaryClassDescriptor { break; - case PORTABLE: + case BINARY: case EXTERNALIZABLE: ctor = constructor(cls); fields = null; @@ -284,7 +284,7 @@ public class BinaryClassDescriptor { throw new BinaryObjectException("Invalid mode: " + mode); } - if (mode == BinaryWriteMode.PORTABLE || mode == BinaryWriteMode.EXTERNALIZABLE || + if (mode == BinaryWriteMode.BINARY || mode == BinaryWriteMode.EXTERNALIZABLE || mode == BinaryWriteMode.OBJECT) { readResolveMtd = U.findNonPublicMethod(cls, "readResolve"); writeReplaceMtd = U.findNonPublicMethod(cls, "writeReplace"); @@ -362,14 +362,14 @@ public class BinaryClassDescriptor { } /** - * @return portableWriteReplace() method + * @return binaryWriteReplace() method */ @Nullable Method getWriteReplaceMethod() { return writeReplaceMtd; } /** - * @return portableReadResolve() method + * @return binaryReadResolve() method */ @SuppressWarnings("UnusedDeclaration") @Nullable Method getReadResolveMethod() { @@ -546,8 +546,8 @@ public class BinaryClassDescriptor { break; - case PORTABLE_ENUM: - writer.doWritePortableEnum((BinaryEnumObjectImpl)obj); + case BINARY_ENUM: + writer.doWriteBinaryEnum((BinaryEnumObjectImpl)obj); break; @@ -561,12 +561,12 @@ public class BinaryClassDescriptor { break; - case PORTABLE_OBJ: - writer.doWritePortableObject((BinaryObjectImpl)obj); + case BINARY_OBJ: + writer.doWriteBinaryObject((BinaryObjectImpl)obj); break; - case PORTABLE: + case BINARY: if (preWrite(writer, obj)) { try { if (serializer != null) @@ -660,7 +660,7 @@ public class BinaryClassDescriptor { Object res; switch (mode) { - case PORTABLE: + case BINARY: res = newInstance(); reader.setHandle(res); http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java index 6293cfe..7f9bacf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java @@ -75,7 +75,7 @@ import java.util.jar.JarEntry; import java.util.jar.JarFile; /** - * Portable context. + * Binary context. */ public class BinaryContext implements Externalizable { /** */ @@ -224,7 +224,7 @@ public class BinaryContext implements Externalizable { } /** - * @param marsh Portable marshaller. + * @param marsh Binary marshaller. * @param cfg Configuration. * @throws BinaryObjectException In case of error. */ @@ -279,7 +279,7 @@ public class BinaryContext implements Externalizable { String clsName = typeCfg.getTypeName(); if (clsName == null) - throw new BinaryObjectException("Class name is required for portable type configuration."); + throw new BinaryObjectException("Class name is required for binary type configuration."); BinaryIdMapper idMapper = globalIdMapper; @@ -675,7 +675,7 @@ public class BinaryContext implements Externalizable { } /** - * @return Portable context. + * @return Binary context. * @throws ObjectStreamException In case of error. */ protected Object readResolve() throws ObjectStreamException { @@ -685,7 +685,7 @@ public class BinaryContext implements Externalizable { if (g == null) throw new IllegalStateException("Failed to find grid for name: " + gridName); - return ((CacheObjectBinaryProcessorImpl)g.context().cacheObjects()).portableContext(); + return ((CacheObjectBinaryProcessorImpl)g.context().cacheObjects()).binaryContext(); } catch (IllegalStateException e) { throw U.withCause(new InvalidObjectException(e.getMessage()), e); @@ -695,7 +695,7 @@ public class BinaryContext implements Externalizable { /** * @param cls Class. * @param id Type ID. - * @return GridPortableClassDescriptor. + * @return GridBinaryClassDescriptor. */ public BinaryClassDescriptor registerPredefinedType(Class<?> cls, int id) { String typeName = typeName(cls.getName()); @@ -1047,7 +1047,7 @@ public class BinaryContext implements Externalizable { } /** - * Override portable class descriptor. + * Override binary class descriptor. * * @param other Other descriptor. * @throws BinaryObjectException If failed. http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java index 3321170..b2ee16f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java @@ -219,7 +219,7 @@ public class BinaryEnumObjectImpl implements BinaryObjectEx, Externalizable, Cac /** {@inheritDoc} */ @Override public void finishUnmarshal(CacheObjectContext ctx, ClassLoader ldr) throws IgniteCheckedException { - this.ctx = ((CacheObjectBinaryProcessorImpl)ctx.processor()).portableContext(); + this.ctx = ((CacheObjectBinaryProcessorImpl)ctx.processor()).binaryContext(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java index 8cf1a11..8050edd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldAccessor.java @@ -103,8 +103,8 @@ public abstract class BinaryFieldAccessor { case TIMESTAMP_ARR: case ENUM_ARR: case OBJECT_ARR: - case PORTABLE_OBJ: - case PORTABLE: + case BINARY_OBJ: + case BINARY: case EXTERNALIZABLE: return new DefaultFinalClassAccessor(field, id, mode, false); @@ -608,8 +608,8 @@ public abstract class BinaryFieldAccessor { break; - case PORTABLE_OBJ: - writer.writePortableObjectField((BinaryObjectImpl)val); + case BINARY_OBJ: + writer.writeBinaryObjectField((BinaryObjectImpl)val); break; @@ -623,7 +623,7 @@ public abstract class BinaryFieldAccessor { break; - case PORTABLE: + case BINARY: case EXTERNALIZABLE: case OBJECT: writer.writeObjectField(val); @@ -809,8 +809,8 @@ public abstract class BinaryFieldAccessor { break; - case PORTABLE_OBJ: - val = reader.readPortableObject(id); + case BINARY_OBJ: + val = reader.readBinaryObject(id); break; @@ -824,7 +824,7 @@ public abstract class BinaryFieldAccessor { break; - case PORTABLE: + case BINARY: case EXTERNALIZABLE: case OBJECT: val = reader.readObject(id); http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldImpl.java index 7f51631..78ed17a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryFieldImpl.java @@ -24,7 +24,7 @@ import org.apache.ignite.binary.BinaryObject; import org.apache.ignite.binary.BinaryField; /** - * Implementation of portable field descriptor. + * Implementation of binary field descriptor. */ public class BinaryFieldImpl implements BinaryField { /** Type ID. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java index 03bf9f9..5480967 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMarshaller.java @@ -81,10 +81,10 @@ public class BinaryMarshaller extends AbstractMarshaller { /** * Sets {@link BinaryContext}. * <p/> - * @param ctx Portable context. + * @param ctx Binary context. */ @SuppressWarnings("UnusedDeclaration") - private void setPortableContext(BinaryContext ctx, IgniteConfiguration cfg) { + private void setBinaryContext(BinaryContext ctx, IgniteConfiguration cfg) { ctx.configure(this, cfg); impl = new GridBinaryMarshaller(ctx); @@ -116,7 +116,7 @@ public class BinaryMarshaller extends AbstractMarshaller { @Override public <T> T unmarshal(InputStream in, @Nullable ClassLoader clsLdr) throws IgniteCheckedException { ByteArrayOutputStream buf = new ByteArrayOutputStream(); - // we have to fully read the InputStream because GridPortableMarshaller requires support of a method that + // we have to fully read the InputStream because GridBinaryMarshaller requires support of a method that // returns number of bytes remaining. try { byte[] arr = new byte[4096]; http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadata.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadata.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadata.java index a8ff140..7de73b8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadata.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadata.java @@ -30,7 +30,7 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.jetbrains.annotations.Nullable; /** - * Portable metadata which is passed over a wire. + * Binary metadata which is passed over a wire. */ public class BinaryMetadata implements Externalizable { /** */ @@ -146,7 +146,7 @@ public class BinaryMetadata implements Externalizable { /** * Wrap metadata into binary type. * - * @param ctx Portable context. + * @param ctx Binary context. * @return Binary type. */ public BinaryTypeImpl wrap(BinaryContext ctx) { http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadataHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadataHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadataHandler.java index fea2893..29ff7b3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadataHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadataHandler.java @@ -21,7 +21,7 @@ import org.apache.ignite.binary.BinaryObjectException; import org.apache.ignite.binary.BinaryType; /** - * Portable meta data handler. + * Binary meta data handler. */ public interface BinaryMetadataHandler { /** http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectExImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectExImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectExImpl.java index 252c495..404300d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectExImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectExImpl.java @@ -29,7 +29,7 @@ import org.apache.ignite.binary.BinaryObject; import org.jetbrains.annotations.Nullable; /** - * Internal portable object interface. + * Internal binary object interface. */ public abstract class BinaryObjectExImpl implements BinaryObjectEx { /** @@ -245,7 +245,7 @@ public abstract class BinaryObjectExImpl implements BinaryObjectEx { return toString(ctx, new IdentityHashMap<BinaryObject, Integer>()); } catch (BinaryObjectException e) { - throw new IgniteException("Failed to create string representation of portable object.", e); + throw new IgniteException("Failed to create string representation of binary object.", e); } } } http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java index 9fd5901..2342766 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java @@ -46,7 +46,7 @@ import org.jetbrains.annotations.Nullable; import static java.nio.charset.StandardCharsets.UTF_8; /** - * Portable object implementation. + * Binary object implementation. */ @IgniteCodeGeneratingFail // Fields arr and start should not be generated by MessageCodeGenerator. public final class BinaryObjectImpl extends BinaryObjectExImpl implements Externalizable, KeyCacheObject { @@ -142,7 +142,7 @@ public final class BinaryObjectImpl extends BinaryObjectExImpl implements Extern /** {@inheritDoc} */ @Override public void finishUnmarshal(CacheObjectContext ctx, ClassLoader ldr) throws IgniteCheckedException { - this.ctx = ((CacheObjectBinaryProcessorImpl)ctx.processor()).portableContext(); + this.ctx = ((CacheObjectBinaryProcessorImpl)ctx.processor()).binaryContext(); } /** {@inheritDoc} */ @@ -156,7 +156,7 @@ public final class BinaryObjectImpl extends BinaryObjectExImpl implements Extern } /** - * @return Detached portable object. + * @return Detached binary object. */ public BinaryObject detach() { if (!detachAllowed || detached()) @@ -227,7 +227,7 @@ public final class BinaryObjectImpl extends BinaryObjectExImpl implements Extern /** {@inheritDoc} */ @Nullable @Override public BinaryType type() throws BinaryObjectException { if (ctx == null) - throw new BinaryObjectException("PortableContext is not set for the object."); + throw new BinaryObjectException("BinaryContext is not set for the object."); return ctx.metadata(typeId()); } http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java index 1206db7..0246a36 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java @@ -45,7 +45,7 @@ import java.util.UUID; import static java.nio.charset.StandardCharsets.UTF_8; /** - * Portable object implementation over offheap memory + * Binary object implementation over offheap memory */ public class BinaryObjectOffheapImpl extends BinaryObjectExImpl implements Externalizable, CacheObject { /** */ @@ -141,7 +141,7 @@ public class BinaryObjectOffheapImpl extends BinaryObjectExImpl implements Exter /** {@inheritDoc} */ @Nullable @Override public BinaryType type() throws BinaryObjectException { if (ctx == null) - throw new BinaryObjectException("PortableContext is not set for the object."); + throw new BinaryObjectException("BinaryContext is not set for the object."); return ctx.metadata(typeId()); } http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java index b673e27..8f9cc92 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryReaderExImpl.java @@ -69,7 +69,7 @@ import static org.apache.ignite.internal.binary.GridBinaryMarshaller.NULL; import static org.apache.ignite.internal.binary.GridBinaryMarshaller.OBJ; import static org.apache.ignite.internal.binary.GridBinaryMarshaller.OBJ_ARR; import static org.apache.ignite.internal.binary.GridBinaryMarshaller.OPTM_MARSH; -import static org.apache.ignite.internal.binary.GridBinaryMarshaller.PORTABLE_OBJ; +import static org.apache.ignite.internal.binary.GridBinaryMarshaller.BINARY_OBJ; import static org.apache.ignite.internal.binary.GridBinaryMarshaller.SHORT; import static org.apache.ignite.internal.binary.GridBinaryMarshaller.SHORT_ARR; import static org.apache.ignite.internal.binary.GridBinaryMarshaller.STRING; @@ -81,11 +81,11 @@ import static org.apache.ignite.internal.binary.GridBinaryMarshaller.UUID; import static org.apache.ignite.internal.binary.GridBinaryMarshaller.UUID_ARR; /** - * Portable reader implementation. + * Binary reader implementation. */ @SuppressWarnings("unchecked") public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, BinaryReaderHandlesHolder, ObjectInput { - /** Portable context. */ + /** Binary context. */ private final BinaryContext ctx; /** Input stream. */ @@ -185,7 +185,7 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina start = in.position(); - // Perform full header parsing in case of portable object. + // Perform full header parsing in case of binary object. if (!skipHdrCheck && (in.readByte() == GridBinaryMarshaller.OBJ)) { // Ensure protocol is fine. BinaryUtils.checkProtocolVersion(in.readByte()); @@ -312,12 +312,12 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina /** * @param fieldId Field ID. - * @return Portable object. + * @return Binary object. * @throws BinaryObjectException In case of error. */ - @Nullable BinaryObject readPortableObject(int fieldId) throws BinaryObjectException { + @Nullable BinaryObject readBinaryObject(int fieldId) throws BinaryObjectException { if (findFieldById(fieldId)) { - if (checkFlag(PORTABLE_OBJ) == Flag.NULL) + if (checkFlag(BINARY_OBJ) == Flag.NULL) return null; return new BinaryObjectImpl(ctx, BinaryUtils.doReadByteArray(in), in.readInt()); @@ -1598,12 +1598,12 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Bina break; - case PORTABLE_OBJ: - obj = BinaryUtils.doReadPortableObject(in, ctx); + case BINARY_OBJ: + obj = BinaryUtils.doReadBinaryObject(in, ctx); ((BinaryObjectImpl)obj).context(ctx); - if (!GridBinaryMarshaller.KEEP_PORTABLES.get()) + if (!GridBinaryMarshaller.KEEP_BINARIES.get()) obj = ((BinaryObject)obj).deserialize(); break; http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySchema.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySchema.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySchema.java index 99e642c..156ac0f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySchema.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySchema.java @@ -26,7 +26,7 @@ import java.util.Iterator; import java.util.List; /** - * Schema describing portable object content. We rely on the following assumptions: + * Schema describing binary object content. We rely on the following assumptions: * - When amount of fields in the object is low, it is better to inline these values into int fields thus allowing * for quick comparisons performed within already fetched L1 cache line. * - When there are more fields, we store them inside a hash map. http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySchemaRegistry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySchemaRegistry.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySchemaRegistry.java index 6920a34..91f29b2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySchemaRegistry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinarySchemaRegistry.java @@ -22,7 +22,7 @@ import org.jetbrains.annotations.Nullable; import java.util.HashMap; /** - * Portable schema registry. Contains all well-known object schemas. + * Binary schema registry. Contains all well-known object schemas. * <p> * We rely on the fact that usually object has only few different schemas. For this reason we inline several * of them with optional fallback to normal hash map lookup. http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryTypeImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryTypeImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryTypeImpl.java index 23aacb2..d4fd625 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryTypeImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryTypeImpl.java @@ -25,7 +25,7 @@ import java.util.Collection; * Binary type implementation. */ public class BinaryTypeImpl implements BinaryType { - /** Portable context. */ + /** Binary context. */ private final BinaryContext ctx; /** Type metadata. */ @@ -34,7 +34,7 @@ public class BinaryTypeImpl implements BinaryType { /** * Constructor. * - * @param ctx Portable context. + * @param ctx Binary context. * @param meta Type metadata. */ public BinaryTypeImpl(BinaryContext ctx, BinaryMetadata meta) { http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java index d285df5..8b5ec68 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java @@ -58,7 +58,7 @@ import java.util.concurrent.ConcurrentSkipListSet; import static java.nio.charset.StandardCharsets.UTF_8; /** - * Portable utils. + * Binary utils. */ public class BinaryUtils { /** */ @@ -70,8 +70,8 @@ public class BinaryUtils { /** {@code true} if serialized value of this type cannot contain references to objects. */ private static final boolean[] PLAIN_TYPE_FLAG = new boolean[102]; - /** Portable classes. */ - private static final Collection<Class<?>> PORTABLE_CLS = new HashSet<>(); + /** Binary classes. */ + private static final Collection<Class<?>> BINARY_CLS = new HashSet<>(); /** Flag: user type. */ public static final short FLAG_USR_TYP = 0x0001; @@ -166,32 +166,32 @@ public class BinaryUtils { PLAIN_TYPE_FLAG[b] = true; } - PORTABLE_CLS.add(Byte.class); - PORTABLE_CLS.add(Short.class); - PORTABLE_CLS.add(Integer.class); - PORTABLE_CLS.add(Long.class); - PORTABLE_CLS.add(Float.class); - PORTABLE_CLS.add(Double.class); - PORTABLE_CLS.add(Character.class); - PORTABLE_CLS.add(Boolean.class); - PORTABLE_CLS.add(String.class); - PORTABLE_CLS.add(UUID.class); - PORTABLE_CLS.add(Date.class); - PORTABLE_CLS.add(Timestamp.class); - PORTABLE_CLS.add(BigDecimal.class); - PORTABLE_CLS.add(byte[].class); - PORTABLE_CLS.add(short[].class); - PORTABLE_CLS.add(int[].class); - PORTABLE_CLS.add(long[].class); - PORTABLE_CLS.add(float[].class); - PORTABLE_CLS.add(double[].class); - PORTABLE_CLS.add(char[].class); - PORTABLE_CLS.add(boolean[].class); - PORTABLE_CLS.add(String[].class); - PORTABLE_CLS.add(UUID[].class); - PORTABLE_CLS.add(Date[].class); - PORTABLE_CLS.add(Timestamp[].class); - PORTABLE_CLS.add(BigDecimal[].class); + BINARY_CLS.add(Byte.class); + BINARY_CLS.add(Short.class); + BINARY_CLS.add(Integer.class); + BINARY_CLS.add(Long.class); + BINARY_CLS.add(Float.class); + BINARY_CLS.add(Double.class); + BINARY_CLS.add(Character.class); + BINARY_CLS.add(Boolean.class); + BINARY_CLS.add(String.class); + BINARY_CLS.add(UUID.class); + BINARY_CLS.add(Date.class); + BINARY_CLS.add(Timestamp.class); + BINARY_CLS.add(BigDecimal.class); + BINARY_CLS.add(byte[].class); + BINARY_CLS.add(short[].class); + BINARY_CLS.add(int[].class); + BINARY_CLS.add(long[].class); + BINARY_CLS.add(float[].class); + BINARY_CLS.add(double[].class); + BINARY_CLS.add(char[].class); + BINARY_CLS.add(boolean[].class); + BINARY_CLS.add(String[].class); + BINARY_CLS.add(UUID[].class); + BINARY_CLS.add(Date[].class); + BINARY_CLS.add(Timestamp[].class); + BINARY_CLS.add(BigDecimal[].class); FIELD_TYPE_NAMES = new String[104]; @@ -210,7 +210,7 @@ public class BinaryUtils { FIELD_TYPE_NAMES[GridBinaryMarshaller.TIMESTAMP] = "Timestamp"; FIELD_TYPE_NAMES[GridBinaryMarshaller.ENUM] = "Enum"; FIELD_TYPE_NAMES[GridBinaryMarshaller.OBJ] = "Object"; - FIELD_TYPE_NAMES[GridBinaryMarshaller.PORTABLE_OBJ] = "Object"; + FIELD_TYPE_NAMES[GridBinaryMarshaller.BINARY_OBJ] = "Object"; FIELD_TYPE_NAMES[GridBinaryMarshaller.COL] = "Collection"; FIELD_TYPE_NAMES[GridBinaryMarshaller.MAP] = "Map"; FIELD_TYPE_NAMES[GridBinaryMarshaller.CLASS] = "Class"; @@ -547,7 +547,7 @@ public class BinaryUtils { /** * @param cls Class. - * @return Portable field type. + * @return Binary field type. */ public static byte typeByClass(Class<?> cls) { Byte type = PLAIN_CLASS_TO_FLAG.get(cls); @@ -571,16 +571,16 @@ public class BinaryUtils { } /** - * Tells whether provided type is portable. + * Tells whether provided type is binary. * * @param cls Class to check. - * @return Whether type is portable. + * @return Whether type is binary. */ - public static boolean isPortableType(Class<?> cls) { + public static boolean isBinaryType(Class<?> cls) { assert cls != null; return BinaryObject.class.isAssignableFrom(cls) || - PORTABLE_CLS.contains(cls) || + BINARY_CLS.contains(cls) || cls.isEnum() || (cls.isArray() && cls.getComponentType().isEnum()); } @@ -632,7 +632,7 @@ public class BinaryUtils { } /** - * Get portable object length. + * Get binary object length. * * @param in Input stream. * @param start Start position. @@ -801,7 +801,7 @@ public class BinaryUtils { // Check type name. if (!F.eq(oldMeta.typeName(), newMeta.typeName())) { throw new BinaryObjectException( - "Two portable types have duplicate type ID [" + "typeId=" + oldMeta.typeId() + + "Two binary types have duplicate type ID [" + "typeId=" + oldMeta.typeId() + ", typeName1=" + oldMeta.typeName() + ", typeName2=" + newMeta.typeName() + ']' ); } @@ -944,9 +944,9 @@ public class BinaryUtils { else if (cls.isArray()) return cls.getComponentType().isEnum() ? BinaryWriteMode.ENUM_ARR : BinaryWriteMode.OBJECT_ARR; else if (cls == BinaryObjectImpl.class) - return BinaryWriteMode.PORTABLE_OBJ; + return BinaryWriteMode.BINARY_OBJ; else if (Binarylizable.class.isAssignableFrom(cls)) - return BinaryWriteMode.PORTABLE; + return BinaryWriteMode.BINARY; else if (Externalizable.class.isAssignableFrom(cls)) return BinaryWriteMode.EXTERNALIZABLE; else if (isSpecialCollection(cls)) @@ -1249,7 +1249,7 @@ public class BinaryUtils { /** * @return Value. */ - public static BinaryObject doReadPortableObject(BinaryInputStream in, BinaryContext ctx) { + public static BinaryObject doReadBinaryObject(BinaryInputStream in, BinaryContext ctx) { if (in.offheapPointer() > 0) { int len = in.readInt(); @@ -1343,7 +1343,7 @@ public class BinaryUtils { /** * Resolve the class. * - * @param ctx Portable context. + * @param ctx Binary context. * @param typeId Type ID. * @param clsName Class name. * @param ldr Class loaded. @@ -1374,26 +1374,26 @@ public class BinaryUtils { } /** - * Read portable enum. + * Read binary enum. * * @param in Input stream. - * @param ctx Portable context. + * @param ctx Binary context. * @param type Plain type. * @return Enum. */ - private static BinaryEnumObjectImpl doReadPortableEnum(BinaryInputStream in, BinaryContext ctx, + private static BinaryEnumObjectImpl doReadBinaryEnum(BinaryInputStream in, BinaryContext ctx, EnumType type) { return new BinaryEnumObjectImpl(ctx, type.typeId, type.clsName, in.readInt()); } /** - * Read portable enum array. + * Read binary enum array. * * @param in Input stream. - * @param ctx Portable context. + * @param ctx Binary context. * @return Enum array. */ - private static Object[] doReadPortableEnumArray(BinaryInputStream in, BinaryContext ctx) { + private static Object[] doReadBinaryEnumArray(BinaryInputStream in, BinaryContext ctx) { int len = in.readInt(); Object[] arr = (Object[]) Array.newInstance(BinaryObject.class, len); @@ -1404,7 +1404,7 @@ public class BinaryUtils { if (flag == GridBinaryMarshaller.NULL) arr[i] = null; else - arr[i] = doReadPortableEnum(in, ctx, doReadEnumType(in)); + arr[i] = doReadBinaryEnum(in, ctx, doReadEnumType(in)); } return arr; @@ -1644,16 +1644,16 @@ public class BinaryUtils { case GridBinaryMarshaller.MAP: return doReadMap(in, ctx, ldr, handles, false, null); - case GridBinaryMarshaller.PORTABLE_OBJ: - return doReadPortableObject(in, ctx); + case GridBinaryMarshaller.BINARY_OBJ: + return doReadBinaryObject(in, ctx); case GridBinaryMarshaller.ENUM: - return doReadPortableEnum(in, ctx, doReadEnumType(in)); + return doReadBinaryEnum(in, ctx, doReadEnumType(in)); case GridBinaryMarshaller.ENUM_ARR: doReadEnumType(in); // Simply skip this part as we do not need it. - return doReadPortableEnumArray(in, ctx); + return doReadBinaryEnumArray(in, ctx); case GridBinaryMarshaller.CLASS: return doReadClass(in, ctx, ldr); http://git-wip-us.apache.org/repos/asf/ignite/blob/10b83fb8/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java index 9a37bdb..90127f4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteMode.java @@ -133,13 +133,13 @@ public enum BinaryWriteMode { MAP(GridBinaryMarshaller.MAP), /** */ - PORTABLE_OBJ(GridBinaryMarshaller.OBJ), + BINARY_OBJ(GridBinaryMarshaller.OBJ), /** */ ENUM(GridBinaryMarshaller.ENUM), - /** Portable enum. */ - PORTABLE_ENUM(GridBinaryMarshaller.ENUM), + /** Binary enum. */ + BINARY_ENUM(GridBinaryMarshaller.ENUM), /** */ ENUM_ARR(GridBinaryMarshaller.ENUM_ARR), @@ -148,7 +148,7 @@ public enum BinaryWriteMode { CLASS(GridBinaryMarshaller.CLASS), /** */ - PORTABLE(GridBinaryMarshaller.PORTABLE_OBJ), + BINARY(GridBinaryMarshaller.BINARY_OBJ), /** */ EXTERNALIZABLE(GridBinaryMarshaller.OBJ),