Repository: olingo-odata4 Updated Branches: refs/heads/master 8ffd80ef3 -> e981aaad7
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e981aaad/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EdmTechProvider.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EdmTechProvider.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EdmTechProvider.java index ffb1946..da47222 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EdmTechProvider.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EdmTechProvider.java @@ -18,11 +18,9 @@ */ package org.apache.olingo.server.tecsvc.provider; -import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.apache.olingo.commons.api.ex.ODataException; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.provider.CsdlAbstractEdmProvider; import org.apache.olingo.commons.api.edm.provider.CsdlAction; @@ -40,7 +38,7 @@ import org.apache.olingo.commons.api.edm.provider.CsdlSchema; import org.apache.olingo.commons.api.edm.provider.CsdlSingleton; import org.apache.olingo.commons.api.edm.provider.CsdlTerm; import org.apache.olingo.commons.api.edm.provider.CsdlTypeDefinition; -import org.apache.olingo.server.api.edmx.EdmxReference; +import org.apache.olingo.commons.api.ex.ODataException; public class EdmTechProvider extends CsdlAbstractEdmProvider { @@ -56,10 +54,6 @@ public class EdmTechProvider extends CsdlAbstractEdmProvider { private final TypeDefinitionProvider typeDefinitionProvider; public EdmTechProvider() { - this(Collections.<EdmxReference> emptyList()); - } - - public EdmTechProvider(final List<EdmxReference> references) { containerProvider = new ContainerProvider(this); entityTypeProvider = new EntityTypeProvider(); complexTypeProvider = new ComplexTypeProvider(); @@ -72,9 +66,8 @@ public class EdmTechProvider extends CsdlAbstractEdmProvider { @Override public List<CsdlAliasInfo> getAliasInfos() throws ODataException { - return Arrays.asList( - new CsdlAliasInfo().setAlias("Namespace1_Alias").setNamespace(nameSpace) - ); + return Collections.singletonList( + new CsdlAliasInfo().setAlias("Namespace1_Alias").setNamespace(nameSpace)); } @Override http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e981aaad/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/ActionDataProviderTest.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/ActionDataProviderTest.java b/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/ActionDataProviderTest.java index 87643a6..199f0f1 100644 --- a/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/ActionDataProviderTest.java +++ b/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/ActionDataProviderTest.java @@ -26,7 +26,9 @@ import static org.junit.Assert.fail; import java.math.BigDecimal; import java.util.Calendar; +import java.util.Collections; import java.util.HashMap; +import java.util.Map; import java.util.TimeZone; import org.apache.olingo.commons.api.data.ComplexValue; @@ -34,19 +36,29 @@ import org.apache.olingo.commons.api.data.EntityCollection; import org.apache.olingo.commons.api.data.Parameter; import org.apache.olingo.commons.api.data.Property; import org.apache.olingo.commons.api.data.ValueType; +import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.http.HttpStatusCode; +import org.apache.olingo.server.api.OData; +import org.apache.olingo.server.api.edmx.EdmxReference; import org.apache.olingo.server.tecsvc.data.DataProvider.DataProviderException; +import org.apache.olingo.server.tecsvc.provider.EdmTechProvider; import org.junit.Test; public class ActionDataProviderTest { + private final OData oData = OData.newInstance(); + private final Edm edm = + oData.createServiceMetadata(new EdmTechProvider(), Collections.<EdmxReference> emptyList()) + .getEdm(); + private final Map<String, EntityCollection> data = new DataCreator(oData, edm).getData(); + @Test public void actionUARTString() throws Exception { Property result = ActionData.primitiveAction("UARTString", null); assertNotNull(result); assertEquals("UARTString string value", result.asPrimitive()); - result = ActionData.primitiveAction("UARTString", new HashMap<String, Parameter>()); + result = ActionData.primitiveAction("UARTString", Collections.<String, Parameter> emptyMap()); assertNotNull(result); assertEquals("UARTString string value", result.asPrimitive()); } @@ -58,7 +70,7 @@ public class ActionDataProviderTest { @Test public void actionUARTCollStringTwoParam() throws Exception { - HashMap<String, Parameter> parameters = new HashMap<String, Parameter>(); + Map<String, Parameter> parameters = new HashMap<String, Parameter>(); Parameter paramInt16 = new Parameter(); paramInt16.setName("ParameterInt16"); paramInt16.setValue(ValueType.PRIMITIVE, new Short((short) 3)); @@ -69,25 +81,24 @@ public class ActionDataProviderTest { paramDuration.setValue(ValueType.PRIMITIVE, new BigDecimal(2)); parameters.put("ParameterDuration", paramDuration); - Property result = ActionData.primitiveCollectionAction("UARTCollStringTwoParam", parameters); + Property result = ActionData.primitiveCollectionAction("UARTCollStringTwoParam", parameters, oData); assertNotNull(result); assertEquals(3, result.asCollection().size()); } @Test public void actionUARTCTTwoPrimParam() throws Exception { - HashMap<String, Parameter> parameters = new HashMap<String, Parameter>(); Parameter paramInt16 = new Parameter(); paramInt16.setName("ParameterInt16"); paramInt16.setValue(ValueType.PRIMITIVE, new Short((short) 3)); - parameters.put("ParameterInt16", paramInt16); + final Map<String, Parameter> parameters = Collections.singletonMap("ParameterInt16", paramInt16); Property result = ActionData.complexAction("UARTCTTwoPrimParam", parameters); assertNotNull(result); ComplexValue value = result.asComplex(); assertEquals((short) 3, value.getValue().get(0).asPrimitive()); - result = ActionData.complexAction("UARTCTTwoPrimParam", new HashMap<String, Parameter>()); + result = ActionData.complexAction("UARTCTTwoPrimParam", Collections.<String, Parameter> emptyMap()); assertNotNull(result); value = result.asComplex(); assertEquals((short) 32767, value.getValue().get(0).asPrimitive()); @@ -95,10 +106,9 @@ public class ActionDataProviderTest { @Test public void actionUARTCollCTTwoPrimParam() throws Exception { - HashMap<String, Parameter> parameters = new HashMap<String, Parameter>(); Parameter paramInt16 = new Parameter(); paramInt16.setName("ParameterInt16"); - parameters.put("ParameterInt16", paramInt16); + final Map<String, Parameter> parameters = Collections.singletonMap("ParameterInt16", paramInt16); paramInt16.setValue(ValueType.PRIMITIVE, new Short((short) 0)); Property result = ActionData.complexCollectionAction("UARTCollCTTwoPrimParam", parameters); @@ -146,13 +156,12 @@ public class ActionDataProviderTest { @Test public void actionUARTETTwoKeyTwoPrimParam() throws Exception { - HashMap<String, Parameter> parameters = new HashMap<String, Parameter>(); Parameter paramInt16 = new Parameter(); paramInt16.setName("ParameterInt16"); paramInt16.setValue(ValueType.PRIMITIVE, new Short((short) 32767)); - parameters.put("ParameterInt16", paramInt16); + final Map<String, Parameter> parameters = Collections.singletonMap("ParameterInt16", paramInt16); - EntityActionResult result = ActionData.entityAction("UARTETTwoKeyTwoPrimParam", parameters); + EntityActionResult result = ActionData.entityAction("UARTETTwoKeyTwoPrimParam", parameters, data); assertNotNull(result); assertFalse(result.isCreated()); assertEquals((short) 32767, result.getEntity().getProperty("PropertyInt16").asPrimitive()); @@ -160,15 +169,14 @@ public class ActionDataProviderTest { @Test public void actionUARTETTwoKeyTwoPrimParamNegative() throws Exception { - HashMap<String, Parameter> parameters = new HashMap<String, Parameter>(); Parameter paramInt16 = new Parameter(); paramInt16.setName("ParameterInt16"); paramInt16.setValue(ValueType.PRIMITIVE, new Short((short) 12345)); - parameters.put("ParameterInt16", paramInt16); + final Map<String, Parameter> parameters = Collections.singletonMap("ParameterInt16", paramInt16); try { - ActionData.entityAction("UARTETTwoKeyTwoPrimParam", parameters); - fail("Expected a DataProviderException but wasn`t thrown"); + ActionData.entityAction("UARTETTwoKeyTwoPrimParam", parameters, data); + fail("Expected a DataProviderException but wasn't thrown"); } catch (DataProviderException e) { assertEquals("Entity not found with key: 12345", e.getMessage()); assertEquals(HttpStatusCode.NOT_FOUND.getStatusCode(), e.getStatusCode()); @@ -177,7 +185,8 @@ public class ActionDataProviderTest { @Test public void actionUARTETAllPrimParamWithoutParam() throws Exception { - EntityActionResult result = ActionData.entityAction("UARTETAllPrimParam", new HashMap<String, Parameter>()); + final EntityActionResult result = ActionData.entityAction("UARTETAllPrimParam", + Collections.<String, Parameter> emptyMap(), data); assertNotNull(result); assertFalse(result.isCreated()); assertEquals(Short.MAX_VALUE, result.getEntity().getProperty("PropertyInt16").asPrimitive()); @@ -185,13 +194,12 @@ public class ActionDataProviderTest { @Test public void actionUARTETAllPrimParamWithParam() throws Exception { - HashMap<String, Parameter> parameters = new HashMap<String, Parameter>(); - Parameter paramInt16 = new Parameter(); - paramInt16.setName("ParameterDate"); - paramInt16.setValue(ValueType.PRIMITIVE, null); - parameters.put("ParameterDate", paramInt16); + Parameter paramDate = new Parameter(); + paramDate.setName("ParameterDate"); + paramDate.setValue(ValueType.PRIMITIVE, null); + final Map<String, Parameter> parameters = Collections.singletonMap("ParameterDate", paramDate); - EntityActionResult result = ActionData.entityAction("UARTETAllPrimParam", parameters); + EntityActionResult result = ActionData.entityAction("UARTETAllPrimParam", parameters, data); assertNotNull(result); assertTrue(result.isCreated()); assertEquals((short) 1, result.getEntity().getProperty("PropertyInt16").asPrimitive()); @@ -199,11 +207,10 @@ public class ActionDataProviderTest { @Test public void actionUARTCollETKeyNavParam() throws Exception { - HashMap<String, Parameter> parameters = new HashMap<String, Parameter>(); Parameter paramInt16 = new Parameter(); paramInt16.setName("ParameterInt16"); - paramInt16.setValue(ValueType.PRIMITIVE, new Short((short) 5)); - parameters.put("ParameterInt16", paramInt16); + paramInt16.setValue(ValueType.PRIMITIVE, Short.valueOf((short) 5)); + final Map<String, Parameter> parameters = Collections.singletonMap("ParameterInt16", paramInt16); EntityCollection result = ActionData.entityCollectionAction("UARTCollETKeyNavParam", parameters); assertNotNull(result); @@ -212,11 +219,10 @@ public class ActionDataProviderTest { @Test public void actionUARTCollETAllPrimParam() throws Exception { - HashMap<String, Parameter> parameters = new HashMap<String, Parameter>(); - Parameter paramInt16 = new Parameter(); - paramInt16.setName("ParameterTimeOfDay"); - paramInt16.setValue(ValueType.PRIMITIVE, getTime(5, 0, 0)); - parameters.put("ParameterTimeOfDay", paramInt16); + Parameter paramTimeOfDay = new Parameter(); + paramTimeOfDay.setName("ParameterTimeOfDay"); + paramTimeOfDay.setValue(ValueType.PRIMITIVE, getTime(5, 0, 0)); + final Map<String, Parameter> parameters = Collections.singletonMap("ParameterTimeOfDay", paramTimeOfDay); EntityCollection result = ActionData.entityCollectionAction("UARTCollETAllPrimParam", parameters); assertNotNull(result); @@ -225,8 +231,8 @@ public class ActionDataProviderTest { @Test public void actionUARTCollETAllPrimParamNoParam() throws Exception { - EntityCollection result = - ActionData.entityCollectionAction("UARTCollETAllPrimParam", new HashMap<String, Parameter>()); + final EntityCollection result = ActionData.entityCollectionAction("UARTCollETAllPrimParam", + Collections.<String, Parameter> emptyMap()); assertNotNull(result); assertEquals(0, result.getEntities().size()); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e981aaad/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/DataProviderTest.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/DataProviderTest.java b/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/DataProviderTest.java index dab178c..93c3c9a 100644 --- a/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/DataProviderTest.java +++ b/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/DataProviderTest.java @@ -40,8 +40,9 @@ import org.mockito.Mockito; public class DataProviderTest { - private final Edm edm = OData.newInstance().createServiceMetadata(new EdmTechProvider( - Collections.<EdmxReference> emptyList()), Collections.<EdmxReference> emptyList()) + private final OData oData = OData.newInstance(); + private final Edm edm = + oData.createServiceMetadata(new EdmTechProvider(), Collections.<EdmxReference> emptyList()) .getEdm(); private final EdmEntityContainer entityContainer = edm.getEntityContainer( new FullQualifiedName("olingo.odata.test1", "Container")); @@ -55,7 +56,7 @@ public class DataProviderTest { @Test public void esAllPrimEntity() throws Exception { - final DataProvider dataProvider = new DataProvider(edm); + final DataProvider dataProvider = new DataProvider(oData, edm); final Entity entity = dataProvider.readAll(esAllPrim).getEntities().get(2); Assert.assertEquals(16, entity.getProperties().size()); @@ -65,7 +66,7 @@ public class DataProviderTest { @Test public void esAllKeyEntity() throws Exception { - final DataProvider dataProvider = new DataProvider(edm); + final DataProvider dataProvider = new DataProvider(oData, edm); final Entity entity = dataProvider.readAll(esAllKey).getEntities().get(0); Assert.assertEquals(13, entity.getProperties().size()); @@ -87,7 +88,7 @@ public class DataProviderTest { @Test public void esAllPrim() throws Exception { - final DataProvider data = new DataProvider(edm); + final DataProvider data = new DataProvider(oData, edm); EntityCollection outSet = data.readAll(esAllPrim); Assert.assertEquals(3, outSet.getEntities().size()); @@ -107,7 +108,7 @@ public class DataProviderTest { @Test public void esCollAllPrim() throws Exception { - final DataProvider dataProvider = new DataProvider(edm); + final DataProvider dataProvider = new DataProvider(oData, edm); EntityCollection outSet = dataProvider.readAll(esCollAllPrim); Assert.assertEquals(3, outSet.getEntities().size()); @@ -121,7 +122,7 @@ public class DataProviderTest { @Test public void esCompAllPrim() throws Exception { - final DataProvider dataProvider = new DataProvider(edm); + final DataProvider dataProvider = new DataProvider(oData, edm); EntityCollection outSet = dataProvider.readAll(esCompAllPrim); @@ -136,7 +137,7 @@ public class DataProviderTest { @Test public void esMixPrimCollComp() throws Exception { - final DataProvider dataProvider = new DataProvider(edm); + final DataProvider dataProvider = new DataProvider(oData, edm); EntityCollection outSet = dataProvider.readAll(esMixPrimCollComp); @@ -161,8 +162,8 @@ public class DataProviderTest { @Test public void esMedia() throws Exception { - DataProvider dataProvider = new DataProvider(edm); - + DataProvider dataProvider = new DataProvider(oData, edm); + Entity entity = dataProvider.read(esMedia, Arrays.asList(mockParameter("PropertyInt16", "3"))); Assert.assertNotNull(dataProvider.readMedia(entity)); dataProvider.delete(esMedia, entity); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e981aaad/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java index 572e71a..a882fa6 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java @@ -37,6 +37,7 @@ import org.apache.olingo.commons.api.edm.EdmEntityType; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmProperty; import org.apache.olingo.commons.api.format.ContentType; +import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.ServiceMetadata; import org.apache.olingo.server.api.edmx.EdmxReference; import org.apache.olingo.server.api.serializer.ComplexSerializerOptions; @@ -56,7 +57,6 @@ import org.apache.olingo.server.api.uri.queryoption.SelectItem; import org.apache.olingo.server.api.uri.queryoption.SelectOption; import org.apache.olingo.server.core.ServiceMetadataImpl; import org.apache.olingo.server.core.serializer.ExpandSelectMock; -import org.apache.olingo.server.core.uri.UriHelperImpl; import org.apache.olingo.server.tecsvc.MetadataETagSupport; import org.apache.olingo.server.tecsvc.data.DataProvider; import org.apache.olingo.server.tecsvc.provider.EdmTechProvider; @@ -69,12 +69,13 @@ public class ODataJsonSerializerTest { private static final ServiceMetadata metadata = new ServiceMetadataImpl( new EdmTechProvider(), Collections.<EdmxReference> emptyList(), new MetadataETagSupport("W/\"metadataETag\"")); private static final EdmEntityContainer entityContainer = metadata.getEdm().getEntityContainer(); - private final DataProvider data = new DataProvider(metadata.getEdm()); + private final OData odata = OData.newInstance(); + private final DataProvider data = new DataProvider(odata, metadata.getEdm()); private final ODataSerializer serializer = new ODataJsonSerializer(ContentType.JSON); private final ODataSerializer serializerNoMetadata = new ODataJsonSerializer(ContentType.JSON_NO_METADATA); private final ODataSerializer serializerIEEECompatible = new ODataJsonSerializer(ContentType.create(ContentType.JSON, ContentType.PARAMETER_IEEE754_COMPATIBLE, "true")); - private final UriHelper helper = new UriHelperImpl(); + private final UriHelper helper = odata.createUriHelper(); @Test public void entitySimple() throws Exception { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e981aaad/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentTest.java index ef27e24..6f59060 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentTest.java @@ -43,9 +43,8 @@ public class MetadataDocumentTest { @Test public void writeMetadataWithTechnicalScenario() throws Exception { final OData odata = OData.newInstance(); - final List<EdmxReference> references = getEdmxReferences(); final ServiceMetadata serviceMetadata = odata.createServiceMetadata( - new EdmTechProvider(references), references); + new EdmTechProvider(), getEdmxReferences()); final String metadata = IOUtils.toString( odata.createSerializer(ContentType.APPLICATION_XML).metadataDocument(serviceMetadata).getContent()); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e981aaad/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializerTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializerTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializerTest.java index 32ca425..9ef0845 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializerTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializerTest.java @@ -41,6 +41,7 @@ import org.apache.olingo.commons.api.edm.EdmEntityType; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmProperty; import org.apache.olingo.commons.api.format.ContentType; +import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.ServiceMetadata; import org.apache.olingo.server.api.edmx.EdmxReference; import org.apache.olingo.server.api.serializer.ComplexSerializerOptions; @@ -85,8 +86,8 @@ public class ODataXmlSerializerTest { private static final DifferenceListener DIFFERENCE_LISTENER = new CustomDifferenceListener(); private static final int MAX_ALLOWED_UPDATED_DIFFERENCE = 2000; private static final String UPDATED_FORMAT = "yyyy-MM-dd'T'HH:mm:ss'Z'"; - - private final DataProvider data = new DataProvider(metadata.getEdm()); + + private final DataProvider data = new DataProvider(OData.newInstance(), metadata.getEdm()); private final ODataSerializer serializer = new ODataXmlSerializer(); private final UriHelper helper = new UriHelperImpl(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e981aaad/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriHelperTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriHelperTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriHelperTest.java index d15c40d..781f48d 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriHelperTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriHelperTest.java @@ -37,12 +37,13 @@ import org.junit.Test; public class UriHelperTest { - private static final Edm edm = OData.newInstance().createServiceMetadata( + private static final OData odata = OData.newInstance(); + private static final Edm edm = odata.createServiceMetadata( new EdmTechProvider(), Collections.<EdmxReference> emptyList()).getEdm(); private static final EdmEntityContainer container = edm.getEntityContainer( new FullQualifiedName("olingo.odata.test1", "Container")); - private static final UriHelper helper = new UriHelperImpl(); - private final DataProvider data = new DataProvider(edm); + private static final UriHelper helper = odata.createUriHelper(); + private final DataProvider data = new DataProvider(odata, edm); @Test public void canonicalURL() throws Exception { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e981aaad/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/ParserTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/ParserTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/ParserTest.java index c9c0907..e27289d 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/ParserTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/parser/ParserTest.java @@ -120,7 +120,7 @@ public class ParserTest { .goPath().first() .isType(new FullQualifiedName("NS", "Category"), false); fail("Expected exception was not thrown."); - } catch (Exception e) { + } catch (final UriParserException e) { assertEquals("NavigationProperty 'Category' not found in type 'NS.Products'", e.getMessage()); } }
