Repository: olingo-odata4 Updated Branches: refs/heads/OLINGO-564 754e23abe -> cbbe3da69
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cbbe3da6/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientPropertyValue.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientPropertyValue.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientPropertyValue.java deleted file mode 100644 index 97ff40a..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientPropertyValue.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.client.core.edm.xml.annotation; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.databind.DeserializationContext; -import org.apache.olingo.client.core.edm.xml.AbstractClientEdmDeserializer; -import org.apache.olingo.client.core.edm.xml.ClientAnnotation; -import org.apache.olingo.commons.api.edm.provider.annotation.AnnotationExpression; -import org.apache.olingo.commons.api.edm.provider.annotation.PropertyValue; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -import java.io.IOException; - -@JsonDeserialize(using = ClientPropertyValue.PropertyValueDeserializer.class) -public class ClientPropertyValue extends AbstractClientAnnotatableDynamicAnnotationExpression implements PropertyValue { - - private static final long serialVersionUID = -8437649215282645228L; - - private String property; - - private AnnotationExpression value; - - @Override - public String getProperty() { - return property; - } - - public void setProperty(final String property) { - this.property = property; - } - - @Override - public AnnotationExpression getValue() { - return value; - } - - public void setValue(final AnnotationExpression value) { - this.value = value; - } - - static class PropertyValueDeserializer extends AbstractClientEdmDeserializer<ClientPropertyValue> { - @Override - protected ClientPropertyValue doDeserialize(final JsonParser jp, final DeserializationContext ctxt) - throws IOException { - final ClientPropertyValue propValue = new ClientPropertyValue(); - for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) { - final JsonToken token = jp.getCurrentToken(); - if (token == JsonToken.FIELD_NAME) { - if ("Property".equals(jp.getCurrentName())) { - propValue.setProperty(jp.nextTextValue()); - } else if ("Annotation".equals(jp.getCurrentName())) { - propValue.getAnnotations().add(jp.readValueAs(ClientAnnotation.class)); - } else if (isAnnotationConstExprConstruct(jp)) { - propValue.setValue(parseAnnotationConstExprConstruct(jp)); - } else { - propValue.setValue(jp.readValueAs(AbstractClientDynamicAnnotationExpression.class)); - } - } - } - return propValue; - } - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cbbe3da6/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientRecord.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientRecord.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientRecord.java deleted file mode 100644 index 744e061..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientRecord.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.client.core.edm.xml.annotation; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.databind.DeserializationContext; -import org.apache.olingo.client.core.edm.xml.AbstractClientEdmDeserializer; -import org.apache.olingo.client.core.edm.xml.ClientAnnotation; -import org.apache.olingo.commons.api.edm.provider.annotation.PropertyValue; -import org.apache.olingo.commons.api.edm.provider.annotation.Record; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -@JsonDeserialize(using = ClientRecord.RecordDeserializer.class) -public class ClientRecord extends AbstractClientAnnotatableDynamicAnnotationExpression implements Record { - - private static final long serialVersionUID = 4275271751615410709L; - - private String type; - - private final List<PropertyValue> propertyValues = new ArrayList<PropertyValue>(); - - @Override - public String getType() { - return type; - } - - public void setType(final String type) { - this.type = type; - } - - @Override - public List<PropertyValue> getPropertyValues() { - return propertyValues; - } - - static class RecordDeserializer extends AbstractClientEdmDeserializer<ClientRecord> { - @Override - protected ClientRecord doDeserialize(final JsonParser jp, final DeserializationContext ctxt) - throws IOException { - final ClientRecord record = new ClientRecord(); - for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) { - final JsonToken token = jp.getCurrentToken(); - if (token == JsonToken.FIELD_NAME) { - if ("Type".equals(jp.getCurrentName())) { - record.setType(jp.nextTextValue()); - } else if ("Annotation".equals(jp.getCurrentName())) { - record.getAnnotations().add(jp.readValueAs(ClientAnnotation.class)); - } else { - record.getPropertyValues().add(jp.readValueAs(ClientPropertyValue.class)); - } - } - } - return record; - } - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cbbe3da6/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientTwoParamsOpDynamicAnnotationExpression.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientTwoParamsOpDynamicAnnotationExpression.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientTwoParamsOpDynamicAnnotationExpression.java deleted file mode 100644 index 2c371b6..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientTwoParamsOpDynamicAnnotationExpression.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.client.core.edm.xml.annotation; - -import org.apache.olingo.commons.api.edm.provider.annotation.DynamicAnnotationExpression; -import org.apache.olingo.commons.api.edm.provider.annotation.TwoParamsOpDynamicAnnotationExpression; - -public class ClientTwoParamsOpDynamicAnnotationExpression - extends AbstractClientDynamicAnnotationExpression implements TwoParamsOpDynamicAnnotationExpression { - - private static final long serialVersionUID = 6241842185452451946L; - - private Type type; - - private DynamicAnnotationExpression left; - - private DynamicAnnotationExpression right; - - @Override - public Type getType() { - return type; - } - - public void setType(final Type type) { - this.type = type; - } - - @Override - public DynamicAnnotationExpression getLeftExpression() { - return left; - } - - public void setLeftExpression(final DynamicAnnotationExpression left) { - this.left = left; - } - - @Override - public DynamicAnnotationExpression getRightExpression() { - return right; - } - - public void setRightExpression(final DynamicAnnotationExpression right) { - this.right = right; - } - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cbbe3da6/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientUrlRef.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientUrlRef.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientUrlRef.java deleted file mode 100644 index 82d6d38..0000000 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientUrlRef.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.client.core.edm.xml.annotation; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.databind.DeserializationContext; -import org.apache.olingo.client.core.edm.xml.AbstractClientEdmDeserializer; -import org.apache.olingo.commons.api.edm.provider.annotation.AnnotationExpression; -import org.apache.olingo.commons.api.edm.provider.annotation.UrlRef; - -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -import java.io.IOException; - -@JsonDeserialize(using = ClientUrlRef.UrlRefDeserializer.class) -public class ClientUrlRef extends AbstractClientDynamicAnnotationExpression implements UrlRef { - - private static final long serialVersionUID = -7693224811739000440L; - - private AnnotationExpression value; - - @Override - public AnnotationExpression getValue() { - return value; - } - - public void setValue(final AnnotationExpression value) { - this.value = value; - } - - static class UrlRefDeserializer extends AbstractClientEdmDeserializer<ClientUrlRef> { - @Override - protected ClientUrlRef doDeserialize(final JsonParser jp, final DeserializationContext ctxt) - throws IOException { - final ClientUrlRef urlref = new ClientUrlRef(); - for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) { - final JsonToken token = jp.getCurrentToken(); - if (token == JsonToken.FIELD_NAME) { - if (isAnnotationConstExprConstruct(jp)) { - urlref.setValue(parseAnnotationConstExprConstruct(jp)); - } else { - urlref.setValue(jp.readValueAs(AbstractClientDynamicAnnotationExpression.class)); - } - } - } - return urlref; - } - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cbbe3da6/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ClientODataDeserializerImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ClientODataDeserializerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ClientODataDeserializerImpl.java index 8430cff..55a02d4 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ClientODataDeserializerImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ClientODataDeserializerImpl.java @@ -29,7 +29,7 @@ import org.apache.olingo.client.api.serialization.ClientODataDeserializer; import org.apache.olingo.client.core.data.JSONServiceDocumentDeserializer; import org.apache.olingo.client.core.data.XMLServiceDocumentDeserializer; import org.apache.olingo.client.core.edm.xml.ClientEdmx; -import org.apache.olingo.client.core.edm.xml.ClientXMLMetadata; +import org.apache.olingo.client.core.edm.ClientXMLMetadata; import org.apache.olingo.commons.api.data.Delta; import org.apache.olingo.commons.api.data.Entity; import org.apache.olingo.commons.api.data.EntityCollection; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cbbe3da6/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/URIEscapeTest.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/URIEscapeTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/URIEscapeTest.java index 4854887..2245a14 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/URIEscapeTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/URIEscapeTest.java @@ -27,12 +27,12 @@ import java.util.Calendar; import java.util.Collections; import java.util.TimeZone; -import org.apache.olingo.client.core.edm.xml.ClientEnumType; import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.edm.EdmEnumType; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.geo.Geospatial; import org.apache.olingo.commons.api.edm.geo.Point; +import org.apache.olingo.commons.api.edm.provider.EnumType; import org.apache.olingo.commons.core.edm.EdmEnumTypeImpl; import org.junit.Test; @@ -51,7 +51,7 @@ public class URIEscapeTest { @Test public void _enum() throws UnsupportedEncodingException { final EdmEnumType pattern = - new EdmEnumTypeImpl(null, new FullQualifiedName("Sales", "Pattern"), new ClientEnumType()); + new EdmEnumTypeImpl(null, new FullQualifiedName("Sales", "Pattern"), new EnumType()); assertEquals("Sales.Pattern'Yellow'", URIUtils.escape( pattern.toUriLiteral("Yellow"))); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cbbe3da6/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/v4/FilterFactoryTest.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/v4/FilterFactoryTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/v4/FilterFactoryTest.java index 5edd2cf..aa94a80 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/v4/FilterFactoryTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/v4/FilterFactoryTest.java @@ -30,10 +30,10 @@ import org.apache.olingo.client.api.uri.FilterArgFactory; import org.apache.olingo.client.api.uri.FilterFactory; import org.apache.olingo.client.api.uri.URIFilter; import org.apache.olingo.client.core.AbstractTest; -import org.apache.olingo.client.core.edm.xml.ClientEnumType; import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.edm.EdmEnumType; import org.apache.olingo.commons.api.edm.FullQualifiedName; +import org.apache.olingo.commons.api.edm.provider.EnumType; import org.apache.olingo.commons.core.edm.EdmEnumTypeImpl; import org.junit.Test; @@ -55,7 +55,7 @@ public class FilterFactoryTest extends AbstractTest { @Test public void has() { final EdmEnumType pattern = - new EdmEnumTypeImpl(null, new FullQualifiedName("Sales", "Pattern"), new ClientEnumType()); + new EdmEnumTypeImpl(null, new FullQualifiedName("Sales", "Pattern"), new EnumType()); final URIFilter filter = getFilterFactory().has(getFilterArgFactory().property("style"), pattern, "Yellow"); assertEquals("(style has Sales.Pattern'Yellow')", filter.build()); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/cbbe3da6/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/MetadataTest.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/MetadataTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/MetadataTest.java index bb29eaa..19b6881 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/MetadataTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/MetadataTest.java @@ -29,8 +29,6 @@ import java.util.List; import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.edm.xml.XMLMetadata; import org.apache.olingo.client.core.AbstractTest; -import org.apache.olingo.client.core.edm.xml.annotation.ClientConstantAnnotationExpression; -import org.apache.olingo.client.core.edm.xml.annotation.ClientPath; import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAction; @@ -63,6 +61,7 @@ import org.apache.olingo.commons.api.edm.provider.Term; import org.apache.olingo.commons.api.edm.provider.annotation.Apply; import org.apache.olingo.commons.api.edm.provider.annotation.Collection; import org.apache.olingo.commons.api.edm.provider.annotation.ConstantAnnotationExpression; +import org.apache.olingo.commons.api.edm.provider.annotation.Path; import org.apache.olingo.commons.api.edm.provider.annotation.TwoParamsOpDynamicAnnotationExpression; import org.apache.olingo.commons.api.edm.provider.annotation.UrlRef; import org.apache.olingo.commons.api.format.ODataFormat; @@ -297,18 +296,16 @@ public class MetadataTest extends AbstractTest { assertEquals(Constants.CANONICAL_FUNCTION_CONCAT, apply.getFunction()); assertEquals(3, apply.getParameters().size()); - final ClientPath firstArg = new ClientPath(); - firstArg.setValue("Name"); - assertEquals(firstArg, apply.getParameters().get(0)); + Path path = (Path) apply.getParameters().get(0); + assertEquals("Name", path.getValue()); - final ConstantAnnotationExpression secondArg = new ClientConstantAnnotationExpression(); - secondArg.setType(ConstantAnnotationExpression.Type.String); - secondArg.setValue(" in "); - assertEquals(secondArg, apply.getParameters().get(1)); + ConstantAnnotationExpression expression = + (ConstantAnnotationExpression) apply.getParameters().get(1); + assertEquals(" in ", expression.getValue()); + assertEquals(ConstantAnnotationExpression.Type.String, expression.getType()); - final ClientPath thirdArg = new ClientPath(); - thirdArg.setValue("Address/CountryName"); - assertEquals(thirdArg, apply.getParameters().get(2)); + Path thirdArg = (Path) apply.getParameters().get(2); + assertEquals("Address/CountryName", thirdArg.getValue()); // Check Tags final Annotation tags = metadata.getSchema(0).getAnnotationGroup("ODataDemo.Product").
