ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [49/50] [abbrv] ignite git commit: IGNITE-1917: Method renames.
Date Wed, 18 Nov 2015 13:40:23 GMT
IGNITE-1917: Method renames.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/56ad7bda
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/56ad7bda
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/56ad7bda

Branch: refs/heads/ignite-1917
Commit: 56ad7bda56e142bb2729354d9d32ffdc58f6a557
Parents: ed2b1e7
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Wed Nov 18 16:32:35 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Wed Nov 18 16:32:35 2015 +0300

----------------------------------------------------------------------
 .../internal/portable/BinaryFieldAccessor.java  | 28 ++++++-------
 .../internal/portable/BinaryReaderExImpl.java   | 44 ++++++++++----------
 2 files changed, 36 insertions(+), 36 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/56ad7bda/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryFieldAccessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryFieldAccessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryFieldAccessor.java
index 2a9bb45..0eda375 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryFieldAccessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryFieldAccessor.java
@@ -170,7 +170,7 @@ public abstract class BinaryFieldAccessor {
 
         /** {@inheritDoc} */
         @Override public void read(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException
{
-            byte val = reader.readBytePrimitive(id);
+            byte val = reader.readByte(id);
 
             UNSAFE.putByte(obj, offset, val);
         }
@@ -200,7 +200,7 @@ public abstract class BinaryFieldAccessor {
 
         /** {@inheritDoc} */
         @Override public void read(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException
{
-            boolean val = reader.readBooleanPrimitive(id);
+            boolean val = reader.readBoolean(id);
 
             UNSAFE.putBoolean(obj, offset, val);
         }
@@ -230,7 +230,7 @@ public abstract class BinaryFieldAccessor {
 
         /** {@inheritDoc} */
         @Override public void read(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException
{
-            short val = reader.readShortPrimitive(id);
+            short val = reader.readShort(id);
 
             UNSAFE.putShort(obj, offset, val);
         }
@@ -260,7 +260,7 @@ public abstract class BinaryFieldAccessor {
 
         /** {@inheritDoc} */
         @Override public void read(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException
{
-            char val = reader.readCharPrimitive(id);
+            char val = reader.readChar(id);
 
             UNSAFE.putChar(obj, offset, val);
         }
@@ -320,7 +320,7 @@ public abstract class BinaryFieldAccessor {
 
         /** {@inheritDoc} */
         @Override public void read(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException
{
-            long val = reader.readLongPrimitive(id);
+            long val = reader.readLong(id);
 
             UNSAFE.putLong(obj, offset, val);
         }
@@ -350,7 +350,7 @@ public abstract class BinaryFieldAccessor {
 
         /** {@inheritDoc} */
         @Override public void read(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException
{
-            float val = reader.readFloatPrimitive(id);
+            float val = reader.readFloat(id);
 
             UNSAFE.putFloat(obj, offset, val);
         }
@@ -380,7 +380,7 @@ public abstract class BinaryFieldAccessor {
 
         /** {@inheritDoc} */
         @Override public void read(Object obj, BinaryReaderExImpl reader) throws BinaryObjectException
{
-            double val = reader.readDoublePrimitive(id);
+            double val = reader.readDouble(id);
 
             UNSAFE.putDouble(obj, offset, val);
         }
@@ -613,12 +613,12 @@ public abstract class BinaryFieldAccessor {
 
             switch (mode) {
                 case BYTE:
-                    val = reader.readByte(id);
+                    val = reader.readByteNullable(id);
 
                     break;
 
                 case SHORT:
-                    val = reader.readShort(id);
+                    val = reader.readShortNullable(id);
 
                     break;
 
@@ -628,27 +628,27 @@ public abstract class BinaryFieldAccessor {
                     break;
 
                 case LONG:
-                    val = reader.readLong(id);
+                    val = reader.readLongNullable(id);
 
                     break;
 
                 case FLOAT:
-                    val = reader.readFloat(id);
+                    val = reader.readFloatNullable(id);
 
                     break;
 
                 case DOUBLE:
-                    val = reader.readDouble(id);
+                    val = reader.readDoubleNullable(id);
 
                     break;
 
                 case CHAR:
-                    val = reader.readChar(id);
+                    val = reader.readCharNullable(id);
 
                     break;
 
                 case BOOLEAN:
-                    val = reader.readBoolean(id);
+                    val = reader.readBooleanNullable(id);
 
                     break;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/56ad7bda/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java
index 0e080c2..d232c7c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java
@@ -308,7 +308,7 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx,
Obje
      * @return Value.
      * @throws BinaryObjectException If failed.
      */
-    byte readBytePrimitive(int fieldId) throws BinaryObjectException {
+    byte readByte(int fieldId) throws BinaryObjectException {
         return findFieldById(fieldId) && checkFlag(BYTE) == Flag.NORMAL ? in.readByte()
: 0;
     }
 
@@ -317,7 +317,7 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx,
Obje
      * @return Value.
      * @throws BinaryObjectException In case of error.
      */
-    @Nullable Byte readByte(int fieldId) throws BinaryObjectException {
+    @Nullable Byte readByteNullable(int fieldId) throws BinaryObjectException {
         if (findFieldById(fieldId)) {
             if (checkFlag(BYTE) == Flag.NULL)
                 return null;
@@ -333,7 +333,7 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx,
Obje
      * @return Value.
      * @throws BinaryObjectException If failed.
      */
-    short readShortPrimitive(int fieldId) throws BinaryObjectException {
+    short readShort(int fieldId) throws BinaryObjectException {
         return findFieldById(fieldId) && checkFlag(SHORT) == Flag.NORMAL ? in.readShort()
: 0;
     }
 
@@ -342,7 +342,7 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx,
Obje
      * @return Value.
      * @throws BinaryObjectException In case of error.
      */
-    @Nullable Short readShort(int fieldId) throws BinaryObjectException {
+    @Nullable Short readShortNullable(int fieldId) throws BinaryObjectException {
         if (findFieldById(fieldId)) {
             if (checkFlag(SHORT) == Flag.NULL)
                 return null;
@@ -358,7 +358,7 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx,
Obje
      * @return Value.
      * @throws BinaryObjectException If failed.
      */
-    long readLongPrimitive(int fieldId) throws BinaryObjectException {
+    long readLong(int fieldId) throws BinaryObjectException {
         return findFieldById(fieldId) && checkFlag(LONG) == Flag.NORMAL ? in.readLong()
: 0;
     }
 
@@ -367,7 +367,7 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx,
Obje
      * @return Value.
      * @throws BinaryObjectException In case of error.
      */
-    @Nullable Long readLong(int fieldId) throws BinaryObjectException {
+    @Nullable Long readLongNullable(int fieldId) throws BinaryObjectException {
         if (findFieldById(fieldId)) {
             if (checkFlag(LONG) == Flag.NULL)
                 return null;
@@ -383,7 +383,7 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx,
Obje
      * @return Value.
      * @throws BinaryObjectException If failed.
      */
-    float readFloatPrimitive(int fieldId) throws BinaryObjectException {
+    float readFloat(int fieldId) throws BinaryObjectException {
         return findFieldById(fieldId) && checkFlag(FLOAT) == Flag.NORMAL ? in.readFloat()
: 0;
     }
 
@@ -392,7 +392,7 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx,
Obje
      * @return Value.
      * @throws BinaryObjectException In case of error.
      */
-    @Nullable Float readFloat(int fieldId) throws BinaryObjectException {
+    @Nullable Float readFloatNullable(int fieldId) throws BinaryObjectException {
         if (findFieldById(fieldId)) {
             if (checkFlag(FLOAT) == Flag.NULL)
                 return null;
@@ -408,7 +408,7 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx,
Obje
      * @return Value.
      * @throws BinaryObjectException If failed.
      */
-    double readDoublePrimitive(int fieldId) throws BinaryObjectException {
+    double readDouble(int fieldId) throws BinaryObjectException {
         return findFieldById(fieldId) && checkFlag(DOUBLE) == Flag.NORMAL ? in.readDouble()
: 0;
     }
 
@@ -417,7 +417,7 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx,
Obje
      * @return Value.
      * @throws BinaryObjectException In case of error.
      */
-    @Nullable Double readDouble(int fieldId) throws BinaryObjectException {
+    @Nullable Double readDoubleNullable(int fieldId) throws BinaryObjectException {
         if (findFieldById(fieldId)) {
             if (checkFlag(DOUBLE) == Flag.NULL)
                 return null;
@@ -433,7 +433,7 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx,
Obje
      * @return Value.
      * @throws BinaryObjectException If failed.
      */
-    char readCharPrimitive(int fieldId) throws BinaryObjectException {
+    char readChar(int fieldId) throws BinaryObjectException {
         return findFieldById(fieldId) && checkFlag(CHAR) == Flag.NORMAL ? in.readChar()
: 0;
     }
 
@@ -442,7 +442,7 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx,
Obje
      * @return Value.
      * @throws BinaryObjectException In case of error.
      */
-    @Nullable Character readChar(int fieldId) throws BinaryObjectException {
+    @Nullable Character readCharNullable(int fieldId) throws BinaryObjectException {
         if (findFieldById(fieldId)) {
             if (checkFlag(CHAR) == Flag.NULL)
                 return null;
@@ -458,7 +458,7 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx,
Obje
      * @return Value.
      * @throws BinaryObjectException If failed.
      */
-    boolean readBooleanPrimitive(int fieldId) throws BinaryObjectException {
+    boolean readBoolean(int fieldId) throws BinaryObjectException {
         return findFieldById(fieldId) && checkFlag(BOOLEAN) == Flag.NORMAL &&
in.readBoolean();
     }
 
@@ -467,7 +467,7 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx,
Obje
      * @return Value.
      * @throws BinaryObjectException In case of error.
      */
-    @Nullable Boolean readBoolean(int fieldId) throws BinaryObjectException {
+    @Nullable Boolean readBooleanNullable(int fieldId) throws BinaryObjectException {
         if (findFieldById(fieldId)) {
             if (checkFlag(BOOLEAN) == Flag.NULL)
                 return null;
@@ -995,7 +995,7 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx,
Obje
     }
     /** {@inheritDoc} */
     @Override public byte readByte(String fieldName) throws BinaryObjectException {
-        Byte val = readByte(fieldId(fieldName));
+        Byte val = readByteNullable(fieldId(fieldName));
 
         return val != null ? val : 0;
     }
@@ -1007,7 +1007,7 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx,
Obje
 
     /** {@inheritDoc} */
     @Override public short readShort(String fieldName) throws BinaryObjectException {
-        Short val = readShort(fieldId(fieldName));
+        Short val = readShortNullable(fieldId(fieldName));
 
         return val != null ? val : 0;
     }
@@ -1027,7 +1027,7 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx,
Obje
      * @return Value.
      * @throws BinaryObjectException If failed.
      */
-    public int readInt(int fieldId) throws BinaryObjectException {
+    int readInt(int fieldId) throws BinaryObjectException {
         return findFieldById(fieldId) && checkFlagPrimitive(INT) == Flag.NORMAL ?
in.readInt() : 0;
     }
 
@@ -1047,7 +1047,7 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx,
Obje
     
     /** {@inheritDoc} */
     @Override public long readLong(String fieldName) throws BinaryObjectException {
-        Long val = readLong(fieldId(fieldName));
+        Long val = readLongNullable(fieldId(fieldName));
 
         return val != null ? val : 0;
     }
@@ -1059,7 +1059,7 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx,
Obje
 
     /** {@inheritDoc} */
     @Override public float readFloat(String fieldName) throws BinaryObjectException {
-        Float val = readFloat(fieldId(fieldName));
+        Float val = readFloatNullable(fieldId(fieldName));
 
         return val != null ? val : 0;
     }
@@ -1071,7 +1071,7 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx,
Obje
 
     /** {@inheritDoc} */
     @Override public double readDouble(String fieldName) throws BinaryObjectException {
-        Double val = readDouble(fieldId(fieldName));
+        Double val = readDoubleNullable(fieldId(fieldName));
 
         return val != null ? val : 0;
     }
@@ -1083,7 +1083,7 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx,
Obje
 
     /** {@inheritDoc} */
     @Override public char readChar(String fieldName) throws BinaryObjectException {
-        Character val = readChar(fieldId(fieldName));
+        Character val = readCharNullable(fieldId(fieldName));
 
         return val != null ? val : 0;
     }
@@ -1095,7 +1095,7 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx,
Obje
 
     /** {@inheritDoc} */
     @Override public boolean readBoolean(String fieldName) throws BinaryObjectException {
-        Boolean val = readBoolean(fieldId(fieldName));
+        Boolean val = readBooleanNullable(fieldId(fieldName));
 
         return val != null ? val : false;
     }


Mime
View raw message