#803 - Fix generics on findMap() to ... <K> Map<K, T> findMap();

src/test/java/com/avaje/ebeaninternal/api/TDSpiEbeanServer.java

@@ -516,7 +516,7 @@ public class TDSpiEbeanServer implements SpiEbeanServer {
   }
 
   @Override
-  public <T> Map<?, T> findMap(Query<T> query, Transaction transaction) {
+  public <K, T> Map<K, T> findMap(Query<T> query, Transaction transaction) {
     return null;
   }
 

src/test/java/com/avaje/tests/basic/TestLazyLoadInCache.java

@@ -22,7 +22,7 @@ public class TestLazyLoadInCache extends BaseTestCase {
 		
 		ResetBasicData.reset();
 		
-		Map<?, Customer> map = Ebean.find(Customer.class)
+		Map<Integer, Customer> map = Ebean.find(Customer.class)
 			.select("id, name")
 			.setLoadBeanCache(true)
 			.setReadOnly(true)

src/test/java/com/avaje/tests/basic/TestLoadBeanCache.java

@@ -17,7 +17,7 @@ public class TestLoadBeanCache extends BaseTestCase {
 		
 		ResetBasicData.reset();
 		
-		Map<?, Country> map = Ebean.find(Country.class)
+		Map<String, Country> map = Ebean.find(Country.class)
 			.setLoadBeanCache(true)
 			.setUseQueryCache(true)
 			.setReadOnly(true)

src/test/java/com/avaje/tests/query/TestQueryFindMapTypedKey.java

@@ -1,14 +1,16 @@
 package com.avaje.tests.query;
 
-import java.util.Map;
-
-import org.junit.Assert;
-import org.junit.Test;
-
 import com.avaje.ebean.BaseTestCase;
 import com.avaje.ebean.Ebean;
 import com.avaje.tests.model.basic.Customer;
+import com.avaje.tests.model.basic.Product;
 import com.avaje.tests.model.basic.ResetBasicData;
+import org.junit.Test;
+
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertNotNull;
 
 public class TestQueryFindMapTypedKey extends BaseTestCase {
 
@@ -17,9 +19,21 @@ public class TestQueryFindMapTypedKey extends BaseTestCase {
 
     ResetBasicData.reset();
 
-    Map<String, Customer> map = Ebean.find(Customer.class).select("id, name")
-        .findMap("name", String.class);
+    Map<String, Product> productsBySku = Ebean.find(Product.class)
+        .setMapKey("sku")
+        .findMap();
+
+    assertThat(productsBySku).isNotEmpty();
+
+    Product desk = productsBySku.get("DSK1");
+    assertNotNull(desk);
+
+    Map<String, Customer> map = Ebean.find(Customer.class)
+        .select("id, name")
+        .setMapKey("name")
+        .findMap();
+
+    assertNotNull(map);
 
-    Assert.assertNotNull(map);
   }
 }

src/test/java/com/avaje/tests/readaudit/TestReadAudit.java

@@ -257,7 +257,7 @@ public class TestReadAudit extends BaseTestCase {
 
     resetCounters();
 
-    Map<?,EBasicChangeLog> list = server.find(EBasicChangeLog.class)
+    Map<Long,EBasicChangeLog> list = server.find(EBasicChangeLog.class)
         .where().startsWith("shortDescription", "readAudit")
         .findMap();