Change Computed annotation to use default attribute name.

olim7t · olim7t · commit 54846185587d · 2015-07-06T10:08:25.000+02:00
diff --git a/driver-mapping/src/main/java/com/datastax/driver/mapping/AnnotationChecks.java b/driver-mapping/src/main/java/com/datastax/driver/mapping/AnnotationChecks.java
@@ -103,8 +103,8 @@ static void checkFrozenTypes(Field field) {
 
     static void checkValidComputed(Field field) {
         Computed computed = field.getAnnotation(Computed.class);
-        if (computed != null && computed.formula().isEmpty()){
-            throw new IllegalArgumentException(String.format("Field %s: attribute 'formula' of annotation @Computed is mandatory for computed fields", field.getName()));
+        if (computed != null && computed.value().isEmpty()){
+            throw new IllegalArgumentException(String.format("Field %s: attribute 'value' of annotation @Computed is mandatory for computed fields", field.getName()));
         }
     }
 
diff --git a/driver-mapping/src/main/java/com/datastax/driver/mapping/AnnotationParser.java b/driver-mapping/src/main/java/com/datastax/driver/mapping/AnnotationParser.java
@@ -233,7 +233,7 @@ public static String columnName(Field field) {
         }
 
         if (computedField != null) {
-            return computedField.formula();
+            return computedField.value();
         }
 
         return field.getName().toLowerCase();
diff --git a/driver-mapping/src/main/java/com/datastax/driver/mapping/annotations/Computed.java b/driver-mapping/src/main/java/com/datastax/driver/mapping/annotations/Computed.java
@@ -46,5 +46,5 @@
      *
      * @return the formula.
      */
-    String formula();
+    String value();
 }
diff --git a/driver-mapping/src/test/java/com/datastax/driver/mapping/MapperComputedFieldsTest.java b/driver-mapping/src/test/java/com/datastax/driver/mapping/MapperComputedFieldsTest.java
@@ -162,10 +162,10 @@ public User(String login, String name) {
 
         // quotes in the column name inserted on purpose
         // to test the alias generation mechanism
-        @Computed(formula = "writetime(\"name\")")
+        @Computed(value = "writetime(\"name\")")
         long writeTime;
 
-        @Computed(formula = "ttl(name)")
+        @Computed("ttl(name)")
         Integer ttl;
 
         public String getLogin() {

Original file line number	Diff line number	Diff line change
`@@ -103,8 +103,8 @@ static void checkFrozenTypes(Field field) {`
`103`	`103`
`104`	`104`	`static void checkValidComputed(Field field) {`
`105`	`105`	`Computed computed = field.getAnnotation(Computed.class);`
`106`		`- if (computed != null && computed.formula().isEmpty()){`
`107`		`- throw new IllegalArgumentException(String.format("Field %s: attribute 'formula' of annotation @Computed is mandatory for computed fields", field.getName()));`
	`106`	`+ if (computed != null && computed.value().isEmpty()){`
	`107`	`+ throw new IllegalArgumentException(String.format("Field %s: attribute 'value' of annotation @Computed is mandatory for computed fields", field.getName()));`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`
Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ public static String columnName(Field field) {`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`if (computedField != null) {`
`236`		`- return computedField.formula();`
	`236`	`+ return computedField.value();`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`return field.getName().toLowerCase();`
Original file line number	Diff line number	Diff line change
`@@ -46,5 +46,5 @@`
`46`	`46`	`*`
`47`	`47`	`* @return the formula.`
`48`	`48`	`*/`
`49`		`- String formula();`
	`49`	`+ String value();`
`50`	`50`	`}`