Happier method names

Author: Juan Pablo Civile

src/main/java/com/monits/jpack/Packer.java

@@ -19,7 +19,7 @@ private Packer() {
 	 * 
 	 * @return The built object or null on failure.
 	 */
-	public static <E> E decode(Class<? extends E> clz, byte[] payload) {
+	public static <E> E unpack(Class<? extends E> clz, byte[] payload) {
 		Codec<? extends E> codec = CodecFactory.get(clz);
 		try {
 			return codec.decode(new InputByteStreamImpl(payload), null);
@@ -35,7 +35,7 @@ public static <E> E decode(Class<? extends E> clz, byte[] payload) {
 	 * 
 	 * @return The bytes resulting from encoding the object.
 	 */
-	public static <E> byte[] encode(E payload) {
+	public static <E> byte[] pack(E payload) {
 
 		@SuppressWarnings("unchecked")
 		Codec<E> codec = CodecFactory.get((Class<E>) payload.getClass());

src/test/java/com/monits/packer/codec/CustomCodecTest.java

@@ -22,11 +22,11 @@ public void testCustomCodec() {
 		ContainsAnInt object = new ContainsAnInt();
 		object.setValue((int) Math.pow(2, 29));
 
-		byte[] encoded = Packer.encode(object);
+		byte[] encoded = Packer.pack(object);
 		Assert.assertNotNull(encoded);
 		Assert.assertEquals(4, encoded.length);
 
-		ContainsAnInt decoded = Packer.decode(ContainsAnInt.class, encoded);
+		ContainsAnInt decoded = Packer.unpack(ContainsAnInt.class, encoded);
 		Assert.assertNotNull(decoded);
 		Assert.assertEquals(object.getValue(), decoded.getValue());
 

src/test/java/com/monits/packer/codec/FixedLengthTest.java

@@ -19,11 +19,11 @@ public void testPrimitive() {
 		PrimitiveObject original = new PrimitiveObject();
 		original.setValue(new int[] { 56323, 123 });
 
-		byte[] encoded = Packer.encode(original);
+		byte[] encoded = Packer.pack(original);
 		Assert.assertNotNull(encoded);
 		Assert.assertEquals(4, encoded.length);
 
-		PrimitiveObject decoded = Packer.decode(PrimitiveObject.class, encoded);
+		PrimitiveObject decoded = Packer.unpack(PrimitiveObject.class, encoded);
 		Assert.assertNotNull(decoded);
 		Assert.assertTrue(Arrays.equals(original.getValue(), decoded.getValue()));
 	}
@@ -33,22 +33,22 @@ public void testString() {
 		StringObject original = new StringObject();
 		original.setValue("asdq");
 
-		byte[] encoded = Packer.encode(original);
+		byte[] encoded = Packer.pack(original);
 		Assert.assertNotNull(encoded);
 		Assert.assertEquals(4, encoded.length);
 
-		StringObject decoded = Packer.decode(StringObject.class, encoded);
+		StringObject decoded = Packer.unpack(StringObject.class, encoded);
 		Assert.assertNotNull(decoded);
 		Assert.assertEquals(original.getValue(), decoded.getValue());
 
 		StringObject second = new StringObject();
 		second.setValue("qwew");
 
-		byte[] secondEncoded = Packer.encode(second);
+		byte[] secondEncoded = Packer.pack(second);
 		Assert.assertNotNull(secondEncoded);
 		Assert.assertEquals(4, secondEncoded.length);
 
-		StringObject secondDecoded = Packer.decode(StringObject.class, secondEncoded);
+		StringObject secondDecoded = Packer.unpack(StringObject.class, secondEncoded);
 		Assert.assertNotNull(secondDecoded);
 		Assert.assertEquals(second.getValue(), secondDecoded.getValue());
 
@@ -61,15 +61,15 @@ public void testSmallerSize() {
 		PrimitiveObject original = new PrimitiveObject();
 		original.setValue(new int[] { 123 });
 
-		Packer.encode(original);
+		Packer.pack(original);
 	}
 
 	@Test(expected = IllegalArgumentException.class)
 	public void testBiggerSize() {
 		PrimitiveObject original = new PrimitiveObject();
 		original.setValue(new int[] { 123, 456, 23 });
 
-		Packer.encode(original);
+		Packer.pack(original);
 	}
 
 	@Test
@@ -80,11 +80,11 @@ public void testNested() {
 			new PrimitiveObject(new int[] { 45, 43 }),
 		});
 
-		byte[] encoded = Packer.encode(original);
+		byte[] encoded = Packer.pack(original);
 		Assert.assertNotNull(encoded);
 		Assert.assertEquals(8, encoded.length);
 
-		HasNestedObject decoded = Packer.decode(HasNestedObject.class, encoded);
+		HasNestedObject decoded = Packer.unpack(HasNestedObject.class, encoded);
 		Assert.assertNotNull(decoded);
 		Assert.assertEquals(original, decoded);
 	}

src/test/java/com/monits/packer/codec/InvalidAnnotationTest.java

@@ -17,11 +17,11 @@ public void testInvalidFixedLength() {
 		InvalidFixedLengthObject original = new InvalidFixedLengthObject();
 		original.setValue(56323);
 
-		byte[] encoded = Packer.encode(original);
+		byte[] encoded = Packer.pack(original);
 		Assert.assertNotNull(encoded);
 		Assert.assertEquals(4, encoded.length);
 
-		InvalidFixedLengthObject decoded = Packer.decode(InvalidFixedLengthObject.class, encoded);
+		InvalidFixedLengthObject decoded = Packer.unpack(InvalidFixedLengthObject.class, encoded);
 		Assert.assertNotNull(decoded);
 		Assert.assertEquals(original.getValue(), decoded.getValue());
 	}
@@ -31,11 +31,11 @@ public void testInvalidUnsigned() {
 		InvalidUnsignedObject original = new InvalidUnsignedObject();
 		original.setValue("test");
 
-		byte[] encoded = Packer.encode(original);
+		byte[] encoded = Packer.pack(original);
 		Assert.assertNotNull(encoded);
 		Assert.assertEquals(4, encoded.length);
 
-		InvalidUnsignedObject decoded = Packer.decode(InvalidUnsignedObject.class, encoded);
+		InvalidUnsignedObject decoded = Packer.unpack(InvalidUnsignedObject.class, encoded);
 		Assert.assertNotNull(decoded);
 		Assert.assertEquals(original.getValue(), decoded.getValue());
 	}

src/test/java/com/monits/packer/codec/NestedObjectTest.java

@@ -21,11 +21,11 @@ public void testComplexObject() {
 		original.setUint(232);
 		original.setUshort((short) 255);
 
-		byte[] encoded = Packer.encode(original);
+		byte[] encoded = Packer.pack(original);
 		Assert.assertNotNull(encoded);
 		Assert.assertEquals(5, encoded.length);
 
-		ComplexObject decoded = Packer.decode(ComplexObject.class, encoded);
+		ComplexObject decoded = Packer.unpack(ComplexObject.class, encoded);
 
 		Assert.assertNotNull(decoded);
 		Assert.assertNotNull(decoded.getNested());

src/test/java/com/monits/packer/codec/UnsignedTest.java

@@ -16,11 +16,11 @@ public void testSimpleObject() {
 		 original.setUint(256);
 		 original.setUlong(153456L);
 
-		 byte[] encoded = Packer.encode(original);
+		 byte[] encoded = Packer.pack(original);
 		 Assert.assertNotNull(encoded);
 		 Assert.assertEquals(7, encoded.length);
 
-		 SimpleObject decoded = Packer.decode(SimpleObject.class, encoded);
+		 SimpleObject decoded = Packer.unpack(SimpleObject.class, encoded);
 		 Assert.assertNotNull(decoded);
 		 Assert.assertEquals(original.getUshort(), decoded.getUshort());
 		 Assert.assertEquals(original.getUint(), decoded.getUint());

src/test/java/com/monits/packer/codec/VariableLengthTest.java

@@ -18,11 +18,11 @@ public void testPrimitive() {
 		original.setThing(2);
 		original.setArray(new int[] { 234, 342 });
 
-		byte[] encoded = Packer.encode(original);
+		byte[] encoded = Packer.pack(original);
 		Assert.assertNotNull(encoded);
 		Assert.assertEquals(6, encoded.length);
 
-		VariablePrimitive decoded = Packer.decode(VariablePrimitive.class, encoded);
+		VariablePrimitive decoded = Packer.unpack(VariablePrimitive.class, encoded);
 		Assert.assertNotNull(decoded);
 		Assert.assertEquals(original, decoded);
 	}