[OLINGO-467] Fixed EdmConcurrencyControl
diff --git a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/edm/AnnotationEdmProviderTest.java b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/edm/AnnotationEdmProviderTest.java
index a067a19..bc78f6f 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/edm/AnnotationEdmProviderTest.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/edm/AnnotationEdmProviderTest.java
@@ -40,6 +40,7 @@
import org.apache.olingo.odata2.api.annotation.edm.EdmComplexType;
import org.apache.olingo.odata2.api.annotation.edm.EdmEntitySet;
import org.apache.olingo.odata2.api.annotation.edm.EdmEntityType;
+import org.apache.olingo.odata2.api.edm.EdmConcurrencyMode;
import org.apache.olingo.odata2.api.edm.EdmMultiplicity;
import org.apache.olingo.odata2.api.edm.FullQualifiedName;
import org.apache.olingo.odata2.api.edm.provider.Association;
@@ -331,6 +332,7 @@
assertEquals("Employee", employee.getName());
Property name = getProperty(employee, "EmployeeName");
assertEquals(Integer.valueOf(20), name.getFacets().getMaxLength());
+ assertNull(name.getFacets().getConcurrencyMode());
assertTrue(name.getFacets().isNullable());
Property id = getProperty(employee, "EmployeeId");
assertFalse(id.getFacets().isNullable());
@@ -343,6 +345,7 @@
Property version = getProperty(room, "Version");
assertEquals(Integer.valueOf(0), version.getFacets().getScale());
assertEquals(Integer.valueOf(0), version.getFacets().getPrecision());
+ assertEquals(EdmConcurrencyMode.Fixed, version.getFacets().getConcurrencyMode());
}
@Test
diff --git a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/model/Room.java b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/model/Room.java
index 40f9202..f422ad7 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/model/Room.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/model/Room.java
@@ -35,6 +35,7 @@
@EdmProperty
private Integer seats;
@EdmProperty(facets = @EdmFacets(scale = 0, precision = 0))
+ @EdmConcurrencyControl
private Integer version;
@EdmNavigationProperty(name = "nr_Building", association = "BuildingRooms")
private Building building;
diff --git a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmConcurrencyControl.java b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmConcurrencyControl.java
index 1761810..7b1fa51 100644
--- a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmConcurrencyControl.java
+++ b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmConcurrencyControl.java
@@ -31,5 +31,5 @@
* = NONE</code>.
*/
@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.ANNOTATION_TYPE)
+@Target(ElementType.FIELD)
public @interface EdmConcurrencyControl {}
