Apache
/
olingo-odata4
mirror of https://github.com/apache/olingo-odata4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[OLINGO-447] Better key access in technical service 

Change-Id: I8a953aedc7f05d10c239e45655760df879122027

Signed-off-by: Michael Bolz <michael.bolz@sap.com>
This commit is contained in:
Klaus Straubinger 2014-10-09 09:30:38 +02:00 committed by Michael Bolz
parent bc0129490b
commit 169651531c
2 changed files with 42 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataProvider.java
View File

@ -87,9 +87,10 @@ public class DataProvider {
final EdmProperty property = (EdmProperty) entityType.getProperty(key.getName()); final EdmProperty property = (EdmProperty) entityType.getProperty(key.getName());
final EdmPrimitiveType type = (EdmPrimitiveType) property.getType(); final EdmPrimitiveType type = (EdmPrimitiveType) property.getType();
final Object value = entity.getProperty(key.getName()).getValue(); final Object value = entity.getProperty(key.getName()).getValue();
final Object keyValue = type.valueOfString(key.getText(), final Object keyValue = type.valueOfString(type.fromUriLiteral(key.getText()),
property.isNullable(), property.getMaxLength(), property.getPrecision(), property.getScale(), property.isNullable(), property.getMaxLength(), property.getPrecision(), property.getScale(),
property.isUnicode(), value.getClass()); property.isUnicode(),
Calendar.class.isAssignableFrom(value.getClass()) ? Calendar.class : value.getClass());
if (!value.equals(keyValue)) { if (!value.equals(keyValue)) {
found = false; found = false;
break; break;

57
lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/DataProviderTest.java
View File

@ -42,28 +42,42 @@ public class DataProviderTest {
private final EdmEntityContainer entityContainer = edm.getEntityContainer( private final EdmEntityContainer entityContainer = edm.getEntityContainer(
new FullQualifiedName("olingo.odata.test1", "Container")); new FullQualifiedName("olingo.odata.test1", "Container"));
private final EdmEntitySet esAllPrim; private final EdmEntitySet esAllPrim = entityContainer.getEntitySet("ESAllPrim");
private final EdmEntitySet esCompAllPrim; private final EdmEntitySet esAllKey = entityContainer.getEntitySet("ESAllKey");
private final EdmEntitySet esCollAllPrim; private final EdmEntitySet esCompAllPrim = entityContainer.getEntitySet("ESCompAllPrim");
private final EdmEntitySet esMixPrimCollAllPrim; private final EdmEntitySet esCollAllPrim = entityContainer.getEntitySet("ESCollAllPrim");
private final EdmEntitySet esMixPrimCollComp = entityContainer.getEntitySet("ESMixPrimCollComp");
public DataProviderTest() {
esAllPrim = entityContainer.getEntitySet("ESAllPrim");
esCompAllPrim = entityContainer.getEntitySet("ESCompAllPrim");
esCollAllPrim = entityContainer.getEntitySet("ESCollAllPrim");
esMixPrimCollAllPrim = entityContainer.getEntitySet("ESMixPrimCollComp");
}
@Test @Test
public void esAllPrimEntity() throws Exception { public void esAllPrimEntity() throws Exception {
final DataProvider dataProvider = new DataProvider(); final DataProvider dataProvider = new DataProvider();
Entity first = dataProvider.readAll(esAllPrim).getEntities().get(2); final Entity entity = dataProvider.readAll(esAllPrim).getEntities().get(2);
Assert.assertEquals(16, first.getProperties().size()); Assert.assertEquals(16, entity.getProperties().size());
UriParameter parameter = Mockito.mock(UriParameter.class); Assert.assertEquals(entity,
Mockito.when(parameter.getName()).thenReturn("PropertyInt16"); dataProvider.read(esAllPrim, Arrays.asList(mockParameter("PropertyInt16", "-0"))));
Mockito.when(parameter.getText()).thenReturn("-0"); }
Assert.assertEquals(first, dataProvider.read(esAllPrim, Arrays.asList(parameter)));
@Test
public void esAllKeyEntity() throws Exception {
final DataProvider dataProvider = new DataProvider();
final Entity entity = dataProvider.readAll(esAllKey).getEntities().get(0);
Assert.assertEquals(13, entity.getProperties().size());
Assert.assertEquals(entity, dataProvider.read(esAllKey, Arrays.asList(
mockParameter("PropertyBoolean", "true"),
mockParameter("PropertyByte", "255"),
mockParameter("PropertyDate", "2012-12-03"),
mockParameter("PropertyDateTimeOffset", "2012-12-03T07:16:23Z"),
mockParameter("PropertyDecimal", "34"),
mockParameter("PropertyDuration", "duration'PT6S'"),
mockParameter("PropertyGuid", "01234567-89AB-CDEF-0123-456789ABCDEF"),
mockParameter("PropertyInt16", "32767"),
mockParameter("PropertyInt32", "2147483647"),
mockParameter("PropertyInt64", "9223372036854775807"),
mockParameter("PropertySByte", "127"),
mockParameter("PropertyString", "'First'"),
mockParameter("PropertyTimeOfDay", "02:48:21"))));
} }
@Test @Test
@ -114,7 +128,7 @@ public class DataProviderTest {
@Test @Test
public void esMixPrimCollComp() throws Exception { public void esMixPrimCollComp() throws Exception {
EntitySet outSet = new DataProvider().readAll(esMixPrimCollAllPrim); EntitySet outSet = new DataProvider().readAll(esMixPrimCollComp);
Assert.assertEquals(3, outSet.getEntities().size()); Assert.assertEquals(3, outSet.getEntities().size());
Assert.assertEquals(4, outSet.getEntities().get(0).getProperties().size()); Assert.assertEquals(4, outSet.getEntities().get(0).getProperties().size());
@ -134,4 +148,11 @@ public class DataProviderTest {
Assert.assertEquals(4, outSet.getEntities().get(1).getProperties().size()); Assert.assertEquals(4, outSet.getEntities().get(1).getProperties().size());
Assert.assertEquals(4, outSet.getEntities().get(2).getProperties().size()); Assert.assertEquals(4, outSet.getEntities().get(2).getProperties().size());
} }
private static UriParameter mockParameter(final String name, final String text) {
UriParameter parameter = Mockito.mock(UriParameter.class);
Mockito.when(parameter.getName()).thenReturn(name);
Mockito.when(parameter.getText()).thenReturn(text);
return parameter;
}
} }