From 125f0cda384082a5277ea7cc40797c988e3963ed Mon Sep 17 00:00:00 2001 From: godotg Date: Fri, 7 Oct 2022 14:12:47 +0800 Subject: [PATCH] rename[array]: rename primitive array list --- .../zfoo/protocol/buffer/ByteBufUtils.java | 14 +++++----- ...BooleanList.java => ArrayListBoolean.java} | 6 ++--- ...{ArrayByteList.java => ArrayListByte.java} | 6 ++--- ...ayDoubleList.java => ArrayListDouble.java} | 6 ++--- ...rrayFloatList.java => ArrayListFloat.java} | 6 ++--- .../{ArrayIntList.java => ArrayListInt.java} | 6 ++--- ...{ArrayLongList.java => ArrayListLong.java} | 6 ++--- ...rrayShortList.java => ArrayListShort.java} | 6 ++--- .../protocol/collection/ArrayListTest.java | 26 +++++++++---------- 9 files changed, 41 insertions(+), 41 deletions(-) rename protocol/src/main/java/com/zfoo/protocol/collection/{ArrayBooleanList.java => ArrayListBoolean.java} (98%) rename protocol/src/main/java/com/zfoo/protocol/collection/{ArrayByteList.java => ArrayListByte.java} (98%) rename protocol/src/main/java/com/zfoo/protocol/collection/{ArrayDoubleList.java => ArrayListDouble.java} (98%) rename protocol/src/main/java/com/zfoo/protocol/collection/{ArrayFloatList.java => ArrayListFloat.java} (98%) rename protocol/src/main/java/com/zfoo/protocol/collection/{ArrayIntList.java => ArrayListInt.java} (98%) rename protocol/src/main/java/com/zfoo/protocol/collection/{ArrayLongList.java => ArrayListLong.java} (98%) rename protocol/src/main/java/com/zfoo/protocol/collection/{ArrayShortList.java => ArrayListShort.java} (98%) diff --git a/protocol/src/main/java/com/zfoo/protocol/buffer/ByteBufUtils.java b/protocol/src/main/java/com/zfoo/protocol/buffer/ByteBufUtils.java index 81c9c6d5..1ca25b60 100644 --- a/protocol/src/main/java/com/zfoo/protocol/buffer/ByteBufUtils.java +++ b/protocol/src/main/java/com/zfoo/protocol/buffer/ByteBufUtils.java @@ -751,7 +751,7 @@ public abstract class ByteBufUtils { } public static List readBooleanList(ByteBuf byteBuf) { - return new ArrayBooleanList(readBooleanArray(byteBuf)); + return new ArrayListBoolean(readBooleanArray(byteBuf)); } public static void writeBooleanSet(ByteBuf byteBuf, Set set) { @@ -824,7 +824,7 @@ public abstract class ByteBufUtils { } public static List readByteList(ByteBuf byteBuf) { - return new ArrayByteList(readByteArray(byteBuf)); + return new ArrayListByte(readByteArray(byteBuf)); } public static void writeByteSet(ByteBuf byteBuf, Set set) { @@ -905,7 +905,7 @@ public abstract class ByteBufUtils { } public static List readShortList(ByteBuf byteBuf) { - return new ArrayShortList(readShortArray(byteBuf)); + return new ArrayListShort(readShortArray(byteBuf)); } public static void writeShortSet(ByteBuf byteBuf, Set set) { @@ -979,7 +979,7 @@ public abstract class ByteBufUtils { } public static List readIntList(ByteBuf byteBuf) { - return new ArrayIntList(readIntArray(byteBuf)); + return new ArrayListInt(readIntArray(byteBuf)); } public static void writeIntSet(ByteBuf byteBuf, Set set) { @@ -1053,7 +1053,7 @@ public abstract class ByteBufUtils { } public static List readLongList(ByteBuf byteBuf) { - return new ArrayLongList(readLongArray(byteBuf)); + return new ArrayListLong(readLongArray(byteBuf)); } public static void writeLongSet(ByteBuf byteBuf, Set set) { @@ -1134,7 +1134,7 @@ public abstract class ByteBufUtils { } public static List readFloatList(ByteBuf byteBuf) { - return new ArrayFloatList(readFloatArray(byteBuf)); + return new ArrayListFloat(readFloatArray(byteBuf)); } public static void writeFloatSet(ByteBuf byteBuf, Set set) { @@ -1215,7 +1215,7 @@ public abstract class ByteBufUtils { } public static List readDoubleList(ByteBuf byteBuf) { - return new ArrayDoubleList(readDoubleArray(byteBuf)); + return new ArrayListDouble(readDoubleArray(byteBuf)); } public static void writeDoubleSet(ByteBuf byteBuf, Set set) { diff --git a/protocol/src/main/java/com/zfoo/protocol/collection/ArrayBooleanList.java b/protocol/src/main/java/com/zfoo/protocol/collection/ArrayListBoolean.java similarity index 98% rename from protocol/src/main/java/com/zfoo/protocol/collection/ArrayBooleanList.java rename to protocol/src/main/java/com/zfoo/protocol/collection/ArrayListBoolean.java index fedb541e..51c63258 100644 --- a/protocol/src/main/java/com/zfoo/protocol/collection/ArrayBooleanList.java +++ b/protocol/src/main/java/com/zfoo/protocol/collection/ArrayListBoolean.java @@ -18,16 +18,16 @@ import java.util.*; * @author godotg * @version 3.0 */ -public class ArrayBooleanList implements List { +public class ArrayListBoolean implements List { private boolean[] array; private int size; - public ArrayBooleanList(int initialCapacity) { + public ArrayListBoolean(int initialCapacity) { this.array = new boolean[initialCapacity]; } - public ArrayBooleanList(boolean[] array) { + public ArrayListBoolean(boolean[] array) { this.array = array; this.size = array.length; } diff --git a/protocol/src/main/java/com/zfoo/protocol/collection/ArrayByteList.java b/protocol/src/main/java/com/zfoo/protocol/collection/ArrayListByte.java similarity index 98% rename from protocol/src/main/java/com/zfoo/protocol/collection/ArrayByteList.java rename to protocol/src/main/java/com/zfoo/protocol/collection/ArrayListByte.java index 8614181d..f70918b3 100644 --- a/protocol/src/main/java/com/zfoo/protocol/collection/ArrayByteList.java +++ b/protocol/src/main/java/com/zfoo/protocol/collection/ArrayListByte.java @@ -18,16 +18,16 @@ import java.util.*; * @author godotg * @version 3.0 */ -public class ArrayByteList implements List { +public class ArrayListByte implements List { private byte[] array; private int size; - public ArrayByteList(int initialCapacity) { + public ArrayListByte(int initialCapacity) { this.array = new byte[initialCapacity]; } - public ArrayByteList(byte[] array) { + public ArrayListByte(byte[] array) { this.array = array; this.size = array.length; } diff --git a/protocol/src/main/java/com/zfoo/protocol/collection/ArrayDoubleList.java b/protocol/src/main/java/com/zfoo/protocol/collection/ArrayListDouble.java similarity index 98% rename from protocol/src/main/java/com/zfoo/protocol/collection/ArrayDoubleList.java rename to protocol/src/main/java/com/zfoo/protocol/collection/ArrayListDouble.java index 1cdd76bf..bcc2c1d5 100644 --- a/protocol/src/main/java/com/zfoo/protocol/collection/ArrayDoubleList.java +++ b/protocol/src/main/java/com/zfoo/protocol/collection/ArrayListDouble.java @@ -18,16 +18,16 @@ import java.util.*; * @author godotg * @version 3.0 */ -public class ArrayDoubleList implements List { +public class ArrayListDouble implements List { private double[] array; private int size; - public ArrayDoubleList(int initialCapacity) { + public ArrayListDouble(int initialCapacity) { this.array = new double[initialCapacity]; } - public ArrayDoubleList(double[] array) { + public ArrayListDouble(double[] array) { this.array = array; this.size = array.length; } diff --git a/protocol/src/main/java/com/zfoo/protocol/collection/ArrayFloatList.java b/protocol/src/main/java/com/zfoo/protocol/collection/ArrayListFloat.java similarity index 98% rename from protocol/src/main/java/com/zfoo/protocol/collection/ArrayFloatList.java rename to protocol/src/main/java/com/zfoo/protocol/collection/ArrayListFloat.java index c3c3aef2..a1b817ed 100644 --- a/protocol/src/main/java/com/zfoo/protocol/collection/ArrayFloatList.java +++ b/protocol/src/main/java/com/zfoo/protocol/collection/ArrayListFloat.java @@ -18,16 +18,16 @@ import java.util.*; * @author godotg * @version 3.0 */ -public class ArrayFloatList implements List { +public class ArrayListFloat implements List { private float[] array; private int size; - public ArrayFloatList(int initialCapacity) { + public ArrayListFloat(int initialCapacity) { this.array = new float[initialCapacity]; } - public ArrayFloatList(float[] array) { + public ArrayListFloat(float[] array) { this.array = array; this.size = array.length; } diff --git a/protocol/src/main/java/com/zfoo/protocol/collection/ArrayIntList.java b/protocol/src/main/java/com/zfoo/protocol/collection/ArrayListInt.java similarity index 98% rename from protocol/src/main/java/com/zfoo/protocol/collection/ArrayIntList.java rename to protocol/src/main/java/com/zfoo/protocol/collection/ArrayListInt.java index b27d7a6b..768027d5 100644 --- a/protocol/src/main/java/com/zfoo/protocol/collection/ArrayIntList.java +++ b/protocol/src/main/java/com/zfoo/protocol/collection/ArrayListInt.java @@ -18,16 +18,16 @@ import java.util.*; * @author godotg * @version 3.0 */ -public class ArrayIntList implements List { +public class ArrayListInt implements List { private int[] array; private int size; - public ArrayIntList(int initialCapacity) { + public ArrayListInt(int initialCapacity) { this.array = new int[initialCapacity]; } - public ArrayIntList(int[] array) { + public ArrayListInt(int[] array) { this.array = array; this.size = array.length; } diff --git a/protocol/src/main/java/com/zfoo/protocol/collection/ArrayLongList.java b/protocol/src/main/java/com/zfoo/protocol/collection/ArrayListLong.java similarity index 98% rename from protocol/src/main/java/com/zfoo/protocol/collection/ArrayLongList.java rename to protocol/src/main/java/com/zfoo/protocol/collection/ArrayListLong.java index ff34d044..5722aa51 100644 --- a/protocol/src/main/java/com/zfoo/protocol/collection/ArrayLongList.java +++ b/protocol/src/main/java/com/zfoo/protocol/collection/ArrayListLong.java @@ -18,16 +18,16 @@ import java.util.*; * @author godotg * @version 3.0 */ -public class ArrayLongList implements List { +public class ArrayListLong implements List { private long[] array; private int size; - public ArrayLongList(int initialCapacity) { + public ArrayListLong(int initialCapacity) { this.array = new long[initialCapacity]; } - public ArrayLongList(long[] array) { + public ArrayListLong(long[] array) { this.array = array; this.size = array.length; } diff --git a/protocol/src/main/java/com/zfoo/protocol/collection/ArrayShortList.java b/protocol/src/main/java/com/zfoo/protocol/collection/ArrayListShort.java similarity index 98% rename from protocol/src/main/java/com/zfoo/protocol/collection/ArrayShortList.java rename to protocol/src/main/java/com/zfoo/protocol/collection/ArrayListShort.java index d81ad341..cd648694 100644 --- a/protocol/src/main/java/com/zfoo/protocol/collection/ArrayShortList.java +++ b/protocol/src/main/java/com/zfoo/protocol/collection/ArrayListShort.java @@ -18,16 +18,16 @@ import java.util.*; * @author godotg * @version 3.0 */ -public class ArrayShortList implements List { +public class ArrayListShort implements List { private short[] array; private int size; - public ArrayShortList(int initialCapacity) { + public ArrayListShort(int initialCapacity) { this.array = new short[initialCapacity]; } - public ArrayShortList(short[] array) { + public ArrayListShort(short[] array) { this.array = array; this.size = array.length; } diff --git a/protocol/src/test/java/com/zfoo/protocol/collection/ArrayListTest.java b/protocol/src/test/java/com/zfoo/protocol/collection/ArrayListTest.java index 340b0c2f..32b642de 100644 --- a/protocol/src/test/java/com/zfoo/protocol/collection/ArrayListTest.java +++ b/protocol/src/test/java/com/zfoo/protocol/collection/ArrayListTest.java @@ -26,7 +26,7 @@ public class ArrayListTest { @Test public void testAdd() { - var list = new ArrayIntList(1); + var list = new ArrayListInt(1); Assert.assertTrue(list.isEmpty()); Assert.assertEquals(list.size(), 0); int[] array = new int[100]; @@ -49,9 +49,9 @@ public class ArrayListTest { var array1 = new int[]{0, 1, 2}; var array2 = new int[]{3, 4, 5}; var array3 = new int[]{6, 7, 8}; - var list1 = new ArrayIntList(array1); - var list2 = new ArrayIntList(array2); - var list3 = new ArrayIntList(array3); + var list1 = new ArrayListInt(array1); + var list2 = new ArrayListInt(array2); + var list3 = new ArrayListInt(array3); list2.addAll(0, list1); Assert.assertArrayEquals(list2.toArrayPrimitive(), new int[]{0, 1, 2, 3, 4, 5}); try { @@ -67,7 +67,7 @@ public class ArrayListTest { @Test public void testRemove() { - var list = new ArrayIntList(1); + var list = new ArrayListInt(1); for (var i = 1; i <= 5; i++) { list.add(i); } @@ -102,9 +102,9 @@ public class ArrayListTest { var array1 = new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 6, 7, 8}; var array2 = new int[]{3, 4, 5}; var array3 = new int[]{6, 7, 8}; - var list1 = new ArrayIntList(array1); - var list2 = new ArrayIntList(array2); - var list3 = new ArrayIntList(array3); + var list1 = new ArrayListInt(array1); + var list2 = new ArrayListInt(array2); + var list3 = new ArrayListInt(array3); list1.removeAll(list3); Assert.assertArrayEquals(list1.toArrayPrimitive(), new int[]{0, 1, 2, 3, 4, 5}); @@ -116,7 +116,7 @@ public class ArrayListTest { @Test public void testInsert() { - var list = new ArrayIntList(1); + var list = new ArrayListInt(1); for (var i = 1; i <= 3; i++) { list.add(i); } @@ -143,7 +143,7 @@ public class ArrayListTest { @Test public void testSet() { - var list = new ArrayIntList(1); + var list = new ArrayListInt(1); for (var i = 1; i <= 3; i++) { list.add(i); } @@ -167,7 +167,7 @@ public class ArrayListTest { @Test public void testAddRemoveLast() { - var list = new ArrayIntList(1); + var list = new ArrayListInt(1); for (var i = 1; i <= 3; i++) { list.add(i); } @@ -196,7 +196,7 @@ public class ArrayListTest { @Test public void testIndexOf() { var srcArray = new int[]{1, 2, 3, 2, 1, 2, 3, 2, 1}; - var list = new ArrayIntList(0); + var list = new ArrayListInt(0); list.addAll(ArrayUtils.toList(srcArray)); Assert.assertArrayEquals(list.toArrayPrimitive(), srcArray); Assert.assertEquals(list.indexOf(1), 0); @@ -211,7 +211,7 @@ public class ArrayListTest { @Test public void testIterator() { - var list = new ArrayIntList(0); + var list = new ArrayListInt(0); for (var i = 0; i < 42; i++) { Assert.assertTrue(list.add(i)); }