add boxed type for Schema#getPrimaryKey()

CHANGELOG.md

@@ -10,6 +10,10 @@ The versioning follows [Semantic Versioning](http://semver.org/):
 
 Note that _experimental_ features, annotated with `@Experimental` may change without notice.
 
+## NEXT
+
+* [#377](https://github.com/gfx/Android-Orma/pull/377): `Schema#getPrimaryKey` holds the boxed type of the primary key, instead of wildcard type
+
 ## v4.1.1 2017/01/25
 
 https://github.com/gfx/Android-Orma/compare/v4.1.0...v4.1.1

example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Category_Schema.java

@@ -114,7 +114,7 @@ public String getSelectFromTableClause() {
 
   @NonNull
   @Override
-  public ColumnDef<Category, ?> getPrimaryKey() {
+  public ColumnDef<Category, Long> getPrimaryKey() {
     return id;
   }
 

example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Entry_Schema.java

@@ -135,7 +135,7 @@ public String getSelectFromTableClause() {
 
   @NonNull
   @Override
-  public ColumnDef<Entry, ?> getPrimaryKey() {
+  public ColumnDef<Entry, Long> getPrimaryKey() {
     return id;
   }
 

example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Item2_Schema.java

@@ -198,7 +198,7 @@ public String getSelectFromTableClause() {
 
   @NonNull
   @Override
-  public ColumnDef<Item2, ?> getPrimaryKey() {
+  public ColumnDef<Item2, String> getPrimaryKey() {
     return name;
   }
 

example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Item_Schema.java

@@ -121,7 +121,7 @@ public String getSelectFromTableClause() {
 
   @NonNull
   @Override
-  public ColumnDef<Item, ?> getPrimaryKey() {
+  public ColumnDef<Item, String> getPrimaryKey() {
     return name;
   }
 

example/build/generated/source/apt/debug/com/github/gfx/android/orma/example/orma/Todo_Schema.java

@@ -182,7 +182,7 @@ public String getSelectFromTableClause() {
 
   @NonNull
   @Override
-  public ColumnDef<Todo, ?> getPrimaryKey() {
+  public ColumnDef<Todo, Long> getPrimaryKey() {
     return id;
   }
 

processor/src/main/java/com/github/gfx/android/orma/processor/generator/SchemaWriter.java

@@ -269,6 +269,7 @@ public FieldSpecDefinition buildColumnFieldSpec(ColumnDefinition c) {
                 .build());
 
         return new FieldSpecDefinition(
+                c,
                 FieldSpec.builder(c.getColumnDefType(), c.name).addModifiers(publicFinal).build(),
                 columnDefType.build());
     }
@@ -477,7 +478,7 @@ public List<MethodSpec> buildMethodSpecs() {
                 MethodSpec.methodBuilder("getPrimaryKey")
                         .addAnnotations(Annotations.overrideAndNonNull())
                         .addModifiers(Modifier.PUBLIC)
-                        .returns(Types.getColumnDef(schema.getModelClassName(), Types.WildcardType))
+                        .returns(Types.getColumnDef(schema.getModelClassName(), primaryKeyFieldSpecDef.column.getBoxType()))
                         .addStatement("return $N", primaryKeyFieldSpecDef.fieldSpec)
                         .build()
         );
@@ -837,11 +838,14 @@ private CodeBlock cursorGetter(ColumnDefinition column, CodeBlock index) {
 
     private static class FieldSpecDefinition {
 
-        FieldSpec fieldSpec;
+        final ColumnDefinition column;
 
-        TypeSpec initializer;
+        final FieldSpec fieldSpec;
 
-        FieldSpecDefinition(FieldSpec fieldSpec, TypeSpec initializer) {
+        final TypeSpec initializer;
+
+        FieldSpecDefinition(ColumnDefinition column, FieldSpec fieldSpec, TypeSpec initializer) {
+            this.column = column;
             this.fieldSpec = fieldSpec;
             this.initializer = initializer;
         }