GEODE-255: Removed deprecated DataSerializer.register(Class,byte) This closes #466
Signed-off-by: adongre <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/f9c5f572 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/f9c5f572 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/f9c5f572 Branch: refs/heads/feature/GEM-1299 Commit: f9c5f572aaad9570168aaa43cdd722a02df44506 Parents: 82a18c4 Author: Avinash <[email protected]> Authored: Wed Apr 19 13:48:23 2017 +0530 Committer: zhouxh <[email protected]> Committed: Wed Apr 26 23:28:49 2017 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/geode/DataSerializer.java | 8 -------- .../geode/internal/DataSerializableJUnitTest.java | 16 ++++++++-------- 2 files changed, 8 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/f9c5f572/geode-core/src/main/java/org/apache/geode/DataSerializer.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/DataSerializer.java b/geode-core/src/main/java/org/apache/geode/DataSerializer.java index 627661a..58518f4 100644 --- a/geode-core/src/main/java/org/apache/geode/DataSerializer.java +++ b/geode-core/src/main/java/org/apache/geode/DataSerializer.java @@ -3000,14 +3000,6 @@ public abstract class DataSerializer { return InternalDataSerializer.register(c, true); } - /** - * @deprecated as of 5.7 use {@link #register(Class)} instead - */ - @Deprecated - public static final DataSerializer register(Class<?> c, byte b) { - return register(c); - } - /////////////////////// Constructors /////////////////////// /** http://git-wip-us.apache.org/repos/asf/geode/blob/f9c5f572/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java index 0c5d561..2f853db 100755 --- a/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java @@ -1841,7 +1841,7 @@ public class DataSerializableJUnitTest implements Serializable { byte id = (byte) 100; Class c = NonDataSerializable.NonDSSerializer.class; - DataSerializer.register(c, id); + DataSerializer.register(c); Object o = new NonDataSerializable(random); DataSerializer.writeObject(o, getDataOutput()); @@ -1871,7 +1871,7 @@ public class DataSerializableJUnitTest implements Serializable { final byte id = (byte) 100; final Class c = NonDataSerializable.NonDSSerializer.class; - DataSerializer.register(c, id); + DataSerializer.register(c); Object o = new NonDataSerializable(random); DataSerializer.writeObject(o, getDataOutput()); @@ -1889,7 +1889,7 @@ public class DataSerializableJUnitTest implements Serializable { public void run() { try { Thread.sleep(300); - DataSerializer.register(c, id); + DataSerializer.register(c); } catch (Exception ex) { fail("Interrupted while registering", ex); @@ -1981,7 +1981,7 @@ public class DataSerializableJUnitTest implements Serializable { Class c = NonDataSerializable.NonDSSerializer.class; byte id = (byte) 100; - DataSerializer.register(c, id); + DataSerializer.register(c); Object o = new NonDataSerializable(random); try { @@ -2072,7 +2072,7 @@ public class DataSerializableJUnitTest implements Serializable { try { byte id = (byte) 57; Class_testInstantiator.supClass = DataSerializableImpl.class; - DataSerializer.register(Class_testInstantiator.class, id); + DataSerializer.register(Class_testInstantiator.class); try { Object o = new DataSerializableImpl(new Random()); DataSerializer.writeObject(o, getDataOutput()); @@ -2099,7 +2099,7 @@ public class DataSerializableJUnitTest implements Serializable { try { byte id = (byte) 57; Class_testInstantiator.supClass = DataSerializableImpl.class; - DataSerializer.register(Class_testInstantiator.class, id); + DataSerializer.register(Class_testInstantiator.class); try { Object o = new DataSerializableImpl(new Random()); DataSerializer.writeObject(o, getDataOutput()); @@ -2126,7 +2126,7 @@ public class DataSerializableJUnitTest implements Serializable { try { byte id = (byte) 57; Class_testInstantiator.supClass = DataSerializableImpl.class; - DataSerializer.register(Class_testInstantiator.class, id); + DataSerializer.register(Class_testInstantiator.class); try { Object o = new DataSerializableImpl(new Random()); DataSerializer.writeObject(o, getDataOutput()); @@ -2177,7 +2177,7 @@ public class DataSerializableJUnitTest implements Serializable { byte id = (byte) 57; Class_testInstantiator.supClass = CanonicalDataSerializableImpl.class; - DataSerializer.register(Class_testInstantiator.class, id); + DataSerializer.register(Class_testInstantiator.class); try { Object o = CanonicalDataSerializableImpl.create(); DataSerializer.writeObject(o, getDataOutput());
