ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [25/45] incubator-ignite git commit: ignite-1258: renaming portalbe internal classes
Date Fri, 21 Aug 2015 06:48:43 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4662feca/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/GridPortableInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/GridPortableInputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/GridPortableInputStream.java
deleted file mode 100644
index 501517b..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/GridPortableInputStream.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.portable;
-
-/**
- * Portable input stream.
- */
-public interface GridPortableInputStream extends GridPortableStream {
-    /**
-     * Read byte value.
-     *
-     * @return Byte value.
-     */
-    public byte readByte();
-
-    /**
-     * Read byte array.
-     *
-     * @param cnt Expected item count.
-     * @return Byte array.
-     */
-    public byte[] readByteArray(int cnt);
-
-    /**
-     * Reads {@code cnt} of bytes into byte array.
-     *
-     * @param arr Expected item count.
-     * @param off offset
-     * @param cnt number of bytes to read.
-     * @return actual length read.
-     */
-    public int read(byte[] arr, int off, int cnt);
-
-    /**
-     * Read boolean value.
-     *
-     * @return Boolean value.
-     */
-    public boolean readBoolean();
-
-    /**
-     * Read boolean array.
-     *
-     * @param cnt Expected item count.
-     * @return Boolean array.
-     */
-    public boolean[] readBooleanArray(int cnt);
-
-    /**
-     * Read short value.
-     *
-     * @return Short value.
-     */
-    public short readShort();
-
-    /**
-     * Read short array.
-     *
-     * @param cnt Expected item count.
-     * @return Short array.
-     */
-    public short[] readShortArray(int cnt);
-
-    /**
-     * Read char value.
-     *
-     * @return Char value.
-     */
-    public char readChar();
-
-    /**
-     * Read char array.
-     *
-     * @param cnt Expected item count.
-     * @return Char array.
-     */
-    public char[] readCharArray(int cnt);
-
-    /**
-     * Read int value.
-     *
-     * @return Int value.
-     */
-    public int readInt();
-
-    /**
-     * Read int value at the given position.
-     *
-     * @param pos Position.
-     * @return Value.
-     */
-    public int readInt(int pos);
-
-    /**
-     * Read int array.
-     *
-     * @param cnt Expected item count.
-     * @return Int array.
-     */
-    public int[] readIntArray(int cnt);
-
-    /**
-     * Read float value.
-     *
-     * @return Float value.
-     */
-    public float readFloat();
-
-    /**
-     * Read float array.
-     *
-     * @param cnt Expected item count.
-     * @return Float array.
-     */
-    public float[] readFloatArray(int cnt);
-
-    /**
-     * Read long value.
-     *
-     * @return Long value.
-     */
-    public long readLong();
-
-    /**
-     * Read long array.
-     *
-     * @param cnt Expected item count.
-     * @return Long array.
-     */
-    public long[] readLongArray(int cnt);
-
-    /**
-     * Read double value.
-     *
-     * @return Double value.
-     */
-    public double readDouble();
-
-    /**
-     * Read double array.
-     *
-     * @param cnt Expected item count.
-     * @return Double array.
-     */
-    public double[] readDoubleArray(int cnt);
-
-    /**
-     * Gets amount of remaining data in bytes.
-     *
-     * @return Remaining data.
-     */
-    public int remaining();
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4662feca/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/GridPortableOutputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/GridPortableOutputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/GridPortableOutputStream.java
deleted file mode 100644
index 4f23fd1..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/GridPortableOutputStream.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.portable;
-
-/**
- * Portable output stream.
- */
-public interface GridPortableOutputStream extends GridPortableStream, AutoCloseable {
-    /**
-     * Write byte value.
-     *
-     * @param val Byte value.
-     */
-    public void writeByte(byte val);
-
-    /**
-     * Write byte array.
-     *
-     * @param val Byte array.
-     */
-    public void writeByteArray(byte[] val);
-
-    /**
-     * Write boolean value.
-     *
-     * @param val Boolean value.
-     */
-    public void writeBoolean(boolean val);
-
-    /**
-     * Write boolean array.
-     *
-     * @param val Boolean array.
-     */
-    public void writeBooleanArray(boolean[] val);
-
-    /**
-     * Write short value.
-     *
-     * @param val Short value.
-     */
-    public void writeShort(short val);
-
-    /**
-     * Write short array.
-     *
-     * @param val Short array.
-     */
-    public void writeShortArray(short[] val);
-
-    /**
-     * Write char value.
-     *
-     * @param val Char value.
-     */
-    public void writeChar(char val);
-
-    /**
-     * Write char array.
-     *
-     * @param val Char array.
-     */
-    public void writeCharArray(char[] val);
-
-    /**
-     * Write int value.
-     *
-     * @param val Int value.
-     */
-    public void writeInt(int val);
-
-    /**
-     * Write int value to the given position.
-     *
-     * @param pos Position.
-     * @param val Value.
-     */
-    public void writeInt(int pos, int val);
-
-    /**
-     * Write int array.
-     *
-     * @param val Int array.
-     */
-    public void writeIntArray(int[] val);
-
-    /**
-     * Write float value.
-     *
-     * @param val Float value.
-     */
-    public void writeFloat(float val);
-
-    /**
-     * Write float array.
-     *
-     * @param val Float array.
-     */
-    public void writeFloatArray(float[] val);
-
-    /**
-     * Write long value.
-     *
-     * @param val Long value.
-     */
-    public void writeLong(long val);
-
-    /**
-     * Write long array.
-     *
-     * @param val Long array.
-     */
-    public void writeLongArray(long[] val);
-
-    /**
-     * Write double value.
-     *
-     * @param val Double value.
-     */
-    public void writeDouble(double val);
-
-    /**
-     * Write double array.
-     *
-     * @param val Double array.
-     */
-    public void writeDoubleArray(double[] val);
-
-    /**
-     * Write byte array.
-     *
-     * @param arr Array.
-     * @param off Offset.
-     * @param len Length.
-     */
-    public void write(byte[] arr, int off, int len);
-
-    /**
-     * Write data from unmanaged memory.
-     *
-     * @param addr Address.
-     * @param cnt Count.
-     */
-    public void write(long addr, int cnt);
-
-    /**
-     * Close the stream releasing resources.
-     */
-    @Override public void close();
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4662feca/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/GridPortableStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/GridPortableStream.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/GridPortableStream.java
deleted file mode 100644
index 2c3fc78..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/GridPortableStream.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.portable;
-
-/**
- * Portable stream.
- */
-public interface GridPortableStream {
-    /**
-     * @return Position.
-     */
-    public int position();
-
-    /**
-     * @param pos Position.
-     */
-    public void position(int pos);
-
-    /**
-     * @return Underlying array.
-     */
-    public byte[] array();
-
-    /**
-     * @return Copy of data in the stream.
-     */
-    public byte[] arrayCopy();
-
-    /**
-     * @return Offheap pointer if stream is offheap based, otherwise {@code 0}.
-     */
-    public long offheapPointer();
-
-    /**
-     * @return {@code True} is stream is array based.
-     */
-    public boolean hasArray();
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4662feca/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/package-info.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/package-info.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/package-info.java
deleted file mode 100644
index c6e664c..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/package-info.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * <!-- Package description. -->
- * Portable processor.
- */
-package org.apache.ignite.internal.processors.portable;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4662feca/modules/core/src/main/java/org/apache/ignite/marshaller/portable/PortableMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/portable/PortableMarshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/portable/PortableMarshaller.java
index 08f9336..fab7f61 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/portable/PortableMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/portable/PortableMarshaller.java
@@ -291,11 +291,11 @@ public class PortableMarshaller extends AbstractMarshaller {
     }
 
     /**
-     * Sets {@link GridPortableContext}.
+     * Sets {@link PortableContext}.
      * <p/>
      * @param ctx Portable context.
      */
-    private void setPortableContext(GridPortableContext ctx) {
+    private void setPortableContext(PortableContext ctx) {
         ctx.configure(this);
 
         impl = new GridPortableMarshaller(ctx);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4662feca/modules/core/src/main/resources/META-INF/classnames.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/main/resources/META-INF/classnames.properties b/modules/core/src/main/resources/META-INF/classnames.properties
index 869c367..583eed4 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -277,11 +277,11 @@ org.apache.ignite.internal.managers.loadbalancer.GridLoadBalancerAdapter
 org.apache.ignite.internal.managers.loadbalancer.GridLoadBalancerManager$1
 org.apache.ignite.internal.portable.GridPortableClassDescriptor$Mode
 org.apache.ignite.internal.portable.GridPortableContext
-org.apache.ignite.internal.portable.GridPortableLazyMap$1$1$1
-org.apache.ignite.internal.portable.GridPortableMetaDataImpl
-org.apache.ignite.internal.portable.GridPortableObjectEx
-org.apache.ignite.internal.portable.GridPortableObjectImpl
-org.apache.ignite.internal.portable.GridPortableObjectOffheapImpl
+org.apache.ignite.internal.portable.PortableLazyMap$1$1$1
+org.apache.ignite.internal.portable.PortableMetaDataImpl
+org.apache.ignite.internal.portable.PortableObjectEx
+org.apache.ignite.internal.portable.PortableObjectImpl
+org.apache.ignite.internal.portable.PortableObjectOffheapImpl
 org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion
 org.apache.ignite.internal.processors.affinity.GridAffinityAssignment
 org.apache.ignite.internal.processors.affinity.GridAffinityMessage

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4662feca/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableBuilderAdditionalSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableBuilderAdditionalSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableBuilderAdditionalSelfTest.java
index 97baa59..1d7e7e7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableBuilderAdditionalSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableBuilderAdditionalSelfTest.java
@@ -108,11 +108,11 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
 
             switch (field.getName()) {
                 case "anEnum":
-                    assertEquals(((GridPortableBuilderEnum)actVal).getOrdinal(), ((Enum)expVal).ordinal());
+                    assertEquals(((PortableBuilderEnum)actVal).getOrdinal(), ((Enum)expVal).ordinal());
                     break;
 
                 case "enumArr": {
-                    GridPortableBuilderEnum[] actArr = (GridPortableBuilderEnum[])actVal;
+                    PortableBuilderEnum[] actArr = (PortableBuilderEnum[])actVal;
                     Enum[] expArr = (Enum[])expVal;
 
                     assertEquals(expArr.length, actArr.length);
@@ -143,7 +143,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
 
         exp.setDefaultData();
 
-        GridPortableBuilderImpl mutPo = wrap(exp);
+        PortableBuilderImpl mutPo = wrap(exp);
 
         TestObjectAllTypes res = mutPo.build().deserialize();
 
@@ -158,7 +158,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
 
         exp.setDefaultData();
 
-        GridPortableBuilderImpl mutPo = wrap(new TestObjectAllTypes());
+        PortableBuilderImpl mutPo = wrap(new TestObjectAllTypes());
 
         for (Field field : TestObjectAllTypes.class.getDeclaredFields())
             mutPo.setField(field.getName(), field.get(exp));
@@ -176,7 +176,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
 
         exp.setDefaultData();
 
-        GridPortableBuilderImpl mutPo = wrap(exp);
+        PortableBuilderImpl mutPo = wrap(exp);
 
         for (Field field : TestObjectAllTypes.class.getDeclaredFields()) {
             if (!field.getType().isPrimitive())
@@ -198,9 +198,9 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
         TestObjectOuter outer = new TestObjectOuter();
         outer.inner = new TestObjectInner();
 
-        GridPortableBuilderImpl mutOuter = wrap(outer);
+        PortableBuilderImpl mutOuter = wrap(outer);
 
-        GridPortableBuilderImpl mutInner = mutOuter.getField("inner");
+        PortableBuilderImpl mutInner = mutOuter.getField("inner");
 
         mutInner.setField("outer", mutOuter);
         mutInner.setField("foo", mutInner);
@@ -219,7 +219,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
 
         obj.strArr = new String[]{"a", "a", "a"};
 
-        GridPortableBuilderImpl mutObj = wrap(obj);
+        PortableBuilderImpl mutObj = wrap(obj);
 
         String[] arr = mutObj.getField("strArr");
         arr[0] = "b";
@@ -238,7 +238,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
         TestObjectContainer obj = new TestObjectContainer();
         obj.foo = new Object[]{"a"};
 
-        GridPortableBuilderImpl mutObj = wrap(obj);
+        PortableBuilderImpl mutObj = wrap(obj);
 
         Object[] arr = mutObj.getField("foo");
 
@@ -255,7 +255,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
      *
      */
     public void testOverrideObjectArrayField() {
-        GridPortableBuilderImpl mutObj = wrap(new TestObjectContainer());
+        PortableBuilderImpl mutObj = wrap(new TestObjectContainer());
 
         Object[] createdArr = {mutObj, "a", 1, new String[] {"s", "s"}, new byte[]{1, 2}, new UUID(3, 0)};
 
@@ -275,7 +275,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
         TestObjectContainer obj = new TestObjectContainer();
         obj.foo = new Object[]{new Object[]{"a", obj}};
 
-        GridPortableBuilderImpl mutObj = wrap(obj);
+        PortableBuilderImpl mutObj = wrap(obj);
 
         Object[] arr = (Object[])mutObj.<Object[]>getField("foo")[0];
 
@@ -299,7 +299,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
         TestObjectContainer obj = new TestObjectContainer();
         obj.foo = Lists.newArrayList(obj, "a");
 
-        GridPortableBuilderImpl mutObj = wrap(obj);
+        PortableBuilderImpl mutObj = wrap(obj);
 
         List<Object> list = mutObj.getField("foo");
 
@@ -312,7 +312,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
     public void testArrayListOverride() {
         TestObjectContainer obj = new TestObjectContainer();
 
-        GridPortableBuilderImpl mutObj = wrap(obj);
+        PortableBuilderImpl mutObj = wrap(obj);
 
         ArrayList<Object> list = Lists.newArrayList(mutObj, "a", Lists.newArrayList(1, 2));
 
@@ -333,7 +333,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
         TestObjectContainer obj = new TestObjectContainer();
         obj.foo = Lists.newArrayList("a", "b", "c");
 
-        GridPortableBuilderImpl mutObj = wrap(obj);
+        PortableBuilderImpl mutObj = wrap(obj);
 
         List<String> list = mutObj.getField("foo");
 
@@ -360,7 +360,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
         TestObjectContainer obj = new TestObjectContainer();
         obj.foo = Lists.newArrayList("a", "b", "c");
 
-        GridPortableBuilderImpl mutObj = wrap(obj);
+        PortableBuilderImpl mutObj = wrap(obj);
 
         List<String> list = mutObj.getField("foo");
 
@@ -379,7 +379,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
 
         obj.foo = src;
 
-        GridPortableBuilderImpl mutObj = wrap(obj);
+        PortableBuilderImpl mutObj = wrap(obj);
 
         TestObjectContainer deserialized = mutObj.build().deserialize();
 
@@ -397,7 +397,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
         TestObjectContainer obj = new TestObjectContainer();
         obj.foo = Lists.newLinkedList(Arrays.asList(obj, "a"));
 
-        GridPortableBuilderImpl mutObj = wrap(obj);
+        PortableBuilderImpl mutObj = wrap(obj);
 
         List<Object> list = mutObj.getField("foo");
 
@@ -410,7 +410,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
     public void testLinkedListOverride() {
         TestObjectContainer obj = new TestObjectContainer();
 
-        GridPortableBuilderImpl mutObj = wrap(obj);
+        PortableBuilderImpl mutObj = wrap(obj);
 
         List<Object> list = Lists.newLinkedList(Arrays.asList(mutObj, "a", Lists.newLinkedList(Arrays.asList(1, 2))));
 
@@ -432,7 +432,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
 
         obj.foo = Lists.newLinkedList(Arrays.asList("a", "b", "c"));
 
-        GridPortableBuilderImpl mutObj = wrap(obj);
+        PortableBuilderImpl mutObj = wrap(obj);
 
         List<String> list = mutObj.getField("foo");
 
@@ -462,7 +462,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
 
         obj.foo = src;
 
-        GridPortableBuilderImpl mutObj = wrap(obj);
+        PortableBuilderImpl mutObj = wrap(obj);
 
         TestObjectContainer deserialized = mutObj.build().deserialize();
 
@@ -480,7 +480,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
         TestObjectContainer obj = new TestObjectContainer();
         obj.foo = Sets.newHashSet(obj, "a");
 
-        GridPortableBuilderImpl mutObj = wrap(obj);
+        PortableBuilderImpl mutObj = wrap(obj);
 
         Set<Object> set = mutObj.getField("foo");
 
@@ -493,7 +493,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
     public void testHashSetOverride() {
         TestObjectContainer obj = new TestObjectContainer();
 
-        GridPortableBuilderImpl mutObj = wrap(obj);
+        PortableBuilderImpl mutObj = wrap(obj);
 
         Set<Object> c = Sets.newHashSet(mutObj, "a", Sets.newHashSet(1, 2));
 
@@ -515,7 +515,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
         TestObjectContainer obj = new TestObjectContainer();
         obj.foo = Sets.newHashSet("a", "b", "c");
 
-        GridPortableBuilderImpl mutObj = wrap(obj);
+        PortableBuilderImpl mutObj = wrap(obj);
 
         Set<String> set = mutObj.getField("foo");
 
@@ -559,7 +559,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
         TestObjectContainer obj = new TestObjectContainer();
         obj.foo = Maps.newHashMap(ImmutableMap.of(obj, "a", "b", obj));
 
-        GridPortableBuilderImpl mutObj = wrap(obj);
+        PortableBuilderImpl mutObj = wrap(obj);
 
         Map<Object, Object> map = mutObj.getField("foo");
 
@@ -572,7 +572,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
     public void testMapOverride() {
         TestObjectContainer obj = new TestObjectContainer();
 
-        GridPortableBuilderImpl mutObj = wrap(obj);
+        PortableBuilderImpl mutObj = wrap(obj);
 
         Map<Object, Object> map = Maps.newHashMap(ImmutableMap.of(mutObj, "a", "b", mutObj));
 
@@ -590,7 +590,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
         TestObjectContainer obj = new TestObjectContainer();
         obj.foo = Maps.newHashMap(ImmutableMap.of(1, "a", 2, "b"));
 
-        GridPortableBuilderImpl mutObj = wrap(obj);
+        PortableBuilderImpl mutObj = wrap(obj);
 
         Map<Object, Object> map = mutObj.getField("foo");
 
@@ -612,10 +612,10 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
 
         obj.enumArr = new TestObjectEnum[]{TestObjectEnum.A, TestObjectEnum.B};
 
-        GridPortableBuilderImpl mutObj = wrap(obj);
+        PortableBuilderImpl mutObj = wrap(obj);
 
-        GridPortableBuilderEnum[] arr = mutObj.getField("enumArr");
-        arr[0] = new GridPortableBuilderEnum(mutObj.typeId(), TestObjectEnum.B);
+        PortableBuilderEnum[] arr = mutObj.getField("enumArr");
+        arr[0] = new PortableBuilderEnum(mutObj.typeId(), TestObjectEnum.B);
 
         TestObjectAllTypes res = mutObj.build().deserialize();
 
@@ -631,7 +631,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
         obj.s = "a";
         obj.sRaw = "aa";
 
-        GridPortableBuilderImpl mutableObj = wrap(obj);
+        PortableBuilderImpl mutableObj = wrap(obj);
 
         mutableObj.setField("s", "z");
 
@@ -646,7 +646,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
     public void testHashCode() {
         TestObjectContainer obj = new TestObjectContainer();
 
-        GridPortableBuilderImpl mutableObj = wrap(obj);
+        PortableBuilderImpl mutableObj = wrap(obj);
 
         assertEquals(obj.hashCode(), mutableObj.build().hashCode());
 
@@ -679,7 +679,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
         TestObjectContainer obj = new TestObjectContainer();
         obj.foo = ImmutableMap.of(1, "a").entrySet().iterator().next();
 
-        GridPortableBuilderImpl mutableObj = wrap(obj);
+        PortableBuilderImpl mutableObj = wrap(obj);
 
         Map.Entry<Object, Object> entry = mutableObj.getField("foo");
 
@@ -699,7 +699,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
     public void testMapEntryOverride() {
         TestObjectContainer obj = new TestObjectContainer();
 
-        GridPortableBuilderImpl mutableObj = wrap(obj);
+        PortableBuilderImpl mutableObj = wrap(obj);
 
         mutableObj.setField("foo", new GridMapEntry<>(1, "a"));
 
@@ -712,7 +712,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
      *
      */
     public void testMetadataChangingDoublePut() {
-        GridPortableBuilderImpl mutableObj = wrap(new TestObjectContainer());
+        PortableBuilderImpl mutableObj = wrap(new TestObjectContainer());
 
         mutableObj.setField("xx567", "a");
         mutableObj.setField("xx567", "b");
@@ -728,7 +728,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
      *
      */
     public void testMetadataChangingDoublePut2() {
-        GridPortableBuilderImpl mutableObj = wrap(new TestObjectContainer());
+        PortableBuilderImpl mutableObj = wrap(new TestObjectContainer());
 
         mutableObj.setField("xx567", "a");
         mutableObj.setField("xx567", "b");
@@ -746,7 +746,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
     public void testMetadataChanging() {
         TestObjectContainer c = new TestObjectContainer();
 
-        GridPortableBuilderImpl mutableObj = wrap(c);
+        PortableBuilderImpl mutableObj = wrap(c);
 
         mutableObj.setField("intField", 1);
         mutableObj.setField("intArrField", new int[] {1});
@@ -782,7 +782,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
 
         obj.foo = new Date();
 
-        GridPortableBuilderImpl mutableObj = wrap(obj);
+        PortableBuilderImpl mutableObj = wrap(obj);
 
         assertEquals(Timestamp.class, mutableObj.getField("foo").getClass());
     }
@@ -795,7 +795,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
 
         obj.foo = Lists.newArrayList(new Date());
 
-        GridPortableBuilderImpl mutableObj = wrap(obj);
+        PortableBuilderImpl mutableObj = wrap(obj);
 
         assertEquals(Timestamp.class, ((List<?>)mutableObj.getField("foo")).get(0).getClass());
     }
@@ -807,7 +807,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
     public void testDateArrayOverride() {
         TestObjectContainer obj = new TestObjectContainer();
 
-        GridPortableBuilderImpl mutableObj = wrap(obj);
+        PortableBuilderImpl mutableObj = wrap(obj);
 
         Date[] arr = {new Date()};
 
@@ -830,13 +830,13 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
         addrBook.addCompany(new Company(3, "Microsoft", 100, new Address("Saint-Petersburg", "Torzhkovskya", 1, 55), "occupation"));
         addrBook.addCompany(new Company(4, "Oracle", 100, new Address("Saint-Petersburg", "Nevskiy", 1, 1), "occupation"));
 
-        GridPortableBuilderImpl mutableObj = wrap(addrBook);
+        PortableBuilderImpl mutableObj = wrap(addrBook);
 
-        Map<String, List<GridPortableBuilderImpl>> map = mutableObj.getField("companyByStreet");
+        Map<String, List<PortableBuilderImpl>> map = mutableObj.getField("companyByStreet");
 
-        List<GridPortableBuilderImpl> list = map.get("Torzhkovskya");
+        List<PortableBuilderImpl> list = map.get("Torzhkovskya");
 
-        GridPortableBuilderImpl company = list.get(0);
+        PortableBuilderImpl company = list.get(0);
 
         assert "Google inc".equals(company.<String>getField("name"));
 
@@ -862,9 +862,9 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
         out.inner = inner;
         inner.outer = out;
 
-        GridPortableBuilderImpl builder = wrap(out);
+        PortableBuilderImpl builder = wrap(out);
 
-        GridPortableBuilderImpl innerBuilder = builder.getField("inner");
+        PortableBuilderImpl innerBuilder = builder.getField("inner");
 
         TestObjectInner res = innerBuilder.build().deserialize();
 
@@ -877,7 +877,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
     public void testPortableObjectField() {
         TestObjectContainer container = new TestObjectContainer(toPortable(new TestObjectArrayList()));
 
-        GridPortableBuilderImpl wrapper = wrap(container);
+        PortableBuilderImpl wrapper = wrap(container);
 
         assertTrue(wrapper.getField("foo") instanceof PortableObject);
 
@@ -891,7 +891,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
     public void testAssignPortableObject() {
         TestObjectContainer container = new TestObjectContainer();
 
-        GridPortableBuilderImpl wrapper = wrap(container);
+        PortableBuilderImpl wrapper = wrap(container);
 
         wrapper.setField("foo", toPortable(new TestObjectArrayList()));
 
@@ -903,7 +903,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
      *
      */
     public void testRemoveFromNewObject() {
-        GridPortableBuilderImpl wrapper = newWrapper(TestObjectAllTypes.class);
+        PortableBuilderImpl wrapper = newWrapper(TestObjectAllTypes.class);
 
         wrapper.setField("str", "a");
 
@@ -919,7 +919,7 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
         TestObjectAllTypes obj = new TestObjectAllTypes();
         obj.setDefaultData();
 
-        GridPortableBuilderImpl wrapper = wrap(toPortable(obj));
+        PortableBuilderImpl wrapper = wrap(toPortable(obj));
 
         wrapper.removeField("str");
 
@@ -983,19 +983,19 @@ public class GridPortableBuilderAdditionalSelfTest extends GridCommonAbstractTes
      * @param obj Object.
      * @return GridMutablePortableObject.
      */
-    private GridPortableBuilderImpl wrap(Object obj) {
-        return GridPortableBuilderImpl.wrap(toPortable(obj));
+    private PortableBuilderImpl wrap(Object obj) {
+        return PortableBuilderImpl.wrap(toPortable(obj));
     }
 
     /**
      * @param aCls Class.
      * @return Wrapper.
      */
-    private GridPortableBuilderImpl newWrapper(Class<?> aCls) {
+    private PortableBuilderImpl newWrapper(Class<?> aCls) {
         CacheObjectPortableProcessorImpl processor = (CacheObjectPortableProcessorImpl)(
             (IgnitePortablesImpl)portables()).processor();
 
-        return new GridPortableBuilderImpl(processor.portableContext(), processor.typeId(aCls.getName()),
+        return new PortableBuilderImpl(processor.portableContext(), processor.typeId(aCls.getName()),
             aCls.getSimpleName());
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4662feca/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableBuilderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableBuilderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableBuilderSelfTest.java
index a91c53e..6ffa3dd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableBuilderSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableBuilderSelfTest.java
@@ -57,11 +57,11 @@ public class GridPortableBuilderSelfTest extends GridCommonAbstractTest {
         customIdMapper.setClassName(CustomIdMapper.class.getName());
         customIdMapper.setIdMapper(new PortableIdMapper() {
             @Override public int typeId(String clsName) {
-                return ~GridPortableContext.DFLT_ID_MAPPER.typeId(clsName);
+                return ~PortableContext.DFLT_ID_MAPPER.typeId(clsName);
             }
 
             @Override public int fieldId(int typeId, String fieldName) {
-                return typeId + ~GridPortableContext.DFLT_ID_MAPPER.fieldId(typeId, fieldName);
+                return typeId + ~PortableContext.DFLT_ID_MAPPER.fieldId(typeId, fieldName);
             }
         });
 
@@ -660,7 +660,7 @@ public class GridPortableBuilderSelfTest extends GridCommonAbstractTest {
             PortableObject offheapObj = (PortableObject)
                 ((CacheObjectPortableProcessorImpl)(grid(0)).context().cacheObjects()).unmarshal(ptr, false);
 
-            assertEquals(GridPortableObjectOffheapImpl.class, offheapObj.getClass());
+            assertEquals(PortableObjectOffheapImpl.class, offheapObj.getClass());
 
             assertEquals("class".hashCode(), offheapObj.typeId());
             assertEquals(100, offheapObj.hashCode());
@@ -778,7 +778,7 @@ public class GridPortableBuilderSelfTest extends GridCommonAbstractTest {
     public void testGetFromCopiedObj() {
         PortableObject objStr = builder(TestObjectAllTypes.class.getName()).setField("str", "aaa").build();
 
-        GridPortableBuilderImpl builder = builder(objStr);
+        PortableBuilderImpl builder = builder(objStr);
         assertEquals("aaa", builder.getField("str"));
 
         builder.setField("str", "bbb");
@@ -798,7 +798,7 @@ public class GridPortableBuilderSelfTest extends GridCommonAbstractTest {
 
         TestObjectContainer c = new TestObjectContainer(list);
 
-        GridPortableBuilderImpl builder = builder(toPortable(c));
+        PortableBuilderImpl builder = builder(toPortable(c));
         builder.<List>getField("foo").add("!!!");
 
         PortableObject res = builder.build();
@@ -829,7 +829,7 @@ public class GridPortableBuilderSelfTest extends GridCommonAbstractTest {
     public void testPlainPortableObjectCopyFrom() {
         TestObjectPlainPortable obj = new TestObjectPlainPortable(toPortable(new TestObjectAllTypes()));
 
-        GridPortableBuilderImpl builder = builder(toPortable(obj));
+        PortableBuilderImpl builder = builder(toPortable(obj));
         assertTrue(builder.getField("plainPortable") instanceof PortableObject);
 
         TestObjectPlainPortable deserialized = builder.build().deserialize();
@@ -872,7 +872,7 @@ public class GridPortableBuilderSelfTest extends GridCommonAbstractTest {
         obj.setDefaultData();
         obj.enumArr = null;
 
-        GridPortableBuilderImpl builder = builder(toPortable(obj));
+        PortableBuilderImpl builder = builder(toPortable(obj));
 
         builder.getField("i_");
 
@@ -932,8 +932,8 @@ public class GridPortableBuilderSelfTest extends GridCommonAbstractTest {
     /**
      * @return Builder.
      */
-    private <T> GridPortableBuilderImpl builder(PortableObject obj) {
-        return (GridPortableBuilderImpl)portables().builder(obj);
+    private <T> PortableBuilderImpl builder(PortableObject obj) {
+        return (PortableBuilderImpl)portables().builder(obj);
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4662feca/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerCtxDisabledSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerCtxDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerCtxDisabledSelfTest.java
index f6749fe..b79c701 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerCtxDisabledSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerCtxDisabledSelfTest.java
@@ -29,8 +29,8 @@ import org.apache.ignite.testframework.junits.common.*;
  */
 public class GridPortableMarshallerCtxDisabledSelfTest extends GridCommonAbstractTest {
     /** */
-    protected static final GridPortableMetaDataHandler META_HND = new GridPortableMetaDataHandler() {
-        @Override public void addMeta(int typeId, GridPortableMetaDataImpl meta) {
+    protected static final PortableMetaDataHandler META_HND = new PortableMetaDataHandler() {
+        @Override public void addMeta(int typeId, PortableMetaDataImpl meta) {
             // No-op.
         }
 
@@ -46,7 +46,7 @@ public class GridPortableMarshallerCtxDisabledSelfTest extends GridCommonAbstrac
         PortableMarshaller marsh = new PortableMarshaller();
         marsh.setContext(new MarshallerContextWithNoStorage());
 
-        GridPortableContext context = new GridPortableContext(META_HND, null);
+        PortableContext context = new PortableContext(META_HND, null);
 
         IgniteUtils.invoke(PortableMarshaller.class, marsh, "setPortableContext", context);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4662feca/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerSelfTest.java
index 1569c2d..68f80b5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableMarshallerSelfTest.java
@@ -38,7 +38,7 @@ import java.util.*;
 import java.util.Date;
 import java.util.concurrent.*;
 
-import static org.apache.ignite.internal.portable.GridPortableThreadLocalMemoryAllocator.*;
+import static org.apache.ignite.internal.portable.PortableThreadLocalMemoryAllocator.*;
 import static org.junit.Assert.*;
 
 /**
@@ -53,8 +53,8 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
     protected static final long BYTE_ARR_OFF = UNSAFE.arrayBaseOffset(byte[].class);
 
     /** */
-    protected static final GridPortableMetaDataHandler META_HND = new GridPortableMetaDataHandler() {
-        @Override public void addMeta(int typeId, GridPortableMetaDataImpl meta) {
+    protected static final PortableMetaDataHandler META_HND = new PortableMetaDataHandler() {
+        @Override public void addMeta(int typeId, PortableMetaDataImpl meta) {
             // No-op.
         }
 
@@ -702,7 +702,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
 
         U.intToBytes(Integer.reverseBytes(11111), arr, 2);
 
-        final PortableObject po = new GridPortableObjectImpl(initPortableContext(new PortableMarshaller()), arr, 0);
+        final PortableObject po = new PortableObjectImpl(initPortableContext(new PortableMarshaller()), arr, 0);
 
         GridTestUtils.assertThrows(log, new Callable<Object>() {
                                        @Override public Object call() throws Exception {
@@ -995,7 +995,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
 
         assert obj.inner1 == obj.inner4;
 
-        GridPortableObjectImpl innerPo = (GridPortableObjectImpl)obj.inner2;
+        PortableObjectImpl innerPo = (PortableObjectImpl)obj.inner2;
 
         assert innerPo.detached();
 
@@ -1003,7 +1003,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
 
         assertEquals(id, inner.id);
 
-        GridPortableObjectImpl detachedPo = (GridPortableObjectImpl)innerPo.detach();
+        PortableObjectImpl detachedPo = (PortableObjectImpl)innerPo.detach();
 
         assert detachedPo.detached();
 
@@ -1011,7 +1011,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
 
         assertEquals(id, inner.id);
 
-        innerPo = (GridPortableObjectImpl)obj.inner3;
+        innerPo = (PortableObjectImpl)obj.inner3;
 
         assert innerPo.detached();
 
@@ -1020,7 +1020,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
         assertEquals(id, inner.id);
         assertNotNull(inner.inner);
 
-        detachedPo = (GridPortableObjectImpl)innerPo.detach();
+        detachedPo = (PortableObjectImpl)innerPo.detach();
 
         assert detachedPo.detached();
 
@@ -1086,7 +1086,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
                 String typeName;
 
                 try {
-                    Method mtd = GridPortableContext.class.getDeclaredMethod("typeName", String.class);
+                    Method mtd = PortableContext.class.getDeclaredMethod("typeName", String.class);
 
                     mtd.setAccessible(true);
 
@@ -1111,7 +1111,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
 
         TestPortableObject obj = portableObject();
 
-        GridPortableObjectImpl po = marshal(obj, marsh1);
+        PortableObjectImpl po = marshal(obj, marsh1);
 
         PortableMarshaller marsh2 = new PortableMarshaller();
 
@@ -1120,7 +1120,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
             new PortableTypeConfiguration(TestPortableObject.class.getName())
         ));
 
-        GridPortableContext ctx = initPortableContext(marsh2);
+        PortableContext ctx = initPortableContext(marsh2);
 
         po.context(ctx);
 
@@ -1191,7 +1191,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
             customType4
         ));
 
-        GridPortableContext ctx = initPortableContext(marsh);
+        PortableContext ctx = initPortableContext(marsh);
 
         assertEquals("notconfiguredclass".hashCode(), ctx.typeId("NotConfiguredClass"));
         assertEquals("key".hashCode(), ctx.typeId("Key"));
@@ -1256,7 +1256,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
                                                   customType1,
                                                   customType2));
 
-        GridPortableContext ctx = initPortableContext(marsh);
+        PortableContext ctx = initPortableContext(marsh);
 
         assertEquals("val".hashCode(), ctx.fieldId("key".hashCode(), "val"));
         assertEquals("val".hashCode(), ctx.fieldId("nonexistentclass2".hashCode(), "val"));
@@ -1514,7 +1514,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
      * @return Copy.
      */
     private PortableObject copy(PortableObject po, Map<String, Object> fields) {
-        PortableBuilder builder = GridPortableBuilderImpl.wrap(po);
+        PortableBuilder builder = PortableBuilderImpl.wrap(po);
 
         if (fields != null) {
             for (Map.Entry<String, Object> e : fields.entrySet())
@@ -1878,11 +1878,11 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
 
         marsh.setTypeConfigurations(Arrays.asList(new PortableTypeConfiguration(SimpleObject.class.getName())));
 
-        GridPortableContext ctx = initPortableContext(marsh);
+        PortableContext ctx = initPortableContext(marsh);
 
         SimpleObject simpleObj = simpleObject();
 
-        GridPortableObjectImpl obj = marshal(simpleObj, marsh);
+        PortableObjectImpl obj = marshal(simpleObj, marsh);
 
         long ptr = 0;
 
@@ -1893,7 +1893,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
         try {
             ptr = copyOffheap(obj);
 
-            GridPortableObjectOffheapImpl offheapObj = new GridPortableObjectOffheapImpl(ctx,
+            PortableObjectOffheapImpl offheapObj = new PortableObjectOffheapImpl(ctx,
                 ptr,
                 0,
                 obj.array().length);
@@ -1906,7 +1906,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
 
             ptr1 = copyOffheap(obj);
 
-            GridPortableObjectOffheapImpl offheapObj1 = new GridPortableObjectOffheapImpl(ctx,
+            PortableObjectOffheapImpl offheapObj1 = new PortableObjectOffheapImpl(ctx,
                 ptr1,
                 0,
                 obj.array().length);
@@ -1919,20 +1919,20 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
 
             checkSimpleObjectData(simpleObj, offheapObj);
 
-            GridPortableObjectOffheapImpl innerOffheapObj = offheapObj.field("inner");
+            PortableObjectOffheapImpl innerOffheapObj = offheapObj.field("inner");
 
             assertNotNull(innerOffheapObj);
 
             checkSimpleObjectData(simpleObj.inner, innerOffheapObj);
 
-            obj = (GridPortableObjectImpl)offheapObj.heapCopy();
+            obj = (PortableObjectImpl)offheapObj.heapCopy();
 
             assertEquals(obj.typeId(), offheapObj.typeId());
             assertEquals(obj.hashCode(), offheapObj.hashCode());
 
             checkSimpleObjectData(simpleObj, obj);
 
-            GridPortableObjectImpl innerObj = obj.field("inner");
+            PortableObjectImpl innerObj = obj.field("inner");
 
             assertNotNull(innerObj);
 
@@ -1947,7 +1947,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
 
             ptr2 = copyOffheap(obj);
 
-            GridPortableObjectOffheapImpl offheapObj2 = new GridPortableObjectOffheapImpl(ctx,
+            PortableObjectOffheapImpl offheapObj2 = new PortableObjectOffheapImpl(ctx,
                 ptr2,
                 0,
                 obj.array().length);
@@ -1975,7 +1975,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
         marsh.setClassNames(
             Arrays.asList(MySingleton.class.getName(), SingletonMarker.class.getName()));
 
-        GridPortableObjectImpl portableObj = marshal(MySingleton.INSTANCE, marsh);
+        PortableObjectImpl portableObj = marshal(MySingleton.INSTANCE, marsh);
 
         assertTrue(portableObj.array().length <= 1024); // Check that big string was not serialized.
 
@@ -1992,7 +1992,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
 
         marsh.setClassNames(Collections.singletonList(MyTestClass.class.getName()));
 
-        GridPortableObjectImpl portableObj = marshal(new MyTestClass(), marsh);
+        PortableObjectImpl portableObj = marshal(new MyTestClass(), marsh);
 
         MyTestClass obj = portableObj.deserialize();
 
@@ -2007,7 +2007,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
 
         marsh.setClassNames(Arrays.asList(ChildPortable.class.getName()));
 
-        GridPortableObjectImpl portableObj = marshal(new ChildPortable(), marsh);
+        PortableObjectImpl portableObj = marshal(new ChildPortable(), marsh);
 
         ChildPortable singleton = portableObj.deserialize();
 
@@ -2033,7 +2033,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
         obj1.val = BigDecimal.ZERO;
         obj1.valArr = new BigDecimal[] { BigDecimal.ONE, BigDecimal.TEN };
 
-        GridPortableObjectImpl portObj = marshal(obj1, marsh);
+        PortableObjectImpl portObj = marshal(obj1, marsh);
 
         assertEquals(obj1.val, portObj.field("val"));
         assertArrayEquals(obj1.valArr, portObj.<BigDecimal[]>field("valArr"));
@@ -2080,7 +2080,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
         // Checking the writer directly.
         assertEquals(false, THREAD_LOCAL_ALLOC.isThreadLocalArrayAcquired());
 
-        try (GridPortableWriterExImpl writer = new GridPortableWriterExImpl(initPortableContext(new PortableMarshaller()), 0)) {
+        try (PortableWriterExImpl writer = new PortableWriterExImpl(initPortableContext(new PortableMarshaller()), 0)) {
             assertEquals(true, THREAD_LOCAL_ALLOC.isThreadLocalArrayAcquired());
 
             writer.writeString("Thread local test");
@@ -2102,7 +2102,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
         assertEquals(false, THREAD_LOCAL_ALLOC.isThreadLocalArrayAcquired());
 
         // Checking the builder.
-        PortableBuilder builder = new GridPortableBuilderImpl(initPortableContext(new PortableMarshaller()),
+        PortableBuilder builder = new PortableBuilderImpl(initPortableContext(new PortableMarshaller()),
             "org.gridgain.foo.bar.TestClass");
 
         builder.setField("a", "1");
@@ -2243,7 +2243,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
      * @param obj Object.
      * @return Offheap address.
      */
-    private long copyOffheap(GridPortableObjectImpl obj) {
+    private long copyOffheap(PortableObjectImpl obj) {
         byte[] arr = obj.array();
 
         long ptr = UNSAFE.allocateMemory(arr.length);
@@ -2303,20 +2303,20 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
      * @param marsh Marshaller.
      * @return Portable object.
      */
-    private <T> GridPortableObjectImpl marshal(T obj, PortableMarshaller marsh) throws IgniteCheckedException {
+    private <T> PortableObjectImpl marshal(T obj, PortableMarshaller marsh) throws IgniteCheckedException {
         initPortableContext(marsh);
 
         byte[] bytes = marsh.marshal(obj);
 
-        return new GridPortableObjectImpl(U.<GridPortableMarshaller>field(marsh, "impl").context(),
+        return new PortableObjectImpl(U.<GridPortableMarshaller>field(marsh, "impl").context(),
             bytes, 0);
     }
 
     /**
      * @return Portable context.
      */
-    protected GridPortableContext initPortableContext(PortableMarshaller marsh) throws IgniteCheckedException {
-        GridPortableContext ctx = new GridPortableContext(META_HND, null);
+    protected PortableContext initPortableContext(PortableMarshaller marsh) throws IgniteCheckedException {
+        PortableContext ctx = new PortableContext(META_HND, null);
 
         marsh.setContext(new MarshallerContextTestImpl(null));
 
@@ -3321,7 +3321,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
 
         /** {@inheritDoc} */
         @Override public void writePortable(PortableWriter writer) throws PortableException {
-            GridPortableRawWriterEx raw = (GridPortableRawWriterEx)writer.rawWriter();
+            PortableRawWriterEx raw = (PortableRawWriterEx)writer.rawWriter();
 
             raw.writeObject(inner1);
             raw.writeObjectDetached(inner2);
@@ -3331,7 +3331,7 @@ public class GridPortableMarshallerSelfTest extends GridCommonAbstractTest {
 
         /** {@inheritDoc} */
         @Override public void readPortable(PortableReader reader) throws PortableException {
-            GridPortableRawReaderEx raw = (GridPortableRawReaderEx)reader.rawReader();
+            PortableRawReaderEx raw = (PortableRawReaderEx)reader.rawReader();
 
             inner1 = (DetachedInnerTestObject)raw.readObject();
             inner2 = raw.readObjectDetached();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4662feca/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableWildcardsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableWildcardsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableWildcardsSelfTest.java
index 36beb3f..71af9ed 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableWildcardsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/portable/GridPortableWildcardsSelfTest.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.portable;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.marshaller.*;
 import org.apache.ignite.marshaller.portable.*;
-import org.apache.ignite.plugin.*;
 import org.apache.ignite.portable.*;
 import org.apache.ignite.testframework.junits.common.*;
 
@@ -31,8 +30,8 @@ import java.util.*;
  */
 public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest {
     /** */
-    private static final GridPortableMetaDataHandler META_HND = new GridPortableMetaDataHandler() {
-        @Override public void addMeta(int typeId, GridPortableMetaDataImpl meta) {
+    private static final PortableMetaDataHandler META_HND = new PortableMetaDataHandler() {
+        @Override public void addMeta(int typeId, PortableMetaDataImpl meta) {
             // No-op.
         }
 
@@ -44,8 +43,8 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest {
     /**
      * @return Portable context.
      */
-    private GridPortableContext portableContext() {
-        return new GridPortableContext(META_HND, null);
+    private PortableContext portableContext() {
+        return new PortableContext(META_HND, null);
     }
 
     /**
@@ -62,7 +61,7 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testClassNames() throws Exception {
-        GridPortableContext ctx = portableContext();
+        PortableContext ctx = portableContext();
 
         PortableMarshaller marsh = portableMarshaller();
 
@@ -86,7 +85,7 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testClassNamesWithMapper() throws Exception {
-        GridPortableContext ctx = portableContext();
+        PortableContext ctx = portableContext();
 
         PortableMarshaller marsh = portableMarshaller();
 
@@ -128,7 +127,7 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testTypeConfigurations() throws Exception {
-        GridPortableContext ctx = portableContext();
+        PortableContext ctx = portableContext();
 
         PortableMarshaller marsh = portableMarshaller();
 
@@ -152,7 +151,7 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testTypeConfigurationsWithGlobalMapper() throws Exception {
-        GridPortableContext ctx = portableContext();
+        PortableContext ctx = portableContext();
 
         PortableMarshaller marsh = portableMarshaller();
 
@@ -194,7 +193,7 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testTypeConfigurationsWithNonGlobalMapper() throws Exception {
-        GridPortableContext ctx = portableContext();
+        PortableContext ctx = portableContext();
 
         PortableMarshaller marsh = portableMarshaller();
 
@@ -236,7 +235,7 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testOverride() throws Exception {
-        GridPortableContext ctx = portableContext();
+        PortableContext ctx = portableContext();
 
         PortableMarshaller marsh = portableMarshaller();
 
@@ -278,7 +277,7 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testClassNamesJar() throws Exception {
-        GridPortableContext ctx = portableContext();
+        PortableContext ctx = portableContext();
 
         PortableMarshaller marsh = portableMarshaller();
 
@@ -301,7 +300,7 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testClassNamesWithMapperJar() throws Exception {
-        GridPortableContext ctx = portableContext();
+        PortableContext ctx = portableContext();
 
         PortableMarshaller marsh = portableMarshaller();
 
@@ -340,7 +339,7 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testTypeConfigurationsJar() throws Exception {
-        GridPortableContext ctx = portableContext();
+        PortableContext ctx = portableContext();
 
         PortableMarshaller marsh = portableMarshaller();
 
@@ -363,7 +362,7 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testTypeConfigurationsWithGlobalMapperJar() throws Exception {
-        GridPortableContext ctx = portableContext();
+        PortableContext ctx = portableContext();
 
         PortableMarshaller marsh = portableMarshaller();
 
@@ -402,7 +401,7 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testTypeConfigurationsWithNonGlobalMapperJar() throws Exception {
-        GridPortableContext ctx = portableContext();
+        PortableContext ctx = portableContext();
 
         PortableMarshaller marsh = portableMarshaller();
 
@@ -441,7 +440,7 @@ public class GridPortableWildcardsSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testOverrideJar() throws Exception {
-        GridPortableContext ctx = portableContext();
+        PortableContext ctx = portableContext();
 
         PortableMarshaller marsh = portableMarshaller();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4662feca/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableObjectsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableObjectsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableObjectsAbstractSelfTest.java
index a20148e..8fa3db0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableObjectsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableObjectsAbstractSelfTest.java
@@ -119,10 +119,10 @@ public abstract class GridCachePortableObjectsAbstractSelfTest extends GridCommo
                 Object val = CU.value(e.rawGet(), c.context(), false);
 
                 if (key instanceof PortableObject)
-                    assert ((GridPortableObjectImpl)key).detached() : val;
+                    assert ((PortableObjectImpl)key).detached() : val;
 
                 if (val instanceof PortableObject)
-                    assert ((GridPortableObjectImpl)val).detached() : val;
+                    assert ((PortableObjectImpl)val).detached() : val;
             }
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4662feca/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridPortableCacheEntryMemorySizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridPortableCacheEntryMemorySizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridPortableCacheEntryMemorySizeSelfTest.java
index be30835..95c0f10 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridPortableCacheEntryMemorySizeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridPortableCacheEntryMemorySizeSelfTest.java
@@ -15,11 +15,8 @@ import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.util.*;
 import org.apache.ignite.marshaller.*;
 import org.apache.ignite.marshaller.portable.*;
-import org.apache.ignite.plugin.*;
 import org.apache.ignite.portable.*;
 
-import java.util.*;
-
 /**
  *
  */
@@ -30,8 +27,8 @@ public class GridPortableCacheEntryMemorySizeSelfTest extends GridCacheEntryMemo
 
         marsh.setContext(new MarshallerContextTestImpl(null));
 
-        GridPortableContext pCtx = new GridPortableContext(new GridPortableMetaDataHandler() {
-            @Override public void addMeta(int typeId, GridPortableMetaDataImpl meta) throws PortableException {
+        PortableContext pCtx = new PortableContext(new PortableMetaDataHandler() {
+            @Override public void addMeta(int typeId, PortableMetaDataImpl meta) throws PortableException {
                 // No-op
             }
 


Mime
View raw message