Issue 380 notation primary key

example/src/main/java/com/example/models/PrimaryKeyNotationBigDecimalFieldAnnotatedModel.java

@@ -0,0 +1,28 @@
+package com.example.models;
+
+import com.orm.dsl.PrimaryKey;
+import com.orm.dsl.Table;
+
+import java.math.BigDecimal;
+
+@Table
+public class PrimaryKeyNotationBigDecimalFieldAnnotatedModel{
+
+    @PrimaryKey
+    private Long myId;
+    private BigDecimal decimal;
+
+    public PrimaryKeyNotationBigDecimalFieldAnnotatedModel() {}
+
+    public PrimaryKeyNotationBigDecimalFieldAnnotatedModel(BigDecimal decimal) {
+        this.decimal = decimal;
+    }
+
+    public BigDecimal getBigDecimal() {
+        return decimal;
+    }
+
+    public Long getMyId() {
+        return myId;
+    }
+}

example/src/main/java/com/example/models/PrimaryKeyNotationBooleanFieldAnnotatedModel.java

@@ -0,0 +1,29 @@
+package com.example.models;
+
+import com.orm.dsl.PrimaryKey;
+import com.orm.dsl.Table;
+
+@Table
+public class PrimaryKeyNotationBooleanFieldAnnotatedModel{
+    private             Boolean objectBoolean;
+    private             boolean rawBoolean;
+    @PrimaryKey private Long    myId;
+
+    public PrimaryKeyNotationBooleanFieldAnnotatedModel(){}
+
+    public PrimaryKeyNotationBooleanFieldAnnotatedModel(Boolean objectBoolean){
+        this.objectBoolean = objectBoolean;
+    }
+
+    public PrimaryKeyNotationBooleanFieldAnnotatedModel(boolean rawBoolean) {
+        this.rawBoolean = rawBoolean;
+    }
+
+    public Boolean getBoolean() {
+        return objectBoolean;
+    }
+
+    public boolean getRawBoolean() {
+        return rawBoolean;
+    }
+}

example/src/main/java/com/example/models/PrimaryKeyNotationRelationshipAnnotatedModel.java

@@ -0,0 +1,24 @@
+package com.example.models;
+
+import com.orm.dsl.PrimaryKey;
+import com.orm.dsl.Table;
+
+@Table
+public class PrimaryKeyNotationRelationshipAnnotatedModel{
+    private             SimpleAnnotatedModel simple;
+    @PrimaryKey private Long                 myId;
+
+    public PrimaryKeyNotationRelationshipAnnotatedModel(){}
+
+    public PrimaryKeyNotationRelationshipAnnotatedModel(SimpleAnnotatedModel simple){
+        this.simple = simple;
+    }
+
+    public SimpleAnnotatedModel getSimple(){
+        return simple;
+    }
+
+    public Long getMyId(){
+        return myId;
+    }
+}

example/src/main/java/com/example/models/PrimaryKeyNotationRelationshipExtendedModel.java

@@ -0,0 +1,26 @@
+package com.example.models;
+
+
+import com.orm.SugarRecord;
+import com.orm.dsl.PrimaryKey;
+
+public class PrimaryKeyNotationRelationshipExtendedModel extends SugarRecord{
+
+    @PrimaryKey private Long myId;
+
+    private SimpleExtendedModel simple;
+
+    public PrimaryKeyNotationRelationshipExtendedModel(){}
+
+    public PrimaryKeyNotationRelationshipExtendedModel(SimpleExtendedModel simple){
+        this.simple = simple;
+    }
+
+    public SimpleExtendedModel getSimple(){
+        return simple;
+    }
+
+    public Long getMyId(){
+        return myId;
+    }
+}

example/src/main/java/com/example/models/PrimaryKeyNotationSimpleAnnotatedModel.java

@@ -0,0 +1,16 @@
+package com.example.models;
+
+import com.orm.dsl.PrimaryKey;
+import com.orm.dsl.Table;
+
+@Table
+public class PrimaryKeyNotationSimpleAnnotatedModel{
+
+    @PrimaryKey private Long myId;
+
+    public PrimaryKeyNotationSimpleAnnotatedModel(){}
+
+    public Long getMyId(){
+        return myId;
+    }
+}

example/src/main/java/com/example/models/PrimaryKeyNotationSimpleModel.java

@@ -0,0 +1,40 @@
+package com.example.models;
+
+import com.orm.SugarRecord;
+import com.orm.dsl.PrimaryKey;
+
+public class PrimaryKeyNotationSimpleModel extends SugarRecord{
+    @PrimaryKey
+    private Long    myId;
+    private String  str;
+    private int     integer;
+    private boolean bool;
+
+    public String getStr(){
+        return str;
+    }
+
+    public void setStr(String str){
+        this.str = str;
+    }
+
+    public int getInteger(){
+        return integer;
+    }
+
+    public void setInteger(int integer){
+        this.integer = integer;
+    }
+
+    public boolean isBool(){
+        return bool;
+    }
+
+    public void setBool(boolean bool){
+        this.bool = bool;
+    }
+
+    public Long getMyId(){ return myId; }
+
+    public void setMyId(Long myId){ this.myId = myId; }
+}

example/src/test/java/com/example/sugartest/BigDecimalFieldTests.java

@@ -11,43 +11,42 @@
 
 import java.math.BigDecimal;
 
+
 import static com.orm.SugarRecord.save;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18)
-public class BigDecimalFieldTests {
+@RunWith (RobolectricGradleTestRunner.class)
+@Config (sdk = 18)
+public class BigDecimalFieldTests{
     @Test
-    public void nullBigDecimalExtendedTest() {
+    public void nullBigDecimalExtendedTest(){
         save(new BigDecimalFieldExtendedModel());
-        BigDecimalFieldExtendedModel model =
-                SugarRecord.findById(BigDecimalFieldExtendedModel.class, 1);
+        BigDecimalFieldExtendedModel model = SugarRecord.findById(BigDecimalFieldExtendedModel.class, 1);
         assertNull(model.getBigDecimal());
     }
 
     @Test
-    public void nullBigDecimalAnnotatedTest() {
+    public void nullBigDecimalAnnotatedTest(){
         save(new BigDecimalFieldAnnotatedModel());
-        BigDecimalFieldAnnotatedModel model =
-                SugarRecord.findById(BigDecimalFieldAnnotatedModel.class, 1);
+        BigDecimalFieldAnnotatedModel model = SugarRecord.findById(BigDecimalFieldAnnotatedModel.class, 1);
         assertNull(model.getBigDecimal());
     }
 
     @Test
-    public void bigDecimalExtendedTest() {
+    public void bigDecimalExtendedTest(){
         BigDecimal decimal = new BigDecimal(1234.5678901234567890123456789);
         save(new BigDecimalFieldExtendedModel(decimal));
         BigDecimalFieldExtendedModel model = SugarRecord.findById(BigDecimalFieldExtendedModel.class, 1);
         assertEquals(decimal, model.getBigDecimal());
     }
 
     @Test
-    public void bigDecimalAnnotatedTest() {
+    public void bigDecimalAnnotatedTest(){
         BigDecimal decimal = new BigDecimal(1234.5678901234567890123456789);
         save(new BigDecimalFieldAnnotatedModel(decimal));
-        BigDecimalFieldAnnotatedModel model =
-                SugarRecord.findById(BigDecimalFieldAnnotatedModel.class, 1);
+        BigDecimalFieldAnnotatedModel model = SugarRecord.findById(BigDecimalFieldAnnotatedModel.class, 1);
         assertEquals(decimal, model.getBigDecimal());
     }
+
 }

example/src/test/java/com/example/sugartest/BooleanFieldTests.java

@@ -2,75 +2,76 @@
 
 
 import com.example.models.BooleanFieldAnnotatedModel;
-import com.example.models.BooleanFieldExtendedModel;
 import com.orm.SugarRecord;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
 
+
 import static com.orm.SugarRecord.save;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
-@RunWith(RobolectricGradleTestRunner.class)
-@Config(sdk=18)
-public class BooleanFieldTests {
+@RunWith (RobolectricGradleTestRunner.class)
+@Config (sdk = 18)
+public class BooleanFieldTests{
     @Test
-    public void nullBooleanExtendedTest() {
-        save(new BooleanFieldExtendedModel());
-        BooleanFieldExtendedModel model = SugarRecord.findById(BooleanFieldExtendedModel.class, 1);
+    public void nullBooleanExtendedTest(){
+        save(new BooleanFieldAnnotatedModel());
+        BooleanFieldAnnotatedModel model = SugarRecord.findById(BooleanFieldAnnotatedModel.class, 1);
         assertNull(model.getBoolean());
     }
 
     @Test
-    public void nullRawBooleanExtendedTest() {
-        save(new BooleanFieldExtendedModel());
-        BooleanFieldExtendedModel model = SugarRecord.findById(BooleanFieldExtendedModel.class, 1);
+    public void nullRawBooleanExtendedTest(){
+        save(new BooleanFieldAnnotatedModel());
+        BooleanFieldAnnotatedModel model = SugarRecord.findById(BooleanFieldAnnotatedModel.class, 1);
         assertEquals(false, model.getRawBoolean());
     }
 
     @Test
-    public void nullBooleanAnnotatedTest() {
+    public void nullBooleanAnnotatedTest(){
         save(new BooleanFieldAnnotatedModel());
         BooleanFieldAnnotatedModel model = SugarRecord.findById(BooleanFieldAnnotatedModel.class, 1);
         assertNull(model.getBoolean());
     }
 
     @Test
-    public void nullRawBooleanAnnotatedTest() {
+    public void nullRawBooleanAnnotatedTest(){
         save(new BooleanFieldAnnotatedModel());
         BooleanFieldAnnotatedModel model = SugarRecord.findById(BooleanFieldAnnotatedModel.class, 1);
         assertEquals(false, model.getRawBoolean());
     }
 
     @Test
-    public void objectBooleanExtendedTest() {
+    public void objectBooleanExtendedTest(){
         Boolean objectBoolean = new Boolean(true);
-        save(new BooleanFieldExtendedModel(objectBoolean));
-        BooleanFieldExtendedModel model = SugarRecord.findById(BooleanFieldExtendedModel.class, 1);
+        save(new BooleanFieldAnnotatedModel(objectBoolean));
+        BooleanFieldAnnotatedModel model = SugarRecord.findById(BooleanFieldAnnotatedModel.class, 1);
         assertEquals(objectBoolean, model.getBoolean());
     }
 
     @Test
-    public void rawBooleanExtendedTest() {
-        save(new BooleanFieldExtendedModel(true));
-        BooleanFieldExtendedModel model = SugarRecord.findById(BooleanFieldExtendedModel.class, 1);
+    public void rawBooleanExtendedTest(){
+        save(new BooleanFieldAnnotatedModel(true));
+        BooleanFieldAnnotatedModel model = SugarRecord.findById(BooleanFieldAnnotatedModel.class, 1);
         assertEquals(true, model.getRawBoolean());
     }
 
     @Test
-    public void objectBooleanAnnotatedTest() {
+    public void objectBooleanAnnotatedTest(){
         Boolean objectBoolean = new Boolean(true);
         save(new BooleanFieldAnnotatedModel(objectBoolean));
         BooleanFieldAnnotatedModel model = SugarRecord.findById(BooleanFieldAnnotatedModel.class, 1);
         assertEquals(objectBoolean, model.getBoolean());
     }
 
     @Test
-    public void rawBooleanAnnotatedTest() {
+    public void rawBooleanAnnotatedTest(){
         save(new BooleanFieldAnnotatedModel(true));
         BooleanFieldAnnotatedModel model = SugarRecord.findById(BooleanFieldAnnotatedModel.class, 1);
         assertEquals(true, model.getRawBoolean());
     }
+
 }

example/src/test/java/com/example/sugartest/PrimaryKeyNotationBigDecimalFieldTests.java

@@ -0,0 +1,47 @@
+package com.example.sugartest;
+
+
+import com.example.models.PrimaryKeyNotationBigDecimalFieldAnnotatedModel;
+import com.orm.SugarRecord;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import java.math.BigDecimal;
+
+
+import static com.orm.SugarRecord.save;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+@RunWith (RobolectricGradleTestRunner.class)
+@Config (sdk = 18)
+public class PrimaryKeyNotationBigDecimalFieldTests{
+
+    @Test
+    public void primryKeyNotationNullBigDecimalExtendedTest(){
+        save(new PrimaryKeyNotationBigDecimalFieldAnnotatedModel());
+        PrimaryKeyNotationBigDecimalFieldAnnotatedModel model =
+                SugarRecord.findById(PrimaryKeyNotationBigDecimalFieldAnnotatedModel.class, 1);
+        assertNull(model.getBigDecimal());
+    }
+
+    @Test
+    public void primryKeyNotationBigDecimalExtendedTest(){
+        BigDecimal decimal = new BigDecimal(1234.5678901234567890123456789);
+        save(new PrimaryKeyNotationBigDecimalFieldAnnotatedModel(decimal));
+        PrimaryKeyNotationBigDecimalFieldAnnotatedModel model =
+                SugarRecord.findById(PrimaryKeyNotationBigDecimalFieldAnnotatedModel.class, 1);
+        assertEquals(decimal, model.getBigDecimal());
+    }
+
+    @Test
+    public void primryKeyNotationBigDecimalAnnotatedTest(){
+        BigDecimal decimal = new BigDecimal(1234.5678901234567890123456789);
+        save(new PrimaryKeyNotationBigDecimalFieldAnnotatedModel(decimal));
+        PrimaryKeyNotationBigDecimalFieldAnnotatedModel model =
+                SugarRecord.findById(PrimaryKeyNotationBigDecimalFieldAnnotatedModel.class, 1);
+        assertEquals(decimal, model.getBigDecimal());
+    }
+}