Merge pull request androidannotations#442 from excilys/441_Extra_in_constant

pyricau · pyricau · commit 103dba06bc42 · 2012-12-27T08:22:49.000-08:00
Extra field names are now referencing generated public constants. Fixes androidannotations#441
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/CaseHelper.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/CaseHelper.java
@@ -56,4 +56,8 @@ public static String camelCaseToSnakeCase(String camelCase) {
 		}
 	}
 
+	public static String camelCaseToUpperSnakeCase(String camelCase) {
+		return camelCaseToSnakeCase(camelCase).toUpperCase();
+	}
+
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/ExtraProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/ExtraProcessor.java
@@ -15,15 +15,18 @@
  */
 package org.androidannotations.processing;
 
-import static org.androidannotations.helper.CanonicalNameConstants.PARCELABLE;
-import static org.androidannotations.helper.CanonicalNameConstants.STRING;
 import static com.sun.codemodel.JExpr._null;
 import static com.sun.codemodel.JExpr._super;
 import static com.sun.codemodel.JExpr._this;
 import static com.sun.codemodel.JExpr.cast;
 import static com.sun.codemodel.JExpr.invoke;
+import static com.sun.codemodel.JExpr.lit;
+import static com.sun.codemodel.JMod.FINAL;
 import static com.sun.codemodel.JMod.PRIVATE;
 import static com.sun.codemodel.JMod.PUBLIC;
+import static com.sun.codemodel.JMod.STATIC;
+import static org.androidannotations.helper.CanonicalNameConstants.PARCELABLE;
+import static org.androidannotations.helper.CanonicalNameConstants.STRING;
 
 import java.lang.annotation.Annotation;
 
@@ -36,13 +39,16 @@
 
 import org.androidannotations.annotations.Extra;
 import org.androidannotations.helper.APTCodeModelHelper;
+import org.androidannotations.helper.CaseHelper;
 import org.androidannotations.processing.EBeansHolder.Classes;
+
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JCatchBlock;
 import com.sun.codemodel.JClass;
 import com.sun.codemodel.JCodeModel;
 import com.sun.codemodel.JExpr;
 import com.sun.codemodel.JFieldRef;
+import com.sun.codemodel.JFieldVar;
 import com.sun.codemodel.JInvocation;
 import com.sun.codemodel.JMethod;
 import com.sun.codemodel.JMod;
@@ -89,7 +95,16 @@ public void process(Element element, JCodeModel codeModel, EBeanHolder holder) {
 			injectExtras(holder, codeModel);
 		}
 
-		JBlock ifContainsKey = holder.extrasNotNullBlock._if(JExpr.invoke(holder.extras, "containsKey").arg(extraKey))._then();
+		String staticFieldName;
+		if (fieldName.endsWith("Extra")) {
+			staticFieldName = CaseHelper.camelCaseToUpperSnakeCase(fieldName);
+		} else {
+			staticFieldName = CaseHelper.camelCaseToUpperSnakeCase(fieldName + "Extra");
+		}
+
+		JFieldVar extraKeyField = holder.generatedClass.field(PUBLIC | STATIC | FINAL, classes.STRING, staticFieldName, lit(extraKey));
+
+		JBlock ifContainsKey = holder.extrasNotNullBlock._if(JExpr.invoke(holder.extras, "containsKey").arg(extraKeyField))._then();
 
 		JTryBlock containsKeyTry = ifContainsKey._try();
 
@@ -98,9 +113,9 @@ public void process(Element element, JCodeModel codeModel, EBeanHolder holder) {
 		if (isPrimitive) {
 			JPrimitiveType primitiveType = JType.parse(codeModel, elementType.toString());
 			JClass wrapperType = primitiveType.boxify();
-			containsKeyTry.body().assign(extraField, JExpr.cast(wrapperType, holder.extras.invoke("get").arg(extraKey)));
+			containsKeyTry.body().assign(extraField, JExpr.cast(wrapperType, holder.extras.invoke("get").arg(extraKeyField)));
 		} else {
-			containsKeyTry.body().assign(extraField, JExpr.invoke(holder.cast).arg(holder.extras.invoke("get").arg(extraKey)));
+			containsKeyTry.body().assign(extraField, JExpr.invoke(holder.cast).arg(holder.extras.invoke("get").arg(extraKeyField)));
 		}
 
 		JCatchBlock containsKeyCatch = containsKeyTry._catch(classes.CLASS_CAST_EXCEPTION);
@@ -139,7 +154,7 @@ public void process(Element element, JCodeModel codeModel, EBeanHolder holder) {
 				JClass paramClass = helper.typeMirrorToJClass(extraType, holder);
 				JVar extraParam = method.param(paramClass, fieldName);
 				JBlock body = method.body();
-				JInvocation invocation = body.invoke(holder.intentField, "putExtra").arg(extraKey);
+				JInvocation invocation = body.invoke(holder.intentField, "putExtra").arg(extraKeyField);
 				if (castToSerializable) {
 					invocation.arg(cast(classes.SERIALIZABLE, extraParam));
 				} else {

Original file line number	Diff line number	Diff line change
`@@ -56,4 +56,8 @@ public static String camelCaseToSnakeCase(String camelCase) {`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
	`59`	`+ public static String camelCaseToUpperSnakeCase(String camelCase) {`
	`60`	`+ return camelCaseToSnakeCase(camelCase).toUpperCase();`
	`61`	`+ }`
	`62`	`+`
`59`	`63`	`}`