Tests directory cleanup. (#6)

Author: roimenashe

README.md

@@ -445,11 +445,11 @@ Let's look at an example:
 
 ```java
 @AerospikeSetter(name="bob")
-public void setCrazyness(int value) {
+public void setCraziness(int value) {
 	unmapped = value/3;
 }
 @AerospikeGetter(name="bob")
-public int getCrazyness() {
+public int getCraziness() {
 	return unmapped*3;
 }
 ```

src/test/java/com/aerospike/mapper/AdTechUseCaseExampleTest.java

@@ -106,7 +106,7 @@ public void adTechUseCase() {
 					.withReadPolicy(readPolicy).forAll()
 				.build();
 
-		User user = new User("User1", new Date(), new ArrayList<Segment>());
+		User user = new User("User1", new Date(), new ArrayList<>());
 		mapper.save(user);
 
 		// Create a virtual list pointing to the users' segments

src/test/java/com/aerospike/mapper/AeroMapperArrayTests.java

@@ -55,6 +55,5 @@ public void compare(Object original, Object read, boolean showObjects) {
     	} catch (JsonProcessingException jpe) {
     		throw new RuntimeException(jpe);
     	}
-    	
     }
 }

src/test/java/com/aerospike/mapper/AeroMapperBaseTest.java

@@ -140,5 +140,4 @@ public void testConvenienceMethods() throws Exception {
 		ContainerClass container2 = mapper.read(ContainerClass.class, container.id);
 		assertEquals(container, container2);
     }
-    
 }

src/test/java/com/aerospike/mapper/AeroMapperConfigurationYamlTest.java

@@ -27,8 +27,8 @@ public void setup() {
         client.truncate(null, NAMESPACE, "poker", null);
     }
 
-    public static enum Suit {
-        CLUBS, DIAMONDS, HEARTS, SPADES;
+    public enum Suit {
+        CLUBS, DIAMONDS, HEARTS, SPADES
     }
 
     @AerospikeRecord(namespace = NAMESPACE, set = "card")
@@ -90,7 +90,6 @@ public boolean equals(Object obj) {
         }
     }
 
-
     public static class CardConverter {
         @ToAerospike
         public String toAerospike(Card card) {

src/test/java/com/aerospike/mapper/AeroMapperCustomConverterTest.java

@@ -1,31 +1,18 @@
 package com.aerospike.mapper;
 
-import static org.junit.Assert.fail;
-
-import java.time.Duration;
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.junit.Before;
-import org.junit.Test;
-
 import com.aerospike.client.AerospikeException;
-import com.aerospike.mapper.annotations.AerospikeBin;
-import com.aerospike.mapper.annotations.AerospikeConstructor;
-import com.aerospike.mapper.annotations.AerospikeEmbed;
+import com.aerospike.mapper.annotations.*;
 import com.aerospike.mapper.annotations.AerospikeEmbed.EmbedType;
-import com.aerospike.mapper.annotations.AerospikeKey;
-import com.aerospike.mapper.annotations.AerospikeOrdinal;
-import com.aerospike.mapper.annotations.AerospikeRecord;
-import com.aerospike.mapper.annotations.AerospikeReference;
 import com.aerospike.mapper.annotations.AerospikeReference.ReferenceType;
-import com.aerospike.mapper.annotations.AerospikeVersion;
-import com.aerospike.mapper.annotations.ParamFrom;
 import com.aerospike.mapper.tools.AeroMapper;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.time.Duration;
+import java.time.Instant;
+import java.util.*;
+
+import static org.junit.Assert.fail;
 
 public class AeroMapperDocExamples extends AeroMapperBaseTest {
 
@@ -47,7 +34,6 @@ public static class Account {
         public Product product;
     }
 
-
     @Test
     public void runEmbed() {
         Product product = new Product();
@@ -198,9 +184,10 @@ public void testListOrdering() {
     	}
     }
 
-    public static enum AccountType {
+    public enum AccountType {
     	SAVINGS, CHEQUING
     }
+
     @AerospikeRecord(namespace = "test", set = "accounts") 
     public static class Accounts {
     	@AerospikeKey
@@ -224,7 +211,7 @@ public Accounts(int id, String name, AccountType type) {
     @AerospikeRecord(namespace = "test", set = "txns")
     public static class Transactions {
     	public String txnId;
-    	@AerospikeOrdinal(value = 1)
+    	@AerospikeOrdinal()
     	public Instant date;
     	public double amt;
     	public String merchant;
@@ -253,7 +240,6 @@ public void testAccounts() {
     	System.out.println("done");
     }
 
-    
     @AerospikeRecord(namespace = "test", set = "parent")
     public static class Parent {
     	@AerospikeKey

src/test/java/com/aerospike/mapper/AeroMapperDocExamples.java

@@ -1,29 +1,23 @@
 package com.aerospike.mapper;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-
 import com.aerospike.client.AerospikeClient;
 import com.aerospike.client.IAerospikeClient;
 import com.aerospike.client.Key;
-import com.aerospike.client.policy.Policy;
 import com.aerospike.mapper.model.Account;
 import com.aerospike.mapper.model.Person;
 import com.aerospike.mapper.model.Product;
 import com.aerospike.mapper.model.ProductType;
 import com.aerospike.mapper.tools.AeroMapper;
 
+import java.util.*;
+import java.util.function.Function;
+
 public class AeroMapperExample {
 
     public static void main(String[] args) {
 
         IAerospikeClient client = new AerospikeClient("localhost", 3000);
 
-        Policy readPolicy = new Policy();
         AeroMapper mapper = new AeroMapper.Builder(client)
                 // The following lines are for performance reasons only, they are not required.
                 .preLoadClass(Account.class)
@@ -99,7 +93,7 @@ public static void main(String[] args) {
 
             Account otherAccount = new Account();
             otherAccount.setBalance(150);
-            otherAccount.setCrazyness(22);
+            otherAccount.setCraziness(22);
             otherAccount.setId(17);
             otherAccount.setProduct(product);
             otherAccount.setTitle("This is an account title");
@@ -122,7 +116,7 @@ public static void main(String[] args) {
         System.out.printf("Loaded person: %s\n", p1.toString());
 
         Function<Person, Boolean> function = person -> {
-            System.out.println(String.format("\n\n:::: %s ::::", person.getSsn()));
+            System.out.printf("\n\n:::: %s ::::%n", person.getSsn());
             System.out.println(person.toString());
 
             //mapper.delete(person);

src/test/java/com/aerospike/mapper/AeroMapperExample.java

@@ -20,14 +20,14 @@ public static class OwningClass {
 		@AerospikeKey
 		private int id;
 		@AerospikeEmbed(elementType = EmbedType.LIST)
-		private List<OwnedClass> children;
+		private final List<OwnedClass> children;
 
 		public OwningClass() {
 			children = new ArrayList<>();
 		}
 	}
 
-	@AerospikeRecord(namespace = "", set = "")
+	@AerospikeRecord()
 	public static class OwnedClass {
 		public String name;
 		public int id;
@@ -60,6 +60,4 @@ public void test() {
 
 		mapper.save(owner);
 	}
-	
-	
 }

src/test/java/com/aerospike/mapper/AeroMapperListOfObjectTransformTest.java

@@ -28,7 +28,7 @@ public void setup() {
     @AerospikeRecord(namespace = NAMESPACE, set = "testSet")
     public static class TestV1 {
         public int a;
-        @AerospikeOrdinal(1)
+        @AerospikeOrdinal()
         public int b;
         public int c;
         public int d;
@@ -38,7 +38,7 @@ public static class TestV1 {
     @AerospikeRecord(namespace = NAMESPACE, set = "testSet", version = 2)
     public static class TestV2 {
         public int a;
-        @AerospikeOrdinal(1)
+        @AerospikeOrdinal()
         public int b;
         @AerospikeVersion(max = 1)
         public int c;
@@ -52,7 +52,7 @@ public static class TestV2 {
     public static class TestV3 {
         @AerospikeVersion(max = 2)
         public int a;
-        @AerospikeOrdinal(1)
+        @AerospikeOrdinal()
         public int b;
         @AerospikeVersion(max = 1)
         public int c;
@@ -234,7 +234,5 @@ public void testConvenienceMethods() {
     	assertEquals(value.b, value2.b);
     	assertEquals(value.c, value2.c);
     	assertEquals(value.d, value2.d);
-    	
     }
-
 }