Merge pull request #1198 from harawata/unset-keyproperty-default

Unset default value of keyProperty.

Author: harawata

src/main/java/org/apache/ibatis/annotations/Options.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2009-2016 the original author or authors.
+ *    Copyright 2009-2018 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -58,7 +58,7 @@ public enum FlushCachePolicy {
 
   boolean useGeneratedKeys() default false;
 
-  String keyProperty() default "id";
+  String keyProperty() default "";
 
   String keyColumn() default "";
 

src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java

@@ -303,7 +303,7 @@ void parseStatement(Method method) {
       boolean useCache = isSelect;
 
       KeyGenerator keyGenerator;
-      String keyProperty = "id";
+      String keyProperty = null;
       String keyColumn = null;
       if (SqlCommandType.INSERT.equals(sqlCommandType) || SqlCommandType.UPDATE.equals(sqlCommandType)) {
         // first check for SelectKey annotation - that overrides everything else