ignite-2065: portable -> binary renaming (methods, javadoc and etc.)

apache · Dec 11, 2015 · 10b83fb · 10b83fb
1 parent 1f2af31
commit 10b83fb
Show file tree

Hide file tree

Showing 214 changed files with 1,588 additions and 1,610 deletions.
diff --git 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 @@
 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[] {});
     }
 }
diff --git 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 @@
 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[] {});
     }
 }
diff --git 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 static TestSuite suite() throws Exception {
         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));
 

diff --git a/...ients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java b/...ients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
@@ -26,7 +26,7 @@
 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 @@ private void doTestGroup(GridClientCacheFlag... flags) {
 
         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);
     }
-}
+}
diff --git 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"/>

diff --git 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"/>

diff --git a/modules/core/pom.xml b/modules/core/pom.xml
@@ -36,8 +36,8 @@
 
     <repositories>
         <repository>
-            <id>ignite-portables-test-repo</id>
+            <id>ignite-binaries-test-repo</id>
-            <url>file://${basedir}/src/test/portables/repo</url>
+            <url>file://${basedir}/src/test/binaries/repo</url>
         </repository>
     </repositories>