Client：避免put(Object object)传入Server没有对应model的object；与server同步model

TommyLemon · TommyLemon · commit f76d950b5213 · 2017-03-25T12:21:07.000+08:00
diff --git a/APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/src/apijson/demo/client/server/model/Comment.java b/APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/src/apijson/demo/client/server/model/Comment.java
@@ -14,9 +14,16 @@
 
 package apijson.demo.client.server.model;
 
+import zuo.biao.apijson.APIJSONRequest;
+import zuo.biao.apijson.RequestMethod;
+
 /**评论类
  * @author Lemon
  */
+@APIJSONRequest(
+		method = {RequestMethod.GET, RequestMethod.HEAD, RequestMethod.POST, RequestMethod.PUT, RequestMethod.DELETE},
+		DELETE = "{necessaryColumns:id}"
+		)
 public class Comment extends BaseModel {
 	private static final long serialVersionUID = -1011007127735372824L;
 	
diff --git a/APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/src/apijson/demo/client/server/model/Login.java b/APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/src/apijson/demo/client/server/model/Login.java
@@ -14,10 +14,17 @@
 
 package apijson.demo.client.server.model;
 
+import zuo.biao.apijson.APIJSONRequest;
+import zuo.biao.apijson.RequestMethod;
+
 /**登录类
  * @author Lemon
  */
 @SuppressWarnings("serial")
+@APIJSONRequest(
+		method = {RequestMethod.POST_GET, RequestMethod.POST, RequestMethod.DELETE},
+		DELETE = "{necessaryColumns:id}"
+		)
 public class Login extends BaseModel {
 
 	public static final int TYPE_PASSWORD = 0;
diff --git a/APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/src/apijson/demo/client/server/model/Moment.java b/APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/src/apijson/demo/client/server/model/Moment.java
@@ -16,9 +16,16 @@
 
 import java.util.List;
 
+import zuo.biao.apijson.APIJSONRequest;
+import zuo.biao.apijson.RequestMethod;
+
 /**作品类
  * @author Lemon
  */
+@APIJSONRequest(
+		method = {RequestMethod.GET, RequestMethod.HEAD, RequestMethod.POST, RequestMethod.PUT, RequestMethod.DELETE},
+		DELETE = "{necessaryColumns:id}"
+		)
 public class Moment extends BaseModel {
 	private static final long serialVersionUID = -7437225320551780084L;
 
diff --git a/APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/src/apijson/demo/client/server/model/Password.java b/APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/src/apijson/demo/client/server/model/Password.java
@@ -14,12 +14,18 @@
 
 package apijson.demo.client.server.model;
 
+import zuo.biao.apijson.APIJSONRequest;
+import zuo.biao.apijson.RequestMethod;
 import zuo.biao.apijson.StringUtil;
 
 /**登录类
  * @author Lemon
  */
 @SuppressWarnings("serial")
+@APIJSONRequest(
+		method = {RequestMethod.POST_GET, RequestMethod.POST, RequestMethod.PUT, RequestMethod.DELETE},
+		DELETE = "{necessaryColumns:id}"
+		)
 public class Password extends BaseModel {
 
 	private String model;//table是MySQL关键字不能用！
@@ -32,15 +38,20 @@ public Password() {
 	public Password(String model, String phone) {
 		this();
 		setModel(model);
-		setId(Long.valueOf(0 + StringUtil.getNumber(phone)));
+		setPhone(phone);
 	}
-	public Password(String model, String phone, String value) {
+	public Password(String model, String phone, String password) {
 		this(model, phone);
-		setPassword(value);
+		setPassword(password);
 	}
 
+	public Password setPhone(String phone) {
+		setId(Long.valueOf(0 + StringUtil.getNumber(phone)));
+		return this;
+	}
+	
 	public String getModel() {
-		return model;
+		return StringUtil.isNotEmpty(model, true) ? model : "User";
 	}
 	public Password setModel(String model) {
 		this.model = model;
diff --git a/APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/src/apijson/demo/client/server/model/Request.java b/APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/src/apijson/demo/client/server/model/Request.java
diff --git a/APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/src/apijson/demo/client/server/model/Verify.java b/APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/src/apijson/demo/client/server/model/Verify.java
@@ -14,12 +14,18 @@
 
 package apijson.demo.client.server.model;
 
+import zuo.biao.apijson.APIJSONRequest;
+import zuo.biao.apijson.RequestMethod;
 import zuo.biao.apijson.StringUtil;
 
 /**登录类
  * @author Lemon
  */
 @SuppressWarnings("serial")
+@APIJSONRequest(
+		method = {RequestMethod.POST_HEAD, RequestMethod.POST_GET, RequestMethod.POST, RequestMethod.DELETE},
+		DELETE = "{necessaryColumns:id}"
+		)
 public class Verify extends BaseModel {
 
 	private String code;
diff --git a/APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/src/apijson/demo/client/server/model/Wallet.java b/APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/src/apijson/demo/client/server/model/Wallet.java
@@ -16,9 +16,17 @@
 
 import java.math.BigDecimal;
 
+import zuo.biao.apijson.APIJSONRequest;
+import zuo.biao.apijson.RequestMethod;
+
 /**钱包类
  * @author Lemon
  */
+@APIJSONRequest(
+		method = {RequestMethod.POST_GET, RequestMethod.POST, RequestMethod.PUT, RequestMethod.DELETE},
+		POST_GET = "{Wallet:{disallowColumns:!, necessaryColumns:userId}, necessaryColumns:currentUserId,loginPassword}",
+		DELETE = "{necessaryColumns:id}"
+		)
 public class Wallet extends BaseModel {
 	private static final long serialVersionUID = 4298571449155754300L;
 	
diff --git a/APIJSON(Android)/APIJSON(ADT)/APIJSONLibrary/src/zuo/biao/apijson/JSONObject.java b/APIJSON(Android)/APIJSON(ADT)/APIJSONLibrary/src/zuo/biao/apijson/JSONObject.java
@@ -145,15 +145,15 @@ public Object get(Object key, boolean decode) {
 
 	/**
 	 * encode = false
-	 * @param value
+	 * @param value must be annotated by {@link APIJSONRequest}
 	 * @return {@link #put(String, boolean)}
 	 */
 	public Object put(Object value) {
 		return put(value, false);
 	}
 	/**
 	 * key = value.getClass().getSimpleName()
-	 * @param value
+	 * @param value must be annotated by {@link APIJSONRequest}
 	 * @param encode
 	 * @return {@link #put(String, Object, boolean)}
 	 */
@@ -170,7 +170,14 @@ public Object put(Object value, boolean encode) {
 	 */
 	public Object put(String key, Object value, boolean encode) {
 		if (StringUtil.isNotEmpty(key, true) == false) {
-			key = value == null ? null : value.getClass().getSimpleName();
+			Class<?> clazz = value == null ? null : value.getClass();
+			if (clazz == null || clazz.getAnnotation(APIJSONRequest.class) == null) {
+				throw new IllegalArgumentException("put  StringUtil.isNotEmpty(key, true) == false" +
+						" && clazz == null || clazz.getAnnotation(APIJSONRequest.class) == null" +
+						" \n key为空时仅支持 类型被@APIJSONRequest注解 的value !!!" +
+						" \n 如果一定要这么用，请对 " + clazz.getName() + " 注解！");
+			}
+			key = value.getClass().getSimpleName();
 		}
 		if (encode) {
 			if (key.endsWith("+") || key.endsWith("-")) {
diff --git a/APIJSON(Android)/APIJSON(ADT)/APIJSONLibrary/src/zuo/biao/apijson/JSONRequest.java b/APIJSON(Android)/APIJSON(ADT)/APIJSONLibrary/src/zuo/biao/apijson/JSONRequest.java
@@ -30,7 +30,7 @@ public JSONRequest() {
 	}
 	/**
 	 * encode = true
-	 * @param object
+	 * @param object must be annotated by {@link APIJSONRequest}
 	 * @see	{@link #JSONRequest(String, Object)}
 	 */
 	public JSONRequest(Object object) {
@@ -46,7 +46,7 @@ public JSONRequest(String name, Object object) {
 		this(name, object, true);
 	}
 	/**
-	 * @param object
+	 * @param object must be annotated by {@link APIJSONRequest}
 	 * @param encode
 	 * @see {@link #JSONRequest(String, Object, boolean)}
 	 */
@@ -133,9 +133,10 @@ public Object putPath(String key, String... parts) {
 
 	/**
 	 * encode = true
-	 * @param value
+	 * @param value must be annotated by {@link APIJSONRequest}
 	 * @return {@link #put(String, boolean)}
 	 */
+	@Override
 	public Object put(Object value) {
 		return put(value, true);
 	}
