You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by il...@apache.org on 2014/05/22 13:43:09 UTC
[01/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Repository: olingo-odata4
Updated Branches:
refs/heads/master 895cd51a4 -> 19f3792f9
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java
deleted file mode 100644
index 6c72ca3..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java
+++ /dev/null
@@ -1,528 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "MappedEntityType",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface MappedEntityType extends Serializable {
-
-
- @Key
- @Property(name = "Id",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getId();
-
- public void setId(final Integer _id);
-
-
- @Property(name = "Href",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getHref();
-
- public void setHref(final String _href);
-
-
- @Property(name = "Title",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getTitle();
-
- public void setTitle(final String _title);
-
-
- @Property(name = "HrefLang",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getHrefLang();
-
- public void setHrefLang(final String _hrefLang);
-
-
- @Property(name = "Type",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getType();
-
- public void setType(final String _type);
-
-
- @Property(name = "Length",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getLength();
-
- public void setLength(final Integer _length);
-
-
- @Property(name = "BagOfPrimitiveToLinks",
- type = "Collection(Edm.String)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<String> getBagOfPrimitiveToLinks();
-
- public void setBagOfPrimitiveToLinks(final Collection<String> _bagOfPrimitiveToLinks);
-
-
- @Property(name = "Logo",
- type = "Edm.Binary",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public byte[] getLogo();
-
- public void setLogo(final byte[] _logo);
-
-
- @Property(name = "BagOfDecimals",
- type = "Collection(Edm.Decimal)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<BigDecimal> getBagOfDecimals();
-
- public void setBagOfDecimals(final Collection<BigDecimal> _bagOfDecimals);
-
-
- @Property(name = "BagOfDoubles",
- type = "Collection(Edm.Double)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<Double> getBagOfDoubles();
-
- public void setBagOfDoubles(final Collection<Double> _bagOfDoubles);
-
-
- @Property(name = "BagOfSingles",
- type = "Collection(Edm.Single)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<Float> getBagOfSingles();
-
- public void setBagOfSingles(final Collection<Float> _bagOfSingles);
-
-
- @Property(name = "BagOfBytes",
- type = "Collection(Edm.Byte)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<Integer> getBagOfBytes();
-
- public void setBagOfBytes(final Collection<Integer> _bagOfBytes);
-
-
- @Property(name = "BagOfInt16s",
- type = "Collection(Edm.Int16)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<Short> getBagOfInt16s();
-
- public void setBagOfInt16s(final Collection<Short> _bagOfInt16s);
-
-
- @Property(name = "BagOfInt32s",
- type = "Collection(Edm.Int32)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<Integer> getBagOfInt32s();
-
- public void setBagOfInt32s(final Collection<Integer> _bagOfInt32s);
-
-
- @Property(name = "BagOfInt64s",
- type = "Collection(Edm.Int64)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<Long> getBagOfInt64s();
-
- public void setBagOfInt64s(final Collection<Long> _bagOfInt64s);
-
-
- @Property(name = "BagOfGuids",
- type = "Collection(Edm.Guid)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<UUID> getBagOfGuids();
-
- public void setBagOfGuids(final Collection<UUID> _bagOfGuids);
-
-
- @Property(name = "BagOfDateTime",
- type = "Collection(Edm.DateTime)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<ODataTimestamp> getBagOfDateTime();
-
- public void setBagOfDateTime(final Collection<ODataTimestamp> _bagOfDateTime);
-
-
- @Property(name = "BagOfComplexToCategories",
- type = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ComplexToCategory)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory> getBagOfComplexToCategories();
-
- public void setBagOfComplexToCategories(final Collection<com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory> _bagOfComplexToCategories);
-
-
- @Property(name = "ComplexPhone",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "PhoneNumber",
- fcTargetPath = "SyndicationRights",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone getComplexPhone();
-
- public void setComplexPhone(final com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _complexPhone);
-
-
- @Property(name = "ComplexContactDetails",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "WorkPhone/Extension",
- fcTargetPath = "SyndicationSummary",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails getComplexContactDetails();
-
- public void setComplexContactDetails(final com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails _complexContactDetails);
-
-
-
-
-
-}
[47/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/ODataValueUpdateRequest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/ODataValueUpdateRequest.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/ODataValueUpdateRequest.java
deleted file mode 100644
index 32745f2..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/ODataValueUpdateRequest.java
+++ /dev/null
@@ -1,138 +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 com.msopentech.odatajclient.engine.communication.request.cud;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.client.http.HttpClientException;
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.engine.communication.response.ODataResponseImpl;
-import com.msopentech.odatajclient.engine.communication.request.AbstractODataBasicRequestImpl;
-import com.msopentech.odatajclient.engine.communication.request.batch.ODataBatchableRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataValueUpdateResponse;
-import com.msopentech.odatajclient.engine.data.ODataPrimitiveValue;
-import com.msopentech.odatajclient.engine.data.ODataValue;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.engine.format.ODataValueFormat;
-import com.msopentech.odatajclient.engine.utils.URIUtils;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import org.apache.commons.io.IOUtils;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
-
-/**
- * This class implements an OData update entity property value request.
- */
-public class ODataValueUpdateRequest extends AbstractODataBasicRequestImpl<ODataValueUpdateResponse, ODataValueFormat>
- implements ODataBatchableRequest {
-
- /**
- * Value to be created.
- */
- private final ODataValue value;
-
- /**
- * Constructor.
- *
- * @param odataClient client instance getting this request
- * @param method request method.
- * @param targetURI entity set or entity or entity property URI.
- * @param value value to be created.
- */
- ODataValueUpdateRequest(final ODataClient odataClient,
- final HttpMethod method, final URI targetURI, final ODataValue value) {
-
- super(odataClient, ODataValueFormat.class, method, targetURI);
- // set request body
- this.value = value;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public ODataValueUpdateResponseImpl execute() {
- final InputStream input = getPayload();
- ((HttpEntityEnclosingRequestBase) request).setEntity(URIUtils.buildInputStreamEntity(odataClient, input));
-
- try {
- return new ODataValueUpdateResponseImpl(httpClient, doExecute());
- } finally {
- IOUtils.closeQuietly(input);
- }
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- protected InputStream getPayload() {
- return IOUtils.toInputStream(value.toString());
- }
-
- /**
- * Response class about an ODataValueUpdateRequest.
- */
- private class ODataValueUpdateResponseImpl extends ODataResponseImpl implements ODataValueUpdateResponse {
-
- private ODataValue value = null;
-
- /**
- * Constructor.
- * <p>
- * Just to create response templates to be initialized from batch.
- */
- private ODataValueUpdateResponseImpl() {
- }
-
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- private ODataValueUpdateResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public ODataValue getBody() {
- if (value == null) {
- final ODataValueFormat format = ODataValueFormat.fromString(getAccept());
-
- try {
- value = new ODataPrimitiveValue.Builder(odataClient).
- setType(format == ODataValueFormat.TEXT ? EdmSimpleType.String : EdmSimpleType.Stream).
- setText(IOUtils.toString(getRawResponse())).
- build();
- } catch (IOException e) {
- throw new HttpClientException(e);
- } finally {
- this.close();
- }
- }
- return value;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/V3CUDRequestFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/V3CUDRequestFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/V3CUDRequestFactory.java
deleted file mode 100644
index 06602a8..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/V3CUDRequestFactory.java
+++ /dev/null
@@ -1,31 +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 com.msopentech.odatajclient.engine.communication.request.cud;
-
-import com.msopentech.odatajclient.engine.client.ODataV3Client;
-
-public class V3CUDRequestFactory extends AbstractCUDRequestFactory {
-
- private static final long serialVersionUID = 109196636064983035L;
-
- public V3CUDRequestFactory(final ODataV3Client client) {
- super(client);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/V4CUDRequestFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/V4CUDRequestFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/V4CUDRequestFactory.java
deleted file mode 100644
index 7fd36fe..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/V4CUDRequestFactory.java
+++ /dev/null
@@ -1,31 +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 com.msopentech.odatajclient.engine.communication.request.cud;
-
-import com.msopentech.odatajclient.engine.client.ODataV4Client;
-
-public class V4CUDRequestFactory extends AbstractCUDRequestFactory {
-
- private static final long serialVersionUID = 3080623853913380425L;
-
- public V4CUDRequestFactory(final ODataV4Client client) {
- super(client);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/invoke/AbstractInvokeRequestFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/invoke/AbstractInvokeRequestFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/invoke/AbstractInvokeRequestFactory.java
deleted file mode 100644
index 4397450..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/invoke/AbstractInvokeRequestFactory.java
+++ /dev/null
@@ -1,58 +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 com.msopentech.odatajclient.engine.communication.request.invoke;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.data.ODataInvokeResult;
-import com.msopentech.odatajclient.engine.data.ODataValue;
-import com.msopentech.odatajclient.engine.metadata.AbstractEdmMetadata;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractComplexType;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractDataServices;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmx;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntityContainer;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntityType;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractFunctionImport;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractSchema;
-import java.net.URI;
-import java.util.Map;
-
-abstract class AbstractInvokeRequestFactory<META extends AbstractEdmMetadata<
- EDMX, DS, S, EC, E, C, FI>, EDMX extends AbstractEdmx<DS, S, EC, E, C, FI>, DS extends AbstractDataServices<
- S, EC, E, C, FI>, S extends AbstractSchema<EC, E, C, FI>, EC extends AbstractEntityContainer<
- FI>, E extends AbstractEntityType, C extends AbstractComplexType, FI extends AbstractFunctionImport>
- implements InvokeRequestFactory<META, EDMX, DS, S, EC, E, C, FI> {
-
- private static final long serialVersionUID = -906760270085197249L;
-
- protected final ODataClient client;
-
- protected AbstractInvokeRequestFactory(final ODataClient client) {
- this.client = client;
- }
-
- @Override
- public <RES extends ODataInvokeResult> ODataInvokeRequest<RES> getInvokeRequest(
- final URI uri, final META metadata, final FI functionImport, final Map<String, ODataValue> parameters) {
-
- final ODataInvokeRequest<RES> result = getInvokeRequest(uri, metadata, functionImport);
- result.setParameters(parameters);
- return result;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/invoke/InvokeRequestFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/invoke/InvokeRequestFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/invoke/InvokeRequestFactory.java
deleted file mode 100644
index 9d06070..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/invoke/InvokeRequestFactory.java
+++ /dev/null
@@ -1,68 +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 com.msopentech.odatajclient.engine.communication.request.invoke;
-
-import com.msopentech.odatajclient.engine.data.ODataInvokeResult;
-import com.msopentech.odatajclient.engine.data.ODataValue;
-import com.msopentech.odatajclient.engine.metadata.AbstractEdmMetadata;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractComplexType;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractDataServices;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmx;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntityContainer;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntityType;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractFunctionImport;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractSchema;
-import java.io.Serializable;
-import java.net.URI;
-import java.util.Map;
-
-/**
- * OData request factory class.
- */
-public interface InvokeRequestFactory<META extends AbstractEdmMetadata<
- EDMX, DS, S, EC, E, C, FI>, EDMX extends AbstractEdmx<DS, S, EC, E, C, FI>, DS extends AbstractDataServices<
- S, EC, E, C, FI>, S extends AbstractSchema<EC, E, C, FI>, EC extends AbstractEntityContainer<
- FI>, E extends AbstractEntityType, C extends AbstractComplexType, FI extends AbstractFunctionImport>
- extends Serializable {
-
- /**
- * Gets an invoke request instance.
- *
- * @param <RES> OData domain object result, derived from return type defined in the function import
- * @param uri URI that identifies the function import
- * @param metadata Edm metadata
- * @param functionImport function import to be invoked
- * @return new ODataInvokeRequest instance.
- */
- <RES extends ODataInvokeResult> ODataInvokeRequest<RES> getInvokeRequest(
- URI uri, META metadata, FI functionImport);
-
- /**
- * Gets an invoke request instance.
- *
- * @param <RES> OData domain object result, derived from return type defined in the function import
- * @param uri URI that identifies the function import
- * @param metadata Edm metadata
- * @param functionImport function import to be invoked
- * @param parameters parameters to pass to function import invocation
- * @return new ODataInvokeRequest instance.
- */
- <RES extends ODataInvokeResult> ODataInvokeRequest<RES> getInvokeRequest(
- URI uri, META metadata, FI functionImport, Map<String, ODataValue> parameters);
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/invoke/ODataInvokeRequest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/invoke/ODataInvokeRequest.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/invoke/ODataInvokeRequest.java
deleted file mode 100644
index 49fa245..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/invoke/ODataInvokeRequest.java
+++ /dev/null
@@ -1,235 +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 com.msopentech.odatajclient.engine.communication.request.invoke;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.client.http.HttpClientException;
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.engine.communication.request.AbstractODataBasicRequestImpl;
-import com.msopentech.odatajclient.engine.communication.request.batch.ODataBatchableRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataInvokeResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataResponseImpl;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.data.ODataEntitySet;
-import com.msopentech.odatajclient.engine.data.ODataInvokeResult;
-import com.msopentech.odatajclient.engine.data.ODataNoContent;
-import com.msopentech.odatajclient.engine.data.ODataProperty;
-import com.msopentech.odatajclient.engine.data.ODataValue;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import com.msopentech.odatajclient.engine.utils.URIUtils;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import org.apache.commons.io.IOUtils;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.methods.HttpRequestBase;
-import org.apache.http.client.utils.URIBuilder;
-
-/**
- * This class implements an OData invoke operation request.
- */
-public class ODataInvokeRequest<T extends ODataInvokeResult>
- extends AbstractODataBasicRequestImpl<ODataInvokeResponse<T>, ODataPubFormat>
- implements ODataBatchableRequest {
-
- private final Class<T> reference;
-
- /**
- * Function parameters.
- */
- private Map<String, ODataValue> parameters;
-
- /**
- * Constructor.
- *
- * @param odataClient client instance getting this request
- * @param reference reference class for invoke result
- * @param method HTTP method of the request.
- * @param uri URI that identifies the operation.
- */
- ODataInvokeRequest(
- final ODataClient odataClient,
- final Class<T> reference,
- final HttpMethod method,
- final URI uri) {
-
- super(odataClient, ODataPubFormat.class, method, uri);
-
- this.reference = reference;
- this.parameters = new LinkedHashMap<String, ODataValue>();
- }
-
- /**
- * Sets operation parameters.
- *
- * @param parameters operation parameters.
- */
- public void setParameters(final Map<String, ODataValue> parameters) {
- this.parameters.clear();
- if (parameters != null && !parameters.isEmpty()) {
- this.parameters.putAll(parameters);
- }
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public void setFormat(final ODataPubFormat format) {
- final String _format = (reference.isAssignableFrom(ODataProperty.class) && format == ODataPubFormat.ATOM)
- ? ODataFormat.XML.toString()
- : format.toString();
- setAccept(_format);
- setContentType(_format);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- protected InputStream getPayload() {
- if (!this.parameters.isEmpty() && this.method == HttpMethod.POST) {
- // Additional, non-binding parameters MUST be sent as JSON
- final ODataEntity tmp = odataClient.getObjectFactory().newEntity("");
- for (Map.Entry<String, ODataValue> param : parameters.entrySet()) {
- ODataProperty property = null;
-
- if (param.getValue().isPrimitive()) {
- property = odataClient.getObjectFactory().
- newPrimitiveProperty(param.getKey(), param.getValue().asPrimitive());
- } else if (param.getValue().isComplex()) {
- property = odataClient.getObjectFactory().
- newComplexProperty(param.getKey(), param.getValue().asComplex());
- } else if (param.getValue().isCollection()) {
- property = odataClient.getObjectFactory().
- newCollectionProperty(param.getKey(), param.getValue().asCollection());
- }
-
- if (property != null) {
- tmp.addProperty(property);
- }
- }
-
- return odataClient.getWriter().writeEntity(tmp, ODataPubFormat.JSON, false);
- }
-
- return null;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public ODataInvokeResponse<T> execute() {
- final InputStream input = getPayload();
-
- if (!this.parameters.isEmpty()) {
- if (this.method == HttpMethod.GET) {
- final URIBuilder uriBuilder = new URIBuilder(this.uri);
- for (Map.Entry<String, ODataValue> param : parameters.entrySet()) {
- if (!param.getValue().isPrimitive()) {
- throw new IllegalArgumentException("Only primitive values can be passed via GET");
- }
-
- uriBuilder.addParameter(param.getKey(), param.getValue().toString());
- }
- try {
- ((HttpRequestBase) this.request).setURI(uriBuilder.build());
- } catch (URISyntaxException e) {
- throw new IllegalArgumentException("While adding GET parameters", e);
- }
- } else if (this.method == HttpMethod.POST) {
- ((HttpPost) request).setEntity(URIUtils.buildInputStreamEntity(odataClient, input));
-
- setContentType(ODataPubFormat.JSON.toString());
- }
- }
-
- try {
- return new ODataInvokeResponseImpl(httpClient, doExecute());
- } finally {
- IOUtils.closeQuietly(input);
- }
- }
-
- /**
- * Response class about an ODataInvokeRequest.
- */
- protected class ODataInvokeResponseImpl extends ODataResponseImpl implements ODataInvokeResponse<T> {
-
- private T invokeResult = null;
-
- /**
- * Constructor.
- * <p>
- * Just to create response templates to be initialized from batch.
- */
- private ODataInvokeResponseImpl() {
- }
-
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- private ODataInvokeResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- @SuppressWarnings("unchecked")
- public T getBody() {
- if (invokeResult == null) {
- if (reference.isAssignableFrom(ODataNoContent.class)) {
- invokeResult = (T) new ODataNoContent();
- }
-
- try {
- if (reference.isAssignableFrom(ODataEntitySet.class)) {
- invokeResult = (T) odataClient.getReader().readEntitySet(res.getEntity().getContent(),
- ODataPubFormat.fromString(getContentType()));
- }
- if (reference.isAssignableFrom(ODataEntity.class)) {
- invokeResult = (T) odataClient.getReader().readEntity(res.getEntity().getContent(),
- ODataPubFormat.fromString(getContentType()));
- }
- if (reference.isAssignableFrom(ODataProperty.class)) {
- invokeResult = (T) odataClient.getReader().readProperty(res.getEntity().getContent(),
- ODataFormat.fromString(getContentType()));
- }
- } catch (IOException e) {
- throw new HttpClientException(e);
- } finally {
- this.close();
- }
- }
- return invokeResult;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/invoke/V3InvokeRequestFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/invoke/V3InvokeRequestFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/invoke/V3InvokeRequestFactory.java
deleted file mode 100644
index 79cef99..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/invoke/V3InvokeRequestFactory.java
+++ /dev/null
@@ -1,88 +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 com.msopentech.odatajclient.engine.communication.request.invoke;
-
-import com.msopentech.odatajclient.engine.client.ODataV3Client;
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.data.ODataEntitySet;
-import com.msopentech.odatajclient.engine.data.ODataInvokeResult;
-import com.msopentech.odatajclient.engine.data.ODataNoContent;
-import com.msopentech.odatajclient.engine.data.ODataProperty;
-import com.msopentech.odatajclient.engine.metadata.EdmV3Metadata;
-import com.msopentech.odatajclient.engine.metadata.EdmV3Type;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ComplexType;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.DataServices;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.Edmx;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.EntityContainer;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.EntityType;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.FunctionImport;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.Schema;
-import java.net.URI;
-import org.apache.commons.lang3.StringUtils;
-
-public class V3InvokeRequestFactory extends AbstractInvokeRequestFactory<
- EdmV3Metadata, Edmx, DataServices, Schema, EntityContainer, EntityType, ComplexType, FunctionImport> {
-
- private static final long serialVersionUID = -659256862901915496L;
-
- public V3InvokeRequestFactory(final ODataV3Client client) {
- super(client);
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public <RES extends ODataInvokeResult> ODataInvokeRequest<RES> getInvokeRequest(
- final URI uri, final EdmV3Metadata metadata, final FunctionImport functionImport) {
-
- HttpMethod method = null;
- if (HttpMethod.GET.name().equals(functionImport.getHttpMethod())) {
- method = HttpMethod.GET;
- } else if (HttpMethod.POST.name().equals(functionImport.getHttpMethod())) {
- method = HttpMethod.POST;
- } else if (functionImport.getHttpMethod() == null) {
- if (functionImport.isSideEffecting()) {
- method = HttpMethod.POST;
- } else {
- method = HttpMethod.GET;
- }
- }
-
- ODataInvokeRequest<RES> result;
- if (StringUtils.isBlank(functionImport.getReturnType())) {
- result = (ODataInvokeRequest<RES>) new ODataInvokeRequest<ODataNoContent>(
- client, ODataNoContent.class, method, uri);
- } else {
- final EdmV3Type returnType = new EdmV3Type(metadata, functionImport.getReturnType());
-
- if (returnType.isCollection() && returnType.isEntityType()) {
- result = (ODataInvokeRequest<RES>) new ODataInvokeRequest<ODataEntitySet>(
- client, ODataEntitySet.class, method, uri);
- } else if (!returnType.isCollection() && returnType.isEntityType()) {
- result = (ODataInvokeRequest<RES>) new ODataInvokeRequest<ODataEntity>(
- client, ODataEntity.class, method, uri);
- } else {
- result = (ODataInvokeRequest<RES>) new ODataInvokeRequest<ODataProperty>(
- client, ODataProperty.class, method, uri);
- }
- }
-
- return result;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/invoke/V4InvokeRequestFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/invoke/V4InvokeRequestFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/invoke/V4InvokeRequestFactory.java
deleted file mode 100644
index 33ff14d..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/invoke/V4InvokeRequestFactory.java
+++ /dev/null
@@ -1,49 +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 com.msopentech.odatajclient.engine.communication.request.invoke;
-
-import com.msopentech.odatajclient.engine.client.ODataV4Client;
-import com.msopentech.odatajclient.engine.data.ODataInvokeResult;
-import com.msopentech.odatajclient.engine.metadata.EdmV4Metadata;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.ComplexType;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.EntityContainer;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.EntityType;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.DataServices;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Edmx;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.FunctionImport;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Schema;
-import java.net.URI;
-
-public class V4InvokeRequestFactory extends AbstractInvokeRequestFactory<
- EdmV4Metadata, Edmx, DataServices, Schema, EntityContainer, EntityType, ComplexType, FunctionImport> {
-
- private static final long serialVersionUID = 8452737360003104372L;
-
- public V4InvokeRequestFactory(final ODataV4Client client) {
- super(client);
- }
-
- @Override
- public <RES extends ODataInvokeResult> ODataInvokeRequest<RES> getInvokeRequest(
- final URI uri, final EdmV4Metadata metadata, final FunctionImport functionImport) {
-
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/AbstractODataRetrieveRequest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/AbstractODataRetrieveRequest.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/AbstractODataRetrieveRequest.java
deleted file mode 100644
index 4ce0f94..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/AbstractODataRetrieveRequest.java
+++ /dev/null
@@ -1,97 +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 com.msopentech.odatajclient.engine.communication.request.retrieve;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.engine.communication.response.ODataResponseImpl;
-import com.msopentech.odatajclient.engine.communication.request.AbstractODataBasicRequestImpl;
-import com.msopentech.odatajclient.engine.communication.request.batch.ODataBatchableRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import java.io.InputStream;
-import java.net.URI;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-
-/**
- * This is an abstract representation of an OData retrieve query request returning one or more result item.
- * Get instance by using ODataRetrieveRequestFactory.
- */
-abstract class AbstractODataRetrieveRequest<V, T extends Enum<T>>
- extends AbstractODataBasicRequestImpl<ODataRetrieveResponse<V>, T>
- implements ODataBatchableRequest {
-
- /**
- * Private constructor.
- *
- * @param odataClient client instance getting this request
- * @param formatRef reference class for the format being used
- * @param query query to be executed.
- */
- AbstractODataRetrieveRequest(final ODataClient odataClient, final Class<T> formatRef, final URI query) {
- super(odataClient, formatRef, HttpMethod.GET, query);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public abstract ODataRetrieveResponse<V> execute();
-
- /**
- * {@inheritDoc }
- * <p>
- * This kind of request doesn't have any payload: null will be returned.
- */
- @Override
- protected InputStream getPayload() {
- return null;
- }
-
- /**
- * Response abstract class about an ODataRetrieveRequest.
- */
- protected abstract class ODataRetrieveResponseImpl extends ODataResponseImpl implements ODataRetrieveResponse<V> {
-
- /**
- * Constructor.
- * <p>
- * Just to create response templates to be initialized from batch.
- */
- protected ODataRetrieveResponseImpl() {
- super();
- }
-
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- protected ODataRetrieveResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public abstract V getBody();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/AbstractRetrieveRequestFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/AbstractRetrieveRequestFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/AbstractRetrieveRequestFactory.java
deleted file mode 100644
index 633c1e8..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/AbstractRetrieveRequestFactory.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 com.msopentech.odatajclient.engine.communication.request.retrieve;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import java.net.URI;
-
-public abstract class AbstractRetrieveRequestFactory implements RetrieveRequestFactory {
-
- private static final long serialVersionUID = -111683263158803362L;
-
- protected final ODataClient client;
-
- protected AbstractRetrieveRequestFactory(final ODataClient client) {
- this.client = client;
- }
-
- @Override
- public ODataEntitySetRequest getEntitySetRequest(final URI query) {
- return new ODataEntitySetRequest(client, query);
- }
-
- @Override
- public ODataEntitySetIteratorRequest getEntitySetIteratorRequest(final URI query) {
- return new ODataEntitySetIteratorRequest(client, query);
- }
-
- @Override
- public ODataEntityRequest getEntityRequest(final URI query) {
- return new ODataEntityRequest(client, query);
- }
-
- @Override
- public ODataPropertyRequest getPropertyRequest(final URI query) {
- return new ODataPropertyRequest(client, query);
- }
-
- @Override
- public ODataValueRequest getValueRequest(final URI query) {
- return new ODataValueRequest(client, query);
- }
-
- @Override
- public ODataLinkCollectionRequest getLinkCollectionRequest(final URI targetURI, final String linkName) {
- return new ODataLinkCollectionRequest(client, targetURI, linkName);
- }
-
- @Override
- public ODataMediaRequest getMediaRequest(final URI query) {
- return new ODataMediaRequest(client, query);
- }
-
- @Override
- public ODataRawRequest getRawRequest(final URI uri) {
- return new ODataRawRequest(client, uri);
- }
-
- @Override
- public ODataGenericRetrieveRequest getGenericRetrieveRequest(final URI uri) {
- return new ODataGenericRetrieveRequest(client, uri);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataEntityRequest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataEntityRequest.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataEntityRequest.java
deleted file mode 100644
index 4ac6b3c..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataEntityRequest.java
+++ /dev/null
@@ -1,93 +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 com.msopentech.odatajclient.engine.communication.request.retrieve;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import java.net.URI;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-
-/**
- * This class implements an OData retrieve query request returning a single entity.
- */
-public class ODataEntityRequest extends AbstractODataRetrieveRequest<ODataEntity, ODataPubFormat> {
-
- /**
- * Private constructor.
- *
- * @param odataClient client instance getting this request
- * @param query query to be executed.
- */
- ODataEntityRequest(final ODataClient odataClient, final URI query) {
- super(odataClient, ODataPubFormat.class, query);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public ODataRetrieveResponse<ODataEntity> execute() {
- return new ODataEntityResponseImpl(httpClient, doExecute());
- }
-
- /**
- * Response class about an ODataEntityRequest.
- */
- public class ODataEntityResponseImpl extends ODataRetrieveResponseImpl {
-
- private ODataEntity entity = null;
-
- /**
- * Constructor.
- * <p>
- * Just to create response templates to be initialized from batch.
- */
- private ODataEntityResponseImpl() {
- }
-
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- private ODataEntityResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public ODataEntity getBody() {
- if (entity == null) {
- try {
- entity = odataClient.getReader().
- readEntity(getRawResponse(), ODataPubFormat.fromString(getContentType()));
- } finally {
- this.close();
- }
- }
- return entity;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataEntitySetIteratorRequest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataEntitySetIteratorRequest.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataEntitySetIteratorRequest.java
deleted file mode 100644
index 60529a3..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataEntitySetIteratorRequest.java
+++ /dev/null
@@ -1,83 +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 com.msopentech.odatajclient.engine.communication.request.retrieve;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.data.ODataEntitySetIterator;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import java.net.URI;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-
-/**
- * This class implements an OData EntitySet query request.
- */
-public class ODataEntitySetIteratorRequest extends AbstractODataRetrieveRequest<ODataEntitySetIterator, ODataPubFormat> {
-
- private ODataEntitySetIterator feedIterator = null;
-
- /**
- * Private constructor.
- *
- * @param odataClient client instance getting this request
- * @param query query to be executed.
- */
- ODataEntitySetIteratorRequest(final ODataClient odataClient, final URI query) {
- super(odataClient, ODataPubFormat.class, query);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public ODataRetrieveResponse<ODataEntitySetIterator> execute() {
- final HttpResponse res = doExecute();
- return new ODataEntitySetIteratorResponseImpl(httpClient, res);
- }
-
- /**
- * Response class about an ODataEntitySetIteratorRequest.
- */
- protected class ODataEntitySetIteratorResponseImpl extends ODataRetrieveResponseImpl {
-
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- private ODataEntitySetIteratorResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- @SuppressWarnings("unchecked")
- public ODataEntitySetIterator getBody() {
- if (feedIterator == null) {
- feedIterator = new ODataEntitySetIterator(
- odataClient, getRawResponse(), ODataPubFormat.fromString(getContentType()));
- }
- return feedIterator;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataEntitySetRequest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataEntitySetRequest.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataEntitySetRequest.java
deleted file mode 100644
index 54e3f54..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataEntitySetRequest.java
+++ /dev/null
@@ -1,95 +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 com.msopentech.odatajclient.engine.communication.request.retrieve;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.data.ODataEntitySet;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import java.net.URI;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-
-/**
- * This class implements an OData EntitySet query request.
- */
-public class ODataEntitySetRequest extends AbstractODataRetrieveRequest<ODataEntitySet, ODataPubFormat> {
-
- private ODataEntitySet feed = null;
-
- /**
- * Private constructor.
- *
- * @param odataClient client instance getting this request
- * @param query query to be executed.
- */
- ODataEntitySetRequest(final ODataClient odataClient, final URI query) {
- super(odataClient, ODataPubFormat.class, query);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public ODataRetrieveResponse<ODataEntitySet> execute() {
- final HttpResponse res = doExecute();
- return new ODataEntitySetResponseImpl(httpClient, res);
- }
-
- /**
- * Response class about an ODataEntitySetRequest.
- */
- protected class ODataEntitySetResponseImpl extends ODataRetrieveResponseImpl {
-
- /**
- * Constructor.
- * <p>
- * Just to create response templates to be initialized from batch.
- */
- private ODataEntitySetResponseImpl() {
- }
-
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- private ODataEntitySetResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- @SuppressWarnings("unchecked")
- public ODataEntitySet getBody() {
- if (feed == null) {
- try {
- feed = odataClient.getReader().
- readEntitySet(getRawResponse(), ODataPubFormat.fromString(getContentType()));
- } finally {
- this.close();
- }
- }
- return feed;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataGenericRetrieveRequest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataGenericRetrieveRequest.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataGenericRetrieveRequest.java
deleted file mode 100644
index a428c43..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataGenericRetrieveRequest.java
+++ /dev/null
@@ -1,107 +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 com.msopentech.odatajclient.engine.communication.request.retrieve;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.communication.response.ODataResponseImpl;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.data.ODataObjectWrapper;
-import java.net.URI;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-
-/**
- * This class implements a generic OData retrieve query request.
- */
-public class ODataGenericRetrieveRequest extends ODataRawRequest {
-
- /**
- * Constructor.
- *
- * @param odataClient client instance getting this request
- * @param uri query request.
- */
- public ODataGenericRetrieveRequest(final ODataClient odataClient, final URI uri) {
- super(odataClient, uri);
- }
-
- /**
- * Sets accepted format.
- *
- * @param format format.
- */
- public void setFormat(final String format) {
- setAccept(format);
- setContentType(format);
- }
-
- /**
- * Executes the query.
- *
- * @return query response.
- */
- public ODataRetrieveResponse<ODataObjectWrapper> execute() {
- return new ODataGenericResponseImpl(httpClient, doExecute());
- }
-
- /**
- * Query response implementation about a generic query request.
- */
- protected class ODataGenericResponseImpl extends ODataResponseImpl
- implements ODataRetrieveResponse<ODataObjectWrapper> {
-
- /**
- * Retrieved object wrapper.
- */
- private ODataObjectWrapper obj = null;
-
- /**
- * Constructor.
- * <p>
- * Just to create response templates to be initialized from batch.
- */
- private ODataGenericResponseImpl() {
- }
-
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- private ODataGenericResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public ODataObjectWrapper getBody() {
- if (obj == null) {
- try {
- obj = new ODataObjectWrapper(odataClient.getReader(), getRawResponse(), getContentType());
- } finally {
- this.close();
- }
- }
- return obj;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataLinkCollectionRequest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataLinkCollectionRequest.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataLinkCollectionRequest.java
deleted file mode 100644
index 4007777..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataLinkCollectionRequest.java
+++ /dev/null
@@ -1,96 +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 com.msopentech.odatajclient.engine.communication.request.retrieve;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.client.http.HttpClientException;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.data.ODataLinkCollection;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import java.io.IOException;
-import java.net.URI;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-
-/**
- * This class implements an OData link query request.
- */
-public class ODataLinkCollectionRequest extends AbstractODataRetrieveRequest<ODataLinkCollection, ODataFormat> {
-
- /**
- * Private constructor.
- *
- * @param odataClient client instance getting this request
- * @param targetURI target URI.
- * @param linkName link name.
- */
- ODataLinkCollectionRequest(final ODataClient odataClient, final URI targetURI, final String linkName) {
- super(odataClient, ODataFormat.class,
- odataClient.getURIBuilder(targetURI.toASCIIString()).appendLinksSegment(linkName).build());
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public ODataRetrieveResponse<ODataLinkCollection> execute() {
- return new ODataLinkCollectionResponseImpl(httpClient, doExecute());
- }
-
- protected class ODataLinkCollectionResponseImpl extends ODataRetrieveResponseImpl {
-
- private ODataLinkCollection links = null;
-
- /**
- * Constructor.
- * <p>
- * Just to create response templates to be initialized from batch.
- */
- private ODataLinkCollectionResponseImpl() {
- }
-
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- private ODataLinkCollectionResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public ODataLinkCollection getBody() {
- if (links == null) {
- try {
- links = odataClient.getReader().readLinks(
- res.getEntity().getContent(), ODataFormat.fromString(getContentType()));
- } catch (IOException e) {
- throw new HttpClientException(e);
- } finally {
- this.close();
- }
- }
- return links;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataMediaRequest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataMediaRequest.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataMediaRequest.java
deleted file mode 100644
index 01a4644..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataMediaRequest.java
+++ /dev/null
@@ -1,107 +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 com.msopentech.odatajclient.engine.communication.request.retrieve;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.client.http.HttpClientException;
-import com.msopentech.odatajclient.engine.communication.header.ODataHeaders;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.format.ODataMediaFormat;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-
-/**
- * This class implements an OData media query request.
- */
-public class ODataMediaRequest extends AbstractODataRetrieveRequest<InputStream, ODataMediaFormat> {
-
- /**
- * Private constructor.
- *
- * @param odataClient client instance getting this request
- * @param query query to be executed.
- */
- ODataMediaRequest(final ODataClient odataClient, final URI query) {
- super(odataClient, ODataMediaFormat.class, query);
-
- setAccept(ODataMediaFormat.APPLICATION_OCTET_STREAM.toString());
- setContentType(ODataMediaFormat.APPLICATION_OCTET_STREAM.toString());
-
- this.odataHeaders.removeHeader(ODataHeaders.HeaderName.minDataServiceVersion);
- this.odataHeaders.removeHeader(ODataHeaders.HeaderName.maxDataServiceVersion);
- this.odataHeaders.removeHeader(ODataHeaders.HeaderName.dataServiceVersion);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public ODataRetrieveResponse<InputStream> execute() {
- final HttpResponse res = doExecute();
- return new ODataMediaResponseImpl(httpClient, res);
- }
-
- /**
- * Response class about an ODataMediaRequest.
- */
- protected class ODataMediaResponseImpl extends ODataRetrieveResponseImpl {
-
- private InputStream input = null;
-
- /**
- * Constructor.
- * <p>
- * Just to create response templates to be initialized from batch.
- */
- private ODataMediaResponseImpl() {
- }
-
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- private ODataMediaResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
- }
-
- /**
- * Gets query result objects.
- * <br/>
- * <b>WARNING</b>: Closing this <tt>ODataResponse</tt> instance is left to the caller.
- *
- * @return query result objects as <tt>InputStream</tt>.
- */
- @Override
- public InputStream getBody() {
- if (input == null) {
- try {
- input = res.getEntity().getContent();
- } catch (IOException e) {
- throw new HttpClientException(e);
- }
- }
- return input;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataMetadataRequest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataMetadataRequest.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataMetadataRequest.java
deleted file mode 100644
index 06e497b..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataMetadataRequest.java
+++ /dev/null
@@ -1,118 +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 com.msopentech.odatajclient.engine.communication.request.retrieve;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.communication.request.ODataRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.metadata.AbstractEdmMetadata;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractComplexType;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractDataServices;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmx;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntityContainer;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntityType;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractFunctionImport;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractSchema;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import java.net.URI;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.entity.ContentType;
-
-/**
- * This class implements a metadata query request.
- */
-class ODataMetadataRequest<META extends AbstractEdmMetadata<
- EDMX, DS, S, EC, E, C, FI>, EDMX extends AbstractEdmx<DS, S, EC, E, C, FI>, DS extends AbstractDataServices<
- S, EC, E, C, FI>, S extends AbstractSchema<EC, E, C, FI>, EC extends AbstractEntityContainer<
- FI>, E extends AbstractEntityType, C extends AbstractComplexType, FI extends AbstractFunctionImport>
- extends AbstractODataRetrieveRequest<META, ODataPubFormat> {
-
- /**
- * Constructor.
- *
- * @param odataClient client instance getting this request
- * @param uri metadata URI.
- */
- ODataMetadataRequest(final ODataClient odataClient, final URI uri) {
- super(odataClient, ODataPubFormat.class, uri);
- super.setAccept(ContentType.APPLICATION_XML.getMimeType());
- super.setContentType(ContentType.APPLICATION_XML.getMimeType());
- }
-
- @Override
- public ODataRequest setAccept(final String value) {
- // do nothing: Accept is application/XML
- return this;
- }
-
- @Override
- public ODataRequest setContentType(final String value) {
- // do nothing: Accept is application/XML
- return this;
- }
-
- @Override
- public ODataRetrieveResponse<META> execute() {
- final HttpResponse res = doExecute();
- return new ODataMetadataResponseImpl(httpClient, res);
- }
-
- /**
- * Response class about an ODataMetadataRequest.
- */
- protected class ODataMetadataResponseImpl extends ODataRetrieveResponseImpl {
-
- private META metadata = null;
-
- /**
- * Constructor.
- * <p>
- * Just to create response templates to be initialized from batch.
- */
- public ODataMetadataResponseImpl() {
- }
-
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- private ODataMetadataResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- @SuppressWarnings("unchecked")
- public META getBody() {
- if (metadata == null) {
- try {
- metadata = (META) odataClient.getReader().readMetadata(getRawResponse());
- } finally {
- this.close();
- }
- }
- return metadata;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataPropertyRequest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataPropertyRequest.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataPropertyRequest.java
deleted file mode 100644
index cc3429d..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataPropertyRequest.java
+++ /dev/null
@@ -1,95 +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 com.msopentech.odatajclient.engine.communication.request.retrieve;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.client.http.HttpClientException;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.data.ODataProperty;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import java.io.IOException;
-import java.net.URI;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-
-/**
- * This class implements an OData entity property query request.
- */
-public class ODataPropertyRequest extends AbstractODataRetrieveRequest<ODataProperty, ODataFormat> {
-
- /**
- * Private constructor.
- *
- * @param odataClient client instance getting this request
- * @param query query to be executed.
- */
- ODataPropertyRequest(final ODataClient odataClient, final URI query) {
- super(odataClient, ODataFormat.class, query);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public ODataRetrieveResponse<ODataProperty> execute() {
- final HttpResponse res = doExecute();
- return new ODataPropertyResponseImpl(httpClient, res);
- }
-
- protected class ODataPropertyResponseImpl extends ODataRetrieveResponseImpl {
-
- private ODataProperty property = null;
-
- /**
- * Constructor.
- * <p>
- * Just to create response templates to be initialized from batch.
- */
- private ODataPropertyResponseImpl() {
- }
-
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- private ODataPropertyResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public ODataProperty getBody() {
- if (property == null) {
- try {
- property = odataClient.getReader().readProperty(
- res.getEntity().getContent(), ODataFormat.fromString(getContentType()));
- } catch (IOException e) {
- throw new HttpClientException(e);
- } finally {
- this.close();
- }
- }
- return property;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataRawRequest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataRawRequest.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataRawRequest.java
deleted file mode 100644
index 31bb6ac..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataRawRequest.java
+++ /dev/null
@@ -1,41 +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 com.msopentech.odatajclient.engine.communication.request.retrieve;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.engine.communication.request.ODataRequestImpl;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import java.net.URI;
-
-/**
- * This class implements a generic OData request.
- */
-public class ODataRawRequest extends ODataRequestImpl<ODataPubFormat> {
-
- /**
- * Constructor.
- *
- * @param odataClient client instance getting this request
- * @param uri request URI.
- */
- ODataRawRequest(final ODataClient odataClient, final URI uri) {
- super(odataClient, ODataPubFormat.class, HttpMethod.GET, uri);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataServiceDocumentRequest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataServiceDocumentRequest.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataServiceDocumentRequest.java
deleted file mode 100644
index c7ab454..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataServiceDocumentRequest.java
+++ /dev/null
@@ -1,91 +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 com.msopentech.odatajclient.engine.communication.request.retrieve;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.data.ODataServiceDocument;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import java.net.URI;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-
-/**
- * This class implements an OData service document request.
- */
-public class ODataServiceDocumentRequest extends AbstractODataRetrieveRequest<ODataServiceDocument, ODataFormat> {
-
- /**
- * Constructor.
- *
- * @param odataClient client instance getting this request
- * @param uri request URI.
- */
- ODataServiceDocumentRequest(final ODataClient odataClient, final URI uri) {
- super(odataClient, ODataFormat.class, uri);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public ODataRetrieveResponse<ODataServiceDocument> execute() {
- final HttpResponse res = doExecute();
- return new ODataServiceResponseImpl(httpClient, res);
- }
-
- /**
- * Response class about an ODataServiceDocumentRequest.
- */
- protected class ODataServiceResponseImpl extends ODataRetrieveResponseImpl {
-
- private ODataServiceDocument serviceDocument = null;
-
- /**
- * Constructor.
- * <p>
- * Just to create response templates to be initialized from batch.
- */
- private ODataServiceResponseImpl() {
- }
-
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- private ODataServiceResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
- }
-
- @Override
- public ODataServiceDocument getBody() {
- if (serviceDocument == null) {
- try {
- serviceDocument = odataClient.getReader().readServiceDocument(
- getRawResponse(), ODataFormat.fromString(getContentType()));
- } finally {
- this.close();
- }
- }
- return serviceDocument;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataV3MetadataRequest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataV3MetadataRequest.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataV3MetadataRequest.java
deleted file mode 100644
index c50b949..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataV3MetadataRequest.java
+++ /dev/null
@@ -1,39 +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 com.msopentech.odatajclient.engine.communication.request.retrieve;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.metadata.EdmV3Metadata;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ComplexType;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.DataServices;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.Edmx;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.EntityContainer;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.EntityType;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.FunctionImport;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.Schema;
-import java.net.URI;
-
-public class ODataV3MetadataRequest extends ODataMetadataRequest<
- EdmV3Metadata, Edmx, DataServices, Schema, EntityContainer, EntityType, ComplexType, FunctionImport> {
-
- public ODataV3MetadataRequest(final ODataClient odataClient, final URI uri) {
- super(odataClient, uri);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataV4MetadataRequest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataV4MetadataRequest.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataV4MetadataRequest.java
deleted file mode 100644
index 20a383f..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataV4MetadataRequest.java
+++ /dev/null
@@ -1,39 +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 com.msopentech.odatajclient.engine.communication.request.retrieve;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.metadata.EdmV4Metadata;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.ComplexType;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.DataServices;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Edmx;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.EntityContainer;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.EntityType;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.FunctionImport;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Schema;
-import java.net.URI;
-
-public class ODataV4MetadataRequest extends ODataMetadataRequest<
- EdmV4Metadata, Edmx, DataServices, Schema, EntityContainer, EntityType, ComplexType, FunctionImport> {
-
- public ODataV4MetadataRequest(final ODataClient odataClient, final URI uri) {
- super(odataClient, uri);
- }
-
-}
[38/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/PropertyRef.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/PropertyRef.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/PropertyRef.java
deleted file mode 100644
index b1440a1..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/PropertyRef.java
+++ /dev/null
@@ -1,49 +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 com.msopentech.odatajclient.engine.metadata.edm;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public class PropertyRef extends AbstractEdm {
-
- private static final long serialVersionUID = 6738212067449628983L;
-
- @JsonProperty(value = "Name", required = true)
- private String name;
-
- @JsonProperty(value = "Alias")
- private String alias;
-
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public String getAlias() {
- return alias;
- }
-
- public void setAlias(final String alias) {
- this.alias = alias;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/SchemaDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/SchemaDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/SchemaDeserializer.java
deleted file mode 100644
index c9f4db8..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/SchemaDeserializer.java
+++ /dev/null
@@ -1,146 +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 com.msopentech.odatajclient.engine.metadata.edm;
-
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ValueTerm;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.Association;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.Using;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Action;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Annotation;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Function;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.TypeDefinition;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-import java.io.IOException;
-
-@SuppressWarnings("rawtypes")
-public class SchemaDeserializer extends AbstractEdmDeserializer<AbstractSchema> {
-
- @Override
- protected AbstractSchema doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final AbstractSchema schema = ODataVersion.V3 == client.getWorkingVersion()
- ? new com.msopentech.odatajclient.engine.metadata.edm.v3.Schema()
- : new com.msopentech.odatajclient.engine.metadata.edm.v4.Schema();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Namespace".equals(jp.getCurrentName())) {
- schema.setNamespace(jp.nextTextValue());
- } else if ("Alias".equals(jp.getCurrentName())) {
- schema.setAlias(jp.nextTextValue());
- } else if ("Using".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v3.Schema) schema).
- getUsings().add(jp.getCodec().readValue(jp, Using.class));
- } else if ("Association".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v3.Schema) schema).
- getAssociations().add(jp.getCodec().readValue(jp, Association.class));
- } else if ("ComplexType".equals(jp.getCurrentName())) {
- jp.nextToken();
- if (schema instanceof com.msopentech.odatajclient.engine.metadata.edm.v3.Schema) {
- ((com.msopentech.odatajclient.engine.metadata.edm.v3.Schema) schema).
- getComplexTypes().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v3.ComplexType.class));
- } else {
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.Schema) schema).
- getComplexTypes().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v4.ComplexType.class));
- }
- } else if ("EntityType".equals(jp.getCurrentName())) {
- jp.nextToken();
- if (schema instanceof com.msopentech.odatajclient.engine.metadata.edm.v3.Schema) {
- ((com.msopentech.odatajclient.engine.metadata.edm.v3.Schema) schema).
- getEntityTypes().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v3.EntityType.class));
- } else {
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.Schema) schema).
- getEntityTypes().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v4.EntityType.class));
- }
- } else if ("EnumType".equals(jp.getCurrentName())) {
- jp.nextToken();
- if (schema instanceof com.msopentech.odatajclient.engine.metadata.edm.v3.Schema) {
- ((com.msopentech.odatajclient.engine.metadata.edm.v3.Schema) schema).
- getEnumTypes().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v3.EnumType.class));
- } else {
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.Schema) schema).
- getEnumTypes().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v4.EnumType.class));
- }
- } else if ("ValueTerm".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v3.Schema) schema).
- getValueTerms().add(jp.getCodec().readValue(jp, ValueTerm.class));
- } else if ("EntityContainer".equals(jp.getCurrentName())) {
- jp.nextToken();
-
- if (schema instanceof com.msopentech.odatajclient.engine.metadata.edm.v3.Schema) {
- ((com.msopentech.odatajclient.engine.metadata.edm.v3.Schema) schema).
- getEntityContainers().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v3.EntityContainer.class));
- } else {
- com.msopentech.odatajclient.engine.metadata.edm.v4.EntityContainer entityContainer =
- jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v4.EntityContainer.class);
- entityContainer.setDefaultEntityContainer(true);
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.Schema) schema).
- setEntityContainer(entityContainer);
- }
- } else if ("Annotations".equals(jp.getCurrentName())) {
- jp.nextToken();
- if (schema instanceof com.msopentech.odatajclient.engine.metadata.edm.v3.Schema) {
- ((com.msopentech.odatajclient.engine.metadata.edm.v3.Schema) schema).getAnnotationsList().
- add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v3.Annotations.class));
- } else {
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.Schema) schema).getAnnotationsList().
- add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v4.Annotations.class));
- }
- } else if ("Action".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.Schema) schema).getActions().
- add(jp.getCodec().readValue(jp, Action.class));
- } else if ("Annotation".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.Schema) schema).getAnnotations().
- add(jp.getCodec().readValue(jp, Annotation.class));
- } else if ("Function".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.Schema) schema).getFunctions().
- add(jp.getCodec().readValue(jp, Function.class));
- } else if ("TypeDefinition".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.Schema) schema).
- getTypeDefinitions().add(jp.getCodec().readValue(jp, TypeDefinition.class));
- }
- }
- }
-
- return schema;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/StoreGeneratedPattern.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/StoreGeneratedPattern.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/StoreGeneratedPattern.java
deleted file mode 100644
index 5172156..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/StoreGeneratedPattern.java
+++ /dev/null
@@ -1,27 +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 com.msopentech.odatajclient.engine.metadata.edm;
-
-public enum StoreGeneratedPattern {
-
- None,
- Identity,
- Computed
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/ComposedGeospatial.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/ComposedGeospatial.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/ComposedGeospatial.java
deleted file mode 100644
index 0e19160..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/ComposedGeospatial.java
+++ /dev/null
@@ -1,75 +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 com.msopentech.odatajclient.engine.metadata.edm.geospatial;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * Abstract base class for all Geometries that are composed out of other geospatial elements.
- */
-public abstract class ComposedGeospatial<T extends Geospatial> extends Geospatial implements Iterable<T> {
-
- private static final long serialVersionUID = 8796254901098541307L;
-
- protected final List<T> geospatials;
-
- /**
- * Constructor.
- *
- * @param dimension dimension.
- * @param type type.
- * @param geospatials geospatials info.
- */
- protected ComposedGeospatial(final Dimension dimension, final Type type, final List<T> geospatials) {
- super(dimension, type);
- this.geospatials = new ArrayList<T>();
- if (geospatials != null) {
- this.geospatials.addAll(geospatials);
- }
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public Iterator<T> iterator() {
- return this.geospatials.iterator();
- }
-
- /**
- * Checks if is empty.
- *
- * @return 'TRUE' if is empty; 'FALSE' otherwise.
- */
- public boolean isEmpty() {
- return geospatials.isEmpty();
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public void setSrid(final Integer srid) {
- for (Geospatial geospatial : this.geospatials) {
- geospatial.setSrid(srid);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/Geospatial.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/Geospatial.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/Geospatial.java
deleted file mode 100644
index 9af2553..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/Geospatial.java
+++ /dev/null
@@ -1,156 +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 com.msopentech.odatajclient.engine.metadata.edm.geospatial;
-
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import java.io.Serializable;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * Base class for all geospatial info.
- */
-public abstract class Geospatial implements Serializable {
-
- public enum Dimension {
-
- GEOMETRY,
- GEOGRAPHY;
-
- }
-
- public enum Type {
-
- /**
- * The OGIS geometry type number for points.
- */
- POINT,
- /**
- * The OGIS geometry type number for lines.
- */
- LINESTRING,
- /**
- * The OGIS geometry type number for polygons.
- */
- POLYGON,
- /**
- * The OGIS geometry type number for aggregate points.
- */
- MULTIPOINT,
- /**
- * The OGIS geometry type number for aggregate lines.
- */
- MULTILINESTRING,
- /**
- * The OGIS geometry type number for aggregate polygons.
- */
- MULTIPOLYGON,
- /**
- * The OGIS geometry type number for feature collections.
- */
- GEOSPATIALCOLLECTION;
-
- }
-
- protected final Dimension dimension;
-
- protected final Type type;
-
- /**
- * Null value means it is expected to vary per instance.
- */
- protected Integer srid;
-
- /**
- * Constructor.
- *
- * @param dimension dimension.
- * @param type type.
- */
- protected Geospatial(final Dimension dimension, final Type type) {
- this.dimension = dimension;
- this.type = type;
- }
-
- /**
- * Gets dimension.
- *
- * @return dimension.
- * @see Dimension
- */
- public Dimension getDimension() {
- return dimension;
- }
-
- /**
- * Gets type.
- *
- * @return type.
- * @see Type
- */
- public Type getType() {
- return type;
- }
-
- /**
- * Gets s-rid.
- *
- * @return s-rid.
- */
- public Integer getSrid() {
- return srid;
- }
-
- /**
- * Sets s-rid.
- *
- * @param srid s-rid.
- */
- public void setSrid(final Integer srid) {
- this.srid = srid;
- }
-
- public abstract EdmSimpleType getEdmSimpleType();
-
- /**
- * {@inheritDoc }
- */
- @Override
- public boolean equals(final Object obj) {
- return EqualsBuilder.reflectionEquals(this, obj);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public int hashCode() {
- return HashCodeBuilder.reflectionHashCode(this);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/GeospatialCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/GeospatialCollection.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/GeospatialCollection.java
deleted file mode 100644
index 5475a4b..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/GeospatialCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.engine.metadata.edm.geospatial;
-
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import java.util.List;
-
-/**
- * Wrapper for a collection of geospatials info.
- */
-public class GeospatialCollection extends ComposedGeospatial<Geospatial> {
-
- private static final long serialVersionUID = -9181547636133878977L;
-
- /**
- * Constructor.
- *
- * @param dimension dimension.
- * @param geospatials geospatials info.
- */
- public GeospatialCollection(final Dimension dimension, final List<Geospatial> geospatials) {
- super(dimension, Type.GEOSPATIALCOLLECTION, geospatials);
- }
-
- @Override
- public EdmSimpleType getEdmSimpleType() {
- return dimension == Dimension.GEOGRAPHY
- ? EdmSimpleType.GeographyCollection
- : EdmSimpleType.GeometryCollection;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/LineString.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/LineString.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/LineString.java
deleted file mode 100644
index 1a0912e..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/LineString.java
+++ /dev/null
@@ -1,38 +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 com.msopentech.odatajclient.engine.metadata.edm.geospatial;
-
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import java.util.List;
-
-public class LineString extends ComposedGeospatial<Point> {
-
- private static final long serialVersionUID = 3207958185407535907L;
-
- public LineString(final Dimension dimension, final List<Point> points) {
- super(dimension, Type.LINESTRING, points);
- }
-
- @Override
- public EdmSimpleType getEdmSimpleType() {
- return dimension == Dimension.GEOGRAPHY
- ? EdmSimpleType.GeographyLineString
- : EdmSimpleType.GeometryLineString;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/MultiLineString.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/MultiLineString.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/MultiLineString.java
deleted file mode 100644
index 35715b9..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/MultiLineString.java
+++ /dev/null
@@ -1,38 +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 com.msopentech.odatajclient.engine.metadata.edm.geospatial;
-
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import java.util.List;
-
-public class MultiLineString extends ComposedGeospatial<LineString> {
-
- private static final long serialVersionUID = -5042414471218124125L;
-
- public MultiLineString(final Dimension dimension, final List<LineString> lineStrings) {
- super(dimension, Type.MULTILINESTRING, lineStrings);
- }
-
- @Override
- public EdmSimpleType getEdmSimpleType() {
- return dimension == Dimension.GEOGRAPHY
- ? EdmSimpleType.GeographyMultiLineString
- : EdmSimpleType.GeometryMultiLineString;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/MultiPoint.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/MultiPoint.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/MultiPoint.java
deleted file mode 100644
index ea896e7..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/MultiPoint.java
+++ /dev/null
@@ -1,38 +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 com.msopentech.odatajclient.engine.metadata.edm.geospatial;
-
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import java.util.List;
-
-public class MultiPoint extends ComposedGeospatial<Point> {
-
- private static final long serialVersionUID = 4951011255142116129L;
-
- public MultiPoint(final Dimension dimension, final List<Point> points) {
- super(dimension, Type.MULTIPOINT, points);
- }
-
- @Override
- public EdmSimpleType getEdmSimpleType() {
- return dimension == Dimension.GEOGRAPHY
- ? EdmSimpleType.GeographyMultiPoint
- : EdmSimpleType.GeometryMultiPoint;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/MultiPolygon.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/MultiPolygon.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/MultiPolygon.java
deleted file mode 100644
index de23eba..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/MultiPolygon.java
+++ /dev/null
@@ -1,38 +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 com.msopentech.odatajclient.engine.metadata.edm.geospatial;
-
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import java.util.List;
-
-public class MultiPolygon extends ComposedGeospatial<Polygon> {
-
- private static final long serialVersionUID = -160184788048512883L;
-
- public MultiPolygon(final Dimension dimension, final List<Polygon> polygons) {
- super(dimension, Type.MULTIPOLYGON, polygons);
- }
-
- @Override
- public EdmSimpleType getEdmSimpleType() {
- return dimension == Dimension.GEOGRAPHY
- ? EdmSimpleType.GeographyMultiPolygon
- : EdmSimpleType.GeometryMultiPolygon;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/Point.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/Point.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/Point.java
deleted file mode 100644
index 2521abe..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/Point.java
+++ /dev/null
@@ -1,81 +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 com.msopentech.odatajclient.engine.metadata.edm.geospatial;
-
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-
-public class Point extends Geospatial {
-
- private static final long serialVersionUID = 4917380107331557828L;
-
- /**
- * The X coordinate of the point.
- * In most long/lat systems, this is the longitude.
- */
- private double x;
-
- /**
- * The Y coordinate of the point.
- * In most long/lat systems, this is the latitude.
- */
- private double y;
-
- /**
- * The Z coordinate of the point.
- * In most long/lat systems, this is a radius from the
- * center of the earth, or the height / elevation over
- * the ground.
- */
- private double z;
-
- public Point(final Dimension dimension) {
- super(dimension, Type.POINT);
- }
-
- public double getX() {
- return x;
- }
-
- public void setX(double x) {
- this.x = x;
- }
-
- public double getY() {
- return y;
- }
-
- public void setY(double y) {
- this.y = y;
- }
-
- public double getZ() {
- return z;
- }
-
- public void setZ(double z) {
- this.z = z;
- }
-
- @Override
- public EdmSimpleType getEdmSimpleType() {
- return dimension == Dimension.GEOGRAPHY
- ? EdmSimpleType.GeographyPoint
- : EdmSimpleType.GeometryPoint;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/Polygon.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/Polygon.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/Polygon.java
deleted file mode 100644
index 89cb9fb..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/geospatial/Polygon.java
+++ /dev/null
@@ -1,72 +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 com.msopentech.odatajclient.engine.metadata.edm.geospatial;
-
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import java.util.List;
-
-/**
- * Polygon.
- */
-public class Polygon extends Geospatial {
-
- private static final long serialVersionUID = 7797602503445391678L;
-
- final ComposedGeospatial<Point> interior;
-
- final ComposedGeospatial<Point> exterior;
-
- /**
- * Constructor.
- *
- * @param dimension dimension.
- * @param interior interior points.
- * @param exterior exterior points.
- */
- public Polygon(final Dimension dimension, final List<Point> interior, final List<Point> exterior) {
- super(dimension, Type.POLYGON);
- this.interior = new MultiPoint(dimension, interior);
- this.exterior = new MultiPoint(dimension, exterior);
- }
-
- /**
- * Gest interior points.
- *
- * @return interior points.
- */
- public ComposedGeospatial<Point> getInterior() {
- return interior;
- }
-
- /**
- * Gets exterior points.
- *
- * @return exterior points.I
- */
- public ComposedGeospatial<Point> getExterior() {
- return exterior;
- }
-
- @Override
- public EdmSimpleType getEdmSimpleType() {
- return dimension == Dimension.GEOGRAPHY
- ? EdmSimpleType.GeographyPolygon
- : EdmSimpleType.GeometryPolygon;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Annotations.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Annotations.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Annotations.java
deleted file mode 100644
index e8e9483..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Annotations.java
+++ /dev/null
@@ -1,43 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractAnnotations;
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonDeserialize(using = AnnotationsDeserializer.class)
-public class Annotations extends AbstractAnnotations {
-
- private static final long serialVersionUID = 3877353656301805410L;
-
- private final List<TypeAnnotation> typeAnnotations = new ArrayList<TypeAnnotation>();
-
- private final List<ValueAnnotation> valueAnnotations = new ArrayList<ValueAnnotation>();
-
- public List<TypeAnnotation> getTypeAnnotations() {
- return typeAnnotations;
- }
-
- public List<ValueAnnotation> getValueAnnotations() {
- return valueAnnotations;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AnnotationsDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AnnotationsDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AnnotationsDeserializer.java
deleted file mode 100644
index 4c46682..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AnnotationsDeserializer.java
+++ /dev/null
@@ -1,55 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-import java.io.IOException;
-
-public class AnnotationsDeserializer extends AbstractEdmDeserializer<Annotations> {
-
- @Override
- protected Annotations doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final Annotations annotations = new Annotations();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Target".equals(jp.getCurrentName())) {
- annotations.setTarget(jp.nextTextValue());
- } else if ("Qualifier".equals(jp.getCurrentName())) {
- annotations.setQualifier(jp.nextTextValue());
- } else if ("typeAnnotation".equals(jp.getCurrentName())) {
- jp.nextToken();
- annotations.getTypeAnnotations().add(jp.getCodec().readValue(jp, TypeAnnotation.class));
- } else if ("ValueAnnotation".equals(jp.getCurrentName())) {
- jp.nextToken();
- annotations.getValueAnnotations().add(jp.getCodec().readValue(jp, ValueAnnotation.class));
- }
- }
- }
-
- return annotations;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Association.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Association.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Association.java
deleted file mode 100644
index 7797ed0..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Association.java
+++ /dev/null
@@ -1,60 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdm;
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonDeserialize(using = AssociationDeserializer.class)
-public class Association extends AbstractEdm {
-
- private static final long serialVersionUID = 73763231919532482L;
-
- private String name;
-
- private ReferentialConstraint referentialConstraint;
-
- private List<AssociationEnd> ends = new ArrayList<AssociationEnd>();
-
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public ReferentialConstraint getReferentialConstraint() {
- return referentialConstraint;
- }
-
- public void setReferentialConstraint(final ReferentialConstraint referentialConstraint) {
- this.referentialConstraint = referentialConstraint;
- }
-
- public List<AssociationEnd> getEnds() {
- return ends;
- }
-
- public void setEnds(final List<AssociationEnd> ends) {
- this.ends = ends;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationDeserializer.java
deleted file mode 100644
index 7331497..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationDeserializer.java
+++ /dev/null
@@ -1,53 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-import java.io.IOException;
-
-public class AssociationDeserializer extends AbstractEdmDeserializer<Association> {
-
- @Override
- protected Association doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final Association association = new Association();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Name".equals(jp.getCurrentName())) {
- association.setName(jp.nextTextValue());
- } else if ("ReferentialConstraint".equals(jp.getCurrentName())) {
- jp.nextToken();
- association.setReferentialConstraint(jp.getCodec().readValue(jp, ReferentialConstraint.class));
- } else if ("End".equals(jp.getCurrentName())) {
- jp.nextToken();
- association.getEnds().add(jp.getCodec().readValue(jp, AssociationEnd.class));
- }
- }
- }
-
- return association;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationEnd.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationEnd.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationEnd.java
deleted file mode 100644
index 1cc1f61..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationEnd.java
+++ /dev/null
@@ -1,72 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.msopentech.odatajclient.engine.metadata.edm.v4.OnDelete;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdm;
-
-public class AssociationEnd extends AbstractEdm {
-
- private static final long serialVersionUID = 3305394053564979376L;
-
- @JsonProperty(value = "Type", required = true)
- private String type;
-
- @JsonProperty(value = "Role")
- private String role;
-
- @JsonProperty(value = "Multiplicity")
- private String multiplicity;
-
- @JsonProperty(value = "OnDelete")
- private OnDelete onDelete;
-
- public String getType() {
- return type;
- }
-
- public void setType(final String type) {
- this.type = type;
- }
-
- public String getRole() {
- return role;
- }
-
- public void setRole(final String role) {
- this.role = role;
- }
-
- public String getMultiplicity() {
- return multiplicity;
- }
-
- public void setMultiplicity(final String multiplicity) {
- this.multiplicity = multiplicity;
- }
-
- public OnDelete getOnDelete() {
- return onDelete;
- }
-
- public void setOnDelete(final OnDelete onDelete) {
- this.onDelete = onDelete;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationSet.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationSet.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationSet.java
deleted file mode 100644
index 7d8b53c..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationSet.java
+++ /dev/null
@@ -1,60 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdm;
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonDeserialize(using = AssociationSetDeserializer.class)
-public class AssociationSet extends AbstractEdm {
-
- private static final long serialVersionUID = 1248430921598774799L;
-
- private String name;
-
- private String association;
-
- private List<AssociationSetEnd> ends = new ArrayList<AssociationSetEnd>();
-
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public String getAssociation() {
- return association;
- }
-
- public void setAssociation(final String association) {
- this.association = association;
- }
-
- public List<AssociationSetEnd> getEnds() {
- return ends;
- }
-
- public void setEnds(final List<AssociationSetEnd> ends) {
- this.ends = ends;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationSetDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationSetDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationSetDeserializer.java
deleted file mode 100644
index 337483b..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationSetDeserializer.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-import java.io.IOException;
-
-public class AssociationSetDeserializer extends AbstractEdmDeserializer<AssociationSet> {
-
- @Override
- protected AssociationSet doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final AssociationSet associationSet = new AssociationSet();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Name".equals(jp.getCurrentName())) {
- associationSet.setName(jp.nextTextValue());
- } else if ("Association".equals(jp.getCurrentName())) {
- associationSet.setAssociation(jp.nextTextValue());
- } else if ("End".equals(jp.getCurrentName())) {
- jp.nextToken();
- associationSet.getEnds().add(jp.getCodec().readValue(jp, AssociationSetEnd.class));
- }
- }
- }
-
- return associationSet;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationSetEnd.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationSetEnd.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationSetEnd.java
deleted file mode 100644
index 5d2d3d6..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/AssociationSetEnd.java
+++ /dev/null
@@ -1,49 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdm;
-
-public class AssociationSetEnd extends AbstractEdm {
-
- private static final long serialVersionUID = -6238344152962217446L;
-
- @JsonProperty("Role")
- private String role;
-
- @JsonProperty(value = "EntitySet", required = true)
- private String entitySet;
-
- public String getRole() {
- return role;
- }
-
- public void setRole(final String role) {
- this.role = role;
- }
-
- public String getEntitySet() {
- return entitySet;
- }
-
- public void setEntitySet(final String entitySet) {
- this.entitySet = entitySet;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/ComplexType.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/ComplexType.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/ComplexType.java
deleted file mode 100644
index e07343a..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/ComplexType.java
+++ /dev/null
@@ -1,46 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractComplexType;
-import java.util.ArrayList;
-import java.util.List;
-
-public class ComplexType extends AbstractComplexType {
-
- private static final long serialVersionUID = -1251230308269425962L;
-
- private final List<Property> properties = new ArrayList<Property>();
-
- @Override
- public List<Property> getProperties() {
- return properties;
- }
-
- @Override
- public Property getProperty(final String name) {
- Property result = null;
- for (Property property : getProperties()) {
- if (name.equals(property.getName())) {
- result = property;
- }
- }
- return result;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/DataServices.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/DataServices.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/DataServices.java
deleted file mode 100644
index f8e3f45..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/DataServices.java
+++ /dev/null
@@ -1,37 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractDataServices;
-import java.util.ArrayList;
-import java.util.List;
-
-public class DataServices extends AbstractDataServices<
- Schema, EntityContainer, EntityType, ComplexType, FunctionImport> {
-
- private static final long serialVersionUID = 633129618050875211L;
-
- private final List<Schema> schemas = new ArrayList<Schema>();
-
- @Override
- public List<Schema> getSchemas() {
- return schemas;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Edmx.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Edmx.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Edmx.java
deleted file mode 100644
index f307b46..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Edmx.java
+++ /dev/null
@@ -1,28 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmx;
-
-public class Edmx extends AbstractEdmx<
- DataServices, Schema, EntityContainer, EntityType, ComplexType, FunctionImport> {
-
- private static final long serialVersionUID = -8031883176876401375L;
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/EntityContainer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/EntityContainer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/EntityContainer.java
deleted file mode 100644
index c7c1f4e..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/EntityContainer.java
+++ /dev/null
@@ -1,60 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntityContainer;
-import java.util.ArrayList;
-import java.util.List;
-
-public class EntityContainer extends AbstractEntityContainer<FunctionImport> {
-
- private static final long serialVersionUID = 8934431875078180370L;
-
- private final List<EntitySet> entitySets = new ArrayList<EntitySet>();
-
- private final List<AssociationSet> associationSets = new ArrayList<AssociationSet>();
-
- private final List<FunctionImport> functionImports = new ArrayList<FunctionImport>();
-
- @Override
- public List<EntitySet> getEntitySets() {
- return entitySets;
- }
-
- @Override
- public EntitySet getEntitySet(final String name) {
- EntitySet result = null;
- for (EntitySet entitySet : getEntitySets()) {
- if (name.equals(entitySet.getName())) {
- result = entitySet;
- }
- }
- return result;
- }
-
- public List<AssociationSet> getAssociationSets() {
- return associationSets;
- }
-
- @Override
- public List<FunctionImport> getFunctionImports() {
- return functionImports;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/EntitySet.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/EntitySet.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/EntitySet.java
deleted file mode 100644
index 8780001..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/EntitySet.java
+++ /dev/null
@@ -1,27 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntitySet;
-
-public class EntitySet extends AbstractEntitySet {
-
- private static final long serialVersionUID = 5570833733884884012L;
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/EntityType.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/EntityType.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/EntityType.java
deleted file mode 100644
index 39fdcb3..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/EntityType.java
+++ /dev/null
@@ -1,65 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntityType;
-import java.util.ArrayList;
-import java.util.List;
-
-public class EntityType extends AbstractEntityType {
-
- private static final long serialVersionUID = 8727765036150269547L;
-
- private final List<Property> properties = new ArrayList<Property>();
-
- private final List<NavigationProperty> navigationProperties = new ArrayList<NavigationProperty>();
-
- @Override
- public List<Property> getProperties() {
- return properties;
- }
-
- @Override
- public Property getProperty(final String name) {
- Property result = null;
- for (Property property : getProperties()) {
- if (name.equals(property.getName())) {
- result = property;
- }
- }
- return result;
- }
-
- @Override
- public List<NavigationProperty> getNavigationProperties() {
- return navigationProperties;
- }
-
- @Override
- public NavigationProperty getNavigationProperty(final String name) {
- NavigationProperty result = null;
- for (NavigationProperty property : getNavigationProperties()) {
- if (name.equals(property.getName())) {
- result = property;
- }
- }
- return result;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/EnumType.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/EnumType.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/EnumType.java
deleted file mode 100644
index 701d81f..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/EnumType.java
+++ /dev/null
@@ -1,58 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEnumType;
-import java.util.ArrayList;
-import java.util.List;
-
-public class EnumType extends AbstractEnumType {
-
- private static final long serialVersionUID = 8967396195669128419L;
-
- private final List<Member> members = new ArrayList<Member>();
-
- @Override
- public List<Member> getMembers() {
- return members;
- }
-
- @Override
- public Member getMember(final String name) {
- Member result = null;
- for (Member member : getMembers()) {
- if (name.equals(member.getName())) {
- result = member;
- }
- }
- return result;
- }
-
- @Override
- public Member getMember(final Integer value) {
- Member result = null;
- for (Member member : getMembers()) {
- if (value.equals(member.getValue())) {
- result = member;
- }
- }
- return result;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/FunctionImport.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/FunctionImport.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/FunctionImport.java
deleted file mode 100644
index 4e43d51..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/FunctionImport.java
+++ /dev/null
@@ -1,129 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractFunctionImport;
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonDeserialize(using = FunctionImportDeserializer.class)
-public class FunctionImport extends AbstractFunctionImport {
-
- private static final long serialVersionUID = -6214472528425935461L;
-
- private String name;
-
- private String returnType;
-
- private String entitySet;
-
- private String entitySetPath;
-
- private boolean composable;
-
- private boolean sideEffecting = true;
-
- private boolean bindable;
-
- private boolean alwaysBindable;
-
- private String httpMethod;
-
- private final List<Parameter> parameters = new ArrayList<Parameter>();
-
- @Override
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public String getReturnType() {
- return returnType;
- }
-
- public void setReturnType(final String returnType) {
- this.returnType = returnType;
- }
-
- @Override
- public String getEntitySet() {
- return entitySet;
- }
-
- public void setEntitySet(final String entitySet) {
- this.entitySet = entitySet;
- }
-
- public String getEntitySetPath() {
- return entitySetPath;
- }
-
- public void setEntitySetPath(final String entitySetPath) {
- this.entitySetPath = entitySetPath;
- }
-
- public boolean isComposable() {
- return composable;
- }
-
- public void setComposable(final boolean composable) {
- this.composable = composable;
- }
-
- public boolean isSideEffecting() {
- return sideEffecting;
- }
-
- public void setSideEffecting(final boolean sideEffecting) {
- this.sideEffecting = sideEffecting;
- }
-
- public boolean isBindable() {
- return bindable;
- }
-
- public void setBindable(final boolean bindable) {
- this.bindable = bindable;
- }
-
- public boolean isAlwaysBindable() {
- return alwaysBindable;
- }
-
- public void setAlwaysBindable(final boolean alwaysBindable) {
- this.alwaysBindable = alwaysBindable;
- }
-
- public String getHttpMethod() {
- return httpMethod;
- }
-
- public void setHttpMethod(final String httpMethod) {
- this.httpMethod = httpMethod;
- }
-
- public List<Parameter> getParameters() {
- return parameters;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/FunctionImportDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/FunctionImportDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/FunctionImportDeserializer.java
deleted file mode 100644
index 4836e86..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/FunctionImportDeserializer.java
+++ /dev/null
@@ -1,67 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-import java.io.IOException;
-import org.apache.commons.lang3.BooleanUtils;
-
-public class FunctionImportDeserializer extends AbstractEdmDeserializer<FunctionImport> {
-
- @Override
- protected FunctionImport doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final FunctionImport funcImp = new FunctionImport();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Name".equals(jp.getCurrentName())) {
- funcImp.setName(jp.nextTextValue());
- } else if ("ReturnType".equals(jp.getCurrentName())) {
- funcImp.setReturnType(jp.nextTextValue());
- } else if ("EntitySet".equals(jp.getCurrentName())) {
- funcImp.setEntitySet(jp.nextTextValue());
- } else if ("EntitySetPath".equals(jp.getCurrentName())) {
- funcImp.setEntitySetPath(jp.nextTextValue());
- } else if ("IsComposable".equals(jp.getCurrentName())) {
- funcImp.setComposable(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("IsSideEffecting".equals(jp.getCurrentName())) {
- funcImp.setSideEffecting(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("IsBindable".equals(jp.getCurrentName())) {
- funcImp.setBindable(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("IsAlwaysBindable".equals(jp.getCurrentName())) {
- funcImp.setAlwaysBindable(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("HttpMethod".equals(jp.getCurrentName())) {
- funcImp.setHttpMethod(jp.nextTextValue());
- } else if ("Parameter".equals(jp.getCurrentName())) {
- jp.nextToken();
- funcImp.getParameters().add(jp.getCodec().readValue(jp, Parameter.class));
- }
- }
- }
-
- return funcImp;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Member.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Member.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Member.java
deleted file mode 100644
index 2de21dd..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Member.java
+++ /dev/null
@@ -1,27 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractMember;
-
-public class Member extends AbstractMember {
-
- private static final long serialVersionUID = 6605381518349837929L;
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/NavigationProperty.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/NavigationProperty.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/NavigationProperty.java
deleted file mode 100644
index 723ba49..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/NavigationProperty.java
+++ /dev/null
@@ -1,61 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractNavigationProperty;
-
-public class NavigationProperty extends AbstractNavigationProperty {
-
- private static final long serialVersionUID = -2889417442815563307L;
-
- @JsonProperty(value = "Relationship", required = true)
- private String relationship;
-
- @JsonProperty(value = "ToRole", required = true)
- private String toRole;
-
- @JsonProperty(value = "FromRole", required = true)
- private String fromRole;
-
- public String getRelationship() {
- return relationship;
- }
-
- public void setRelationship(final String relationship) {
- this.relationship = relationship;
- }
-
- public String getToRole() {
- return toRole;
- }
-
- public void setToRole(final String toRole) {
- this.toRole = toRole;
- }
-
- public String getFromRole() {
- return fromRole;
- }
-
- public void setFromRole(final String fromRole) {
- this.fromRole = fromRole;
- }
-
-}
[27/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/PropertyRetrieveTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/PropertyRetrieveTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/PropertyRetrieveTestITCase.java
deleted file mode 100644
index 94d9cb2..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/PropertyRetrieveTestITCase.java
+++ /dev/null
@@ -1,275 +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 com.msopentech.odatajclient.engine.it;
-
-import static org.junit.Assert.*;
-
-import java.util.List;
-
-import org.junit.Test;
-
-import com.msopentech.odatajclient.engine.communication.ODataClientErrorException;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataEntitySetRequest;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataPropertyRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.data.ODataCollectionValue;
-import com.msopentech.odatajclient.engine.data.ODataComplexValue;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.data.ODataEntitySet;
-import com.msopentech.odatajclient.engine.data.ODataPrimitiveValue;
-import com.msopentech.odatajclient.engine.data.ODataProperty;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-
-public class PropertyRetrieveTestITCase extends AbstractTestITCase {
-
- private void retreivePropertyTest(final ODataFormat format, String entitySegment, String structuralSegment) {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment(entitySegment).appendStructuralSegment(structuralSegment);
- final ODataPropertyRequest req = client.getRetrieveRequestFactory().getPropertyRequest(uriBuilder.build());
- req.setFormat(format);
- try {
- final ODataProperty property = req.execute().getBody();
- assertNotNull(property);
- if (property.hasNullValue()) {
- assertNull(property.getValue());
- } else if (property.hasPrimitiveValue()) {
- final ODataPrimitiveValue value = property.getPrimitiveValue();
- assertTrue(value.isPrimitive());
- } else if (property.hasComplexValue()) {
- final ODataComplexValue value = property.getComplexValue();
- assertTrue(value.isComplex());
- } else if (property.hasCollectionValue()) {
- final ODataCollectionValue value = property.getCollectionValue();
- assertTrue(value.isCollection());
- }
- } catch (ODataClientErrorException e) {
- if (e.getStatusLine().getStatusCode() != 404
- && e.getStatusLine().getStatusCode() != 400) {
- fail(e.getMessage());
- }
- }
- }
- //test with json header
-
- @Test
- public void jsonRetrieveProperty() {
- //Primitive types
- retreivePropertyTest(ODataFormat.JSON, "Customer(-10)", "Name");
- retreivePropertyTest(ODataFormat.JSON, "Customer(-10)", "CustomerId");
- retreivePropertyTest(ODataFormat.JSON, "Message(FromUsername='1',MessageId=-10)", "Sent");
- retreivePropertyTest(ODataFormat.JSON, "Message(FromUsername='1',MessageId=-10)", "IsRead");
- //Collection of Complex types
- retreivePropertyTest(ODataFormat.JSON, "Customer(-10)", "BackupContactInfo");
- //Collection of primitives
- retreivePropertyTest(ODataFormat.JSON, "Customer(-10)/PrimaryContactInfo", "EmailBag");
- //complex types
- retreivePropertyTest(ODataFormat.JSON, "Order(-9)", "Concurrency");
- }
- //test with json full metadata
-
- @Test
- public void jsonFullMetadataRetrieveProperty() {
- //primitive types
- retreivePropertyTest(ODataFormat.JSON_FULL_METADATA, "Customer(-10)", "Name");
- retreivePropertyTest(ODataFormat.JSON_FULL_METADATA, "Customer(-10)", "CustomerId");
- retreivePropertyTest(ODataFormat.JSON_FULL_METADATA, "Message(FromUsername='1',MessageId=-10)", "Sent");
- retreivePropertyTest(ODataFormat.JSON_FULL_METADATA, "Message(FromUsername='1',MessageId=-10)", "IsRead");
- //Collection of Complex types
- retreivePropertyTest(ODataFormat.JSON_FULL_METADATA, "Customer(-10)", "BackupContactInfo");
- //Collection of primitives
- retreivePropertyTest(ODataFormat.JSON_FULL_METADATA, "Customer(-10)/PrimaryContactInfo", "EmailBag");
- //Complex types
- retreivePropertyTest(ODataFormat.JSON_FULL_METADATA, "Order(-9)", "Concurrency");
- }
- // json with no metadata
-
- @Test
- public void jsonNoMetadataRetrieveProperty() {
- //primitive types
- retreivePropertyTest(ODataFormat.JSON_NO_METADATA, "Customer(-10)", "Name");
- retreivePropertyTest(ODataFormat.JSON_NO_METADATA, "Customer(-10)", "CustomerId");
- retreivePropertyTest(ODataFormat.JSON_NO_METADATA, "Message(FromUsername='1',MessageId=-10)", "Sent");
- retreivePropertyTest(ODataFormat.JSON_NO_METADATA, "Message(FromUsername='1',MessageId=-10)", "IsRead");
- //Collection of Complex types
- retreivePropertyTest(ODataFormat.JSON_NO_METADATA, "Customer(-10)", "BackupContactInfo");
- //Collection of Primitives
- retreivePropertyTest(ODataFormat.JSON_NO_METADATA, "Customer(-10)/PrimaryContactInfo", "EmailBag");
- //Complex types
- retreivePropertyTest(ODataFormat.JSON_NO_METADATA, "Order(-9)", "Concurrency");
-
- }
- // json with minimla metadata
-
- @Test
- public void jsonmininalRetrieveProperty() {
- //primitive types
- retreivePropertyTest(ODataFormat.JSON_NO_METADATA, "Customer(-10)", "Name");
- retreivePropertyTest(ODataFormat.JSON_NO_METADATA, "Customer(-10)", "CustomerId");
- retreivePropertyTest(ODataFormat.JSON_NO_METADATA, "Message(FromUsername='1',MessageId=-10)", "Sent");
- retreivePropertyTest(ODataFormat.JSON_NO_METADATA, "Message(FromUsername='1',MessageId=-10)", "IsRead");
- //Collection of complex types
- retreivePropertyTest(ODataFormat.JSON_NO_METADATA, "Customer(-10)", "BackupContactInfo");
- //Collection of primitives
- retreivePropertyTest(ODataFormat.JSON_NO_METADATA, "Customer(-10)/PrimaryContactInfo", "EmailBag");
- //Complex types
- retreivePropertyTest(ODataFormat.JSON_NO_METADATA, "Order(-9)", "Concurrency");
- }
- // with xml header
-
- @Test
- public void xmlRetrieveProperty() {
- //primitive types
- retreivePropertyTest(ODataFormat.XML, "Customer(-10)", "Name");
- retreivePropertyTest(ODataFormat.XML, "Customer(-10)", "CustomerId");
- retreivePropertyTest(ODataFormat.XML, "Message(FromUsername='1',MessageId=-10)", "Sent");
- retreivePropertyTest(ODataFormat.XML, "Message(FromUsername='1',MessageId=-10)", "IsRead");
- //Collection of Complex types
- retreivePropertyTest(ODataFormat.XML, "Customer(-10)", "BackupContactInfo");
- //Collection of primitives
- retreivePropertyTest(ODataFormat.XML, "Customer(-10)/PrimaryContactInfo", "EmailBag");
- //Complex types
- retreivePropertyTest(ODataFormat.XML, "Order(-9)", "Concurrency");
- }
- // with atom header
-
- @Test
- public void atomRetrieveProperty() {
- //primitive types
- retreivePropertyTest(ODataFormat.XML, "Customer(-10)", "Name");
- retreivePropertyTest(ODataFormat.XML, "Customer(-10)", "CustomerId");
- retreivePropertyTest(ODataFormat.XML, "Message(FromUsername='1',MessageId=-10)", "Sent");
- retreivePropertyTest(ODataFormat.XML, "Message(FromUsername='1',MessageId=-10)", "IsRead");
- //Collection of Complex types
- retreivePropertyTest(ODataFormat.XML, "Customer(-10)", "BackupContactInfo");
- //Collection of primitives
- retreivePropertyTest(ODataFormat.XML, "Customer(-10)/PrimaryContactInfo", "EmailBag");
- //complex types
- retreivePropertyTest(ODataFormat.XML, "Order(-9)", "Concurrency");
- }
- // with invalid structural segment
-
- @Test
- public void invalidSegmentRetrieveProperty() {
- //primitive types
- retreivePropertyTest(ODataFormat.XML, "Customers(-10)", "Name");
-
- }
- // with null pub format
-
- @Test
- public void nullSegmentRetrieveProperty() {
- //primitive types
- retreivePropertyTest(null, "Customers(-10)", "Name");
-
- }
- // with null accept header format
-
- @Test
- public void nullAcceptRetrieveProperty() {
- //primitive types
- retreivePropertyTest(ODataFormat.XML, "Customers(-10)", "Name");
-
- }
- // with json pub format and atom accept format
-
- @Test
- public void differentFormatAndAcceptRetrieveProperty() {
- //
- retreivePropertyTest(ODataFormat.JSON_FULL_METADATA, "Customers(-10)", "Name");
-
- }
- //bad request 400 error. Message takes two keys
-
- @Test
- public void badRequestTest() {
- //primitive types
- retreivePropertyTest(ODataFormat.JSON_FULL_METADATA, "Message(FromUsername='1')", "Sent");
- }
- //navigation link of stream
-
- @Test
- public void navigationMediaLink() {
- URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendNavigationLinkSegment("Product").appendKeySegment(-7).appendLinksSegment("Photos");
- ODataEntitySetRequest req = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
- req.setAccept("application/json");
- ODataRetrieveResponse<ODataEntitySet> res = req.execute();
- assertEquals(200, res.getStatusCode());
- ODataEntitySet entitySet = res.getBody();
- assertNotNull(entitySet);
- List<ODataEntity> entity = entitySet.getEntities();
- assertNotNull(entity);
- assertEquals(entity.size(), 2);
- assertEquals(testStaticServiceRootURL + "/ProductPhoto(PhotoId=-3,ProductId=-3)",
- entity.get(0).getProperties().get(0).getValue().toString());
- assertEquals(testStaticServiceRootURL + "/ProductPhoto(PhotoId=-2,ProductId=-2)",
- entity.get(1).getProperties().get(0).getValue().toString());
- for (int i = 0; i < entity.size(); i++) {
- assertNotNull(entity.get(0).getProperties().get(0).getValue());
- }
- }
- //navigation link of stream, Bad Request(404 error). 'Photo' is not a valid navigation link
-
- @Test
- public void navigationMediaLinkInvalidQuery() {
- URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendNavigationLinkSegment("Product").appendKeySegment(-7).appendLinksSegment("Photo");
- ODataEntitySetRequest req = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
- req.setAccept("application/json");
- try {
- ODataRetrieveResponse<ODataEntitySet> res = req.execute();
- assertEquals(200, res.getStatusCode());
- ODataEntitySet entitySet = res.getBody();
- assertNotNull(entitySet);
- List<ODataEntity> entity = entitySet.getEntities();
- assertNotNull(entity);
- assertEquals(entity.size(), 2);
- assertEquals(testStaticServiceRootURL + "/ProductPhoto(PhotoId=-3,ProductId=-3)", entity.get(0).
- getProperties().get(0).getValue().toString());
- assertEquals(testStaticServiceRootURL + "/ProductPhoto(PhotoId=-2,ProductId=-2)", entity.get(1).
- getProperties().get(0).getValue().toString());
- } catch (ODataClientErrorException e) {
- assertEquals(404, e.getStatusLine().getStatusCode());
- }
- }
-
- @Test
- public void navigationMediaLinkInvalidFormat() {
- URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendNavigationLinkSegment("Product").appendKeySegment(-7).appendLinksSegment("Photos");
- ODataEntitySetRequest req = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
- req.setAccept("application/atom+xml");
- try {
- ODataRetrieveResponse<ODataEntitySet> res = req.execute();
- assertEquals(200, res.getStatusCode());
- ODataEntitySet entitySet = res.getBody();
- assertNotNull(entitySet);
- List<ODataEntity> entity = entitySet.getEntities();
- assertNotNull(entity);
- assertEquals(entity.size(), 2);
- assertEquals(testStaticServiceRootURL + "/ProductPhoto(PhotoId=-3,ProductId=-3)", entity.get(0).
- getProperties().get(0).getValue().toString());
- assertEquals(testStaticServiceRootURL + "/ProductPhoto(PhotoId=-2,ProductId=-2)", entity.get(1).
- getProperties().get(0).getValue().toString());
- } catch (ODataClientErrorException e) {
- assertEquals(415, e.getStatusLine().getStatusCode());
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/PropertyTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/PropertyTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/PropertyTestITCase.java
deleted file mode 100644
index 6322ef0..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/PropertyTestITCase.java
+++ /dev/null
@@ -1,355 +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 com.msopentech.odatajclient.engine.it;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.engine.communication.ODataClientErrorException;
-import com.msopentech.odatajclient.engine.communication.request.UpdateType;
-import com.msopentech.odatajclient.engine.communication.request.cud.ODataPropertyUpdateRequest;
-import com.msopentech.odatajclient.engine.communication.request.cud.ODataValueUpdateRequest;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataGenericRetrieveRequest;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataPropertyRequest;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataValueRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataDeleteResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataPropertyUpdateResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataValueUpdateResponse;
-import com.msopentech.odatajclient.engine.data.ODataCollectionValue;
-import com.msopentech.odatajclient.engine.data.ODataObjectWrapper;
-import com.msopentech.odatajclient.engine.data.ODataPrimitiveValue;
-import com.msopentech.odatajclient.engine.data.ODataProperty;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import com.msopentech.odatajclient.engine.data.ODataValue;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import com.msopentech.odatajclient.engine.format.ODataValueFormat;
-import java.io.IOException;
-import org.junit.Test;
-
-/**
- * This is the unit test class to check basic entity operations.
- */
-public class PropertyTestITCase extends AbstractTestITCase {
-
- protected String getServiceRoot() {
- return testDefaultServiceRootURL;
- }
-
- @Test
- public void replacePropertyValue() throws IOException {
- updatePropertyValue(ODataValueFormat.TEXT, UpdateType.REPLACE);
- }
-
- @Test
- public void replacePrimitivePropertyAsXML() throws IOException {
- updatePrimitiveProperty(ODataFormat.XML);
- }
-
- @Test
- public void replacePrimitivePropertyAsJSON() throws IOException {
- updatePrimitiveProperty(ODataFormat.JSON_FULL_METADATA);
- }
-
- @Test
- public void replaceCollectionPropertyAsXML() throws IOException {
- updateCollectionProperty(ODataFormat.XML);
- }
-
- @Test
- public void replaceCollectionPropertyAsJSON() throws IOException {
- updateCollectionProperty(ODataFormat.JSON_FULL_METADATA);
- }
-
- @Test
- public void replaceComplexPropertyAsXML() throws IOException {
- updateComplexProperty(ODataFormat.XML, UpdateType.REPLACE);
- }
-
- @Test
- public void replaceComplexPropertyAsJSON() throws IOException {
- updateComplexProperty(ODataFormat.JSON_FULL_METADATA, UpdateType.REPLACE);
- }
-
- @Test
- public void patchComplexPropertyAsXML() throws IOException {
- updateComplexProperty(ODataFormat.XML, UpdateType.PATCH);
- }
-
- @Test
- public void patchComplexPropertyAsJSON() throws IOException {
- updateComplexProperty(ODataFormat.JSON_FULL_METADATA, UpdateType.PATCH);
- }
-
- @Test
- public void mergeComplexPropertyAsXML() throws IOException {
- updateComplexProperty(ODataFormat.XML, UpdateType.MERGE);
- }
-
- @Test
- public void mergeComplexPropertyAsJSON() throws IOException {
- updateComplexProperty(ODataFormat.JSON_FULL_METADATA, UpdateType.MERGE);
- }
-
- @Test
- public void genericRequestAsXML() throws IOException {
- genericRequest(ODataFormat.XML);
- }
-
- @Test
- public void genericRequestAsJSON() throws IOException {
- genericRequest(ODataFormat.JSON);
- }
-
- @Test
- public void readCountValue() throws IOException {
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot());
- uriBuilder.appendEntityTypeSegment("Customer").appendCountSegment();
-
- final ODataValueRequest req = client.getRetrieveRequestFactory().getValueRequest(uriBuilder.build());
- req.setFormat(ODataValueFormat.TEXT);
-
- final ODataRetrieveResponse<ODataValue> res = req.execute();
- assertEquals(200, res.getStatusCode());
-
- final ODataValue value = res.getBody();
- debugODataValue(value, "Retrieved property");
-
- assertNotNull(value);
- // the following assert depends on the test execution order (use >= to be sure)
- assertTrue(Integer.valueOf(value.toString()) >= 10);
- }
-
- @Test
- public void nullNullableProperty() {
- final ODataDeleteResponse res = client.getCUDRequestFactory().getDeleteRequest(client.getURIBuilder(
- getServiceRoot()).
- appendEntityTypeSegment("Order").appendKeySegment(-8).
- appendStructuralSegment("CustomerId").appendValueSegment().build()).
- execute();
- assertEquals(204, res.getStatusCode());
- }
-
- @Test(expected = ODataClientErrorException.class)
- public void nullNonNullableProperty() {
- client.getCUDRequestFactory().getDeleteRequest(client.getURIBuilder(getServiceRoot()).
- appendEntityTypeSegment("Driver").appendKeySegment("1").
- appendStructuralSegment("BirthDate").appendValueSegment().build()).
- execute();
- }
-
- private void updatePropertyValue(final ODataValueFormat format, final UpdateType type) throws IOException {
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot()).
- appendEntityTypeSegment("Customer").appendKeySegment(-9).
- appendStructuralSegment("PrimaryContactInfo").
- appendStructuralSegment("HomePhone").
- appendStructuralSegment("PhoneNumber").
- appendValueSegment();
-
- ODataValueRequest retrieveReq = client.getRetrieveRequestFactory().getValueRequest(uriBuilder.build());
- retrieveReq.setFormat(format);
-
- ODataRetrieveResponse<ODataValue> retrieveRes = retrieveReq.execute();
- assertEquals(200, retrieveRes.getStatusCode());
-
- ODataValue phoneNumber = retrieveRes.getBody();
- assertNotNull(phoneNumber);
-
- final String oldMsg = phoneNumber.asPrimitive().<String>toCastValue();
- final String newMsg = "new msg (" + System.currentTimeMillis() + ")";
-
- assertNotEquals(newMsg, oldMsg);
-
- final ODataPrimitiveValue newVal = client.getPrimitiveValueBuilder().setText(newMsg).build();
-
- final ODataValueUpdateRequest updateReq =
- client.getCUDRequestFactory().getValueUpdateRequest(uriBuilder.build(), type, newVal);
- updateReq.setFormat(format);
-
- final ODataValueUpdateResponse updateRes = updateReq.execute();
- assertEquals(204, updateRes.getStatusCode());
-
- retrieveReq = client.getRetrieveRequestFactory().getValueRequest(uriBuilder.build());
- retrieveReq.setFormat(format);
-
- retrieveRes = retrieveReq.execute();
- assertEquals(200, retrieveRes.getStatusCode());
-
- phoneNumber = retrieveRes.getBody();
- assertNotNull(phoneNumber);
-
- assertEquals(newMsg, phoneNumber.asPrimitive().<String>toCastValue());
- }
-
- private void updateComplexProperty(final ODataFormat format, final UpdateType type) throws IOException {
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot()).
- appendEntityTypeSegment("Customer").appendKeySegment(-9).appendStructuralSegment("PrimaryContactInfo");
-
- ODataPropertyRequest retrieveReq = client.getRetrieveRequestFactory().getPropertyRequest(uriBuilder.build());
- retrieveReq.setFormat(format);
-
- ODataRetrieveResponse<ODataProperty> retrieveRes = retrieveReq.execute();
- assertEquals(200, retrieveRes.getStatusCode());
-
- ODataProperty primaryContactInfo = client.getObjectFactory().
- newComplexProperty("PrimaryContactInfo", retrieveRes.getBody().getComplexValue());
-
- final String newItem = "new item " + System.currentTimeMillis();
-
- final ODataCollectionValue originalValue =
- primaryContactInfo.getComplexValue().get("EmailBag").getCollectionValue();
-
- final int origSize = originalValue.size();
-
- originalValue.add(client.getPrimitiveValueBuilder().setText(newItem).build());
- assertEquals(origSize + 1, originalValue.size());
-
- final ODataPropertyUpdateRequest updateReq = client.getCUDRequestFactory().
- getPropertyComplexValueUpdateRequest(uriBuilder.build(), type, primaryContactInfo);
- if (client.getConfiguration().isUseXHTTPMethod()) {
- assertEquals(HttpMethod.POST, updateReq.getMethod());
- } else {
- assertEquals(type.getMethod(), updateReq.getMethod());
- }
- updateReq.setFormat(format);
-
- final ODataPropertyUpdateResponse updateRes = updateReq.execute();
- assertEquals(204, updateRes.getStatusCode());
-
- retrieveReq = client.getRetrieveRequestFactory().getPropertyRequest(uriBuilder.build());
- retrieveReq.setFormat(format);
-
- retrieveRes = retrieveReq.execute();
- assertEquals(200, retrieveRes.getStatusCode());
-
- primaryContactInfo = retrieveRes.getBody();
-
- assertEquals(origSize + 1, primaryContactInfo.getComplexValue().get("EmailBag").getCollectionValue().size());
- }
-
- private void updateCollectionProperty(final ODataFormat format) throws IOException {
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot());
- uriBuilder.appendEntityTypeSegment("Customer").appendKeySegment(-9).
- appendStructuralSegment("PrimaryContactInfo").appendStructuralSegment("AlternativeNames");
-
- ODataPropertyRequest retrieveReq = client.getRetrieveRequestFactory().getPropertyRequest(uriBuilder.build());
- retrieveReq.setFormat(format);
-
- ODataRetrieveResponse<ODataProperty> retrieveRes = retrieveReq.execute();
- assertEquals(200, retrieveRes.getStatusCode());
-
- ODataProperty alternativeNames = client.getObjectFactory().newCollectionProperty("AlternativeNames",
- retrieveRes.getBody().getCollectionValue());
-
- final String newItem = "new item " + System.currentTimeMillis();
-
- final ODataCollectionValue originalValue = alternativeNames.getCollectionValue();
-
- final int origSize = originalValue.size();
-
- originalValue.add(client.getPrimitiveValueBuilder().setText(newItem).build());
- assertEquals(origSize + 1, originalValue.size());
-
- final ODataPropertyUpdateRequest updateReq =
- client.getCUDRequestFactory().getPropertyCollectionValueUpdateRequest(uriBuilder.build(),
- alternativeNames);
- if (client.getConfiguration().isUseXHTTPMethod()) {
- assertEquals(HttpMethod.POST, updateReq.getMethod());
- } else {
- assertEquals(HttpMethod.PUT, updateReq.getMethod());
- }
- updateReq.setFormat(format);
-
- ODataPropertyUpdateResponse updateRes = updateReq.execute();
- assertEquals(204, updateRes.getStatusCode());
-
- retrieveReq = client.getRetrieveRequestFactory().getPropertyRequest(uriBuilder.build());
- retrieveReq.setFormat(format);
-
- retrieveRes = retrieveReq.execute();
- assertEquals(200, retrieveRes.getStatusCode());
-
- alternativeNames = retrieveRes.getBody();
-
- assertEquals(origSize + 1, alternativeNames.getCollectionValue().size());
- }
-
- private void updatePrimitiveProperty(final ODataFormat format) throws IOException {
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot());
- uriBuilder.appendEntityTypeSegment("Customer").appendKeySegment(-9).
- appendStructuralSegment("PrimaryContactInfo").
- appendStructuralSegment("HomePhone").appendStructuralSegment("PhoneNumber");
-
- ODataPropertyRequest retrieveReq = client.getRetrieveRequestFactory().getPropertyRequest(uriBuilder.build());
- retrieveReq.setFormat(format);
-
- ODataRetrieveResponse<ODataProperty> retrieveRes = retrieveReq.execute();
- assertEquals(200, retrieveRes.getStatusCode());
-
- ODataProperty phoneNumber = retrieveRes.getBody();
-
- final String oldMsg = phoneNumber.getPrimitiveValue().<String>toCastValue();
- final String newMsg = "new item " + System.currentTimeMillis();
-
- assertNotEquals(newMsg, oldMsg);
-
- phoneNumber = client.getObjectFactory().newPrimitiveProperty("PhoneNumber",
- client.getPrimitiveValueBuilder().setText(newMsg).build());
-
- final ODataPropertyUpdateRequest updateReq =
- client.getCUDRequestFactory().getPropertyPrimitiveValueUpdateRequest(uriBuilder.build(), phoneNumber);
- if (client.getConfiguration().isUseXHTTPMethod()) {
- assertEquals(HttpMethod.POST, updateReq.getMethod());
- } else {
- assertEquals(HttpMethod.PUT, updateReq.getMethod());
- }
- updateReq.setFormat(format);
-
- ODataPropertyUpdateResponse updateRes = updateReq.execute();
- assertEquals(204, updateRes.getStatusCode());
-
- retrieveReq = client.getRetrieveRequestFactory().getPropertyRequest(uriBuilder.build());
- retrieveReq.setFormat(format);
-
- retrieveRes = retrieveReq.execute();
- assertEquals(200, retrieveRes.getStatusCode());
-
- phoneNumber = retrieveRes.getBody();
- assertEquals(newMsg, phoneNumber.getPrimitiveValue().<String>toCastValue());
- }
-
- private void genericRequest(final ODataFormat format) {
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot()).
- appendEntityTypeSegment("Customer").appendKeySegment(-10).appendStructuralSegment("BackupContactInfo");
-
- final ODataGenericRetrieveRequest req =
- client.getRetrieveRequestFactory().getGenericRetrieveRequest(uriBuilder.build());
- req.setFormat(format.toString());
-
- final ODataRetrieveResponse<ODataObjectWrapper> res = req.execute();
-
- ODataObjectWrapper wrapper = res.getBody();
-
- final ODataProperty property = wrapper.getODataProperty();
- assertNotNull(property);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/PropertyUpdateTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/PropertyUpdateTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/PropertyUpdateTestITCase.java
deleted file mode 100644
index 57d0636..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/PropertyUpdateTestITCase.java
+++ /dev/null
@@ -1,1015 +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 com.msopentech.odatajclient.engine.it;
-
-import static org.junit.Assert.*;
-
-import java.util.HashMap;
-
-import org.apache.commons.lang3.StringUtils;
-import org.junit.Test;
-
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.engine.communication.request.UpdateType;
-import com.msopentech.odatajclient.engine.communication.request.cud.ODataDeleteRequest;
-import com.msopentech.odatajclient.engine.communication.request.cud.ODataPropertyUpdateRequest;
-import com.msopentech.odatajclient.engine.communication.request.cud.ODataValueUpdateRequest;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataPropertyRequest;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataValueRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataDeleteResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataPropertyUpdateResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataValueUpdateResponse;
-import com.msopentech.odatajclient.engine.data.ODataCollectionValue;
-import com.msopentech.odatajclient.engine.data.ODataComplexValue;
-import com.msopentech.odatajclient.engine.data.ODataPrimitiveValue;
-import com.msopentech.odatajclient.engine.data.ODataProperty;
-import com.msopentech.odatajclient.engine.data.ODataValue;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import com.msopentech.odatajclient.engine.format.ODataValueFormat;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import org.junit.Ignore;
-
-public class PropertyUpdateTestITCase extends AbstractTestITCase {
- // update complex property
-
- public void updateComplexProperty(
- final ODataFormat format,
- final String contentType,
- final String prefer,
- final UpdateType type,
- final String entity,
- final String propertyType) {
- final URIBuilder uriBuilder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment(entity).appendKeySegment(-9).appendStructuralSegment(propertyType);
-
- ODataPropertyRequest retrieveReq = client.getRetrieveRequestFactory().getPropertyRequest(uriBuilder.build());
- retrieveReq.setFormat(format);
- retrieveReq.setContentType(contentType);
- retrieveReq.setPrefer(prefer);
- ODataRetrieveResponse<ODataProperty> retrieveRes = retrieveReq.execute();
- assertEquals(200, retrieveRes.getStatusCode());
-
- String etag = retrieveRes.getEtag();
- final ODataComplexValue dimensions = new ODataComplexValue(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions");
- dimensions.add(client.getObjectFactory().newPrimitiveProperty("Width",
- client.getPrimitiveValueBuilder().setText("-1.12").setType(EdmSimpleType.Decimal).build()));
- dimensions.add(client.getObjectFactory().newPrimitiveProperty("Height",
- client.getPrimitiveValueBuilder().setText("-1.12").setType(EdmSimpleType.Decimal).build()));
- dimensions.add(client.getObjectFactory().newPrimitiveProperty("Depth",
- client.getPrimitiveValueBuilder().setText("-1.12").setType(EdmSimpleType.Decimal).build()));
-
- ODataProperty dimensionToBeUpdated = client.getObjectFactory().newComplexProperty("Dimensions",
- dimensions);
-
- final ODataPropertyUpdateRequest req = client.getCUDRequestFactory().
- getPropertyComplexValueUpdateRequest(uriBuilder.build(), type, dimensionToBeUpdated);
- if (client.getConfiguration().isUseXHTTPMethod()) {
- assertEquals(HttpMethod.POST, req.getMethod());
- } else {
- assertEquals(type.getMethod(), req.getMethod());
- }
- req.setFormat(format);
- req.setContentType(contentType);
- req.setPrefer(prefer);
- if (StringUtils.isNotBlank(etag)) {
- req.setIfMatch(etag);
- }
- final ODataPropertyUpdateResponse res = req.execute();
-
- if (prefer.equals("return-content")) {
- assertEquals(200, res.getStatusCode());
- ODataProperty property = res.getBody();
- ODataComplexValue value = property.getComplexValue();
- assertEquals(dimensions.get("Depth").getValue().toString(), value.get("Depth").getValue().toString());
- assertEquals(dimensions.get("Width").getValue().toString(), value.get("Width").getValue().toString());
- assertEquals(dimensions.get("Height").getValue().toString(), value.get("Height").getValue().toString());
- } else {
- assertEquals(204, res.getStatusCode());
- }
- }
- //update property with json full metadata
-
- @Test
- public void updatePropertyWithJSON() {
- final ODataFormat format = ODataFormat.JSON_FULL_METADATA;
- final String contentType = "application/json;odata=fullmetadata";
- final String prefer = "return-content";
- final String entitySet = "Product";
- final String propertyType = "Dimensions";
- final UpdateType replace = UpdateType.REPLACE;
- final UpdateType merge = UpdateType.MERGE;
- final UpdateType patch = UpdateType.PATCH;
-
- final String collectionEntity = "Customer";
- final String collectionPropertyType = "EmailBag";
- final String primitivePropertyType = "PhoneNumber";
- // update complex property
- updateComplexProperty(format, contentType, prefer, replace, entitySet, propertyType);
- updateComplexProperty(format, contentType, prefer, merge, entitySet, propertyType);
- updateComplexProperty(format, contentType, prefer, patch, entitySet, propertyType);
-
- // update collection property
- updateCollectionProperty(format, contentType, prefer, replace, collectionEntity, collectionPropertyType);
- updateCollectionProperty(format, contentType, prefer, merge, collectionEntity, collectionPropertyType);
- updateCollectionProperty(format, contentType, prefer, patch, collectionEntity, collectionPropertyType);
-
- // update primitive property
- updatePrimitiveProperty(format, contentType, prefer, replace, collectionEntity, primitivePropertyType);
- updatePrimitiveProperty(format, contentType, prefer, merge, collectionEntity, primitivePropertyType);
- updatePrimitiveProperty(format, contentType, prefer, patch, collectionEntity, primitivePropertyType);
- }
- //update property with json minimal metadata
-
- @Test
- public void updatePropertyWithJSONMinimal() {
- final ODataFormat format = ODataFormat.JSON;
- final String contentType = "application/json;odata=minimalmetadata";
- final String prefer = "return-content";
- final String entitySet = "Product";
- final String propertyType = "Dimensions";
- final UpdateType replace = UpdateType.REPLACE;
- final UpdateType merge = UpdateType.MERGE;
- final UpdateType patch = UpdateType.PATCH;
-
- final String collectionEntity = "Customer";
- final String collectionPropertyType = "EmailBag";
- final String primitivePropertyType = "PhoneNumber";
- try {
- // update complex property
- updateComplexProperty(format, contentType, prefer, replace, entitySet, propertyType);
- updateComplexProperty(format, contentType, prefer, merge, entitySet, propertyType);
- updateComplexProperty(format, contentType, prefer, patch, entitySet, propertyType);
-
- // update collection property
- updateCollectionProperty(format, contentType, prefer, replace, collectionEntity, collectionPropertyType);
- updateCollectionProperty(format, contentType, prefer, merge, collectionEntity, collectionPropertyType);
- updateCollectionProperty(format, contentType, prefer, patch, collectionEntity, collectionPropertyType);
-
- // update primitive property
- updatePrimitiveProperty(format, contentType, prefer, replace, collectionEntity, primitivePropertyType);
- updatePrimitiveProperty(format, contentType, prefer, merge, collectionEntity, primitivePropertyType);
- updatePrimitiveProperty(format, contentType, prefer, patch, collectionEntity, primitivePropertyType);
- } catch (Exception e) {
- fail(e.getMessage());
- }
- }
- //update property with json no metadata
-
- @Test
- public void updatePropertyWithJSONNoMetadata() {
- final ODataFormat format = ODataFormat.JSON_FULL_METADATA;
- final String contentType = "application/json;odata=fullmetadata";
- final String prefer = "return-content";
- final String entitySet = "Product";
- final String propertyType = "Dimensions";
- final UpdateType replace = UpdateType.REPLACE;
- final UpdateType merge = UpdateType.MERGE;
- final UpdateType patch = UpdateType.PATCH;
-
- final String collectionEntity = "Customer";
- final String collectionPropertyType = "EmailBag";
- final String primitivePropertyType = "PhoneNumber";
- // update complex property
- updateComplexProperty(format, contentType, prefer, replace, entitySet, propertyType);
- updateComplexProperty(format, contentType, prefer, merge, entitySet, propertyType);
- updateComplexProperty(format, contentType, prefer, patch, entitySet, propertyType);
-
- // update collection property
- updateCollectionProperty(format, contentType, prefer, replace, collectionEntity, collectionPropertyType);
- updateCollectionProperty(format, contentType, prefer, merge, collectionEntity, collectionPropertyType);
- updateCollectionProperty(format, contentType, prefer, patch, collectionEntity, collectionPropertyType);
-
- // update primitive property
- updatePrimitiveProperty(format, contentType, prefer, replace, collectionEntity, primitivePropertyType);
- updatePrimitiveProperty(format, contentType, prefer, merge, collectionEntity, primitivePropertyType);
- updatePrimitiveProperty(format, contentType, prefer, patch, collectionEntity, primitivePropertyType);
- }
- //update with xml format
-
- @Test
- public void updatePropertyWithXML() {
- final ODataFormat format = ODataFormat.XML;
- final String contentType = "application/xml";
- final String prefer = "return-content";
- final String entitySet = "ComputerDetail";
- final String propertyType = "Dimensions";
- final UpdateType replace = UpdateType.REPLACE;
- final UpdateType merge = UpdateType.MERGE;
- final UpdateType patch = UpdateType.PATCH;
-
- final String collectionEntity = "Customer";
- final String collectionPropertyType = "AlternativeNames";
-
- final String primitivePropertyType = "PhoneNumber";
- try {
- // update complex property
- updateComplexProperty(format, contentType, prefer, replace, entitySet, propertyType);
- updateComplexProperty(format, contentType, prefer, merge, entitySet, propertyType);
- updateComplexProperty(format, contentType, prefer, patch, entitySet, propertyType);
-
- // update collection property
- updateCollectionProperty(format, contentType, prefer, replace, collectionEntity, collectionPropertyType);
- updateCollectionProperty(format, contentType, prefer, merge, collectionEntity, collectionPropertyType);
- updateCollectionProperty(format, contentType, prefer, patch, collectionEntity, collectionPropertyType);
-
- // update primitive property
- updatePrimitiveProperty(format, contentType, prefer, replace, collectionEntity, primitivePropertyType);
- updatePrimitiveProperty(format, contentType, prefer, merge, collectionEntity, primitivePropertyType);
- updatePrimitiveProperty(format, contentType, prefer, patch, collectionEntity, primitivePropertyType);
- } catch (Exception e) {
- fail(e.getMessage());
- }
- }
- // update with XML format and json contentType
-
- @Test
- @Ignore
- public void updatePropertyWithXMLAndJSON() {
- final ODataFormat format = ODataFormat.XML;
- final String contentType = "application/json;odata=fullmetadata";
- final String prefer = "return-content";
- final String entitySet = "ComputerDetail";
- final String propertyType = "Dimensions";
- final UpdateType replace = UpdateType.REPLACE;
- final UpdateType merge = UpdateType.MERGE;
- final UpdateType patch = UpdateType.PATCH;
-
- final String collectionEntity = "Customer";
- final String collectionPropertyType = "AlternativeNames";
- final String primitivePropertyType = "PhoneNumber";
- try {
- // update complex property
- updateComplexProperty(format, contentType, prefer, replace, entitySet, propertyType);
- updateComplexProperty(format, contentType, prefer, merge, entitySet, propertyType);
- updateComplexProperty(format, contentType, prefer, patch, entitySet, propertyType);
-
- // update collection property
- updateCollectionProperty(format, contentType, prefer, replace, collectionEntity, collectionPropertyType);
- updateCollectionProperty(format, contentType, prefer, merge, collectionEntity, collectionPropertyType);
- updateCollectionProperty(format, contentType, prefer, patch, collectionEntity, collectionPropertyType);
-
- // update primitive property
- updatePrimitiveProperty(format, contentType, prefer, replace, collectionEntity, primitivePropertyType);
- updatePrimitiveProperty(format, contentType, prefer, merge, collectionEntity, primitivePropertyType);
- updatePrimitiveProperty(format, contentType, prefer, patch, collectionEntity, primitivePropertyType);
- } catch (Exception e) {
- fail(e.getMessage());
- }
- }
- // update operation with xml content type header
-
- @Test
- @Ignore
- public void updatePropertyWithJSONAndXML() {
- final ODataFormat format = ODataFormat.JSON_FULL_METADATA;
- final String contentType = "application/xml";
- final String prefer = "return-content";
- final String entitySet = "ComputerDetail";
- final String propertyType = "Dimensions";
- final UpdateType replace = UpdateType.REPLACE;
- final UpdateType merge = UpdateType.MERGE;
- final UpdateType patch = UpdateType.PATCH;
-
- final String collectionEntity = "Customer";
- final String collectionPropertyType = "AlternativeNames";
- final String primitivePropertyType = "PhoneNumber";
- try {
- // update complex property
- updateComplexProperty(format, contentType, prefer, replace, entitySet, propertyType);
- updateComplexProperty(format, contentType, prefer, merge, entitySet, propertyType);
- updateComplexProperty(format, contentType, prefer, patch, entitySet, propertyType);
-
- // update collection property
- updateCollectionProperty(format, contentType, prefer, replace, collectionEntity, collectionPropertyType);
- updateCollectionProperty(format, contentType, prefer, merge, collectionEntity, collectionPropertyType);
- updateCollectionProperty(format, contentType, prefer, patch, collectionEntity, collectionPropertyType);
-
- // update primitive property
- updatePrimitiveProperty(format, contentType, prefer, replace, collectionEntity, primitivePropertyType);
- updatePrimitiveProperty(format, contentType, prefer, merge, collectionEntity, primitivePropertyType);
- updatePrimitiveProperty(format, contentType, prefer, patch, collectionEntity, primitivePropertyType);
- } catch (Exception e) {
- fail(e.getMessage());
- }
- }
- // update collection property
-
- public void updateCollectionProperty(
- final ODataFormat format,
- final String contentType,
- final String prefer,
- final UpdateType type,
- final String entity,
- final String propertyType) {
- final URIBuilder uriBuilder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment(entity).appendKeySegment(-9).appendStructuralSegment("PrimaryContactInfo").
- appendStructuralSegment(propertyType);
-
- ODataPropertyRequest retrieveReq = client.getRetrieveRequestFactory().getPropertyRequest(uriBuilder.build());
- retrieveReq.setFormat(format);
- retrieveReq.setContentType(contentType);
- retrieveReq.setPrefer(prefer);
- ODataRetrieveResponse<ODataProperty> retrieveRes = retrieveReq.execute();
- assertEquals(200, retrieveRes.getStatusCode());
- String etag = retrieveRes.getEtag();
-
- ODataProperty updateProperty = client.getObjectFactory().newCollectionProperty(propertyType,
- retrieveRes.getBody().getCollectionValue());
-
- final String newItem = "new update " + System.currentTimeMillis();
-
- final ODataCollectionValue originalValue = updateProperty.getCollectionValue();
-
- final int origSize = originalValue.size();
-
- originalValue.add(client.getPrimitiveValueBuilder().setText(newItem).build());
- assertEquals(origSize + 1, originalValue.size());
- final ODataPropertyUpdateRequest updateReq =
- client.getCUDRequestFactory().
- getPropertyCollectionValueUpdateRequest(uriBuilder.build(), updateProperty);
- if (client.getConfiguration().isUseXHTTPMethod()) {
- assertEquals(HttpMethod.POST, updateReq.getMethod());
- } else {
- assertEquals(HttpMethod.PUT, updateReq.getMethod());
- }
- updateReq.setFormat(format);
- updateReq.setContentType(contentType);
- updateReq.setPrefer(prefer);
- if (StringUtils.isNotBlank(etag)) {
- updateReq.setIfMatch(etag);
- }
- ODataPropertyUpdateResponse updateRes = updateReq.execute();
- if (prefer.equals("return-content")) {
- assertEquals(200, updateRes.getStatusCode());
- updateProperty = updateRes.getBody();
- assertEquals(origSize + 1, updateProperty.getCollectionValue().size());
- } else {
- assertEquals(204, updateRes.getStatusCode());
- }
- }
- // update primitive property
-
- public void updatePrimitiveProperty(
- final ODataFormat format,
- final String contentType,
- final String prefer,
- final UpdateType type,
- final String entity,
- final String propertyType) {
- final URIBuilder uriBuilder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment(entity).appendKeySegment(-9).
- appendStructuralSegment("PrimaryContactInfo")
- .appendStructuralSegment("HomePhone")
- .appendStructuralSegment(propertyType);
-
- ODataPropertyRequest retrieveReq = client.getRetrieveRequestFactory().getPropertyRequest(uriBuilder.build());
- retrieveReq.setFormat(format);
- retrieveReq.setContentType(contentType);
- retrieveReq.setPrefer(prefer);
- ODataRetrieveResponse<ODataProperty> retrieveRes = retrieveReq.execute();
- assertEquals(200, retrieveRes.getStatusCode());
- String etag = retrieveRes.getEtag();
- ODataProperty updateProperty = retrieveRes.getBody();
- final String oldItem = updateProperty.getPrimitiveValue().<String>toCastValue();
- final String newItem = "new update " + System.currentTimeMillis();
- assertNotEquals(oldItem, newItem);
-
- updateProperty = client.getObjectFactory().newPrimitiveProperty(propertyType,
- client.getPrimitiveValueBuilder().setText(newItem).build());
-
- final ODataPropertyUpdateRequest updateReq =
- client.getCUDRequestFactory().getPropertyPrimitiveValueUpdateRequest(uriBuilder.build(), updateProperty);
- if (client.getConfiguration().isUseXHTTPMethod()) {
- assertEquals(HttpMethod.POST, updateReq.getMethod());
- } else {
- assertEquals(HttpMethod.PUT, updateReq.getMethod());
- }
- updateReq.setFormat(format);
- updateReq.setContentType(contentType);
- updateReq.setPrefer(prefer);
- if (StringUtils.isNotBlank(etag)) {
- updateReq.setIfMatch(etag);
- }
- ODataPropertyUpdateResponse updateRes = updateReq.execute();
- if (prefer.equals("return-content")) {
- assertEquals(200, updateRes.getStatusCode());
- updateProperty = updateRes.getBody();
- assertEquals(newItem, updateProperty.getPrimitiveValue().toString());
- } else {
- assertEquals(204, updateRes.getStatusCode());
- }
- }
- // update String property value
-
- public void updateStringPropertyValue(
- final ODataValueFormat format,
- final String contentType,
- final String prefer,
- final UpdateType type) {
- final URIBuilder uriBuilder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment("Customer").appendKeySegment(-8).
- appendStructuralSegment("PrimaryContactInfo").
- appendStructuralSegment("WorkPhone").
- appendStructuralSegment("PhoneNumber").
- appendValueSegment();
- ODataValueRequest retrieveReq = client.getRetrieveRequestFactory().getValueRequest(uriBuilder.build());
- retrieveReq.setFormat(format);
- retrieveReq.setPrefer(prefer);
- ODataRetrieveResponse<ODataValue> retrieveRes = retrieveReq.execute();
- assertEquals(200, retrieveRes.getStatusCode());
- String etag = retrieveRes.getEtag();
- ODataValue phoneNumber = retrieveRes.getBody();
- assertNotNull(phoneNumber);
-
- final String oldItem = phoneNumber.asPrimitive().<String>toCastValue();
- final String newItem = "new msg value " + System.currentTimeMillis();
-
- assertNotEquals(oldItem, newItem);
-
- final ODataPrimitiveValue newVal = client.getPrimitiveValueBuilder().setText(newItem).build();
- final ODataValueUpdateRequest updateReq =
- client.getCUDRequestFactory().getValueUpdateRequest(uriBuilder.build(), type, newVal);
- updateReq.setFormat(ODataValueFormat.TEXT);
- updateReq.setPrefer(prefer);
- if (StringUtils.isNotBlank(etag)) {
- updateReq.setIfMatch(etag);
- }
- final ODataValueUpdateResponse updateRes = updateReq.execute();
- if (prefer.equals("return-content")) {
- assertEquals(200, updateRes.getStatusCode());
- phoneNumber = updateRes.getBody();
- assertNotNull(phoneNumber);
- assertEquals(newItem, phoneNumber.asPrimitive().<String>toCastValue());
- } else {
- assertEquals(204, updateRes.getStatusCode());
- }
- retrieveReq = client.getRetrieveRequestFactory().getValueRequest(uriBuilder.build());
- retrieveReq.setFormat(format);
- retrieveRes = retrieveReq.execute();
- assertEquals(200, retrieveRes.getStatusCode());
-
- phoneNumber = retrieveRes.getBody();
- assertNotNull(phoneNumber);
-
- assertEquals(newItem, phoneNumber.asPrimitive().<String>toCastValue());
- }
- // update string property value
-
- @Test
- @Ignore
- public void stringPropertyValue() {
- final ODataValueFormat format = ODataValueFormat.TEXT;
- final String contentType = "application/json";
- final String prefer = "return-content";
- final UpdateType replace = UpdateType.REPLACE;
- final UpdateType merge = UpdateType.MERGE;
- final UpdateType patch = UpdateType.PATCH;
-
- try {
- // update string property value with different update types
- updateStringPropertyValue(format, contentType, prefer, merge);
- updateStringPropertyValue(format, contentType, prefer, replace);
- updateStringPropertyValue(format, contentType, prefer, patch);
-
- } catch (Exception e) {
- LOG.error("", e);
- fail(e.getMessage());
- }
- }
- // update date property value
-
- public static void updateDatePropertyValue(
- final ODataValueFormat format,
- final String contentType,
- final String prefer,
- final UpdateType type) {
- try {
- final URIBuilder uriBuilder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment("ComputerDetail").appendKeySegment(-10).
- appendStructuralSegment("PurchaseDate").
- appendValueSegment();
- ODataValueRequest retrieveReq = client.getRetrieveRequestFactory().getValueRequest(uriBuilder.build());
- retrieveReq.setFormat(format);
- retrieveReq.setPrefer(prefer);
- ODataRetrieveResponse<ODataValue> retrieveRes = retrieveReq.execute();
- assertEquals(200, retrieveRes.getStatusCode());
- String etag = retrieveRes.getEtag();
- ODataValue date = retrieveRes.getBody();
- assertNotNull(date);
- final String newItem = "2005-02-09T23:59:59.9999999";
- final ODataPrimitiveValue newVal = client.getPrimitiveValueBuilder().setText(newItem).build();
- final ODataValueUpdateRequest updateReq =
- client.getCUDRequestFactory().getValueUpdateRequest(uriBuilder.build(), type, newVal);
- updateReq.setFormat(ODataValueFormat.TEXT);
- updateReq.setPrefer(prefer);
- if (StringUtils.isNotBlank(etag)) {
- updateReq.setIfMatch(etag);
- }
- final ODataValueUpdateResponse updateRes = updateReq.execute();
-
- if (prefer.equals("return-content")) {
- assertEquals(200, updateRes.getStatusCode());
- ODataValue val = updateRes.getBody();
- assertNotNull(val);
- assertEquals(newItem, val.asPrimitive().<String>toCastValue());
- } else {
- assertEquals(204, updateRes.getStatusCode());
- }
- retrieveReq = client.getRetrieveRequestFactory().getValueRequest(uriBuilder.build());
- retrieveReq.setFormat(format);
- retrieveRes = retrieveReq.execute();
- assertEquals(200, retrieveRes.getStatusCode());
- date = retrieveRes.getBody();
- assertNotNull(date);
- assertEquals(newItem, date.asPrimitive().<String>toCastValue());
- } catch (Exception e) {
- LOG.error("", e);
- fail(e.getMessage());
- }
- }
- // update string property value
-
- @Test
- @Ignore
- public void datePropertyValue() {
- final ODataValueFormat format = ODataValueFormat.TEXT;
- final String contentType = "application/json";
- final String prefer = "return-content";
- final UpdateType replace = UpdateType.REPLACE;
- final UpdateType merge = UpdateType.MERGE;
- final UpdateType patch = UpdateType.PATCH;
-
- try {
- // update date property value with different update types
- updateDatePropertyValue(format, contentType, prefer, merge);
- updateDatePropertyValue(format, contentType, prefer, replace);
- updateDatePropertyValue(format, contentType, prefer, patch);
-
- } catch (Exception e) {
- LOG.error("", e);
- fail(e.getMessage());
- }
- }
-
- // update date property value
- public static void updateIntegerPropertyValue(
- final ODataValueFormat format,
- final String contentType,
- final String prefer,
- final UpdateType type) {
- try {
- final HashMap<String, Object> multiKey = new HashMap<String, Object>();
- multiKey.put("OrderId", -10);
- multiKey.put("ProductId", -10);
- final URIBuilder uriBuilder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment("OrderLine").appendKeySegment(multiKey).
- appendStructuralSegment("Quantity").
- appendValueSegment();
- ODataValueRequest retrieveReq = client.getRetrieveRequestFactory().getValueRequest(uriBuilder.build());
- retrieveReq.setFormat(format);
- retrieveReq.setPrefer(prefer);
- ODataRetrieveResponse<ODataValue> retrieveRes = retrieveReq.execute();
- assertEquals(200, retrieveRes.getStatusCode());
- String etag = retrieveRes.getEtag();
- ODataValue integerValue = retrieveRes.getBody();
- assertNotNull(integerValue);
-
- final int newItem = 4444;
-
- final ODataPrimitiveValue newVal = client.getPrimitiveValueBuilder().setValue(newItem).setType(
- EdmSimpleType.Int32).build();
- final ODataValueUpdateRequest updateReq =
- client.getCUDRequestFactory().getValueUpdateRequest(uriBuilder.build(), type, newVal);
- updateReq.setFormat(ODataValueFormat.TEXT);
- updateReq.setPrefer(prefer);
- if (StringUtils.isNotBlank(etag)) {
- updateReq.setIfMatch(etag);
- }
- final ODataValueUpdateResponse updateRes = updateReq.execute();
- if (prefer.equals("return-content")) {
- assertEquals(200, updateRes.getStatusCode());
- ODataValue val = updateRes.getBody();
- assertNotNull(val);
- assertEquals(newItem, Integer.parseInt(val.toString()));
- } else {
- assertEquals(204, updateRes.getStatusCode());
- }
- retrieveReq = client.getRetrieveRequestFactory().getValueRequest(uriBuilder.build());
- retrieveReq.setFormat(format);
- retrieveRes = retrieveReq.execute();
- assertEquals(200, retrieveRes.getStatusCode());
- integerValue = retrieveRes.getBody();
- assertNotNull(integerValue);
- assertEquals(newItem, Integer.parseInt(integerValue.toString()));
- } catch (Exception e) {
- LOG.error("", e);
- fail(e.getMessage());
- }
- }
- // update int property value
-
- @Test
- @Ignore
- public void intPropertyValue() {
- final ODataValueFormat format = ODataValueFormat.TEXT;
- final String contentType = "application/json";
- final String prefer = "return-content";
- final UpdateType replace = UpdateType.REPLACE;
- final UpdateType merge = UpdateType.MERGE;
- final UpdateType patch = UpdateType.PATCH;
-
- try {
- // update int property value with different update types
- updateIntegerPropertyValue(format, contentType, prefer, merge);
- updateIntegerPropertyValue(format, contentType, prefer, replace);
- updateIntegerPropertyValue(format, contentType, prefer, patch);
-
- } catch (Exception e) {
- LOG.error("", e);
- fail(e.getMessage());
- }
- }
-
- // update decimal property value
- public void updateDecimalPropertyValue(
- final ODataValueFormat format,
- final String contentType,
- final String prefer,
- final UpdateType type) {
- final URIBuilder uriBuilder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment("ComputerDetail").appendKeySegment(-9).
- appendStructuralSegment("Dimensions").
- appendStructuralSegment("Width").
- appendValueSegment();
- ODataValueRequest retrieveReq = client.getRetrieveRequestFactory().getValueRequest(uriBuilder.build());
- retrieveReq.setFormat(format);
- retrieveReq.setPrefer(prefer);
- ODataRetrieveResponse<ODataValue> retrieveRes = retrieveReq.execute();
- assertEquals(200, retrieveRes.getStatusCode());
- String etag = retrieveRes.getEtag();
- ODataValue decimalValue = retrieveRes.getBody();
- assertNotNull(decimalValue);
-
- final String oldItem = decimalValue.asPrimitive().<String>toCastValue();
- final String newItem = "-3.43" + System.currentTimeMillis();
-
- assertNotEquals(oldItem, newItem);
-
- final ODataPrimitiveValue newVal = client.getPrimitiveValueBuilder().setText(newItem).build();
- final ODataValueUpdateRequest updateReq =
- client.getCUDRequestFactory().getValueUpdateRequest(uriBuilder.build(), type, newVal);
- updateReq.setFormat(ODataValueFormat.TEXT);
- updateReq.setPrefer(prefer);
- if (StringUtils.isNotBlank(etag)) {
- updateReq.setIfMatch(etag);
- }
- final ODataValueUpdateResponse updateRes = updateReq.execute();
- if (prefer.equals("return-content")) {
- assertEquals(200, updateRes.getStatusCode());
- } else {
- assertEquals(204, updateRes.getStatusCode());
- }
- retrieveReq = client.getRetrieveRequestFactory().getValueRequest(uriBuilder.build());
- retrieveReq.setFormat(format);
- retrieveRes = retrieveReq.execute();
- assertEquals(200, retrieveRes.getStatusCode());
-
- decimalValue = retrieveRes.getBody();
- assertNotNull(decimalValue);
-
- assertEquals(newItem, decimalValue.asPrimitive().<String>toCastValue());
- }
- // update string property value
-
- @Test
- @Ignore
- public void decimalPropertyValue() {
- final ODataValueFormat format = ODataValueFormat.TEXT;
- final String contentType = "application/json";
- final String prefer = "return-content";
- final UpdateType replace = UpdateType.REPLACE;
- final UpdateType merge = UpdateType.MERGE;
- final UpdateType patch = UpdateType.PATCH;
-
- try {
- // update decimal property value with different update types
- updateDecimalPropertyValue(format, contentType, prefer, merge);
- updateDecimalPropertyValue(format, contentType, prefer, replace);
- updateDecimalPropertyValue(format, contentType, prefer, patch);
-
- } catch (Exception e) {
- LOG.error("", e);
- fail(e.getMessage());
- }
- }
- // update decimal property value
-
- public void updateBooleanPropertyValue(
- final ODataValueFormat format,
- final String contentType,
- final String prefer,
- final UpdateType type) {
- final HashMap<String, Object> multiKey = new HashMap<String, Object>();
- multiKey.put("MessageId", -1);
- multiKey.put("FromUsername", "10");
- final URIBuilder uriBuilder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment("Message").appendKeySegment(multiKey).
- appendStructuralSegment("IsRead").
- appendValueSegment();
- ODataValueRequest retrieveReq = client.getRetrieveRequestFactory().getValueRequest(uriBuilder.build());
- retrieveReq.setFormat(format);
- retrieveReq.setPrefer(prefer);
- ODataRetrieveResponse<ODataValue> retrieveRes = retrieveReq.execute();
- assertEquals(200, retrieveRes.getStatusCode());
- String etag = retrieveRes.getEtag();
- ODataValue booleanValue = retrieveRes.getBody();
- final boolean oldItem = Boolean.valueOf(booleanValue.toString());
- final ODataPrimitiveValue newVal = client.getPrimitiveValueBuilder().setValue(!oldItem).setType(
- EdmSimpleType.Boolean).build();
- final ODataValueUpdateRequest updateReq =
- client.getCUDRequestFactory().getValueUpdateRequest(uriBuilder.build(), type, newVal);
- updateReq.setFormat(ODataValueFormat.TEXT);
- updateReq.setPrefer(prefer);
- if (StringUtils.isNotBlank(etag)) {
- updateReq.setIfMatch(etag);
- }
- final ODataValueUpdateResponse updateRes = updateReq.execute();
- if (prefer.equals("return-content")) {
- assertEquals(200, updateRes.getStatusCode());
- } else {
- assertEquals(204, updateRes.getStatusCode());
- }
- retrieveReq = client.getRetrieveRequestFactory().getValueRequest(uriBuilder.build());
- retrieveReq.setFormat(format);
- retrieveRes = retrieveReq.execute();
- assertEquals(200, retrieveRes.getStatusCode());
-
- ODataValue val = retrieveRes.getBody();
- assertEquals(!oldItem, Boolean.valueOf(val.toString()));
- }
- // update boolean property value
-
- @Test
- @Ignore
- public void booleanPropertyValue() {
- final ODataValueFormat format = ODataValueFormat.TEXT;
- final String contentType = "application/json";
- final String prefer = "return-content";
- final UpdateType replace = UpdateType.REPLACE;
- final UpdateType merge = UpdateType.MERGE;
- final UpdateType patch = UpdateType.PATCH;
-
- try {
- // update boolean property value with different update types
- updateBooleanPropertyValue(format, contentType, prefer, merge);
- updateBooleanPropertyValue(format, contentType, prefer, replace);
- updateBooleanPropertyValue(format, contentType, prefer, patch);
-
- } catch (Exception e) {
- LOG.error("", e);
- fail(e.getMessage());
- }
- }
-
- // update date property value
- public static void updatePrimaryKeyPropertyValue(
- final ODataValueFormat format,
- final String contentType,
- final String prefer,
- final UpdateType type) {
- try {
- final HashMap<String, Object> multiKey = new HashMap<String, Object>();
- multiKey.put("OrderId", -10);
- multiKey.put("ProductId", -10);
- final URIBuilder uriBuilder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment("OrderLine").appendKeySegment(multiKey).
- appendStructuralSegment("OrderId").
- appendValueSegment();
- ODataValueRequest retrieveReq = client.getRetrieveRequestFactory().getValueRequest(uriBuilder.build());
- retrieveReq.setFormat(format);
- retrieveReq.setPrefer(prefer);
- ODataRetrieveResponse<ODataValue> retrieveRes = retrieveReq.execute();
- assertEquals(200, retrieveRes.getStatusCode());
- String etag = retrieveRes.getEtag();
- ODataValue integerValue = retrieveRes.getBody();
- assertNotNull(integerValue);
-
- final int newItem = 32;
-
- final ODataPrimitiveValue newVal = client.getPrimitiveValueBuilder().setValue(newItem).setType(
- EdmSimpleType.Int32).build();
- final ODataValueUpdateRequest updateReq =
- client.getCUDRequestFactory().getValueUpdateRequest(uriBuilder.build(), type, newVal);
- updateReq.setFormat(ODataValueFormat.TEXT);
- updateReq.setPrefer(prefer);
- if (StringUtils.isNotBlank(etag)) {
- updateReq.setIfMatch(etag);
- }
- final ODataValueUpdateResponse updateRes = updateReq.execute();
- if (prefer.equals("return-content")) {
- assertEquals(200, updateRes.getStatusCode());
- ODataValue val = retrieveRes.getBody();
- assertNotNull(val);
- assertEquals(newItem, Integer.parseInt(val.toString()));
- } else {
- assertEquals(204, updateRes.getStatusCode());
- }
-
- retrieveReq = client.getRetrieveRequestFactory().getValueRequest(uriBuilder.build());
- retrieveReq.setFormat(format);
- retrieveRes = retrieveReq.execute();
- assertEquals(200, retrieveRes.getStatusCode());
- integerValue = retrieveRes.getBody();
- assertNotNull(integerValue);
- assertEquals(newItem, Integer.parseInt(integerValue.toString()));
- } catch (Exception e) {
- // trying to update primary key will throw 400 error.
- }
- }
- // update int property value
-
- @Test
- public void primaryKeyPropertyValue() {
- final ODataValueFormat format = ODataValueFormat.TEXT;
- final String contentType = "application/json";
- final String prefer = "return-content";
- final UpdateType replace = UpdateType.REPLACE;
- final UpdateType merge = UpdateType.MERGE;
- final UpdateType patch = UpdateType.PATCH;
-
- try {
- // update int property value with different update types
- updatePrimaryKeyPropertyValue(format, contentType, prefer, merge);
- updatePrimaryKeyPropertyValue(format, contentType, prefer, replace);
- updatePrimaryKeyPropertyValue(format, contentType, prefer, patch);
-
- } catch (Exception e) {
- // trying to update primary key will throw 400 error.
- }
- }
- // delete a non nullable property
-
- public void deleteNonNullableproperty(final ODataPubFormat format, final String contentType) {
- final URIBuilder uriBuilder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment("Customer").appendKeySegment(-10).
- appendStructuralSegment("CustomerId").
- appendValueSegment();
- ODataDeleteRequest deleteReq = client.getCUDRequestFactory().getDeleteRequest(uriBuilder.build());
- deleteReq.setFormat(format);
- deleteReq.setContentType(contentType);
- ODataDeleteResponse deleteRes = deleteReq.execute();
- }
- // delete operation with JSON full metadata
-
- @Test
- public void testDeletePrimaryKeyWithJSON() {
- ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- String contentType = "application/json;odata=fullemtadata";
- try {
- deleteNonNullableproperty(format, contentType);
- } catch (Exception e) {
- // cannot delete primary key property. Hence this test return 400 status.
- }
- }
- // delete operation with ATOM
-
- @Test
- public void testDeletePrimaryKeyWithATOM() {
- ODataPubFormat format = ODataPubFormat.ATOM;
- String contentType = "application/atom+xml";
- try {
- deleteNonNullableproperty(format, contentType);
- } catch (Exception e) {
- // cannot delete primary key property. Hence this test return 400 status.
- }
- }
- // delete operation with atom accept and json contentType header
-
- @Test
- @Ignore
- public void testDeletePrimaryKeyWithATOMAndJSON() {
- ODataPubFormat format = ODataPubFormat.ATOM;
- String contentType = "application/json;odata=fullmetadata";
- try {
- deleteNonNullableproperty(format, contentType);
- } catch (Exception e) {
- // cannot delete primary key property. Hence this test return 400 status.
- }
- }
- // delete operation with json accept and atom contentType header
-
- @Test
- @Ignore
- public void testDeletePrimaryKeyWithJSONAndATOM() {
- ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- String contentType = "application/atom+xml";
- try {
- deleteNonNullableproperty(format, contentType);
- } catch (Exception e) {
- // cannot delete primary key property. Hence this test return 400 status.
- }
- }
- // delete operation with json no metadata
-
- @Test
- public void testDeletePrimaryKeyWithJSONNoMetadata() {
- ODataPubFormat format = ODataPubFormat.JSON_NO_METADATA;
- String contentType = "application/json;odata=nometadata";
- try {
- deleteNonNullableproperty(format, contentType);
- } catch (Exception e) {
- // cannot delete primary key property. Hence this test return 400 status.
- }
- }
-
- // delete a nullable property
- public void deleteNullableProperty(final ODataPubFormat format, final String contentType) {
- final URIBuilder uriBuilder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment("Customer").appendKeySegment(-10).
- appendStructuralSegment("Name").
- appendValueSegment();
- ODataDeleteRequest deleteReq = client.getCUDRequestFactory().getDeleteRequest(uriBuilder.build());
- deleteReq.setFormat(format);
- deleteReq.setContentType(contentType);
- ODataDeleteResponse deleteRes = deleteReq.execute();
- assertEquals(204, deleteRes.getStatusCode());
- }
- // delete operation with JSON full metadata
-
- @Test
- public void testDeleteNullableWithJSON() {
- ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- String contentType = "application/json;odata=fullemtadata";
- try {
- deleteNullableProperty(format, contentType);
- } catch (Exception e) {
- fail(e.getMessage());
- }
- }
- // delete operation with ATOM
-
- @Test
- public void testDeleteNullableWithATOM() {
- ODataPubFormat format = ODataPubFormat.ATOM;
- String contentType = "application/atom+xml";
- try {
- deleteNullableProperty(format, contentType);
- } catch (Exception e) {
- fail(e.getMessage());
- }
- }
- // delete operation with atom accept and json contentType header
-
- @Test
- @Ignore
- public void testDeleteNullableWithATOMAndJSON() {
- ODataPubFormat format = ODataPubFormat.ATOM;
- String contentType = "application/json;odata=fullmetadata";
- deleteNullableProperty(format, contentType);
- }
- // delete operation with json accept and atom contentType header
-
- @Test
- @Ignore
- public void testDeleteNullableWithJSONAndATOM() {
- ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- String contentType = "application/atom+xml";
- try {
- deleteNullableProperty(format, contentType);
- } catch (Exception e) {
- fail(e.getMessage());
- }
- }
- // delete operation with json no metadata
-
- @Test
- public void testDeleteNullableWithJSONNoMetadata() {
- ODataPubFormat format = ODataPubFormat.JSON_NO_METADATA;
- String contentType = "application/json;odata=nometadata";
- try {
- deleteNullableProperty(format, contentType);
- } catch (Exception e) {
- fail(e.getMessage());
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/PropertyValueTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/PropertyValueTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/PropertyValueTestITCase.java
deleted file mode 100644
index e42b880..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/PropertyValueTestITCase.java
+++ /dev/null
@@ -1,167 +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 com.msopentech.odatajclient.engine.it;
-
-import static org.junit.Assert.*;
-import java.io.IOException;
-import org.junit.Test;
-
-import com.msopentech.odatajclient.engine.communication.ODataClientErrorException;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataEntityRequest;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataValueRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import com.msopentech.odatajclient.engine.data.ODataValue;
-import com.msopentech.odatajclient.engine.format.ODataValueFormat;
-
-public class PropertyValueTestITCase extends AbstractTestITCase {
-
- @Test
- public void retrieveIntPropertyValueTest() {
- URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment("Product").appendKeySegment(-10).appendStructuralSegment("ProductId").
- appendValueSegment();
- final ODataValueRequest req = client.getRetrieveRequestFactory().getValueRequest(uriBuilder.build());
- req.setFormat(ODataValueFormat.TEXT);
- final ODataValue value = req.execute().getBody();
- assertNotNull(value);
- assertEquals(-10, Integer.parseInt(value.toString()));
- }
-
- @Test
- public void retrieveBooleanPropertyValueTest() {
- URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment("Product").appendKeySegment(-10).appendStructuralSegment("ProductId").
- appendValueSegment();
- final ODataValueRequest req = client.getRetrieveRequestFactory().getValueRequest(uriBuilder.build());
- req.setFormat(ODataValueFormat.TEXT);
- final ODataValue value = req.execute().getBody();
- assertNotNull(value);
- assertEquals(-10, Integer.parseInt(value.toString()));
- }
-
- @Test
- public void retrieveStringPropertyValueTest() {
- URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment("Product").appendKeySegment(-6).appendStructuralSegment("Description").
- appendValueSegment();
- final ODataValueRequest req = client.getRetrieveRequestFactory().getValueRequest(uriBuilder.build());
- req.setFormat(ODataValueFormat.TEXT);
- final ODataValue value = req.execute().getBody();
- assertNotNull(value);
- assertEquals("expdybhclurfobuyvzmhkgrnrajhamqmkhqpmiypittnp", value.toString());
- }
-
- @Test
- public void retrieveDatePropertyValueTest() {
- URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment("Product").appendKeySegment(-7).appendStructuralSegment(
- "NestedComplexConcurrency/ModifiedDate").appendValueSegment();
- final ODataValueRequest req = client.getRetrieveRequestFactory().getValueRequest(uriBuilder.build());
- req.setFormat(ODataValueFormat.TEXT);
- final ODataValue value = req.execute().getBody();
- assertNotNull(value);
- assertEquals("7866-11-16T22:25:52.747755+01:00", value.toString());
- }
-
- @Test
- public void retrieveDecimalPropertyValueTest() {
- URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment("Product").appendKeySegment(-6).appendStructuralSegment("Dimensions/Height").
- appendValueSegment();
- final ODataValueRequest req = client.getRetrieveRequestFactory().getValueRequest(uriBuilder.build());
- req.setFormat(ODataValueFormat.TEXT);
- final ODataValue value = req.execute().getBody();
- assertNotNull(value);
- assertEquals("-79228162514264337593543950335", value.toString());
- }
-
- @Test
- public void retrieveBinaryPropertyValueTest() throws IOException {
- URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendNavigationLinkSegment("ProductPhoto(PhotoId=-3,ProductId=-3)").appendStructuralSegment("Photo");
- ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setAccept("application/json");
- ODataRetrieveResponse<ODataEntity> res = req.execute();
- assertEquals(200, res.getStatusCode());
- ODataEntity entitySet = res.getBody();
- assertNotNull(entitySet);
- assertEquals(
- "fi653p3+MklA/LdoBlhWgnMTUUEo8tEgtbMXnF0a3CUNL9BZxXpSRiD9ebTnmNR0zWPjJVIDx4tdmCnq55XrJh+RW9aI/b34wAogK3kcORw=",
- entitySet.getProperties().get(0).getValue().toString());
- }
-
- @Test(expected = ODataClientErrorException.class)
- public void retrieveBinaryPropertyValueTestWithAtom() throws IOException {
- URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendNavigationLinkSegment("ProductPhoto(PhotoId=-3,ProductId=-3)").appendStructuralSegment("Photo");
- ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setAccept("application/atom+xml");
- ODataRetrieveResponse<ODataEntity> res = req.execute();
- assertEquals(200, res.getStatusCode());
- ODataEntity entitySet = res.getBody();
- assertNotNull(entitySet);
- assertEquals(
- "fi653p3+MklA/LdoBlhWgnMTUUEo8tEgtbMXnF0a3CUNL9BZxXpSRiD9ebTnmNR0zWPjJVIDx4tdmCnq55XrJh+RW9aI/b34wAogK3kcORw=",
- entitySet.getProperties().get(0).getValue().toString());
- }
-
- @Test(expected = IllegalArgumentException.class)
- public void retrieveBinaryPropertyValueTestWithXML() throws IOException {
- URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendNavigationLinkSegment("ProductPhoto(PhotoId=-3,ProductId=-3)").appendStructuralSegment("Photo");
- ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setAccept("application/xml");
- ODataRetrieveResponse<ODataEntity> res = req.execute();
- assertEquals(200, res.getStatusCode());
- ODataEntity entitySet = res.getBody();
- assertNotNull(entitySet);
- assertEquals(
- "fi653p3+MklA/LdoBlhWgnMTUUEo8tEgtbMXnF0a3CUNL9BZxXpSRiD9ebTnmNR0zWPjJVIDx4tdmCnq55XrJh+RW9aI/b34wAogK3kcORw=",
- entitySet.getProperties().get(0).getValue().toString());
- }
-
- @Test
- public void retrieveCollectionPropertyValueTest() {
- URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment("Product").appendKeySegment(-7).appendStructuralSegment(
- "ComplexConcurrency/QueriedDateTime").appendValueSegment();
- final ODataValueRequest req = client.getRetrieveRequestFactory().getValueRequest(uriBuilder.build());
- req.setFormat(ODataValueFormat.TEXT);
- final ODataValue value = req.execute().getBody();
- if (value.isPrimitive()) {
- assertNotNull(value);
- assertEquals("2013-09-18T00:44:43.6196168", value.toString());
- }
- }
-
- @Test
- public void retrieveNullPropertyValueTest() {
- URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment("Product").appendKeySegment(-10).appendStructuralSegment(
- "ComplexConcurrency/Token").appendValueSegment();
- final ODataValueRequest req = client.getRetrieveRequestFactory().getValueRequest(uriBuilder.build());
- try {
- req.execute().getBody();
- } catch (ODataClientErrorException e) {
- assertEquals(404, e.getStatusLine().getStatusCode());
- }
- }
-}
[32/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/AbstractTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/AbstractTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/AbstractTestITCase.java
deleted file mode 100644
index 70643f0..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/AbstractTestITCase.java
+++ /dev/null
@@ -1,605 +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 com.msopentech.odatajclient.engine.it;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.engine.communication.ODataClientErrorException;
-import com.msopentech.odatajclient.engine.communication.request.UpdateType;
-import com.msopentech.odatajclient.engine.communication.request.cud.ODataDeleteRequest;
-import com.msopentech.odatajclient.engine.communication.request.cud.ODataEntityCreateRequest;
-import com.msopentech.odatajclient.engine.communication.request.cud.ODataEntityUpdateRequest;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataEntityRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataDeleteResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataEntityCreateResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataEntityUpdateResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.data.ODataCollectionValue;
-import com.msopentech.odatajclient.engine.data.ODataComplexValue;
-import com.msopentech.odatajclient.engine.data.ODataProperty;
-import com.msopentech.odatajclient.engine.data.ODataValue;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.msopentech.odatajclient.engine.data.Entry;
-import com.msopentech.odatajclient.engine.data.Feed;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.data.ODataInlineEntity;
-import com.msopentech.odatajclient.engine.data.ODataLink;
-import com.msopentech.odatajclient.engine.data.impl.v3.AtomEntry;
-import com.msopentech.odatajclient.engine.data.impl.v3.JSONEntry;
-import com.msopentech.odatajclient.engine.data.ODataEntitySet;
-import com.msopentech.odatajclient.engine.data.ODataInlineEntitySet;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import com.msopentech.odatajclient.engine.client.ODataClientFactory;
-import com.msopentech.odatajclient.engine.client.ODataV3Client;
-import com.msopentech.odatajclient.engine.utils.URIUtils;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringWriter;
-import java.net.URI;
-import java.util.HashSet;
-import java.util.Locale;
-import java.util.Properties;
-import java.util.Set;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.junit.BeforeClass;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public abstract class AbstractTestITCase {
-
- /**
- * Logger.
- */
- protected static final Logger LOG = LoggerFactory.getLogger(AbstractTestITCase.class);
-
- protected static final String TEST_PRODUCT_TYPE = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product";
-
- protected static final String servicesODataServiceRootURL =
- "http://services.odata.org/V3/(S(csquyjnoaywmz5xcdbfhlc1p))/OData/OData.svc/";
-
- protected static ODataV3Client client;
-
- protected static String testDefaultServiceRootURL;
-
- protected static String testStaticServiceRootURL;
-
- protected static String testActionOverloadingServiceRootURL;
-
- protected static String testKeyAsSegmentServiceRootURL;
-
-// protected static String testODataWriterDefaultServiceRootURL;
- protected static String testOpenTypeServiceRootURL;
-
- protected static String testPrimitiveKeysServiceRootURL;
-
- protected static String testLargeModelServiceRootURL;
-
- protected static String testAuthServiceRootURL;
-
- @BeforeClass
- public static void setUpODataServiceRoot() throws IOException {
- String testBaseURL = null;
-
- InputStream propStream = null;
- try {
- propStream = AbstractTestITCase.class.getResourceAsStream("/test.properties");
- final Properties props = new Properties();
- props.load(propStream);
-
- testBaseURL = props.getProperty("test.base.url");
- } catch (Exception e) {
- LOG.error("Could not load test.properties", e);
- } finally {
- if (propStream != null) {
- propStream.close();
- }
- }
- assertNotNull("Check value for the 'test.base.url' property", testBaseURL);
-
- testDefaultServiceRootURL = testBaseURL + "/DefaultService.svc";
- testStaticServiceRootURL = "http://localhost:9080/StaticService/V3/Static.svc";
- testActionOverloadingServiceRootURL = testBaseURL + "/ActionOverloadingService.svc";
- testKeyAsSegmentServiceRootURL = testBaseURL + "/KeyAsSegmentService.svc";
-// testODataWriterDefaultServiceRootURL = testBaseURL + "/ODataWriterDefaultService.svc";
- testOpenTypeServiceRootURL = testBaseURL + "/OpenTypeService.svc";
- testPrimitiveKeysServiceRootURL = "http://localhost:9080/StaticService/V3/Static.svc";
- testLargeModelServiceRootURL = "http://localhost:9080/StaticService/V3/Static.svc/large";
- testAuthServiceRootURL = "http://localhost:9080/DefaultService.svc";
- }
-
- /**
- * This is needed for correct number handling (Double, for example).
- */
- @BeforeClass
- public static void setEnglishLocale() {
- Locale.setDefault(Locale.ENGLISH);
- }
-
- @BeforeClass
- public static void setClientInstance() {
- client = ODataClientFactory.getV3();
- }
-
- protected void checkLinks(final Collection<ODataLink> original, final Collection<ODataLink> actual) {
- assertTrue(original.size() <= actual.size());
-
- for (ODataLink originalLink : original) {
- ODataLink foundOriginal = null;
- ODataLink foundActual = null;
-
- for (ODataLink actualLink : actual) {
-
- if (actualLink.getType() == originalLink.getType()
- && (originalLink.getLink() == null
- || actualLink.getLink().toASCIIString().endsWith(originalLink.getLink().toASCIIString()))
- && actualLink.getName().equals(originalLink.getName())) {
-
- foundOriginal = originalLink;
- foundActual = actualLink;
- }
- }
-
- assertNotNull(foundOriginal);
- assertNotNull(foundActual);
-
- if (foundOriginal instanceof ODataInlineEntity && foundActual instanceof ODataInlineEntity) {
- final ODataEntity originalInline = ((ODataInlineEntity) foundOriginal).getEntity();
- assertNotNull(originalInline);
-
- final ODataEntity actualInline = ((ODataInlineEntity) foundActual).getEntity();
- assertNotNull(actualInline);
-
- checkProperties(originalInline.getProperties(), actualInline.getProperties());
- }
- }
- }
-
- protected void checkProperties(final Collection<ODataProperty> original, final Collection<ODataProperty> actual) {
- assertTrue(original.size() <= actual.size());
-
- // re-organize actual properties into a Map<String, ODataProperty>
- final Map<String, ODataProperty> actualProps = new HashMap<String, ODataProperty>(actual.size());
-
- for (ODataProperty prop : actual) {
- assertFalse(actualProps.containsKey(prop.getName()));
- actualProps.put(prop.getName(), prop);
- }
-
- assertTrue(actual.size() <= actualProps.size());
-
- for (ODataProperty prop : original) {
- assertNotNull(prop);
- if (actualProps.containsKey(prop.getName())) {
- final ODataProperty actualProp = actualProps.get(prop.getName());
- assertNotNull(actualProp);
-
- if (prop.getValue() != null && actualProp.getValue() != null) {
- checkPropertyValue(prop.getName(), prop.getValue(), actualProp.getValue());
- }
- } else {
- // nothing ... maybe :FC_KeepInContent="false"
- // ..... no assert can be done ....
- }
- }
- }
-
- protected void checkPropertyValue(final String propertyName,
- final ODataValue original, final ODataValue actual) {
-
- assertNotNull("Null original value for " + propertyName, original);
- assertNotNull("Null actual value for " + propertyName, actual);
-
- assertEquals("Type mismatch for '" + propertyName + "': "
- + original.getClass().getSimpleName() + "-" + actual.getClass().getSimpleName(),
- original.getClass().getSimpleName(), actual.getClass().getSimpleName());
-
- if (original.isComplex()) {
- final List<ODataProperty> originalFileds = new ArrayList<ODataProperty>();
- for (ODataProperty prop : original.asComplex()) {
- originalFileds.add(prop);
- }
-
- final List<ODataProperty> actualFileds = new ArrayList<ODataProperty>();
- for (ODataProperty prop : (ODataComplexValue) actual) {
- actualFileds.add(prop);
- }
-
- checkProperties(originalFileds, actualFileds);
- } else if (original.isCollection()) {
- assertTrue(original.asCollection().size() <= actual.asCollection().size());
-
- boolean found = original.asCollection().isEmpty();
-
- for (ODataValue originalValue : original.asCollection()) {
- for (ODataValue actualValue : actual.asCollection()) {
- try {
- checkPropertyValue(propertyName, originalValue, actualValue);
- found = true;
- } catch (AssertionError ignore) {
- // ignore
- }
- }
- }
-
- assertTrue("Found " + actual + " but expected " + original, found);
- } else {
- assertTrue("Primitive value for '" + propertyName + "' type mismatch: " + original.asPrimitive().
- getTypeName() + "-" + actual.asPrimitive().getTypeName(),
- original.asPrimitive().getTypeName().equals(actual.asPrimitive().getTypeName()));
-
- assertEquals("Primitive value for '" + propertyName + "' mismatch: " + original.asPrimitive().toString()
- + "-" + actual.asPrimitive().toString(),
- original.asPrimitive().toString(), actual.asPrimitive().toString());
- }
- }
-
- protected ODataEntity getSampleCustomerInfo(final int id, final String sampleinfo) {
- final ODataEntity entity =
- client.getObjectFactory().newEntity("Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo");
- entity.setMediaEntity(true);
-
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("Information",
- client.getPrimitiveValueBuilder().setText(sampleinfo).setType(
- EdmSimpleType.String).build()));
-
- return entity;
- }
-
- protected ODataEntity getSampleCustomerProfile(
- final int id, final String sampleName, final boolean withInlineInfo) {
-
- final ODataEntity entity =
- client.getObjectFactory().newEntity("Microsoft.Test.OData.Services.AstoriaDefaultService.Customer");
-
- // add name attribute
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("Name",
- client.getPrimitiveValueBuilder().setText(sampleName).setType(
- EdmSimpleType.String).build()));
-
- // add key attribute
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("CustomerId",
- client.getPrimitiveValueBuilder().setText(String.valueOf(id)).setType(
- EdmSimpleType.Int32).build()));
-
- // add BackupContactInfo attribute (collection)
- final ODataCollectionValue backupContactInfoValue = new ODataCollectionValue(
- "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)");
- entity.addProperty(client.getObjectFactory().newCollectionProperty("BackupContactInfo",
- backupContactInfoValue));
-
- // add BackupContactInfo.ContactDetails attribute (complex)
- final ODataComplexValue contactDetails = new ODataComplexValue(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails");
- backupContactInfoValue.add(contactDetails);
-
- // add BackupContactInfo.ContactDetails.AlternativeNames attribute (collection)
- final ODataCollectionValue altNamesValue = new ODataCollectionValue("Collection(Edm.String)");
- altNamesValue.add(client.getPrimitiveValueBuilder().
- setText("myname").setType(EdmSimpleType.String).build());
- contactDetails.add(client.getObjectFactory().newCollectionProperty("AlternativeNames", altNamesValue));
-
- // add BackupContactInfo.ContactDetails.EmailBag attribute (collection)
- final ODataCollectionValue emailBagValue = new ODataCollectionValue("Collection(Edm.String)");
- emailBagValue.add(client.getPrimitiveValueBuilder().
- setText("myname@mydomain.com").setType(EdmSimpleType.String).build());
- contactDetails.add(client.getObjectFactory().newCollectionProperty("EmailBag", emailBagValue));
-
- // add BackupContactInfo.ContactDetails.ContactAlias attribute (complex)
- final ODataComplexValue contactAliasValue = new ODataComplexValue(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases");
- contactDetails.add(client.getObjectFactory().newComplexProperty("ContactAlias", contactAliasValue));
-
- // add BackupContactInfo.ContactDetails.ContactAlias.AlternativeNames attribute (collection)
- final ODataCollectionValue aliasAltNamesValue = new ODataCollectionValue("Collection(Edm.String)");
- aliasAltNamesValue.add(client.getPrimitiveValueBuilder().
- setText("myAlternativeName").setType(EdmSimpleType.String).build());
- contactAliasValue.add(client.getObjectFactory().newCollectionProperty("AlternativeNames", aliasAltNamesValue));
-
- if (withInlineInfo) {
- final ODataInlineEntity inlineInfo = client.getObjectFactory().newInlineEntity(
- "Info",
- URI.create("Customer(" + id + ")/Info"),
- getSampleCustomerInfo(id, sampleName + "_Info"));
- inlineInfo.getEntity().setMediaEntity(true);
- entity.addLink(inlineInfo);
- }
-
- return entity;
- }
-
- protected void debugEntry(final Entry entry, final String message) {
- if (LOG.isDebugEnabled()) {
- final StringWriter writer = new StringWriter();
- client.getSerializer().entry(entry, writer);
- writer.flush();
- LOG.debug(message + "\n{}", writer.toString());
- }
- }
-
- protected void debugFeed(final Feed feed, final String message) {
- if (LOG.isDebugEnabled()) {
- final StringWriter writer = new StringWriter();
- client.getSerializer().feed(feed, writer);
- writer.flush();
- LOG.debug(message + "\n{}", writer.toString());
- }
- }
-
- protected void debugODataProperty(final ODataProperty property, final String message) {
- LOG.debug(message + "\n{}", property.toString());
- }
-
- protected void debugODataValue(final ODataValue value, final String message) {
- LOG.debug(message + "\n{}", value.toString());
- }
-
- protected void debugODataEntity(final ODataEntity entity, final String message) {
- if (LOG.isDebugEnabled()) {
- StringWriter writer = new StringWriter();
- client.getSerializer().entry(client.getBinder().getEntry(entity, AtomEntry.class), writer);
- writer.flush();
- LOG.debug(message + " (Atom)\n{}", writer.toString());
-
- writer = new StringWriter();
- client.getSerializer().entry(client.getBinder().getEntry(entity, JSONEntry.class), writer);
- writer.flush();
- LOG.debug(message + " (JSON)\n{}", writer.toString());
- }
- }
-
- protected void debugInputStream(final InputStream input, final String message) {
- if (LOG.isDebugEnabled()) {
- try {
- LOG.debug(message + "\n{}", IOUtils.toString(input));
- } catch (IOException e) {
- LOG.error("Error writing stream", e);
- } finally {
- IOUtils.closeQuietly(input);
- }
- }
- }
-
- protected String getETag(final URI uri) {
- final ODataRetrieveResponse<ODataEntity> res = client.getRetrieveRequestFactory().
- getEntityRequest(uri).execute();
- try {
- return res.getEtag();
- } finally {
- res.close();
- }
- }
-
- protected ODataEntity read(final ODataPubFormat format, final URI editLink) {
- final ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(editLink);
- req.setFormat(format);
-
- final ODataRetrieveResponse<ODataEntity> res = req.execute();
- final ODataEntity entity = res.getBody();
-
- assertNotNull(entity);
-
- if (ODataPubFormat.JSON_FULL_METADATA == format || ODataPubFormat.ATOM == format) {
- assertEquals(req.getURI(), entity.getEditLink());
- }
-
- return entity;
- }
-
- protected ODataEntity createEntity(
- final String serviceRootURL,
- final ODataPubFormat format,
- final ODataEntity original,
- final String entitySetName) {
-
- final URIBuilder uriBuilder = client.getURIBuilder(serviceRootURL);
- uriBuilder.appendEntitySetSegment(entitySetName);
-
- debugODataEntity(original, "About to create");
-
- final ODataEntityCreateRequest createReq =
- client.getCUDRequestFactory().getEntityCreateRequest(uriBuilder.build(), original);
- createReq.setFormat(format);
-
- final ODataEntityCreateResponse createRes = createReq.execute();
- assertEquals(201, createRes.getStatusCode());
- assertEquals("Created", createRes.getStatusMessage());
-
- final ODataEntity created = createRes.getBody();
- assertNotNull(created);
-
- debugODataEntity(created, "Just created");
-
- return created;
- }
-
- protected ODataEntity compareEntities(final String serviceRootURL,
- final ODataPubFormat format,
- final ODataEntity original,
- final int actualObjectId,
- final Collection<String> expands) {
-
- final URIBuilder uriBuilder = client.getURIBuilder(serviceRootURL).
- appendEntityTypeSegment("Customer").appendKeySegment(actualObjectId);
-
- // search expanded
- if (expands != null) {
- for (String expand : expands) {
- uriBuilder.expand(expand);
- }
- }
-
- final ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setFormat(format);
-
- final ODataRetrieveResponse<ODataEntity> res = req.execute();
- assertEquals(200, res.getStatusCode());
-
- final ODataEntity actual = res.getBody();
- assertNotNull(actual);
-
- // check defined links
- checkLinks(original.getAssociationLinks(), actual.getAssociationLinks());
- checkLinks(original.getEditMediaLinks(), actual.getEditMediaLinks());
- checkLinks(original.getNavigationLinks(), actual.getNavigationLinks());
-
- // check defined properties equality
- checkProperties(original.getProperties(), actual.getProperties());
-
- return actual;
- }
-
- protected void cleanAfterCreate(
- final ODataPubFormat format,
- final ODataEntity created,
- final boolean includeInline,
- final String baseUri) {
-
- final Set<URI> toBeDeleted = new HashSet<URI>();
- toBeDeleted.add(created.getEditLink());
-
- if (includeInline) {
- for (ODataLink link : created.getNavigationLinks()) {
- if (link instanceof ODataInlineEntity) {
- final ODataEntity inline = ((ODataInlineEntity) link).getEntity();
- if (inline.getEditLink() != null) {
- toBeDeleted.add(URIUtils.getURI(baseUri, inline.getEditLink().toASCIIString()));
- }
- }
-
- if (link instanceof ODataInlineEntitySet) {
- final ODataEntitySet inline = ((ODataInlineEntitySet) link).getEntitySet();
- for (ODataEntity entity : inline.getEntities()) {
- if (entity.getEditLink() != null) {
- toBeDeleted.add(URIUtils.getURI(baseUri, entity.getEditLink().toASCIIString()));
- }
- }
- }
- }
- }
-
- assertFalse(toBeDeleted.isEmpty());
-
- for (URI link : toBeDeleted) {
- final ODataDeleteRequest deleteReq = client.getCUDRequestFactory().getDeleteRequest(link);
- final ODataDeleteResponse deleteRes = deleteReq.execute();
-
- assertEquals(204, deleteRes.getStatusCode());
- assertEquals("No Content", deleteRes.getStatusMessage());
-
- deleteRes.close();
-
- final ODataEntityRequest retrieveReq = client.getRetrieveRequestFactory().getEntityRequest(link);
- // bug that needs to be fixed on the SampleService - cannot get entity not found with header
- // Accept: application/json;odata=minimalmetadata
- retrieveReq.setFormat(format == ODataPubFormat.JSON_FULL_METADATA ? ODataPubFormat.JSON : format);
-
- Exception exception = null;
- try {
- retrieveReq.execute();
- fail();
- } catch (ODataClientErrorException e) {
- exception = e;
- assertEquals(404, e.getStatusLine().getStatusCode());
- }
- assertNotNull(exception);
- }
- }
-
- protected void updateEntityDescription(
- final ODataPubFormat format, final ODataEntity changes, final UpdateType type) {
-
- updateEntityDescription(format, changes, type, null);
- }
-
- protected void updateEntityDescription(
- final ODataPubFormat format, final ODataEntity changes, final UpdateType type, final String etag) {
-
- updateEntityStringProperty("Description", format, changes, type, etag);
- }
-
- protected void updateEntityStringProperty(final String propertyName,
- final ODataPubFormat format, final ODataEntity changes, final UpdateType type, final String etag) {
-
- final URI editLink = changes.getEditLink();
-
- final String newm = "New " + propertyName + "(" + System.currentTimeMillis() + ")";
-
- ODataProperty propertyValue = changes.getProperty(propertyName);
-
- final String oldm;
- if (propertyValue == null) {
- oldm = null;
- } else {
- oldm = propertyValue.getValue().toString();
- changes.removeProperty(propertyValue);
- }
-
- assertNotEquals(newm, oldm);
-
- changes.addProperty(client.getObjectFactory().newPrimitiveProperty(propertyName,
- client.getPrimitiveValueBuilder().setText(newm).build()));
-
- update(type, changes, format, etag);
-
- final ODataEntity actual = read(format, editLink);
-
- propertyValue = null;
-
- for (ODataProperty prop : actual.getProperties()) {
- if (prop.getName().equals(propertyName)) {
- propertyValue = prop;
- }
- }
-
- assertNotNull(propertyValue);
- assertEquals(newm, propertyValue.getValue().toString());
- }
-
- protected void update(
- final UpdateType type, final ODataEntity changes, final ODataPubFormat format, final String etag) {
- final ODataEntityUpdateRequest req = client.getCUDRequestFactory().getEntityUpdateRequest(type, changes);
-
- if (client.getConfiguration().isUseXHTTPMethod()) {
- assertEquals(HttpMethod.POST, req.getMethod());
- } else {
- assertEquals(type.getMethod(), req.getMethod());
- }
- req.setFormat(format);
-
- if (StringUtils.isNotBlank(etag)) {
- req.setIfMatch(etag); // Product include ETag header into the response .....
- }
-
- final ODataEntityUpdateResponse res = req.execute();
- assertEquals(204, res.getStatusCode());
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/ActionOverloadingTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/ActionOverloadingTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/ActionOverloadingTestITCase.java
deleted file mode 100644
index de9e03b..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/ActionOverloadingTestITCase.java
+++ /dev/null
@@ -1,152 +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 com.msopentech.odatajclient.engine.it;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import com.msopentech.odatajclient.engine.communication.response.ODataInvokeResponse;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.data.ODataEntitySet;
-import com.msopentech.odatajclient.engine.data.ODataNoContent;
-import com.msopentech.odatajclient.engine.data.ODataProperty;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import com.msopentech.odatajclient.engine.data.ODataValue;
-import com.msopentech.odatajclient.engine.metadata.EdmV3Metadata;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.EntityContainer;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.FunctionImport;
-import com.msopentech.odatajclient.engine.utils.URIUtils;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import org.junit.Test;
-
-public class ActionOverloadingTestITCase extends AbstractTestITCase {
-
- @Test
- public void retrieveProducts() {
- final EdmV3Metadata metadata = client.getRetrieveRequestFactory().
- getMetadataRequest(testActionOverloadingServiceRootURL).execute().getBody();
- assertNotNull(metadata);
-
- final EntityContainer container = metadata.getSchema(0).getEntityContainers().get(0);
- assertNotNull(container);
-
- int execs = 0;
- for (FunctionImport funcImp : container.getFunctionImports("RetrieveProduct")) {
- final ODataInvokeResponse<ODataProperty> res;
- if (funcImp.getParameters().isEmpty()) {
- final URIBuilder funcImpBuilder = client.getURIBuilder(testActionOverloadingServiceRootURL).
- appendFunctionImportSegment(URIUtils.rootFunctionImportURISegment(container, funcImp));
-
- res = client.getInvokeRequestFactory().<ODataProperty>getInvokeRequest(
- funcImpBuilder.build(), metadata, funcImp).execute();
- } else if ("Microsoft.Test.OData.Services.AstoriaDefaultService.Product".
- equals(funcImp.getParameters().get(0).getType())) {
-
- final ODataEntity product = client.getRetrieveRequestFactory().getEntityRequest(
- client.getURIBuilder(testActionOverloadingServiceRootURL).
- appendEntityTypeSegment("Product").appendKeySegment(-10).build()).
- execute().getBody();
- assertNotNull(product);
-
- res = client.getInvokeRequestFactory().<ODataProperty>getInvokeRequest(
- product.getOperation("RetrieveProduct").getTarget(), metadata, funcImp).execute();
- } else if ("Microsoft.Test.OData.Services.AstoriaDefaultService.OrderLine".
- equals(funcImp.getParameters().get(0).getType())) {
-
- final Map<String, Object> key = new LinkedHashMap<String, Object>(2);
- key.put("OrderId", -10);
- key.put("ProductId", -10);
- final ODataEntity orderLine = client.getRetrieveRequestFactory().getEntityRequest(
- client.getURIBuilder(testActionOverloadingServiceRootURL).
- appendEntityTypeSegment("OrderLine").appendKeySegment(key).build()).
- execute().getBody();
- assertNotNull(orderLine);
-
- res = client.getInvokeRequestFactory().<ODataProperty>getInvokeRequest(
- orderLine.getOperation("RetrieveProduct").getTarget(), metadata, funcImp).execute();
- } else {
- res = null;
- }
-
- assertNotNull(res);
- assertEquals(200, res.getStatusCode());
- assertEquals(Integer.valueOf(-10), res.getBody().getPrimitiveValue().<Integer>toCastValue());
- execs++;
- }
- assertEquals(3, execs);
- }
-
- @Test
- public void increaseSalaries() {
- final EdmV3Metadata metadata =
- client.getRetrieveRequestFactory().getMetadataRequest(testActionOverloadingServiceRootURL).execute().
- getBody();
- assertNotNull(metadata);
-
- final EntityContainer container = metadata.getSchema(0).getEntityContainers().get(0);
- assertNotNull(container);
-
- int execs = 0;
- for (FunctionImport funcImp : container.getFunctionImports("IncreaseSalaries")) {
- final Map<String, ODataValue> parameters = new LinkedHashMap<String, ODataValue>(1);
- parameters.put("n",
- client.getPrimitiveValueBuilder().setType(EdmSimpleType.Int32).setValue(5).build());
-
- final ODataInvokeResponse<ODataNoContent> res;
- if ("Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Employee)".
- equals(funcImp.getParameters().get(0).getType())) {
-
- final URIBuilder builder = client.getURIBuilder(testActionOverloadingServiceRootURL).
- appendEntitySetSegment("Person").
- appendStructuralSegment("Microsoft.Test.OData.Services.AstoriaDefaultService.Employee");
-
- final ODataEntitySet employees = client.getRetrieveRequestFactory().getEntitySetRequest(
- builder.build()).execute().getBody();
- assertNotNull(employees);
-
- res = client.getInvokeRequestFactory().<ODataNoContent>getInvokeRequest(
- builder.appendFunctionImportSegment(funcImp.getName()).build(), metadata, funcImp, parameters).
- execute();
- } else if ("Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee)".
- equals(funcImp.getParameters().get(0).getType())) {
-
- final URIBuilder builder = client.getURIBuilder(testActionOverloadingServiceRootURL).
- appendEntitySetSegment("Person").
- appendStructuralSegment("Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee");
-
- final ODataEntitySet specialEmployees = client.getRetrieveRequestFactory().getEntitySetRequest(
- builder.build()).execute().getBody();
- assertNotNull(specialEmployees);
-
- res = client.getInvokeRequestFactory().<ODataNoContent>getInvokeRequest(
- builder.appendFunctionImportSegment(funcImp.getName()).build(), metadata, funcImp, parameters).
- execute();
- } else {
- res = null;
- }
-
- assertNotNull(res);
- assertEquals(204, res.getStatusCode());
- execs++;
- }
- assertEquals(2, execs);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/AsyncTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/AsyncTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/AsyncTestITCase.java
deleted file mode 100644
index f2df3f1..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/AsyncTestITCase.java
+++ /dev/null
@@ -1,129 +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 com.msopentech.odatajclient.engine.it;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertFalse;
-
-import com.msopentech.odatajclient.engine.communication.request.UpdateType;
-import com.msopentech.odatajclient.engine.communication.request.cud.ODataEntityUpdateRequest;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataMediaRequest;
-import com.msopentech.odatajclient.engine.communication.request.streamed.ODataMediaEntityCreateRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataEntityUpdateResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataMediaEntityCreateResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.data.ODataEntitySet;
-import com.msopentech.odatajclient.engine.data.ODataPrimitiveValue;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import org.apache.commons.io.IOUtils;
-import org.junit.Test;
-
-public class AsyncTestITCase extends AbstractTestITCase {
-
- @Test
- public void retrieveEntitySet() throws InterruptedException, ExecutionException {
- final URIBuilder uriBuilder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntitySetSegment("Product");
- final Future<ODataRetrieveResponse<ODataEntitySet>> futureRes =
- client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build()).asyncExecute();
- assertNotNull(futureRes);
-
- while (!futureRes.isDone()) {
- }
-
- final ODataRetrieveResponse<ODataEntitySet> res = futureRes.get();
- assertNotNull(res);
- assertEquals(200, res.getStatusCode());
- assertFalse(res.getBody().getEntities().isEmpty());
- }
-
- @Test
- public void updateEntity() throws InterruptedException, ExecutionException {
- final URI uri = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment("Product").appendKeySegment(-10).build();
-
- final ODataRetrieveResponse<ODataEntity> entityRes = client.getRetrieveRequestFactory().
- getEntityRequest(uri).execute();
- final ODataEntity entity = entityRes.getBody();
- entity.getAssociationLinks().clear();
- entity.getNavigationLinks().clear();
- entity.getEditMediaLinks().clear();
- entity.getProperty("Description").setValue(
- client.getPrimitiveValueBuilder().setText("AsyncTest#updateEntity").build());
-
- final ODataEntityUpdateRequest updateReq =
- client.getCUDRequestFactory().getEntityUpdateRequest(uri, UpdateType.MERGE, entity);
- updateReq.setIfMatch(entityRes.getEtag());
- final Future<ODataEntityUpdateResponse> futureRes = updateReq.asyncExecute();
-
- while (!futureRes.isDone()) {
- }
-
- final ODataEntityUpdateResponse res = futureRes.get();
- assertNotNull(res);
- assertEquals(204, res.getStatusCode());
- }
-
- /**
- * @see MediaEntityTest#createMediaEntity(com.msopentech.odatajclient.engine.format.ODataPubFormat)
- */
- @Test
- public void createMediaEntity() throws InterruptedException, ExecutionException, IOException {
- URIBuilder builder = client.getURIBuilder(testDefaultServiceRootURL).appendEntitySetSegment("Car");
-
- final String TO_BE_UPDATED = "async buffered stream sample";
- final InputStream input = IOUtils.toInputStream(TO_BE_UPDATED);
-
- final ODataMediaEntityCreateRequest createReq =
- client.getStreamedRequestFactory().getMediaEntityCreateRequest(builder.build(), input);
-
- final ODataMediaEntityCreateRequest.MediaEntityCreateStreamManager streamManager = createReq.execute();
- final Future<ODataMediaEntityCreateResponse> futureCreateRes = streamManager.getAsyncResponse();
-
- while (!futureCreateRes.isDone()) {
- }
- final ODataMediaEntityCreateResponse createRes = futureCreateRes.get();
-
- assertEquals(201, createRes.getStatusCode());
-
- final ODataEntity created = createRes.getBody();
- assertNotNull(created);
- assertEquals(2, created.getProperties().size());
-
- final int id = "VIN".equals(created.getProperties().get(0).getName())
- ? created.getProperties().get(0).getPrimitiveValue().<Integer>toCastValue()
- : created.getProperties().get(1).getPrimitiveValue().<Integer>toCastValue();
-
- builder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment("Car").appendKeySegment(id).appendValueSegment();
-
- final ODataMediaRequest retrieveReq = client.getRetrieveRequestFactory().getMediaRequest(builder.build());
-
- final ODataRetrieveResponse<InputStream> retrieveRes = retrieveReq.execute();
- assertEquals(200, retrieveRes.getStatusCode());
- assertEquals(TO_BE_UPDATED, IOUtils.toString(retrieveRes.getBody()));
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/AuthEntityRetrieveTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/AuthEntityRetrieveTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/AuthEntityRetrieveTestITCase.java
deleted file mode 100644
index 0a99553..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/AuthEntityRetrieveTestITCase.java
+++ /dev/null
@@ -1,53 +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 com.msopentech.odatajclient.engine.it;
-
-import com.msopentech.odatajclient.engine.client.http.AbstractBasicAuthHttpClientFactory;
-import com.msopentech.odatajclient.engine.client.http.DefaultHttpClientFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-
-public class AuthEntityRetrieveTestITCase extends EntityRetrieveTestITCase {
-
- @BeforeClass
- public static void enableBasicAuth() {
- client.getConfiguration().setHttpClientFactory(new AbstractBasicAuthHttpClientFactory() {
-
- @Override
- protected String getUsername() {
- return "odatajclient";
- }
-
- @Override
- protected String getPassword() {
- return "odatajclient";
- }
- });
- }
-
- @AfterClass
- public static void disableBasicAuth() {
- client.getConfiguration().setHttpClientFactory(new DefaultHttpClientFactory());
- }
-
- @Override
- protected String getServiceRoot() {
- return testAuthServiceRootURL;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/BatchTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/BatchTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/BatchTestITCase.java
deleted file mode 100644
index f099dfb..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/BatchTestITCase.java
+++ /dev/null
@@ -1,439 +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 com.msopentech.odatajclient.engine.it;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.fail;
-
-import com.msopentech.odatajclient.engine.communication.request.batch.ODataBatchRequest;
-import com.msopentech.odatajclient.engine.communication.request.batch.ODataBatchRequest.BatchStreamManager;
-import com.msopentech.odatajclient.engine.communication.request.ODataStreamManager;
-import com.msopentech.odatajclient.engine.communication.request.UpdateType;
-import com.msopentech.odatajclient.engine.communication.request.batch.ODataBatchResponseItem;
-import com.msopentech.odatajclient.engine.communication.request.batch.ODataChangeset;
-import com.msopentech.odatajclient.engine.communication.request.batch.ODataChangesetResponseItem;
-import com.msopentech.odatajclient.engine.communication.request.batch.ODataRetrieve;
-import com.msopentech.odatajclient.engine.communication.request.batch.ODataRetrieveResponseItem;
-import com.msopentech.odatajclient.engine.communication.request.cud.ODataEntityCreateRequest;
-import com.msopentech.odatajclient.engine.communication.request.cud.ODataEntityUpdateRequest;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataEntityRequest;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataEntityRequest.ODataEntityResponseImpl;
-import org.junit.Test;
-import com.msopentech.odatajclient.engine.communication.response.ODataBatchResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataEntityCreateResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataEntityUpdateResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataResponse;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.data.ODataObjectFactory;
-import com.msopentech.odatajclient.engine.data.ODataPrimitiveValue;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import com.msopentech.odatajclient.engine.utils.ODataBatchConstants;
-import com.msopentech.odatajclient.engine.utils.URIUtils;
-import com.msopentech.odatajclient.engine.utils.Wrapper;
-import java.io.IOException;
-import java.net.URI;
-import java.util.Iterator;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import org.apache.http.HttpResponse;
-
-public class BatchTestITCase extends AbstractTestITCase {
-
- private static String PREFIX = "!!PREFIX!!";
-
- private static String SUFFIX = "!!SUFFIX!!";
-
- private static int MAX = 10000;
-
- @Test
- public void stringStreaming() {
- final TestStreamManager streaming = new TestStreamManager();
-
- new StreamingThread(streaming).start();
-
- streaming.addObject((PREFIX + "\n").getBytes());
-
- for (int i = 0; i <= MAX; i++) {
- streaming.addObject((i + ") send info\n").getBytes());
- }
-
- streaming.addObject((SUFFIX).getBytes());
- streaming.finalizeBody();
- }
-
- @Test
- public void emptyBatchRequest() {
- // create your request
- final ODataBatchRequest request = client.getBatchRequestFactory().getBatchRequest(testDefaultServiceRootURL);
-
- final BatchStreamManager payload = request.execute();
- final ODataBatchResponse response = payload.getResponse();
-
- assertEquals(202, response.getStatusCode());
- assertEquals("Accepted", response.getStatusMessage());
-
- final Iterator<ODataBatchResponseItem> iter = response.getBody();
- assertFalse(iter.hasNext());
- }
-
- @Test
- public void changesetWithError() {
- // create your request
- final ODataBatchRequest request = client.getBatchRequestFactory().getBatchRequest(testDefaultServiceRootURL);
-
- final BatchStreamManager payload = request.execute();
- final ODataChangeset changeset = payload.addChangeset();
-
- URIBuilder targetURI;
- ODataEntityCreateRequest create;
-
- targetURI = client.getURIBuilder(testDefaultServiceRootURL).appendEntitySetSegment("Customer");
- for (int i = 1; i <= 2; i++) {
- // Create Customer into the changeset
- create = client.getCUDRequestFactory().getEntityCreateRequest(
- targetURI.build(),
- getSampleCustomerProfile(100 + i, "Sample customer", false));
- create.setFormat(ODataPubFormat.JSON);
- changeset.addRequest(create);
- }
-
- targetURI = client.getURIBuilder(testDefaultServiceRootURL).appendEntitySetSegment("WrongEntitySet");
- create = client.getCUDRequestFactory().getEntityCreateRequest(
- targetURI.build(),
- getSampleCustomerProfile(105, "Sample customer", false));
- create.setFormat(ODataPubFormat.JSON);
- changeset.addRequest(create);
-
- targetURI = client.getURIBuilder(testDefaultServiceRootURL).appendEntitySetSegment("Customer");
- for (int i = 3; i <= 4; i++) {
- // Create Customer into the changeset
- create = client.getCUDRequestFactory().getEntityCreateRequest(
- targetURI.build(),
- getSampleCustomerProfile(100 + i, "Sample customer", false));
- create.setFormat(ODataPubFormat.ATOM);
- changeset.addRequest(create);
- }
-
- final ODataBatchResponse response = payload.getResponse();
- assertEquals(202, response.getStatusCode());
- assertEquals("Accepted", response.getStatusMessage());
-
- final Iterator<ODataBatchResponseItem> iter = response.getBody();
- final ODataChangesetResponseItem chgResponseItem = (ODataChangesetResponseItem) iter.next();
-
- final ODataResponse res = chgResponseItem.next();
- assertEquals(404, res.getStatusCode());
- assertEquals("Not Found", res.getStatusMessage());
- assertEquals(Integer.valueOf(3), Integer.valueOf(
- res.getHeader(ODataBatchConstants.CHANGESET_CONTENT_ID_NAME).iterator().next()));
- assertFalse(chgResponseItem.hasNext());
- }
-
- @Test
- public void changesetWithReference() {
- // create your request
- final ODataBatchRequest request = client.getBatchRequestFactory().getBatchRequest(testDefaultServiceRootURL);
- final BatchStreamManager streamManager = request.execute();
-
- final ODataChangeset changeset = streamManager.addChangeset();
- ODataEntity customer = getSampleCustomerProfile(20, "sample customer", false);
-
- URIBuilder uriBuilder = client.getURIBuilder(testAuthServiceRootURL).appendEntitySetSegment("Customer");
-
- // add create request
- final ODataEntityCreateRequest createReq =
- client.getCUDRequestFactory().getEntityCreateRequest(uriBuilder.build(), customer);
-
- changeset.addRequest(createReq);
-
- // retrieve request reference
- int createRequestRef = changeset.getLastContentId();
-
- // add update request: link CustomerInfo(17) to the new customer
- final ODataEntity customerChanges = client.getObjectFactory().newEntity(customer.getName());
- customerChanges.addLink(client.getObjectFactory().newEntityNavigationLink(
- "Info",
- client.getURIBuilder(testAuthServiceRootURL).appendEntitySetSegment("CustomerInfo").
- appendKeySegment(17).build()));
-
- final ODataEntityUpdateRequest updateReq = client.getCUDRequestFactory().getEntityUpdateRequest(
- URI.create("$" + createRequestRef), UpdateType.PATCH, customerChanges);
-
- changeset.addRequest(updateReq);
-
- final ODataBatchResponse response = streamManager.getResponse();
- assertEquals(202, response.getStatusCode());
- assertEquals("Accepted", response.getStatusMessage());
-
- // verify response payload ...
- final Iterator<ODataBatchResponseItem> iter = response.getBody();
-
- final ODataBatchResponseItem item = iter.next();
- assertTrue(item instanceof ODataChangesetResponseItem);
-
- final ODataChangesetResponseItem chgitem = (ODataChangesetResponseItem) item;
-
- ODataResponse res = chgitem.next();
- assertEquals(201, res.getStatusCode());
- assertTrue(res instanceof ODataEntityCreateResponse);
-
- customer = ((ODataEntityCreateResponse) res).getBody();
-
- ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(
- URIUtils.getURI(testDefaultServiceRootURL, customer.getEditLink().toASCIIString() + "/Info"));
-
- assertEquals(Integer.valueOf(17),
- req.execute().getBody().getProperty("CustomerInfoId").getPrimitiveValue().<Integer>toCastValue());
-
- res = chgitem.next();
- assertEquals(204, res.getStatusCode());
- assertTrue(res instanceof ODataEntityUpdateResponse);
-
- // clean ...
- assertEquals(204, client.getCUDRequestFactory().getDeleteRequest(
- URIUtils.getURI(testDefaultServiceRootURL, customer.getEditLink().toASCIIString())).execute().
- getStatusCode());
-
- try {
- client.getRetrieveRequestFactory().getEntityRequest(
- URIUtils.getURI(testDefaultServiceRootURL, customer.getEditLink().toASCIIString())).
- execute().getBody();
- fail();
- } catch (Exception e) {
- // ignore
- }
- }
-
- @Test
- public void batchRequest() {
- // create your request
- final ODataBatchRequest request = client.getBatchRequestFactory().getBatchRequest(testDefaultServiceRootURL);
-
- final BatchStreamManager streamManager = request.execute();
-
- // -------------------------------------------
- // Add retrieve item
- // -------------------------------------------
- ODataRetrieve retrieve = streamManager.addRetrieve();
-
- // prepare URI
- URIBuilder targetURI = client.getURIBuilder(testDefaultServiceRootURL);
- targetURI.appendEntityTypeSegment("Customer").appendKeySegment(-10).
- expand("Logins").select("CustomerId,Logins/Username");
-
- // create new request
- ODataEntityRequest query = client.getRetrieveRequestFactory().getEntityRequest(targetURI.build());
- query.setFormat(ODataPubFormat.ATOM);
-
- retrieve.setRequest(query);
- // -------------------------------------------
-
- // -------------------------------------------
- // Add changeset item
- // -------------------------------------------
- final ODataChangeset changeset = streamManager.addChangeset();
-
- // Update Product into the changeset
- targetURI = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment("Product").appendKeySegment(-10);
- final URI editLink = targetURI.build();
-
- final ODataEntity merge = client.getObjectFactory().newEntity(TEST_PRODUCT_TYPE);
- merge.setEditLink(editLink);
-
- merge.addProperty(client.getObjectFactory().newPrimitiveProperty(
- "Description", client.getPrimitiveValueBuilder().setText("new description from batch").build()));
-
- final ODataEntityUpdateRequest changes =
- client.getCUDRequestFactory().getEntityUpdateRequest(UpdateType.MERGE, merge);
- changes.setFormat(ODataPubFormat.JSON_FULL_METADATA);
- changes.setIfMatch(getETag(editLink));
-
- changeset.addRequest(changes);
-
- // Create Customer into the changeset
- targetURI = client.getURIBuilder(testDefaultServiceRootURL).appendEntitySetSegment("Customer");
- final ODataEntity original = getSampleCustomerProfile(1000, "Sample customer", false);
- final ODataEntityCreateRequest create =
- client.getCUDRequestFactory().getEntityCreateRequest(targetURI.build(), original);
- create.setFormat(ODataPubFormat.ATOM);
- changeset.addRequest(create);
- // -------------------------------------------
-
- // -------------------------------------------
- // Add retrieve item
- // -------------------------------------------
- retrieve = streamManager.addRetrieve();
-
- // prepare URI
- targetURI = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment("Product").appendKeySegment(-10);
-
- // create new request
- query = client.getRetrieveRequestFactory().getEntityRequest(targetURI.build());
-
- retrieve.setRequest(query);
- // -------------------------------------------
-
- final ODataBatchResponse response = streamManager.getResponse();
- assertEquals(202, response.getStatusCode());
- assertEquals("Accepted", response.getStatusMessage());
-
- final Iterator<ODataBatchResponseItem> iter = response.getBody();
-
- // retrive the first item (ODataRetrieve)
- ODataBatchResponseItem item = iter.next();
- assertTrue(item instanceof ODataRetrieveResponseItem);
-
- ODataRetrieveResponseItem retitem = (ODataRetrieveResponseItem) item;
- ODataResponse res = retitem.next();
- assertTrue(res instanceof ODataEntityResponseImpl);
- assertEquals(200, res.getStatusCode());
- assertEquals("OK", res.getStatusMessage());
-
- ODataEntityResponseImpl entres = (ODataEntityResponseImpl) res;
- ODataEntity entity = entres.getBody();
- assertEquals(new Integer(-10), entity.getProperty("CustomerId").getPrimitiveValue().<Integer>toCastValue());
-
- // retrieve the second item (ODataChangeset)
- item = iter.next();
- assertTrue(item instanceof ODataChangesetResponseItem);
-
- final ODataChangesetResponseItem chgitem = (ODataChangesetResponseItem) item;
- res = chgitem.next();
- assertTrue(res instanceof ODataEntityUpdateResponse);
- assertEquals(204, res.getStatusCode());
- assertEquals("No Content", res.getStatusMessage());
-
- res = chgitem.next();
- assertTrue(res instanceof ODataEntityCreateResponse);
- assertEquals(201, res.getStatusCode());
- assertEquals("Created", res.getStatusMessage());
-
- final ODataEntityCreateResponse createres = (ODataEntityCreateResponse) res;
- entity = createres.getBody();
- assertEquals(new Integer(1000), entity.getProperty("CustomerId").getPrimitiveValue().<Integer>toCastValue());
-
- // retrive the third item (ODataRetrieve)
- item = iter.next();
- assertTrue(item instanceof ODataRetrieveResponseItem);
-
- retitem = (ODataRetrieveResponseItem) item;
- res = retitem.next();
- assertTrue(res instanceof ODataEntityResponseImpl);
- assertEquals(200, res.getStatusCode());
- assertEquals("OK", res.getStatusMessage());
-
- entres = (ODataEntityResponseImpl) res;
- entity = entres.getBody();
- assertEquals("new description from batch",
- entity.getProperty("Description").getPrimitiveValue().<String>toCastValue());
-
- assertFalse(iter.hasNext());
- }
-
- private static class TestStreamManager extends ODataStreamManager<ODataBatchResponse> {
-
- public TestStreamManager() {
- super(new Wrapper<Future<HttpResponse>>());
- }
-
- public ODataStreamManager<ODataBatchResponse> addObject(byte[] src) {
- stream(src);
- return this;
- }
-
- @Override
- protected ODataBatchResponse getResponse(long timeout, TimeUnit unit) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
- };
-
- /**
- * To be used for debug purposes.
- */
- private static class StreamingThread extends Thread {
-
- private final TestStreamManager streaming;
-
- public StreamingThread(final TestStreamManager streaming) {
- this.streaming = streaming;
- }
-
- @Override
- public void run() {
- try {
- final StringBuilder builder = new StringBuilder();
-
- byte[] buff = new byte[1024];
-
- int len;
-
- while ((len = streaming.getBody().read(buff)) >= 0) {
- builder.append(new String(buff, 0, len));
- }
-
- assertTrue(builder.toString().startsWith(PREFIX));
- assertTrue(builder.toString().contains((MAX / 2) + ") send info"));
- assertTrue(builder.toString().contains((MAX / 3) + ") send info"));
- assertTrue(builder.toString().contains((MAX / 20) + ") send info"));
- assertTrue(builder.toString().contains((MAX / 30) + ") send info"));
- assertTrue(builder.toString().contains(MAX + ") send info"));
- assertTrue(builder.toString().endsWith(SUFFIX));
-
- } catch (IOException e) {
- fail();
- }
- }
- }
-
- private static class BatchStreamingThread extends Thread {
-
- private final BatchStreamManager streaming;
-
- public BatchStreamingThread(final BatchStreamManager streaming) {
- this.streaming = streaming;
- }
-
- @Override
- public void run() {
- try {
- final StringBuilder builder = new StringBuilder();
-
- byte[] buff = new byte[1024];
-
- int len;
-
- while ((len = streaming.getBody().read(buff)) >= 0) {
- builder.append(new String(buff, 0, len));
- }
-
- LOG.debug("Batch request {}", builder.toString());
-
- assertTrue(builder.toString().contains("Content-Id:2"));
- assertTrue(builder.toString().contains("GET " + servicesODataServiceRootURL));
- } catch (IOException e) {
- fail();
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/CountTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/CountTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/CountTestITCase.java
deleted file mode 100644
index 3c1f9c4..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/CountTestITCase.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 com.msopentech.odatajclient.engine.it;
-
-import static org.junit.Assert.*;
-import org.junit.Test;
-
-import com.msopentech.odatajclient.engine.communication.ODataClientErrorException;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataValueRequest;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import com.msopentech.odatajclient.engine.data.ODataValue;
-import com.msopentech.odatajclient.engine.format.ODataValueFormat;
-
-public class CountTestITCase extends AbstractTestITCase {
- //counts the total number of customers
-
- @Test
- public void entityCount() {
- URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment("Customer").appendCountSegment();
- final ODataValueRequest req = client.getRetrieveRequestFactory().getValueRequest(uriBuilder.build());
- req.setFormat(ODataValueFormat.TEXT);
- try {
- final ODataValue value = req.execute().getBody();
- assertTrue(10 <= Integer.parseInt(value.toString()));
- } catch (ODataClientErrorException e) {
- LOG.error("Error code: {}", e.getStatusLine().getStatusCode(), e);
- }
- }
- //returns 415 error for invalid header.
-
- @Test
- public void invalidAccept() {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment("Customer").appendCountSegment();
- final ODataValueRequest req = client.getRetrieveRequestFactory().getValueRequest(uriBuilder.build());
- req.setFormat(ODataValueFormat.TEXT);
- req.setAccept("application/json;odata=fullmetadata");
- try {
- final ODataValue value = req.execute().getBody();
- fail();
- } catch (ODataClientErrorException e) {
- assertEquals(415, e.getStatusLine().getStatusCode());
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/CreateMediaEntityTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/CreateMediaEntityTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/CreateMediaEntityTestITCase.java
deleted file mode 100644
index a291efe..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/CreateMediaEntityTestITCase.java
+++ /dev/null
@@ -1,276 +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 com.msopentech.odatajclient.engine.it;
-
-import static org.junit.Assert.*;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.commons.lang3.StringUtils;
-import org.junit.Test;
-import com.msopentech.odatajclient.engine.communication.request.UpdateType;
-import com.msopentech.odatajclient.engine.communication.request.cud.CUDRequestFactory;
-import com.msopentech.odatajclient.engine.communication.request.cud.ODataDeleteRequest;
-import com.msopentech.odatajclient.engine.communication.request.cud.ODataEntityUpdateRequest;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataEntityRequest;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataMediaRequest;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.RetrieveRequestFactory;
-import com.msopentech.odatajclient.engine.communication.request.streamed.ODataMediaEntityCreateRequest;
-import com.msopentech.odatajclient.engine.communication.request.streamed.ODataMediaEntityCreateRequest.MediaEntityCreateStreamManager;
-import com.msopentech.odatajclient.engine.communication.request.streamed.StreamedRequestFactory;
-import com.msopentech.odatajclient.engine.communication.response.ODataDeleteResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataEntityUpdateResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataMediaEntityCreateResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.data.ODataObjectFactory;
-import com.msopentech.odatajclient.engine.data.ODataPrimitiveValue;
-import com.msopentech.odatajclient.engine.data.ODataProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.engine.format.ODataMediaFormat;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import org.apache.commons.io.input.BoundedInputStream;
-
-public class CreateMediaEntityTestITCase extends AbstractTestITCase {
-
- // create media entity with json
- @Test
- public void createMediaWithJSON() {
- ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- String contentType = "application/json;odata=fullmetadata";
- String prefer = "return-content";
- String fileType = "/images/image1.jpg";
- try {
- createMediaEntity(format, contentType, prefer, fileType);
- } catch (IOException e) {
- fail(e.getMessage());
- }
- }
- // with png image
-
- @Test
- public void createMediaWithJSONAndPng() {
- ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- String contentType = "application/json;odata=fullmetadata";
- String prefer = "return-content";
- String fileType = "/images/image1.png";
- try {
- createMediaEntity(format, contentType, prefer, fileType);
- } catch (IOException e) {
- fail(e.getMessage());
- }
- }
- // with a long image
-
- @Test
- public void createMediaWithJSONBigImage() {
- ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- String contentType = "application/json;odata=fullmetadata";
- String prefer = "return-content";
- String fileType = "/images/Renault.jpg";
- try {
- createMediaEntity(format, contentType, prefer, fileType);
- } catch (IOException e) {
- fail(e.getMessage());
- }
- }
- // create media entity with json no metadata.
-
- @Test
- public void createMediaWithJSONNoMetadata() {
- ODataPubFormat format = ODataPubFormat.JSON_NO_METADATA;
- String contentType = "application/json;odata=nometadata";
- String prefer = "return-content";
- String fileType = "/images/image1.jpg";
- try {
- createMediaEntity(format, contentType, prefer, fileType);
- } catch (IOException e) {
- LOG.error("", e);
- fail(e.getMessage());
- }
- }
- // with JSON minimal meta data
-
- @Test
- public void createMediaWithJSONMinimalMetadata() {
- ODataPubFormat format = ODataPubFormat.JSON;
- String contentType = "application/json";
- String prefer = "return-content";
- String fileType = "/images/image1.jpg";
- try {
- createMediaEntity(format, contentType, prefer, fileType);
- } catch (IOException e) {
- LOG.error("", e);
- fail(e.getMessage());
- }
- }
- // create media with atom
-
- @Test
- public void createMediaWithATOM() {
- ODataPubFormat format = ODataPubFormat.ATOM;
- String contentType = "application/atom+xml";
- String prefer = "return-content";
- String fileType = "/images/image1.png";
- try {
- createMediaEntity(format, contentType, prefer, fileType);
- } catch (IOException e) {
- LOG.error("", e);
- fail(e.getMessage());
- }
- }
- // create video with atom
-
- @Test
- public void createVideoWithATOM() {
- ODataPubFormat format = ODataPubFormat.ATOM;
- String contentType = "application/atom+xml";
- String prefer = "return-content";
- String fileType = "/images/big_buck_bunny.mp4";
- try {
- createMediaEntity(format, contentType, prefer, fileType);
- } catch (IOException e) {
- LOG.error("", e);
- fail(e.getMessage());
- }
- }
- // create video with json
-
- @Test
- public void createVideoWithJSON() {
- ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- String contentType = "application/json;odata=fullmetadata";
- String prefer = "return-content";
- String fileType = "/images/big_buck_bunny.mp4";
- try {
- createMediaEntity(format, contentType, prefer, fileType);
- } catch (IOException e) {
- LOG.error("", e);
- fail(e.getMessage());
- }
- }
- // code to create a media entity.
- // Step 1 - POST an entity
- // Step 2 - PUT other properties in that entity.
-
- private void createMediaEntity(final ODataPubFormat format, final String contentType, final String prefer,
- final String file) throws IOException {
-
- try {
- final URIBuilder uriBuilder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntitySetSegment("Car");
-
- // The sample service has an upload request size of 65k
- final InputStream inputStream = new BoundedInputStream(getClass().getResourceAsStream(file), 65000);
-
- final ODataMediaEntityCreateRequest createReq =
- client.getStreamedRequestFactory().getMediaEntityCreateRequest(uriBuilder.build(), inputStream);
- createReq.setFormat(format);
- createReq.setContentType(contentType);
- createReq.setPrefer(prefer);
- final MediaEntityCreateStreamManager streamManager = createReq.execute();
- final ODataMediaEntityCreateResponse createRes = streamManager.getResponse();
- if (prefer.equals("return-content")) {
- assertEquals(201, createRes.getStatusCode());
-
- final ODataEntity createdEntity = createRes.getBody();
- assertNotNull(createdEntity);
- assertEquals(2, createdEntity.getProperties().size());
- // get the vin property of the entity created
- final int id = "VIN".equals(createdEntity.getProperties().get(0).getName())
- ? createdEntity.getProperties().get(0).getPrimitiveValue().<Integer>toCastValue()
- : createdEntity.getProperties().get(1).getPrimitiveValue().<Integer>toCastValue();
- uriBuilder.appendKeySegment(id).appendValueSegment();
- // get the stream value that got created
- final ODataMediaRequest retrieveReq = client.getRetrieveRequestFactory().getMediaRequest(uriBuilder.build());
- retrieveReq.setFormat(ODataMediaFormat.WILDCARD);
- final ODataRetrieveResponse<InputStream> retrieveRes = retrieveReq.execute();
- assertEquals(200, retrieveRes.getStatusCode());
- assertNotNull(retrieveRes.getBody());
- String etag = retrieveRes.getEtag();
- // get the entity created
- final ODataEntity entity =
- client.getObjectFactory().newEntity("Microsoft.Test.OData.Services.AstoriaDefaultService.Car");
-
- final ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(client.getURIBuilder(
- testDefaultServiceRootURL).
- appendEntityTypeSegment("Car").appendKeySegment(id).build());
- req.setFormat(format);
-
- final ODataRetrieveResponse<ODataEntity> res = req.execute();
- final ODataEntity entityToBeUpdated = res.getBody();
- assertNotNull(entity);
- String propertyName = "Description";
- final String newValue = "New renault car - " + propertyName;
-
- ODataProperty propertyValue = entityToBeUpdated.getProperty(propertyName);
-
- if (propertyValue != null) {
- entityToBeUpdated.removeProperty(propertyValue);
- }
- // add new value for the property
- entityToBeUpdated.addProperty(client.getObjectFactory().newPrimitiveProperty(propertyName,
- client.getPrimitiveValueBuilder().setText(newValue).setType(EdmSimpleType.String).build()));
-
- UpdateType type = UpdateType.REPLACE;
- // update the entity in the server
- ODataEntityUpdateRequest updateReq = client.getCUDRequestFactory().getEntityUpdateRequest(type,
- entityToBeUpdated);
- req.setFormat(format);
- if (StringUtils.isNotBlank(etag)) {
- req.setIfMatch(etag);
- }
- ODataEntityUpdateResponse updateRes = updateReq.execute();
- assertEquals(204, updateRes.getStatusCode());
-
- final ODataEntityRequest afterUpdateReq = client.getRetrieveRequestFactory().getEntityRequest(
- client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment("Car").appendKeySegment(id).build());
-
- req.setFormat(format);
- //assert whether the original value is equal to the actual value that got updated.
- final ODataRetrieveResponse<ODataEntity> afterUpdateRes = afterUpdateReq.execute();
- final ODataEntity entityAfterUpdate = afterUpdateRes.getBody();
- assertEquals(newValue, entityAfterUpdate.getProperty("Description").getValue().toString());
-
- // delete the entity
- URIBuilder deleteUriBuilder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment("Car(" + id + ")");
- ODataDeleteRequest deleteReq = client.getCUDRequestFactory().getDeleteRequest(deleteUriBuilder.build());
- deleteReq.setFormat(format);
- deleteReq.setContentType(contentType);
- ODataDeleteResponse deleteRes = deleteReq.execute();
- assertEquals(204, deleteRes.getStatusCode());
- } else {
- assertEquals(204, createRes.getStatusCode());
- }
- } catch (Exception e) {
- if ((format.equals(ODataPubFormat.JSON) || (format.equals(ODataPubFormat.JSON_NO_METADATA)) && e.
- getMessage().equals("No edit link found"))) {
- assertTrue(true);
- } else {
- fail(e.getMessage());
- }
- } catch (AssertionError e) {
- fail(e.getMessage());
- }
- }
-}
[43/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataTimestamp.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataTimestamp.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataTimestamp.java
deleted file mode 100644
index b59a498..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataTimestamp.java
+++ /dev/null
@@ -1,142 +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 com.msopentech.odatajclient.engine.data;
-
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import java.io.Serializable;
-import java.sql.Timestamp;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-
-/**
- * Helper class for handling datetime and datetime-offset primitive values.
- *
- * @see com.msopentech.odatajclient.engine.data.metadata.edm.EdmSimpleType#DATE_TIME
- * @see com.msopentech.odatajclient.engine.data.metadata.edm.EdmSimpleType#DATE_TIME_OFFSET
- */
-public final class ODataTimestamp implements Serializable {
-
- private static final long serialVersionUID = 4053990618660356004L;
-
- private final SimpleDateFormat sdf;
-
- private final Timestamp timestamp;
-
- private String timezone;
-
- private final boolean offset;
-
- public static ODataTimestamp getInstance(final EdmSimpleType type, final Timestamp timestamp) {
- return new ODataTimestamp(new SimpleDateFormat(type.pattern()),
- new Date(timestamp.getTime()), timestamp.getNanos(), type == EdmSimpleType.DateTimeOffset);
- }
-
- public static ODataTimestamp parse(final EdmSimpleType type, final String input) {
- final ODataTimestamp instance;
-
- final String[] dateParts = input.split("\\.");
- final SimpleDateFormat sdf = new SimpleDateFormat(type.pattern());
- final boolean isOffset = type == EdmSimpleType.DateTimeOffset;
-
- try {
- final Date date = sdf.parse(dateParts[0]);
- if (dateParts.length > 1) {
- int idx = dateParts[1].indexOf('+');
- if (idx == -1) {
- idx = dateParts[1].indexOf('-');
- }
- if (idx == -1) {
- instance = new ODataTimestamp(sdf, date, Integer.parseInt(dateParts[1]), isOffset);
- } else {
- instance = new ODataTimestamp(sdf, date,
- Integer.parseInt(dateParts[1].substring(0, idx)), dateParts[1].substring(idx), isOffset);
- }
- } else {
- instance = new ODataTimestamp(sdf, date, isOffset);
- }
- } catch (Exception e) {
- throw new IllegalArgumentException("Cannot parse " + type.pattern(), e);
- }
-
- return instance;
- }
-
- private ODataTimestamp(final SimpleDateFormat sdf, final Date date, final boolean offset) {
- this.sdf = sdf;
- this.timestamp = new Timestamp(date.getTime());
- this.offset = offset;
- }
-
- private ODataTimestamp(final SimpleDateFormat sdf, final Date date, final int nanos, final boolean offset) {
- this(sdf, date, offset);
- this.timestamp.setNanos(nanos);
- }
-
- private ODataTimestamp(
- final SimpleDateFormat sdf, final Date date, final int nanos, final String timezone, final boolean offset) {
- this(sdf, date, nanos, offset);
- this.timezone = timezone;
- }
-
- public Timestamp getTimestamp() {
- return timestamp;
- }
-
- public String getTimezone() {
- return timezone;
- }
-
- public boolean isOffset() {
- return offset;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public boolean equals(final Object obj) {
- return EqualsBuilder.reflectionEquals(this, obj, "sdf");
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public int hashCode() {
- return HashCodeBuilder.reflectionHashCode(this, "sdf");
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public String toString() {
- final StringBuilder formatted = new StringBuilder().append(sdf.format(timestamp));
- if (timestamp.getNanos() > 0) {
- formatted.append('.').append(String.valueOf(timestamp.getNanos()));
- }
- if (StringUtils.isNotBlank(timezone)) {
- formatted.append(timezone);
- }
- return formatted.toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataValue.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataValue.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataValue.java
deleted file mode 100644
index 37a4dd4..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataValue.java
+++ /dev/null
@@ -1,111 +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 com.msopentech.odatajclient.engine.data;
-
-import java.io.Serializable;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * Abstract representation of an OData entity property value.
- */
-public abstract class ODataValue implements Serializable {
-
- private static final long serialVersionUID = 7445422004232581877L;
-
- /**
- * Check is is a primitive value.
- *
- * @return 'TRUE' if primitive; 'FALSE' otherwise.
- */
- public boolean isPrimitive() {
- return (this instanceof ODataPrimitiveValue);
- }
-
- /**
- * Casts to primitive value.
- *
- * @return primitive value.
- */
- public ODataPrimitiveValue asPrimitive() {
- return isPrimitive() ? (ODataPrimitiveValue) this : null;
- }
-
- /**
- * Check is is a complex value.
- *
- * @return 'TRUE' if complex; 'FALSE' otherwise.
- */
- public boolean isComplex() {
- return (this instanceof ODataComplexValue);
- }
-
- /**
- * Casts to complex value.
- *
- * @return complex value.
- */
- public ODataComplexValue asComplex() {
- return isComplex() ? (ODataComplexValue) this : null;
- }
-
- /**
- * Check is is a collection value.
- *
- * @return 'TRUE' if collection; 'FALSE' otherwise.
- */
- public boolean isCollection() {
- return (this instanceof ODataCollectionValue);
- }
-
- /**
- * Casts to collection value.
- *
- * @return collection value.
- */
- public ODataCollectionValue asCollection() {
- return isCollection() ? (ODataCollectionValue) this : null;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public boolean equals(final Object obj) {
- return EqualsBuilder.reflectionEquals(this, obj);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public int hashCode() {
- return HashCodeBuilder.reflectionHashCode(this);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataWriter.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataWriter.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataWriter.java
deleted file mode 100644
index e0d4928..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataWriter.java
+++ /dev/null
@@ -1,91 +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 com.msopentech.odatajclient.engine.data;
-
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import java.io.InputStream;
-import java.io.Serializable;
-import java.util.Collection;
-
-/**
- * OData writer.
- * <br/>
- * Use this interface to serialize an OData request body.
- * <br/>
- * This interface provides method helpers to serialize a set of entities and a single entity as well.
- */
-public interface ODataWriter extends Serializable {
-
- /**
- * Writes a collection of OData entities.
- *
- * @param entities entities to be serialized.
- * @param format serialization format.
- * @return stream of serialized objects.
- */
- InputStream writeEntities(Collection<ODataEntity> entities, ODataPubFormat format);
-
- /**
- * Writes a collection of OData entities.
- *
- * @param entities entities to be serialized.
- * @param format serialization format.
- * @param outputType whether to explicitly output type information.
- * @return stream of serialized objects.
- */
- InputStream writeEntities(Collection<ODataEntity> entities, ODataPubFormat format, boolean outputType);
-
- /**
- * Serializes a single OData entity.
- *
- * @param entity entity to be serialized.
- * @param format serialization format.
- * @return stream of serialized object.
- */
- InputStream writeEntity(ODataEntity entity, ODataPubFormat format);
-
- /**
- * Serializes a single OData entity.
- *
- * @param entity entity to be serialized.
- * @param format serialization format.
- * @param outputType whether to explicitly output type information.
- * @return stream of serialized object.
- */
- InputStream writeEntity(ODataEntity entity, ODataPubFormat format, boolean outputType);
-
- /**
- * Writes a single OData entity property.
- *
- * @param property entity property to be serialized.
- * @param format serialization format.
- * @return stream of serialized object.
- */
- InputStream writeProperty(ODataProperty property, ODataFormat format);
-
- /**
- * Writes an OData link.
- *
- * @param link link to be serialized.
- * @param format serialization format.
- * @return stream of serialized object.
- */
- InputStream writeLink(ODataLink link, ODataFormat format);
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ResourceFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ResourceFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ResourceFactory.java
deleted file mode 100644
index a2c6029..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ResourceFactory.java
+++ /dev/null
@@ -1,281 +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 com.msopentech.odatajclient.engine.data;
-
-import com.msopentech.odatajclient.engine.data.impl.v3.AtomEntry;
-import com.msopentech.odatajclient.engine.data.impl.v3.AtomFeed;
-import com.msopentech.odatajclient.engine.data.impl.v3.AtomLink;
-import com.msopentech.odatajclient.engine.data.impl.v3.JSONEntry;
-import com.msopentech.odatajclient.engine.data.impl.v3.JSONFeed;
-import com.msopentech.odatajclient.engine.data.impl.v3.JSONLink;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-
-public class ResourceFactory {
-
- /**
- * Gets a new instance of <tt>Feed</tt>.
- *
- * @param <T> resource type.
- * @param resourceClass reference class.
- * @return <tt>Feed</tt> object.
- */
- @SuppressWarnings("unchecked")
- public static <T extends Feed> T newFeed(final Class<T> resourceClass) {
- T result = null;
-
- if (AtomFeed.class.equals(resourceClass)) {
- result = (T) new AtomFeed();
- }
- if (JSONFeed.class.equals(resourceClass)) {
- result = (T) new JSONFeed();
- }
-
- return result;
- }
-
- /**
- * Gets a new instance of <tt>Entry</tt>.
- *
- * @param <T> resource type.
- * @param resourceClass reference class.
- * @return <tt>Entry</tt> object.
- */
- @SuppressWarnings("unchecked")
- public static <T extends Entry> T newEntry(final Class<T> resourceClass) {
- T result = null;
-
- if (AtomEntry.class.equals(resourceClass)) {
- result = (T) new AtomEntry();
- }
- if (JSONEntry.class.equals(resourceClass)) {
- result = (T) new JSONEntry();
- }
-
- return result;
- }
-
- /**
- * Gets a new instance of <tt>Link</tt>.
- *
- * @param <T> resource type.
- * @param resourceClass reference class.
- * @return <tt>Link</tt> object.
- */
- @SuppressWarnings("unchecked")
- public static <T extends Link> T newLink(final Class<T> resourceClass) {
- T result = null;
-
- if (AtomLink.class.equals(resourceClass)) {
- result = (T) new AtomLink();
- }
- if (JSONLink.class.equals(resourceClass)) {
- result = (T) new JSONLink();
- }
-
- return result;
- }
-
- /**
- * Gets feed reference class from the given format.
- *
- * @param <T> resource type.
- * @param format format.
- * @return resource reference class.
- */
- @SuppressWarnings("unchecked")
- public static <T extends Feed> Class<T> feedClassForFormat(final ODataPubFormat format) {
- Class<T> result = null;
-
- switch (format) {
- case ATOM:
- result = (Class<T>) AtomFeed.class;
- break;
-
- case JSON:
- case JSON_FULL_METADATA:
- case JSON_NO_METADATA:
- result = (Class<T>) JSONFeed.class;
- break;
- }
-
- return result;
- }
-
- /**
- * Gets entry reference class from the given format.
- *
- * @param <T> resource type.
- * @param format format.
- * @return resource reference class.
- */
- @SuppressWarnings("unchecked")
- public static <T extends Entry> Class<T> entryClassForFormat(final ODataPubFormat format) {
- Class<T> result = null;
-
- switch (format) {
- case ATOM:
- result = (Class<T>) AtomEntry.class;
- break;
-
- case JSON:
- case JSON_FULL_METADATA:
- case JSON_NO_METADATA:
- result = (Class<T>) JSONEntry.class;
- break;
- }
-
- return result;
- }
-
- /**
- * Gets <tt>Link</tt> object from feed resource.
- *
- * @param <T> link resource type.
- * @param <K> feed resource type.
- * @param resourceClass feed reference class.
- * @return <tt>Link</tt> object.
- */
- @SuppressWarnings("unchecked")
- public static <T extends Link, K extends Feed> T newLinkForFeed(final Class<K> resourceClass) {
- T result = null;
-
- if (AtomFeed.class.equals(resourceClass)) {
- result = (T) new AtomLink();
- }
- if (JSONFeed.class.equals(resourceClass)) {
- result = (T) new JSONLink();
- }
-
- return result;
- }
-
- /**
- * Gets <tt>Link</tt> object from entry resource.
- *
- * @param <T> link resource type.
- * @param <K> entry resource type.
- * @param resourceClass entry reference class.
- * @return <tt>Link</tt> object.
- */
- @SuppressWarnings("unchecked")
- public static <T extends Link, K extends Entry> T newLinkForEntry(final Class<K> resourceClass) {
- T result = null;
-
- if (AtomEntry.class.equals(resourceClass)) {
- result = (T) new AtomLink();
- }
- if (JSONEntry.class.equals(resourceClass)) {
- result = (T) new JSONLink();
- }
-
- return result;
- }
-
- /**
- * Gets <tt>Feed</tt> object from link resource.
- *
- * @param <T> link resource type.
- * @param <K> feed resource type.
- * @param resourceClass link reference class.
- * @return <tt>Feed</tt> object.
- */
- @SuppressWarnings("unchecked")
- public static <T extends Link, K extends Feed> Class<K> feedClassForLink(
- final Class<T> resourceClass) {
-
- Class<K> result = null;
-
- if (AtomLink.class.equals(resourceClass)) {
- result = (Class<K>) AtomFeed.class;
- }
- if (JSONLink.class.equals(resourceClass)) {
- result = (Class<K>) JSONFeed.class;
- }
-
- return result;
- }
-
- /**
- * Gets <tt>Link</tt> object from entry resource.
- *
- * @param <T> link resource type.
- * @param <K> entry resource type.
- * @param resourceClass entry reference class.
- * @return <tt>Link</tt> object.
- */
- @SuppressWarnings("unchecked")
- public static <T extends Link, K extends Entry> Class<T> linkClassForEntry(
- final Class<K> resourceClass) {
-
- Class<T> result = null;
-
- if (AtomEntry.class.equals(resourceClass)) {
- result = (Class<T>) AtomLink.class;
- }
- if (JSONEntry.class.equals(resourceClass)) {
- result = (Class<T>) JSONLink.class;
- }
-
- return result;
- }
-
- /**
- * Gets <tt>Entry</tt> object from link resource.
- *
- * @param <T> link resource type.
- * @param <K> entry resource type.
- * @param resourceClass link reference class.
- * @return <tt>Entry</tt> object.
- */
- @SuppressWarnings("unchecked")
- public static <T extends Link, K extends Entry> Class<K> entryClassForLink(final Class<T> resourceClass) {
- Class<K> result = null;
-
- if (AtomLink.class.equals(resourceClass)) {
- result = (Class<K>) AtomEntry.class;
- }
- if (JSONLink.class.equals(resourceClass)) {
- result = (Class<K>) JSONEntry.class;
- }
-
- return result;
- }
-
- /**
- * Gets <tt>Entry</tt> object from feed resource.
- *
- * @param <T> feed resource type.
- * @param <K> entry resource type.
- * @param resourceClass feed reference class.
- * @return <tt>Entry</tt> object.
- */
- @SuppressWarnings("unchecked")
- public static <T extends Feed, K extends Entry> Class<K> entryClassForFeed(final Class<T> resourceClass) {
- Class<K> result = null;
-
- if (AtomFeed.class.equals(resourceClass)) {
- result = (Class<K>) AtomEntry.class;
- }
- if (JSONFeed.class.equals(resourceClass)) {
- result = (Class<K>) JSONEntry.class;
- }
-
- return result;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ServiceDocument.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ServiceDocument.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ServiceDocument.java
deleted file mode 100644
index 690d17c..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ServiceDocument.java
+++ /dev/null
@@ -1,138 +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 com.msopentech.odatajclient.engine.data;
-
-import java.net.URI;
-import java.util.List;
-
-/**
- * REST resource for an <tt>ODataServiceDocument</tt>.
- *
- * @see ODataServiceDocument
- */
-public interface ServiceDocument {
-
- String getTitle();
-
- /**
- * Gets base URI.
- *
- * @return base URI.
- */
- URI getBaseURI();
-
- /**
- * Returns metadata context.
- *
- * @return metadata context
- */
- String getMetadataContext();
-
- /**
- * Returns metadata ETag.
- *
- * @return metadata ETag
- */
- String getMetadataETag();
-
- /**
- * Gets top level entity sets.
- *
- * @return top level entity sets.
- */
- List<ServiceDocumentElement> getEntitySets();
-
- /**
- * Gets top level entity set with given name.
- *
- * @param name entity set name
- * @return entity set with given name if found, otherwise null
- */
- ServiceDocumentElement getEntitySetByName(String name);
-
- /**
- * Gets top level entity set with given title.
- *
- * @param title entity set title
- * @return entity set with given title if found, otherwise null
- */
- ServiceDocumentElement getEntitySetByTitle(String title);
-
- /**
- * Gets top level function imports.
- *
- * @return top level function imports.
- */
- List<ServiceDocumentElement> getFunctionImports();
-
- /**
- * Gets top level function import set with given name.
- *
- * @param name function import name
- * @return function import with given name if found, otherwise null
- */
- ServiceDocumentElement getFunctionImportByName(String name);
-
- /**
- * Gets top level function import with given title.
- *
- * @param title function import title
- * @return function import with given title if found, otherwise null
- */
- ServiceDocumentElement getFunctionImportByTitle(String title);
-
- /**
- * Gets top level singletons.
- *
- * @return top level singletons.
- */
- List<ServiceDocumentElement> getSingletons();
-
- /**
- * Gets top level singleton with given name.
- *
- * @param name singleton name
- * @return singleton with given name if found, otherwise null
- */
- ServiceDocumentElement getSingletonByName(String name);
-
- /**
- * Gets top level singleton with given title.
- *
- * @param title singleton title
- * @return singleton with given title if found, otherwise null
- */
- ServiceDocumentElement getSingletonByTitle(String title);
-
- /**
- * Gets related service documents.
- *
- * @return related service documents.
- */
- List<ServiceDocumentElement> getRelatedServiceDocuments();
-
- /**
- * Gets related service document with given title.
- *
- * @param title related service document title
- * @return related service document with given title if found, otherwise null
- */
- ServiceDocumentElement getRelatedServiceDocumentByTitle(String title);
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ServiceDocumentElement.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ServiceDocumentElement.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ServiceDocumentElement.java
deleted file mode 100644
index 04c2064..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ServiceDocumentElement.java
+++ /dev/null
@@ -1,74 +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 com.msopentech.odatajclient.engine.data;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-public class ServiceDocumentElement {
-
- private String name;
-
- private String title;
-
- @JsonProperty("url")
- private String href;
-
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(final String title) {
- this.title = title;
- }
-
- public String getHref() {
- return href;
- }
-
- public void setHref(final String href) {
- this.href = href;
- }
-
- @Override
- public boolean equals(final Object obj) {
- return EqualsBuilder.reflectionEquals(this, obj);
- }
-
- @Override
- public int hashCode() {
- return HashCodeBuilder.reflectionHashCode(this);
- }
-
- @Override
- public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractEntry.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractEntry.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractEntry.java
deleted file mode 100644
index bf98c20..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractEntry.java
+++ /dev/null
@@ -1,340 +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 com.msopentech.odatajclient.engine.data.impl;
-
-import com.msopentech.odatajclient.engine.data.Entry;
-import com.msopentech.odatajclient.engine.data.Link;
-import com.msopentech.odatajclient.engine.data.ODataOperation;
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.commons.lang3.StringUtils;
-import org.w3c.dom.Element;
-
-/**
- * Abstract base for classes implementing <tt>EntryResource</tt>.
- */
-public abstract class AbstractEntry<LINK extends Link>
- extends AbstractPayloadObject implements Entry {
-
- private static final long serialVersionUID = 2127764552600969783L;
-
- private String eTag;
-
- private String type;
-
- private String id;
-
- private LINK readLink;
-
- private LINK editLink;
-
- private List<LINK> associationLinks;
-
- private List<LINK> navigationLinks;
-
- private List<LINK> mediaEditLinks;
-
- private List<ODataOperation> operations;
-
- private Element content;
-
- private Element mediaEntryProperties;
-
- private String mediaContentSource;
-
- private String mediaContentType;
-
- public AbstractEntry() {
- associationLinks = new ArrayList<LINK>();
- navigationLinks = new ArrayList<LINK>();
- mediaEditLinks = new ArrayList<LINK>();
- operations = new ArrayList<ODataOperation>();
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public String getETag() {
- return eTag;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public void setETag(final String eTag) {
- this.eTag = eTag;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public String getType() {
- return type;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public void setType(final String type) {
- this.type = type;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public String getId() {
- return id;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public void setId(final String id) {
- this.id = id;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public LINK getSelfLink() {
- return readLink;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- @SuppressWarnings("unchecked")
- public void setSelfLink(final Link readLink) {
- this.readLink = (LINK) readLink;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public LINK getEditLink() {
- return editLink;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- @SuppressWarnings("unchecked")
- public void setEditLink(final Link editLink) {
- this.editLink = (LINK) editLink;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- @SuppressWarnings("unchecked")
- public boolean addAssociationLink(final Link link) {
- return associationLinks.add((LINK) link);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public List<LINK> getAssociationLinks() {
- return associationLinks;
- }
-
- @SuppressWarnings("unchecked")
- private void setLinks(final List<LINK> links, final List<Link> linkResources) {
- links.clear();
- for (Link link : linkResources) {
- links.add((LINK) link);
- }
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- @SuppressWarnings("unchecked")
- public boolean addNavigationLink(final Link link) {
- return navigationLinks.add((LINK) link);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public void setAssociationLinks(final List<Link> associationLinks) {
- setLinks(this.associationLinks, associationLinks);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public List<LINK> getNavigationLinks() {
- return navigationLinks;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- @SuppressWarnings("unchecked")
- public boolean addMediaEditLink(final Link link) {
- return mediaEditLinks.add((LINK) link);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public void setNavigationLinks(final List<Link> navigationLinks) {
- setLinks(this.navigationLinks, navigationLinks);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public List<LINK> getMediaEditLinks() {
- return mediaEditLinks;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public void setMediaEditLinks(final List<Link> mediaEditLinks) {
- setLinks(this.mediaEditLinks, mediaEditLinks);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public List<ODataOperation> getOperations() {
- return operations;
- }
-
- /**
- * Adds operation.
- *
- * @param operation operation.
- * @return 'TRUE' in case of success; 'FALSE' otherwise.
- */
- public boolean addOperation(final ODataOperation operation) {
- return this.operations.add(operation);
- }
-
- /**
- * Sets operations.
- *
- * @param operations operations.
- */
- public void setOperations(final List<ODataOperation> operations) {
- this.operations.clear();
- if (operations != null && !operations.isEmpty()) {
- this.operations.addAll(operations);
- }
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public Element getContent() {
- return content;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public void setContent(final Element content) {
- this.content = content;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public Element getMediaEntryProperties() {
- return mediaEntryProperties;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public void setMediaEntryProperties(final Element mediaEntryProperties) {
- this.mediaEntryProperties = mediaEntryProperties;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public String getMediaContentType() {
- return this.mediaContentType;
- }
-
- /**
- * Sets media content type.
- *
- * @param mediaContentType media content type.
- */
- @Override
- public void setMediaContentType(final String mediaContentType) {
- this.mediaContentType = mediaContentType;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public String getMediaContentSource() {
- return this.mediaContentSource;
- }
-
- /**
- * Sets media content source.
- *
- * @param mediaContentSource media content source.
- */
- @Override
- public void setMediaContentSource(final String mediaContentSource) {
- this.mediaContentSource = mediaContentSource;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public boolean isMediaEntry() {
- return getMediaEntryProperties() != null || StringUtils.isNotBlank(this.mediaContentSource);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractJSONEntry.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractJSONEntry.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractJSONEntry.java
deleted file mode 100644
index 7db4366..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractJSONEntry.java
+++ /dev/null
@@ -1,90 +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 com.msopentech.odatajclient.engine.data.impl;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.msopentech.odatajclient.engine.data.impl.v3.JSONLink;
-import com.msopentech.odatajclient.engine.uri.SegmentType;
-import java.net.URI;
-
-/**
- * A single entry, represented via JSON.
- */
-@JsonSerialize(using = JSONEntrySerializer.class)
-@JsonDeserialize(using = JSONEntryDeserializer.class)
-public abstract class AbstractJSONEntry extends AbstractEntry<JSONLink> {
-
- private static final long serialVersionUID = -5275365545400797758L;
-
- private URI metadata;
-
- private String mediaETag;
-
- @JsonIgnore
- @Override
- public URI getBaseURI() {
- URI baseURI = null;
- if (metadata != null) {
- final String metadataURI = getMetadata().toASCIIString();
- baseURI = URI.create(metadataURI.substring(0, metadataURI.indexOf(SegmentType.METADATA.getValue())));
- }
-
- return baseURI;
- }
-
- /**
- * Gets the metadata URI.
- *
- * @return the metadata URI
- */
- public URI getMetadata() {
- return metadata;
- }
-
- /**
- * Sets the metadata URI.
- *
- * @param metadata metadata URI.
- */
- public void setMetadata(final URI metadata) {
- this.metadata = metadata;
- }
-
- /**
- * The odata.mediaEtag annotation MAY be included; its value MUST be the ETag of the binary stream represented by
- * this media entity or named stream property.
- *
- * @return odata.mediaEtag annotation value.
- */
- public String getMediaETag() {
- return mediaETag;
- }
-
- /**
- * The odata.mediaEtag annotation MAY be included; its value MUST be the ETag of the binary stream represented by
- * this media entity or named stream property.
- *
- * @param eTag odata.mediaEtag annotation value.
- */
- public void setMediaETag(String eTag) {
- this.mediaETag = eTag;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractJacksonTool.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractJacksonTool.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractJacksonTool.java
deleted file mode 100644
index 43c77fb..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractJacksonTool.java
+++ /dev/null
@@ -1,83 +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 com.msopentech.odatajclient.engine.data.impl;
-
-import com.fasterxml.aalto.stax.InputFactoryImpl;
-import com.fasterxml.aalto.stax.OutputFactoryImpl;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.InjectableValues;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.deser.DeserializationProblemHandler;
-import com.fasterxml.jackson.dataformat.xml.JacksonXmlModule;
-import com.fasterxml.jackson.dataformat.xml.XmlFactory;
-import com.fasterxml.jackson.dataformat.xml.XmlMapper;
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import java.io.IOException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-abstract class AbstractJacksonTool {
-
- protected static final Logger LOG = LoggerFactory.getLogger(AbstractJacksonTool.class);
-
- protected final ODataClient client;
-
- protected AbstractJacksonTool(final ODataClient client) {
- this.client = client;
- }
-
- protected ObjectMapper getObjectMapper() {
- final ObjectMapper mapper = new ObjectMapper().setSerializationInclusion(JsonInclude.Include.NON_NULL);
-
- mapper.setInjectableValues(new InjectableValues.Std().addValue(ODataClient.class, client));
-
- mapper.setSerializerProvider(new InjectableSerializerProvider(mapper.getSerializerProvider(),
- mapper.getSerializationConfig().withAttribute(ODataClient.class, client),
- mapper.getSerializerFactory()));
-
- return mapper;
- }
-
- protected XmlMapper getXmlMapper() {
- final XmlMapper xmlMapper = new XmlMapper(
- new XmlFactory(new InputFactoryImpl(), new OutputFactoryImpl()), new JacksonXmlModule());
-
- xmlMapper.setInjectableValues(new InjectableValues.Std().addValue(ODataClient.class, client));
-
- xmlMapper.addHandler(new DeserializationProblemHandler() {
-
- @Override
- public boolean handleUnknownProperty(final DeserializationContext ctxt, final JsonParser jp,
- final JsonDeserializer<?> deserializer, final Object beanOrClass, final String propertyName)
- throws IOException, JsonProcessingException {
-
- // skip any unknown property
- LOG.warn("Skipping unknown property {}", propertyName);
- ctxt.getParser().skipChildren();
- return true;
- }
- });
- return xmlMapper;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractLink.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractLink.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractLink.java
deleted file mode 100644
index d575ce3..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractLink.java
+++ /dev/null
@@ -1,142 +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 com.msopentech.odatajclient.engine.data.impl;
-
-import com.msopentech.odatajclient.engine.data.Entry;
-import com.msopentech.odatajclient.engine.data.Feed;
-import com.msopentech.odatajclient.engine.data.Link;
-
-/**
- * Abstract base for classes implementing <tt>LinkResource</tt>.
- */
-public abstract class AbstractLink<ENTRY extends Entry, FEED extends Feed>
- extends AbstractPayloadObject implements Link {
-
- private static final long serialVersionUID = -3449344217160035501L;
-
- private String title;
-
- private String rel;
-
- private String href;
-
- private String type;
-
- private ENTRY entry;
-
- private FEED feed;
-
- /**
- * {@inheritDoc }
- */
- @Override
- public String getTitle() {
- return title;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public void setTitle(final String title) {
- this.title = title;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public String getRel() {
- return rel;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public void setRel(final String rel) {
- this.rel = rel;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public String getHref() {
- return href;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public void setHref(final String href) {
- this.href = href;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public String getType() {
- return type;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public void setType(final String type) {
- this.type = type;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public Entry getInlineEntry() {
- return entry;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- @SuppressWarnings("unchecked")
- public void setInlineEntry(final Entry entry) {
- this.entry = (ENTRY) entry;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public Feed getInlineFeed() {
- return feed;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- @SuppressWarnings("unchecked")
- public void setInlineFeed(final Feed feed) {
- this.feed = (FEED) feed;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractODataBinder.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractODataBinder.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractODataBinder.java
deleted file mode 100644
index 161c988..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractODataBinder.java
+++ /dev/null
@@ -1,608 +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 com.msopentech.odatajclient.engine.data.impl;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.data.Entry;
-import com.msopentech.odatajclient.engine.data.Feed;
-import com.msopentech.odatajclient.engine.data.LinkCollection;
-import com.msopentech.odatajclient.engine.data.Link;
-import com.msopentech.odatajclient.engine.data.ODataBinder;
-import com.msopentech.odatajclient.engine.data.ODataCollectionValue;
-import com.msopentech.odatajclient.engine.data.ODataComplexValue;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.data.ODataEntitySet;
-import com.msopentech.odatajclient.engine.data.ODataGeospatialValue;
-import com.msopentech.odatajclient.engine.data.ODataInlineEntity;
-import com.msopentech.odatajclient.engine.data.ODataInlineEntitySet;
-import com.msopentech.odatajclient.engine.data.ODataLink;
-import com.msopentech.odatajclient.engine.data.ODataLinkCollection;
-import com.msopentech.odatajclient.engine.data.ODataOperation;
-import com.msopentech.odatajclient.engine.data.ODataPrimitiveValue;
-import com.msopentech.odatajclient.engine.data.ODataProperty;
-import com.msopentech.odatajclient.engine.data.ODataProperty.PropertyType;
-import com.msopentech.odatajclient.engine.data.ODataServiceDocument;
-import com.msopentech.odatajclient.engine.data.ODataValue;
-import com.msopentech.odatajclient.engine.data.ResourceFactory;
-import com.msopentech.odatajclient.engine.data.ServiceDocument;
-import com.msopentech.odatajclient.engine.data.ServiceDocumentElement;
-import com.msopentech.odatajclient.engine.metadata.EdmType;
-import com.msopentech.odatajclient.engine.utils.ODataConstants;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-import com.msopentech.odatajclient.engine.utils.URIUtils;
-import com.msopentech.odatajclient.engine.utils.XMLUtils;
-import java.io.StringWriter;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.ParserConfigurationException;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public abstract class AbstractODataBinder implements ODataBinder {
-
- private static final long serialVersionUID = 454285889193689536L;
-
- /**
- * Logger.
- */
- protected final Logger LOG = LoggerFactory.getLogger(AbstractODataBinder.class);
-
- protected final ODataClient client;
-
- protected AbstractODataBinder(final ODataClient client) {
- this.client = client;
- }
-
- protected Element newEntryContent() {
- Element properties = null;
- try {
- final DocumentBuilder builder = XMLUtils.DOC_BUILDER_FACTORY.newDocumentBuilder();
- final Document doc = builder.newDocument();
- properties = doc.createElement(ODataConstants.ELEM_PROPERTIES);
- properties.setAttribute(ODataConstants.XMLNS_METADATA,
- client.getWorkingVersion().getNamespaceMap().get(ODataVersion.NS_METADATA));
- properties.setAttribute(ODataConstants.XMLNS_DATASERVICES,
- client.getWorkingVersion().getNamespaceMap().get(ODataVersion.NS_DATASERVICES));
- properties.setAttribute(ODataConstants.XMLNS_GML, ODataConstants.NS_GML);
- properties.setAttribute(ODataConstants.XMLNS_GEORSS, ODataConstants.NS_GEORSS);
- } catch (ParserConfigurationException e) {
- LOG.error("Failure building entry content", e);
- }
-
- return properties;
- }
-
- @Override
- public <T extends Feed> T getFeed(final ODataEntitySet feed, final Class<T> reference) {
- final T feedResource = ResourceFactory.newFeed(reference);
-
- final List<Entry> entries = new ArrayList<Entry>();
- feedResource.setEntries(entries);
-
- final URI next = feed.getNext();
- if (next != null) {
- feedResource.setNext(next);
- }
-
- for (ODataEntity entity : feed.getEntities()) {
- entries.add(getEntry(entity, ResourceFactory.entryClassForFeed(reference)));
- }
-
- feedResource.setEntries(entries);
-
- return feedResource;
- }
-
- @Override
- public <T extends Entry> T getEntry(final ODataEntity entity, final Class<T> reference) {
- return getEntry(entity, reference, true);
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public <T extends Entry> T getEntry(final ODataEntity entity, final Class<T> reference,
- final boolean setType) {
-
- final T entry = ResourceFactory.newEntry(reference);
- entry.setType(entity.getName());
-
- // -------------------------------------------------------------
- // Add edit and self link
- // -------------------------------------------------------------
- final URI editLink = entity.getEditLink();
- if (editLink != null) {
- final Link entryEditLink = ResourceFactory.newLinkForEntry(reference);
- entryEditLink.setTitle(entity.getName());
- entryEditLink.setHref(editLink.toASCIIString());
- entryEditLink.setRel(ODataConstants.EDIT_LINK_REL);
- entry.setEditLink(entryEditLink);
- }
-
- if (entity.isReadOnly()) {
- final Link entrySelfLink = ResourceFactory.newLinkForEntry(reference);
- entrySelfLink.setTitle(entity.getName());
- entrySelfLink.setHref(entity.getLink().toASCIIString());
- entrySelfLink.setRel(ODataConstants.SELF_LINK_REL);
- entry.setSelfLink(entrySelfLink);
- }
- // -------------------------------------------------------------
-
- // -------------------------------------------------------------
- // Append navigation links (handling inline entry / feed as well)
- // -------------------------------------------------------------
- // handle navigation links
- for (ODataLink link : entity.getNavigationLinks()) {
- // append link
- LOG.debug("Append navigation link\n{}", link);
- entry.addNavigationLink(getLinkResource(link, ResourceFactory.linkClassForEntry(reference)));
- }
- // -------------------------------------------------------------
-
- // -------------------------------------------------------------
- // Append edit-media links
- // -------------------------------------------------------------
- for (ODataLink link : entity.getEditMediaLinks()) {
- LOG.debug("Append edit-media link\n{}", link);
- entry.addMediaEditLink(getLinkResource(link, ResourceFactory.linkClassForEntry(reference)));
- }
- // -------------------------------------------------------------
-
- // -------------------------------------------------------------
- // Append association links
- // -------------------------------------------------------------
- for (ODataLink link : entity.getAssociationLinks()) {
- LOG.debug("Append association link\n{}", link);
- entry.addAssociationLink(getLinkResource(link, ResourceFactory.linkClassForEntry(reference)));
- }
- // -------------------------------------------------------------
-
- final Element content = newEntryContent();
- if (entity.isMediaEntity()) {
- entry.setMediaEntryProperties(content);
- entry.setMediaContentSource(entity.getMediaContentSource());
- entry.setMediaContentType(entity.getMediaContentType());
- } else {
- entry.setContent(content);
- }
-
- for (ODataProperty prop : entity.getProperties()) {
- content.appendChild(toDOMElement(prop, content.getOwnerDocument(), setType));
- }
-
- return entry;
- }
-
- @Override
- public Element toDOMElement(final ODataProperty prop) {
- try {
- return toDOMElement(prop, XMLUtils.DOC_BUILDER_FACTORY.newDocumentBuilder().newDocument(), true);
- } catch (ParserConfigurationException e) {
- LOG.error("Error retrieving property DOM", e);
- throw new IllegalArgumentException(e);
- }
- }
-
- @Override
- public ODataLinkCollection getLinkCollection(final LinkCollection linkCollection) {
- final ODataLinkCollection collection = new ODataLinkCollection(linkCollection.getNext());
- collection.setLinks(linkCollection.getLinks());
- return collection;
- }
-
- @Override
- public ODataServiceDocument getODataServiceDocument(final ServiceDocument resource) {
- final ODataServiceDocument serviceDocument = new ODataServiceDocument();
-
- for (ServiceDocumentElement entitySet : resource.getEntitySets()) {
- // handles V3 JSON format oddities, where title is not contained
- serviceDocument.getEntitySets().put(StringUtils.isBlank(entitySet.getTitle())
- ? entitySet.getName() : entitySet.getTitle(),
- URIUtils.getURI(resource.getBaseURI(), entitySet.getHref()));
- }
-
- return serviceDocument;
- }
-
- @Override
- public ODataEntitySet getODataEntitySet(final Feed resource) {
- return getODataEntitySet(resource, null);
- }
-
- @Override
- public ODataEntitySet getODataEntitySet(final Feed resource, final URI defaultBaseURI) {
- if (LOG.isDebugEnabled()) {
- final StringWriter writer = new StringWriter();
- client.getSerializer().feed(resource, writer);
- writer.flush();
- LOG.debug("FeedResource -> ODataEntitySet:\n{}", writer.toString());
- }
-
- final URI base = defaultBaseURI == null ? resource.getBaseURI() : defaultBaseURI;
-
- final URI next = resource.getNext();
-
- final ODataEntitySet entitySet = next == null
- ? client.getObjectFactory().newEntitySet()
- : client.getObjectFactory().newEntitySet(URIUtils.getURI(base, next.toASCIIString()));
-
- if (resource.getCount() != null) {
- entitySet.setCount(resource.getCount());
- }
-
- for (Entry entryResource : resource.getEntries()) {
- entitySet.addEntity(getODataEntity(entryResource));
- }
-
- return entitySet;
- }
-
- @Override
- public ODataEntity getODataEntity(final Entry resource) {
- return getODataEntity(resource, null);
- }
-
- @Override
- public ODataEntity getODataEntity(final Entry resource, final URI defaultBaseURI) {
- if (LOG.isDebugEnabled()) {
- final StringWriter writer = new StringWriter();
- client.getSerializer().entry(resource, writer);
- writer.flush();
- LOG.debug("EntryResource -> ODataEntity:\n{}", writer.toString());
- }
-
- final URI base = defaultBaseURI == null ? resource.getBaseURI() : defaultBaseURI;
-
- final ODataEntity entity = resource.getSelfLink() == null
- ? client.getObjectFactory().newEntity(resource.getType())
- : client.getObjectFactory().newEntity(resource.getType(),
- URIUtils.getURI(base, resource.getSelfLink().getHref()));
-
- if (StringUtils.isNotBlank(resource.getETag())) {
- entity.setETag(resource.getETag());
- }
-
- if (resource.getEditLink() != null) {
- entity.setEditLink(URIUtils.getURI(base, resource.getEditLink().getHref()));
- }
-
- for (Link link : resource.getAssociationLinks()) {
- entity.addLink(client.getObjectFactory().newAssociationLink(link.getTitle(), base, link.getHref()));
- }
-
- for (Link link : resource.getNavigationLinks()) {
- final Entry inlineEntry = link.getInlineEntry();
- final Feed inlineFeed = link.getInlineFeed();
-
- if (inlineEntry == null && inlineFeed == null) {
- entity.addLink(
- client.getObjectFactory().newEntityNavigationLink(link.getTitle(), base, link.getHref()));
- } else if (inlineFeed == null) {
- entity.addLink(client.getObjectFactory().newInlineEntity(
- link.getTitle(), base, link.getHref(),
- getODataEntity(inlineEntry,
- inlineEntry.getBaseURI() == null ? base : inlineEntry.getBaseURI())));
- } else {
- entity.addLink(client.getObjectFactory().newInlineEntitySet(
- link.getTitle(), base, link.getHref(),
- getODataEntitySet(inlineFeed,
- inlineFeed.getBaseURI() == null ? base : inlineFeed.getBaseURI())));
- }
- }
-
- for (Link link : resource.getMediaEditLinks()) {
- entity.addLink(client.getObjectFactory().newMediaEditLink(link.getTitle(), base, link.getHref()));
- }
-
- for (ODataOperation operation : resource.getOperations()) {
- operation.setTarget(URIUtils.getURI(base, operation.getTarget()));
- entity.addOperation(operation);
- }
-
- final Element content;
- if (resource.isMediaEntry()) {
- entity.setMediaEntity(true);
- entity.setMediaContentSource(resource.getMediaContentSource());
- entity.setMediaContentType(resource.getMediaContentType());
- content = resource.getMediaEntryProperties();
- } else {
- content = resource.getContent();
- }
- if (content != null) {
- for (Node property : XMLUtils.getChildNodes(content, Node.ELEMENT_NODE)) {
- try {
- entity.addProperty(getProperty((Element) property));
- } catch (IllegalArgumentException e) {
- LOG.warn("Failure retrieving EdmType for {}", property.getTextContent(), e);
- }
- }
- }
-
- return entity;
- }
-
- @Override
- public <T extends Link> T getLinkResource(final ODataLink link, final Class<T> reference) {
- final T linkResource = ResourceFactory.newLink(reference);
- linkResource.setRel(link.getRel());
- linkResource.setTitle(link.getName());
- linkResource.setHref(link.getLink() == null ? null : link.getLink().toASCIIString());
- linkResource.setType(link.getType().toString());
-
- if (link instanceof ODataInlineEntity) {
- // append inline entity
- final ODataEntity inlineEntity = ((ODataInlineEntity) link).getEntity();
- LOG.debug("Append in-line entity\n{}", inlineEntity);
-
- linkResource.setInlineEntry(getEntry(inlineEntity, ResourceFactory.entryClassForLink(reference)));
- } else if (link instanceof ODataInlineEntitySet) {
- // append inline feed
- final ODataEntitySet InlineFeed = ((ODataInlineEntitySet) link).getEntitySet();
- LOG.debug("Append in-line feed\n{}", InlineFeed);
-
- linkResource.setInlineFeed(getFeed(InlineFeed, ResourceFactory.feedClassForLink(reference)));
- }
-
- return linkResource;
- }
-
- @Override
- public ODataProperty getProperty(final Element property) {
- final ODataProperty res;
-
- final Node nullNode = property.getAttributes().getNamedItem(ODataConstants.ATTR_NULL);
-
- if (nullNode == null) {
- final EdmType edmType = StringUtils.isBlank(property.getAttribute(ODataConstants.ATTR_M_TYPE))
- ? null
- : newEdmType(property.getAttribute(ODataConstants.ATTR_M_TYPE));
-
- final PropertyType propType = edmType == null
- ? guessPropertyType(property)
- : edmType.isCollection()
- ? PropertyType.COLLECTION
- : edmType.isSimpleType()
- ? PropertyType.PRIMITIVE
- : PropertyType.COMPLEX;
-
- switch (propType) {
- case COLLECTION:
- res = fromCollectionPropertyElement(property, edmType);
- break;
-
- case COMPLEX:
- res = fromComplexPropertyElement(property, edmType);
- break;
-
- case PRIMITIVE:
- res = fromPrimitivePropertyElement(property, edmType);
- break;
-
- case EMPTY:
- default:
- res = client.getObjectFactory().newPrimitiveProperty(XMLUtils.getSimpleName(property), null);
- }
- } else {
- res = client.getObjectFactory().newPrimitiveProperty(XMLUtils.getSimpleName(property), null);
- }
-
- return res;
- }
-
- protected PropertyType guessPropertyType(final Element property) {
- PropertyType res = null;
-
- if (property.hasChildNodes()) {
- final NodeList children = property.getChildNodes();
-
- for (int i = 0; res == null && i < children.getLength(); i++) {
- final Node child = children.item(i);
-
- if (child.getNodeType() == Node.ELEMENT_NODE
- && !child.getNodeName().startsWith(ODataConstants.PREFIX_GML)) {
-
- res = ODataConstants.ELEM_ELEMENT.equals(XMLUtils.getSimpleName(child))
- ? PropertyType.COLLECTION
- : PropertyType.COMPLEX;
- }
- }
- } else {
- res = PropertyType.EMPTY;
- }
-
- if (res == null) {
- res = PropertyType.PRIMITIVE;
- }
-
- return res;
- }
-
- protected Element toDOMElement(final ODataProperty prop, final Document doc, final boolean setType) {
- final Element element;
-
- if (prop.hasNullValue()) {
- // null property handling
- element = toNullPropertyElement(prop, doc);
- } else if (prop.hasPrimitiveValue()) {
- // primitive property handling
- element = toPrimitivePropertyElement(prop, doc, setType);
- } else if (prop.hasCollectionValue()) {
- // collection property handling
- element = toCollectionPropertyElement(prop, doc, setType);
- } else {
- // complex property handling
- element = toComplexPropertyElement(prop, doc, setType);
- }
-
- element.setAttribute(ODataConstants.XMLNS_METADATA,
- client.getWorkingVersion().getNamespaceMap().get(ODataVersion.NS_METADATA));
- element.setAttribute(ODataConstants.XMLNS_DATASERVICES,
- client.getWorkingVersion().getNamespaceMap().get(ODataVersion.NS_DATASERVICES));
- element.setAttribute(ODataConstants.XMLNS_GML, ODataConstants.NS_GML);
- element.setAttribute(ODataConstants.XMLNS_GEORSS, ODataConstants.NS_GEORSS);
-
- return element;
- }
-
- protected Element toNullPropertyElement(final ODataProperty prop, final Document doc) {
- final Element element = doc.createElement(ODataConstants.PREFIX_DATASERVICES + prop.getName());
- element.setAttribute(ODataConstants.ATTR_NULL, Boolean.toString(true));
- return element;
- }
-
- protected Element toPrimitivePropertyElement(
- final ODataProperty prop, final Document doc, final boolean setType) {
-
- return toPrimitivePropertyElement(prop.getName(), prop.getPrimitiveValue(), doc, setType);
- }
-
- protected Element toPrimitivePropertyElement(
- final String name, final ODataPrimitiveValue value, final Document doc, final boolean setType) {
-
- final Element element = doc.createElement(ODataConstants.PREFIX_DATASERVICES + name);
- if (setType) {
- element.setAttribute(ODataConstants.ATTR_M_TYPE, value.getTypeName());
- }
-
- if (value instanceof ODataGeospatialValue) {
- element.appendChild(doc.importNode(((ODataGeospatialValue) value).toTree(), true));
- } else {
- element.setTextContent(value.toString());
- }
-
- return element;
- }
-
- protected Element toCollectionPropertyElement(
- final ODataProperty prop, final Document doc, final boolean setType) {
-
- if (!prop.hasCollectionValue()) {
- throw new IllegalArgumentException("Invalid property value type "
- + prop.getValue().getClass().getSimpleName());
- }
-
- final ODataCollectionValue value = prop.getCollectionValue();
-
- final Element element = doc.createElement(ODataConstants.PREFIX_DATASERVICES + prop.getName());
- if (value.getTypeName() != null && setType) {
- element.setAttribute(ODataConstants.ATTR_M_TYPE, value.getTypeName());
- }
-
- for (ODataValue el : value) {
- if (el.isPrimitive()) {
- element.appendChild(
- toPrimitivePropertyElement(ODataConstants.ELEM_ELEMENT, el.asPrimitive(), doc, setType));
- } else {
- element.appendChild(
- toComplexPropertyElement(ODataConstants.ELEM_ELEMENT, el.asComplex(), doc, setType));
- }
- }
-
- return element;
- }
-
- protected Element toComplexPropertyElement(
- final ODataProperty prop, final Document doc, final boolean setType) {
-
- return toComplexPropertyElement(prop.getName(), prop.getComplexValue(), doc, setType);
- }
-
- protected Element toComplexPropertyElement(
- final String name, final ODataComplexValue value, final Document doc, final boolean setType) {
-
- final Element element = doc.createElement(ODataConstants.PREFIX_DATASERVICES + name);
- if (value.getTypeName() != null && setType) {
- element.setAttribute(ODataConstants.ATTR_M_TYPE, value.getTypeName());
- }
-
- for (ODataProperty field : value) {
- element.appendChild(toDOMElement(field, doc, true));
- }
- return element;
- }
-
- protected ODataPrimitiveValue fromPrimitiveValueElement(final Element prop, final EdmType edmType) {
- final ODataPrimitiveValue value;
- if (edmType != null && edmType.getSimpleType().isGeospatial()) {
- final Element geoProp = ODataConstants.PREFIX_GML.equals(prop.getPrefix())
- ? prop : (Element) XMLUtils.getChildNodes(prop, Node.ELEMENT_NODE).get(0);
- value = client.getGeospatialValueBuilder().
- setType(edmType.getSimpleType()).setTree(geoProp).build();
- } else {
- value = client.getPrimitiveValueBuilder().
- setType(edmType == null ? null : edmType.getSimpleType()).setText(prop.getTextContent()).build();
- }
- return value;
- }
-
- protected ODataProperty fromPrimitivePropertyElement(final Element prop, final EdmType edmType) {
- return client.getObjectFactory().newPrimitiveProperty(
- XMLUtils.getSimpleName(prop), fromPrimitiveValueElement(prop, edmType));
- }
-
- protected ODataComplexValue fromComplexValueElement(final Element prop, final EdmType edmType) {
- final ODataComplexValue value = new ODataComplexValue(edmType == null ? null : edmType.getTypeExpression());
-
- for (Node child : XMLUtils.getChildNodes(prop, Node.ELEMENT_NODE)) {
- value.add(getProperty((Element) child));
- }
-
- return value;
- }
-
- protected ODataProperty fromComplexPropertyElement(final Element prop, final EdmType edmType) {
- return client.getObjectFactory().newComplexProperty(XMLUtils.getSimpleName(prop),
- fromComplexValueElement(prop, edmType));
- }
-
- protected ODataProperty fromCollectionPropertyElement(final Element prop, final EdmType edmType) {
- final ODataCollectionValue value =
- new ODataCollectionValue(edmType == null ? null : edmType.getTypeExpression());
-
- final EdmType type = edmType == null ? null : newEdmType(edmType.getBaseType());
- final NodeList elements = prop.getChildNodes();
-
- for (int i = 0; i < elements.getLength(); i++) {
- if (elements.item(i).getNodeType() != Node.TEXT_NODE) {
- final Element child = (Element) elements.item(i);
-
- switch (guessPropertyType(child)) {
- case COMPLEX:
- value.add(fromComplexValueElement(child, type));
- break;
- case PRIMITIVE:
- value.add(fromPrimitiveValueElement(child, type));
- break;
- default:
- // do not add null or empty values
- }
- }
- }
-
- return client.getObjectFactory().newCollectionProperty(XMLUtils.getSimpleName(prop), value);
- }
-
- protected abstract EdmType newEdmType(String expression);
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractODataDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractODataDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractODataDeserializer.java
deleted file mode 100644
index 3a16e9c..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractODataDeserializer.java
+++ /dev/null
@@ -1,204 +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 com.msopentech.odatajclient.engine.data.impl;
-
-import com.fasterxml.aalto.stax.InputFactoryImpl;
-import com.fasterxml.aalto.stax.OutputFactoryImpl;
-import com.fasterxml.jackson.dataformat.xml.JacksonXmlModule;
-import com.fasterxml.jackson.dataformat.xml.XmlFactory;
-import com.fasterxml.jackson.dataformat.xml.XmlMapper;
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.data.Entry;
-import com.msopentech.odatajclient.engine.data.Feed;
-import com.msopentech.odatajclient.engine.data.LinkCollection;
-import com.msopentech.odatajclient.engine.data.ODataDeserializer;
-import com.msopentech.odatajclient.engine.data.ODataError;
-import com.msopentech.odatajclient.engine.data.impl.v3.AtomDeserializer;
-import com.msopentech.odatajclient.engine.data.impl.v3.AtomEntry;
-import com.msopentech.odatajclient.engine.data.impl.v3.AtomFeed;
-import com.msopentech.odatajclient.engine.data.impl.v3.JSONFeed;
-import com.msopentech.odatajclient.engine.data.impl.v3.JSONLinkCollection;
-import com.msopentech.odatajclient.engine.data.impl.v3.JSONODataError;
-import com.msopentech.odatajclient.engine.data.impl.v3.JSONODataErrorBundle;
-import com.msopentech.odatajclient.engine.data.impl.v3.JSONProperty;
-import com.msopentech.odatajclient.engine.data.impl.v3.XMLLinkCollection;
-import com.msopentech.odatajclient.engine.data.impl.v3.XMLODataError;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import com.msopentech.odatajclient.engine.utils.ODataConstants;
-import com.msopentech.odatajclient.engine.utils.XMLUtils;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-public abstract class AbstractODataDeserializer extends AbstractJacksonTool implements ODataDeserializer {
-
- private static final long serialVersionUID = -4244158979195609909L;
-
- private final AtomDeserializer atomDeserializer;
-
- public AbstractODataDeserializer(final ODataClient client) {
- super(client);
- this.atomDeserializer = new AtomDeserializer(client);
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public <T extends Feed> T toFeed(final InputStream input, final Class<T> reference) {
- T entry;
-
- if (AtomFeed.class.equals(reference)) {
- entry = (T) toAtomFeed(input);
- } else {
- entry = (T) toJSONFeed(input);
- }
-
- return entry;
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public <T extends Entry> T toEntry(final InputStream input, final Class<T> reference) {
- T entry;
-
- if (AtomEntry.class.equals(reference)) {
- entry = (T) toAtomEntry(input);
-
- } else {
- entry = (T) toJSONEntry(input);
- }
-
- return entry;
- }
-
- @Override
- public Element toPropertyDOM(final InputStream input, final ODataFormat format) {
- return format == ODataFormat.XML
- ? toPropertyDOMFromXML(input)
- : toPropertyDOMFromJSON(input);
- }
-
- @Override
- public LinkCollection toLinkCollection(final InputStream input, final ODataFormat format) {
- return format == ODataFormat.XML
- ? toLinkCollectionFromXML(input)
- : toLinkCollectionFromJSON(input);
- }
-
- @Override
- public ODataError toODataError(final InputStream input, final boolean isXML) {
- return isXML
- ? toODataErrorFromXML(input)
- : toODataErrorFromJSON(input);
- }
-
- @Override
- public Element toDOM(final InputStream input) {
- return XMLUtils.PARSER.deserialize(input);
- }
-
- /*
- * ------------------ Protected methods ------------------
- */
- protected AtomFeed toAtomFeed(final InputStream input) {
- try {
- return atomDeserializer.feed(toDOM(input));
- } catch (Exception e) {
- throw new IllegalArgumentException("While deserializing Atom feed", e);
- }
- }
-
- protected AtomEntry toAtomEntry(final InputStream input) {
- try {
- return atomDeserializer.entry(toDOM(input));
- } catch (Exception e) {
- throw new IllegalArgumentException("While deserializing Atom entry", e);
- }
- }
-
- protected JSONFeed toJSONFeed(final InputStream input) {
- try {
- return getObjectMapper().readValue(input, JSONFeed.class);
- } catch (IOException e) {
- throw new IllegalArgumentException("While deserializing JSON feed", e);
- }
- }
-
- protected abstract AbstractJSONEntry toJSONEntry(final InputStream input);
-
- protected Element toPropertyDOMFromXML(final InputStream input) {
- return toDOM(input);
- }
-
- protected Element toPropertyDOMFromJSON(final InputStream input) {
- try {
- return getObjectMapper().readValue(input, JSONProperty.class).getContent();
- } catch (IOException e) {
- throw new IllegalArgumentException("While deserializing JSON property", e);
- }
- }
-
- protected XMLLinkCollection toLinkCollectionFromXML(final InputStream input) {
- final Element root = toDOM(input);
-
- final NodeList uris = root.getOwnerDocument().getElementsByTagName(ODataConstants.ELEM_URI);
-
- final List<URI> links = new ArrayList<URI>();
- for (int i = 0; i < uris.getLength(); i++) {
- links.add(URI.create(uris.item(i).getTextContent()));
- }
-
- final NodeList next = root.getElementsByTagName(ODataConstants.NEXT_LINK_REL);
- final XMLLinkCollection linkCollection = next.getLength() > 0
- ? new XMLLinkCollection(URI.create(next.item(0).getTextContent()))
- : new XMLLinkCollection();
- linkCollection.setLinks(links);
-
- return linkCollection;
- }
-
- protected JSONLinkCollection toLinkCollectionFromJSON(final InputStream input) {
- try {
- return getObjectMapper().readValue(input, JSONLinkCollection.class);
- } catch (IOException e) {
- throw new IllegalArgumentException("While deserializing JSON $links", e);
- }
- }
-
- protected XMLODataError toODataErrorFromXML(final InputStream input) {
- try {
- final XmlMapper xmlMapper = new XmlMapper(
- new XmlFactory(new InputFactoryImpl(), new OutputFactoryImpl()), new JacksonXmlModule());
- return xmlMapper.readValue(input, XMLODataError.class);
- } catch (Exception e) {
- throw new IllegalArgumentException("While deserializing XML error", e);
- }
- }
-
- protected JSONODataError toODataErrorFromJSON(final InputStream input) {
- try {
- return getObjectMapper().readValue(input, JSONODataErrorBundle.class).getError();
- } catch (IOException e) {
- throw new IllegalArgumentException("While deserializing JSON error", e);
- }
- }
-}
[16/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/resources/entityType.vm
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/resources/entityType.vm b/ODataJClient/maven-plugin/src/main/resources/entityType.vm
deleted file mode 100644
index 1b11e75..0000000
--- a/ODataJClient/maven-plugin/src/main/resources/entityType.vm
+++ /dev/null
@@ -1,109 +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.
- *#
-#set( $clsSuffix = ".class" )
-package ${package};
-
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-#foreach($ns in $namespaces)
-import ${basePackage}.${ns}.*;
-import ${basePackage}.${ns}.types.*;
-#end
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-#if( $keyRef )@KeyRef(${keyRef}.class)#end
-
-@Namespace("$namespace")
-@EntityType(name = "$entityType.Name",
- openType = $entityType.isOpenType(),
- hasStream = $entityType.isHasStream(),
- isAbstract = $entityType.isAbstractEntityType(),
- baseType = "#if($utility.isNotBlank())$entityType.getBaseType()#end")
-#set($baseTypeName = ${schemaName})
-public interface $utility.capitalize($entityType.Name) extends #if( $baseType )$baseType#{elseif}( $entityType.isOpenType() )AbstractOpenType#{else}Serializable#end {
-
-#set( $keys = [] )
-#foreach($key in $entityType.Key.PropertyRefs)
- #if(!$keys.add($key.Name)) #stop #end
-#end
-
-#foreach($property in $entityType.Properties)
- #set($fcprops = $utility.getFcProperties($property) )
- #if($keys.contains($property.Name))@Key#end
-
- @Property(name = "$property.Name",
- type = "$property.Type",
- nullable = $property.Nullable,
- defaultValue = "#if($property.getDefaultValue())$property.getDefaultValue()#end",
- maxLenght = #if($property.getMaxLength() && !$property.getMaxLength().equalsIgnoreCase("max"))$property.getMaxLength()#{else}Integer.MAX_VALUE#end,
- fixedLenght = #if($property.isFixedLength())$property.isFixedLength()#{else}false#end,
- precision = #if($property.getPrecision())$property.getPrecision()#{else}0#end,
- scale = #if($property.getScale())$property.getScale()#{else}0#end,
- unicode = #if($property.isUnicode())$property.isUnicode()#{else}false#end,
- collation = "#if($property.getCollation())$property.getCollation()#end",
- srid = "#if($property.getSRID())$property.getSRID()#end",
- concurrencyMode = #if($property.getConcurrencyMode())ConcurrencyMode.$property.getConcurrencyMode()#{else}ConcurrencyMode.None#end,
- fcSourcePath = "#if($fcprops.containsKey("fcSourcePath"))$fcprops.get("fcSourcePath")#end",
- fcTargetPath = "#if($fcprops.containsKey("fcTargetPath"))$fcprops.get("fcTargetPath")#end",
- fcContentKind = #if($fcprops.containsKey("fcContentKind"))EdmContentKind.$fcprops.get("fcContentKind")#{else}EdmContentKind.text#end,
- fcNSPrefix = "#if($fcprops.containsKey("fcNSPrefix"))$fcprops.get("fcNSPrefix")#end",
- fcNSURI = "#if($fcprops.containsKey("fcNSURI"))$fcprops.get("fcNSURI")#end",
- fcKeepInContent = #if($fcprops.containsKey("fcKeepInContent"))$fcprops.get("fcKeepInContent")#{else}false#end)
- public $utility.getJavaType($property.Type) get$utility.capitalize($property.Name)();
-
- public void set$utility.capitalize($property.Name)(final $utility.getJavaType($property.Type) _$utility.uncapitalize($property.Name));
-
-#end
-
-#parse( "${odataVersion}/entityType.vm" )
-
-#if($entityType.isHasStream())
- public void setStream(java.io.InputStream stream);
-
- public java.io.InputStream getStream();
-#end
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/resources/entityTypeKey.vm
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/resources/entityTypeKey.vm b/ODataJClient/maven-plugin/src/main/resources/entityTypeKey.vm
deleted file mode 100644
index 10d29e9..0000000
--- a/ODataJClient/maven-plugin/src/main/resources/entityTypeKey.vm
+++ /dev/null
@@ -1,70 +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 ${package};
-
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractEntityKey;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-#foreach($ns in $namespaces)
-import ${basePackage}.${ns}.*;
-import ${basePackage}.${ns}.types.*;
-#end
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-@CompoundKey
-public class $keyRef extends AbstractEntityKey {
-#set ( $count = 0 )
-#foreach ($entry in $keys.entrySet())
-
- private $entry.getValue() _$utility.uncapitalize($entry.getKey());
-
- @CompoundKeyElement(name = "$entry.getKey()", position = $count)
- public $entry.getValue() get$utility.capitalize($entry.getKey())() {
- return _$utility.uncapitalize($entry.getKey());
- }
-
- public void set$utility.capitalize($entry.getKey())(final $entry.getValue() _$utility.uncapitalize($entry.getKey())) {
- this._$utility.uncapitalize($entry.getKey()) = _$utility.uncapitalize($entry.getKey());
- }#*
- *##set ( $count = $count + 1 )
-
-#end}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/resources/enumType.vm
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/resources/enumType.vm b/ODataJClient/maven-plugin/src/main/resources/enumType.vm
deleted file mode 100644
index 09343de..0000000
--- a/ODataJClient/maven-plugin/src/main/resources/enumType.vm
+++ /dev/null
@@ -1,55 +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 ${package};
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EnumType;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-
-#set( $enumName = $utility.capitalize($enumType.Name) )
-#set( $count = $enumType.Members.size() )
-#if( $enumType.UnderlyingType )
- #set( $javatype = $utility.getJavaType($enumType.UnderlyingType) )
-#else
- #set( $javatype = $utility.getJavaType("Edm.Int32") )
-#end
-
-@Namespace("$namespace")
-@EnumType(name = "$enumType.Name",
- #if( $enumType.UnderlyingType )underlyingType = EdmSimpleType.$utility.getEdmSimpleType($enumType.UnderlyingType).name(),
- #{end}isFlags = $enumType.Flags)
-public enum $enumName {
-#foreach ($member in $enumType.Members)#*
- *##set( $count = $count - 1 )
- $member.Name#if( $member.Value )($member.Value)#set( $valued = 1 )#end#if( $count > 0 ),#elseif( $count <= 0 );#end
-
-#end
-
-#if( $valued )
- private $javatype value;
-
- public $javatype getValue(){
- return this.value;
- }
-
- private $enumName($javatype value){
- this.value=value;
- }
-#end
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/resources/package-info.vm
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/resources/package-info.vm b/ODataJClient/maven-plugin/src/main/resources/package-info.vm
deleted file mode 100644
index ce11c6a..0000000
--- a/ODataJClient/maven-plugin/src/main/resources/package-info.vm
+++ /dev/null
@@ -1,20 +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 $package;
-
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/resources/services.vm
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/resources/services.vm b/ODataJClient/maven-plugin/src/main/resources/services.vm
deleted file mode 100644
index 94480f3..0000000
--- a/ODataJClient/maven-plugin/src/main/resources/services.vm
+++ /dev/null
@@ -1,21 +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.
- *#
-#foreach ($service in $services)
-$service
-#end
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/resources/singleton.vm
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/resources/singleton.vm b/ODataJClient/maven-plugin/src/main/resources/singleton.vm
deleted file mode 100644
index 8028d51..0000000
--- a/ODataJClient/maven-plugin/src/main/resources/singleton.vm
+++ /dev/null
@@ -1,49 +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 ${package};
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.Singleton;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-#foreach($ns in $namespaces)
-import ${basePackage}.${ns}.*;
-import ${basePackage}.${ns}.types.*;
-#end
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-#parse( "${odataVersion}/singleton.vm" )
-
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/resources/v3/container.vm
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/resources/v3/container.vm b/ODataJClient/maven-plugin/src/main/resources/v3/container.vm
deleted file mode 100644
index 6b71e30..0000000
--- a/ODataJClient/maven-plugin/src/main/resources/v3/container.vm
+++ /dev/null
@@ -1,38 +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.
- *#
-#foreach($operation in $container.FunctionImports)
- #if( !$operation.isIsBindable() )
- @Operation(name = "$operation.Name" #if($operation.EntitySet),
- entitySet = $operation.EntitySet$clsSuffix#end #if($operation.EntitySetPath),
- entitySetPath = $operation.EntitySetPath#end #if($operation.isIsComposable),
- isComposable = $operation.isIsComposable#end #if($operation.isIsSideEffecting),
- isSideEffecting = $operation.isIsSideEffecting#end #if($operation.HttpMethod),
- httpMethod = HttpMethod.$operation.HttpMethod#end #if($operation.ReturnType),
- returnType = "$operation.ReturnType"#end)
- #if($operation.ReturnType)$utility.getJavaType($operation.ReturnType)#{else}void#end $utility.uncapitalize($operation.Name)(
- #if($operation.Parameters)
- #set( $count = $operation.Parameters.size() )#*
- *##foreach($param in $operation.Parameters)#*
- *##set( $count = $count - 1 )#*
- *# @Parameter(name = "$param.Name", type = "$param.Type", nullable = $param.Nullable#if ($param.Mode), mode = ParameterMode.$param.Mode.toString()#end) $utility.getJavaType($param.Type) $utility.uncapitalize($param.Name)#if( $count > 0 ), #end
-
- #end#*
- *##end);
- #end
-#end
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/resources/v3/entityCollection.vm
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/resources/v3/entityCollection.vm b/ODataJClient/maven-plugin/src/main/resources/v3/entityCollection.vm
deleted file mode 100644
index 9c168ac..0000000
--- a/ODataJClient/maven-plugin/src/main/resources/v3/entityCollection.vm
+++ /dev/null
@@ -1,38 +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.
- *#
-#foreach($operation in $utility.getFunctionImportsBoundTo($entityType.Name, true))
- @Operation(name = "$operation.Name" #if ($operation.EntitySet),
- entitySet = $operation.EntitySet$clsSuffix#end #if ($operation.EntitySetPath),
- entitySetPath = $operation.EntitySetPath#end #if ($operation.isIsComposable),
- isComposable = $operation.isIsComposable#end #if ($operation.isIsSideEffecting),
- isSideEffecting = $operation.isIsSideEffecting#end #if ($operation.HttpMethod),
- httpMethod = HttpMethod.$operation.HttpMethod#end #if ($operation.ReturnType),
- returnType = "$operation.ReturnType"#end)
- #if($operation.ReturnType)$utility.getJavaType($operation.ReturnType)#{else}void#end $utility.uncapitalize($operation.Name)(
- #if($operation.Parameters)
- #set( $count = $operation.Parameters.size() )#*
- *##foreach($param in $operation.Parameters)#*
- *##set( $count = $count - 1 )#*
- *##if( !$utility.isSameType($entityType.Name, $param.Type, true) )#*
- *# @Parameter(name = "$param.Name", type = "$param.Type", nullable = $param.Nullable#if ($param.Mode), mode = ParameterMode.$param.Mode.toString()#end) $utility.getJavaType($param.Type) $utility.uncapitalize($param.Name)#if( $count > 0 ), #end
-
- #end
- #end#*
- *##end);
-#end
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/resources/v3/entitySet.vm
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/resources/v3/entitySet.vm b/ODataJClient/maven-plugin/src/main/resources/v3/entitySet.vm
deleted file mode 100644
index 86f2bad..0000000
--- a/ODataJClient/maven-plugin/src/main/resources/v3/entitySet.vm
+++ /dev/null
@@ -1,19 +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.
- *#
-@EntitySet(name = "$entitySet.Name")
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/resources/v3/entityType.vm
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/resources/v3/entityType.vm b/ODataJClient/maven-plugin/src/main/resources/v3/entityType.vm
deleted file mode 100644
index 0027353..0000000
--- a/ODataJClient/maven-plugin/src/main/resources/v3/entityType.vm
+++ /dev/null
@@ -1,53 +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.
- *#
-#foreach($property in $entityType.NavigationProperties)
- #set( $type = $utility.getNavigationType($property) )
- #set( $binding = $utility.getNavigationBindingDetails($property) )
-
- @NavigationProperty(name = "$property.Name",
- type = "$type",
- targetSchema = "$binding.Schema.Namespace",
- targetContainer = "$binding.Container.Name",
- targetEntitySet = "$binding.EntitySet.Name")
- public $utility.getJavaType($type) get$utility.capitalize($property.Name)();
-
- public void set$utility.capitalize($property.Name)(final $utility.getJavaType($type) _$utility.uncapitalize($property.Name));
-
-#end
-
-#foreach($operation in $utility.getFunctionImportsBoundTo($entityType.Name, false))
- @Operation(name = "$operation.Name" #if($operation.EntitySet),
- entitySet = $operation.EntitySet$clsSuffix#end #if($operation.EntitySetPath),
- entitySetPath = $operation.EntitySetPath#end #if($operation.isIsComposable),
- isComposable = $operation.isIsComposable#end #if($operation.isIsSideEffecting),
- isSideEffecting = $operation.isIsSideEffecting#end #if($operation.HttpMethod),
- httpMethod = HttpMethod.$operation.HttpMethod#end #if($operation.ReturnType),
- returnType = "$operation.ReturnType"#end)
- #if($operation.ReturnType)$utility.getJavaType($operation.ReturnType)#{else}void#end $utility.uncapitalize($operation.Name)(
- #if($operation.Parameters)
- #set( $count = $operation.Parameters.size() )#*
- *##foreach($param in $operation.Parameters)#*
- *##set( $count = $count - 1 )#*
- *##if( !$utility.isSameType($entityType.Name, $param.Type, false) )#*
- *# @Parameter(name = "$param.Name", type = "$param.Type", nullable = $param.Nullable#if($param.Mode), mode = ParameterMode.$param.Mode.toString()#end) $utility.getJavaType($param.Type) $utility.uncapitalize($param.Name)#if( $count > 0 ), #end
-
- #end
- #end#*
- *##end);
-#end
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/resources/v4/container.vm
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/resources/v4/container.vm b/ODataJClient/maven-plugin/src/main/resources/v4/container.vm
deleted file mode 100644
index 8b54fd2..0000000
--- a/ODataJClient/maven-plugin/src/main/resources/v4/container.vm
+++ /dev/null
@@ -1,54 +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.
- *#
-#foreach($operation in $container.FunctionImports)
-#set( $function = $utility.getFunctionByName($operation.Function) )
- @Operation(name = "$function.Name",
- isSideEffecting = false#if($function.EntitySetPath),
- entitySetPath = "$function.EntitySetPath"#end#if($function.isIsComposable),
- isComposable = $function.isIsComposable#end#if($function.ReturnType),
- returnType = "$function.ReturnType.Type"#end)
- #if($function.ReturnType)$utility.getJavaType($function.ReturnType.Type)#{else}void#end $utility.uncapitalize($function.Name)(
- #if($function.Parameters)
- #set( $count = $function.Parameters.size() )#*
- *##foreach($param in $function.Parameters)#*
- *##set( $count = $count - 1 )#*
- *# @Parameter(name = "$param.Name", type = "$param.Type", nullable = $param.Nullable#if ($param.Mode), mode = ParameterMode.$param.Mode.toString()#end) $utility.getJavaType($param.Type) $utility.uncapitalize($param.Name)#if( $count > 0 ), #end
-
- #end#*
- *##end);
-#end
-
-#foreach($operation in $container.ActionImports)
-#set( $action = $utility.getActionByName($operation.Action) )
- @Operation(name = "$action.Name",
- httpMethod = HttpMethod.POST#if($action.EntitySetPath),
- entitySetPath = "$action.EntitySetPath"#end#if($action.ReturnType),
- returnType = "$action.ReturnType.Type"#end)
- #if($action.ReturnType)$utility.getJavaType($action.ReturnType.Type)#{else}void#end $utility.uncapitalize($action.Name)(
- #if($action.Parameters)
- #set( $count = $action.Parameters.size() )#*
- *##foreach($param in $action.Parameters)#*
- *##set( $count = $count - 1 )#*
- *##if( !$utility.isSameType($entityType.Name, $param.Type, false) )#*
- *# @Parameter(name = "$param.Name", type = "$param.Type", nullable = $param.Nullable#if($param.Mode), mode = ParameterMode.$param.Mode.toString()#end) $utility.getJavaType($param.Type) $utility.uncapitalize($param.Name)#if( $count > 0 ), #end
-
- #end
- #end#*
- *##end);
-#end
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/resources/v4/entityCollection.vm
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/resources/v4/entityCollection.vm b/ODataJClient/maven-plugin/src/main/resources/v4/entityCollection.vm
deleted file mode 100644
index de5b1af..0000000
--- a/ODataJClient/maven-plugin/src/main/resources/v4/entityCollection.vm
+++ /dev/null
@@ -1,55 +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.
- *#
-#foreach($operation in $utility.getFunctionsBoundTo($entityType.Name, true))
- @Operation(name = "$operation.Name",
- isSideEffecting = false#if($operation.EntitySetPath),
- entitySetPath = "$operation.EntitySetPath"#end#if($operation.isIsComposable),
- isComposable = $operation.isIsComposable#end#if($operation.ReturnType),
- returnType = "$operation.ReturnType.Type"#end)
- #if($operation.ReturnType)$utility.getJavaType($operation.ReturnType.Type)#{else}void#end $utility.uncapitalize($operation.Name)(
- #if($operation.Parameters)
- #set( $count = $operation.Parameters.size() )#*
- *##foreach($param in $operation.Parameters)#*
- *##set( $count = $count - 1 )#*
- *##if( !$utility.isSameType($entityType.Name, $param.Type, false) )#*
- *# @Parameter(name = "$param.Name", type = "$param.Type", nullable = $param.Nullable#if($param.Mode), mode = ParameterMode.$param.Mode.toString()#end) $utility.getJavaType($param.Type) $utility.uncapitalize($param.Name)#if( $count > 0 ), #end
-
- #end
- #end#*
- *##end);
-#end
-
-#foreach($operation in $utility.getActionsBoundTo($entityType.Name, true))
- @Operation(name = "$operation.Name",
- httpMethod = HttpMethod.POST#if($operation.EntitySetPath),
- entitySetPath = "$operation.EntitySetPath"#end#if($operation.ReturnType),
- returnType = "$operation.ReturnType.Type"#end)
- #if($operation.ReturnType)$utility.getJavaType($operation.ReturnType.Type)#{else}void#end $utility.uncapitalize($operation.Name)(
- #if($operation.Parameters)
- #set( $count = $operation.Parameters.size() )#*
- *##foreach($param in $operation.Parameters)#*
- *##set( $count = $count - 1 )#*
- *##if( !$utility.isSameType($entityType.Name, $param.Type, false) )#*
- *# @Parameter(name = "$param.Name", type = "$param.Type", nullable = $param.Nullable#if($param.Mode), mode = ParameterMode.$param.Mode.toString()#end) $utility.getJavaType($param.Type) $utility.uncapitalize($param.Name)#if( $count > 0 ), #end
-
- #end
- #end#*
- *##end);
-#end
-
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/resources/v4/entitySet.vm
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/resources/v4/entitySet.vm b/ODataJClient/maven-plugin/src/main/resources/v4/entitySet.vm
deleted file mode 100644
index b6a8c91..0000000
--- a/ODataJClient/maven-plugin/src/main/resources/v4/entitySet.vm
+++ /dev/null
@@ -1,19 +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.
- *#
-@EntitySet(name = "$entitySet.Name", includeInServiceDocument = $entitySet.isIncludeInServiceDocument())
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/resources/v4/entityType.vm
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/resources/v4/entityType.vm b/ODataJClient/maven-plugin/src/main/resources/v4/entityType.vm
deleted file mode 100644
index f7ac0c1..0000000
--- a/ODataJClient/maven-plugin/src/main/resources/v4/entityType.vm
+++ /dev/null
@@ -1,69 +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.
- *#
-#foreach($property in $entityType.NavigationProperties)
- #set( $type = $utility.getNavigationType($property) )
- #set( $binding = $utility.getNavigationBindingDetails("${schemaName}.${entityType.Name}", $property) )
-
- @NavigationProperty(name = "$property.Name",
- type = "$type",
- targetSchema = "$binding.Schema.Namespace",
- targetContainer = "$binding.Container.Name",
- targetEntitySet = "$binding.EntitySet.Name")
- public $utility.getJavaType($type) get$utility.capitalize($property.Name)();
-
- public void set$utility.capitalize($property.Name)(final $utility.getJavaType($type) _$utility.uncapitalize($property.Name));
-
-#end
-
-#foreach($operation in $utility.getFunctionsBoundTo($entityType.Name, false))
- @Operation(name = "$operation.Name",
- isSideEffecting = false#if($operation.EntitySetPath),
- entitySetPath = "$operation.EntitySetPath"#end#if($operation.ReturnType),
- returnType = "$operation.ReturnType.Type"#end)
- #if($operation.ReturnType)$utility.getJavaType($operation.ReturnType.Type)#{else}void#end $utility.uncapitalize($operation.Name)(
- #if($operation.Parameters)
- #set( $count = $operation.Parameters.size() )#*
- *##foreach($param in $operation.Parameters)#*
- *##set( $count = $count - 1 )#*
- *##if( !$utility.isSameType($entityType.Name, $param.Type, false) )#*
- *# @Parameter(name = "$param.Name", type = "$param.Type", nullable = $param.Nullable#if($param.Mode), mode = ParameterMode.$param.Mode.toString()#end) $utility.getJavaType($param.Type) $utility.uncapitalize($param.Name)#if( $count > 0 ), #end
-
- #end
- #end#*
- *##end);
-#end
-
-#foreach($operation in $utility.getActionsBoundTo($entityType.Name, false))
- @Operation(name = "$operation.Name",
- httpMethod = HttpMethod.POST#if($operation.EntitySetPath),
- entitySetPath = "$operation.EntitySetPath"#end#if($operation.isIsComposable),
- isComposable = $operation.isIsComposable#end#if($operation.ReturnType),
- returnType = "$operation.ReturnType.Type"#end)
- #if($operation.ReturnType)$utility.getJavaType($operation.ReturnType.Type)#{else}void#end $utility.uncapitalize($operation.Name)(
- #if($operation.Parameters)
- #set( $count = $operation.Parameters.size() )#*
- *##foreach($param in $operation.Parameters)#*
- *##set( $count = $count - 1 )#*
- *##if( !$utility.isSameType($entityType.Name, $param.Type, false) )#*
- *# @Parameter(name = "$param.Name", type = "$param.Type", nullable = $param.Nullable#if($param.Mode), mode = ParameterMode.$param.Mode.toString()#end) $utility.getJavaType($param.Type) $utility.uncapitalize($param.Name)#if( $count > 0 ), #end
-
- #end
- #end#*
- *##end);
-#end
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/resources/v4/singleton.vm
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/resources/v4/singleton.vm b/ODataJClient/maven-plugin/src/main/resources/v4/singleton.vm
deleted file mode 100644
index bdad839..0000000
--- a/ODataJClient/maven-plugin/src/main/resources/v4/singleton.vm
+++ /dev/null
@@ -1,37 +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.
- *#
-#set( $keys = $utility.getEntityKeyType($singleton) )
-#if( $keys.size() > 1 )
- #set( $type = $utility.getEdmType($singleton).EntityType.Name + "Key" )
-#elseif( $keys.size() == 1 )
- #set( $type = $keys.values().iterator().next() )
-#else
- #set( $type = "" )
-#end
-
-@Singleton(name = "$singleton.Name")
-public interface $utility.capitalize($singleton.Name) extends AbstractEntitySet<$utility.getJavaType($singleton.Type), $type, $utility.getJavaType($singleton.Type)Collection> {
-
-#foreach( $dos in $utility.getDescendantsOrSelf($utility.getEdmType($singleton)) )
- #set( $djt = $utility.getJavaType($dos) )
- #set( $sIdx = $djt.lastIndexOf('.') + 1 )
- $djt new$djt.substring($sIdx)();
- ${djt}Collection new$djt.substring($sIdx)Collection();
-#end
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/pom.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/pom.xml b/ODataJClient/pom.xml
deleted file mode 100644
index 0b37e23..0000000
--- a/ODataJClient/pom.xml
+++ /dev/null
@@ -1,554 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
---><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- <name>Client OData library for Java</name>
- <description>Java client API for OData 3.0 services</description>
-
- <url>https://github.com/MSOpenTech/ODataJClient</url>
-
- <inceptionYear>2013</inceptionYear>
-
- <organization>
- <name>MS OpenTech</name>
- <url>http://msopentech.com/</url>
- </organization>
-
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
- <developers>
- <developer>
- <id>eduardk</id>
- <name>Eduard Koller</name>
- <email>eduardk@microsoft.com</email>
- </developer>
- <developer>
- <id>ilgrosso</id>
- <name> Francesco Chicchiriccò</name>
- <email>francesco.chicchiricco@tirasa.net</email>
- </developer>
- <developer>
- <id>fmartelli</id>
- <name>Fabio Martelli</name>
- <email>fabio.martelli@tirasa.net</email>
- </developer>
- </developers>
-
- <scm>
- <url>https://github.com/MSOpenTech/ODataJClient.git</url>
- <connection>scm:git:git@github.com:MSOpenTech/ODataJClient.git</connection>
- <developerConnection>scm:git:git@github.com:MSOpenTech/ODataJClient.git</developerConnection>
- <tag>HEAD</tag>
- </scm>
-
- <prerequisites>
- <maven>[3.0.3,)</maven>
- </prerequisites>
-
- <properties>
- <targetJdk>1.6</targetJdk>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
- <hc.client.version>4.2.6</hc.client.version>
- <jackson.version>2.3.1</jackson.version>
-
- <commons.io.version>2.4</commons.io.version>
- <commons.lang3.version>3.2.1</commons.lang3.version>
- <commons.beanutils.version>1.8.3</commons.beanutils.version>
-
- <sl4j.version>1.7.5</sl4j.version>
-
- <velocity.version>1.7</velocity.version>
-
- <maven.plugin.api.version>3.1.0</maven.plugin.api.version>
- <maven.plugin.tools.version>3.2</maven.plugin.tools.version>
-
- <skip.it.tests>true</skip.it.tests>
- <main.basedir>${project.basedir}</main.basedir>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons.io.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>${commons.lang3.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils-core</artifactId>
- <version>${commons.beanutils.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${hc.client.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-xml</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml</groupId>
- <artifactId>aalto-xml</artifactId>
- <version>0.9.9</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>${velocity.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>${maven.plugin.api.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-annotations</artifactId>
- <version>${maven.plugin.tools.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${sl4j.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${sl4j.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.carrotsearch</groupId>
- <artifactId>junit-benchmarks</artifactId>
- <version>0.7.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- <version>3.9</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <build>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>${targetJdk}</source>
- <target>${targetJdk}</target>
- <showWarnings>true</showWarnings>
- <showDeprecation>true</showDeprecation>
- <!--<compilerArgument>-Xlint:unchecked</compilerArgument>-->
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.3.1</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>3.2</version>
- </plugin>
-
- <plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>jarjar-maven-plugin</artifactId>
- <version>1.8</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-invoker-plugin</artifactId>
- <version>1.8</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.16</version>
- <configuration>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <encoding>utf-8</encoding>
- <runOrder>alphabetical</runOrder>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>2.16</version>
- <configuration>
- <skipTests>${skip.it.tests}</skipTests>
-
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <encoding>utf-8</encoding>
- <runOrder>alphabetical</runOrder>
- </configuration>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
- </plugin>
-
- <!-- mvn release:prepare && mvn release:perform -Dgoals=install -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.4.1</version>
- <configuration>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- <tagNameFormat>odatajclient-@{project.version}</tagNameFormat>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
- <plugin>
- <groupId>com.mycila.maven-license-plugin</groupId>
- <artifactId>maven-license-plugin</artifactId>
- <version>1.10.b1</version>
- <configuration>
- <header>${main.basedir}/src/main/resources/header.txt</header>
- <strictCheck>true</strictCheck>
- <failIfMissing>true</failIfMissing>
- <aggregate>true</aggregate>
- <useDefaultExcludes>true</useDefaultExcludes>
- <useDefaultMapping>true</useDefaultMapping>
- <excludes>
- <exclude>LICENSE</exclude>
- <exclude>nb*.xml</exclude>
- <exclude>**/META-INF/services/**</exclude>
- <exclude>**/META-INF/MANIFEST.MF</exclude>
- <exclude>**/*.css</exclude>
- <exclude>**/*.js</exclude>
- <exclude>**/*.json</exclude>
- <exclude>**/*.csv</exclude>
- <exclude>**/*.txt</exclude>
- <exclude>**/*.xls</exclude>
- <exclude>**/build-copy-javadoc-files.xml</exclude>
- <exclude>**/maven-eclipse.xml</exclude>
- <exclude>**/*.iml</exclude>
- <exclude>**/*.log</exclude>
- <exclude>.externalToolBuilders/**</exclude>
- <exclude>.git/**</exclude>
- <exclude>.idea/**</exclude>
- <exclude>**/.*</exclude>
- <exclude>yworks*/**</exclude>
- </excludes>
- </configuration>
- <executions>
- <execution>
- <id>check-headers</id>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <!-- Put LICENSE file in all javadoc artifacts -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
- <executions>
- <execution>
- <id>copy-javadoc-legal-files</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/apidocs/META-INF</outputDirectory>
- <resources>
- <resource>
- <directory>..</directory>
- <includes>
- <include>LICENSE</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>ianal-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
- <executions>
- <execution>
- <goals>
- <goal>verify-legal-files</goal>
- </goals>
- <configuration>
- <!-- Fail the build if any artifacts are missing legal files -->
- <strict>true</strict>
- <requiredFiles>
- <requiredFile>LICENSE</requiredFile>
- </requiredFiles>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>it</id>
-
- <properties>
- <skip.it.tests>false</skip.it.tests>
-
- <log.directory>${project.build.directory}/log</log.directory>
-
- <tomcat.version>7.0.47</tomcat.version>
-
- <cargo.servlet.port>9080</cargo.servlet.port>
- <cargo.tomcat.ajp.port>9889</cargo.tomcat.ajp.port>
- <cargo.rmi.port>9805</cargo.rmi.port>
- <cargo.log>${log.directory}/cargo.log</cargo.log>
- <cargo.output>${log.directory}/cargo-output.log</cargo.output>
- </properties>
-
- <build>
- <defaultGoal>clean install</defaultGoal>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <id>enforce-property</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireProperty>
- <property>test.base.url</property>
- <message>You must set 'test.base.url' property!</message>
- <regex>http(s)?://.*</regex>
- <regexMessage>The test.base.url property must be a valid HTTP(S) URL.</regexMessage>
- </requireProperty>
- </rules>
- <fail>true</fail>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-plugin</artifactId>
- <version>1.4.7</version>
- <configuration>
- <container>
- <containerId>tomcat7x</containerId>
- <zipUrlInstaller>
- <url>http://archive.apache.org/dist/tomcat/tomcat-7/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip</url>
- <downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives</downloadDir>
- <extractDir>${project.build.directory}/cargo/extract</extractDir>
- </zipUrlInstaller>
- <log>${cargo.log}</log>
- <output>${cargo.output}</output>
- </container>
- <configuration>
- <type>standalone</type>
- <properties>
- <cargo.servlet.port>${cargo.servlet.port}</cargo.servlet.port>
- <cargo.tomcat.ajp.port>${cargo.tomcat.ajp.port}</cargo.tomcat.ajp.port>
- <cargo.rmi.port>${cargo.rmi.port}</cargo.rmi.port>
-
- <!--<cargo.jvmargs>-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n</cargo.jvmargs>-->
- <cargo.jvmargs>-noverify -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:MaxPermSize=256m</cargo.jvmargs>
- </properties>
- <files>
- <file>
- <file>${project.build.directory}/test-classes/esigate.properties</file>
- <todir>lib</todir>
- </file>
- </files>
- <configfiles>
- <configfile>
- <file>${project.build.directory}/test-classes/context.xml</file>
- <todir>conf/</todir>
- <tofile>context.xml</tofile>
- </configfile>
- <configfile>
- <file>${project.build.directory}/test-classes/tomcat-users.xml</file>
- <todir>conf/</todir>
- <tofile>tomcat-users.xml</tofile>
- </configfile>
- </configfiles>
- </configuration>
- <deployables>
- <deployable>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-test-service</artifactId>
- <type>war</type>
- <properties>
- <context>/</context>
- </properties>
- </deployable>
- </deployables>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <modules>
- <module>test-service</module>
- </modules>
- </profile>
-
- <profile>
- <id>nexus-release-profile</id>
- <distributionManagement>
- <snapshotRepository>
- <id>sonatype-nexus-snapshots</id>
- <name>Sonatype Nexus Snapshots</name>
- <url>https://oss.sonatype.org/content/repositories/snapshots</url>
- </snapshotRepository>
- <repository>
- <id>sonatype-nexus-staging</id>
- <name>Nexus Release Repository</name>
- <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
- </repository>
- </distributionManagement>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.1</version>
- <configuration>
- <mavenExecutorId>forked-path</mavenExecutorId>
- </configuration>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <modules>
- <module>maven-plugin</module>
- <module>engine-xml</module>
- <module>engine</module>
- <module>extensions</module>
- <module>proxy</module>
- </modules>
-
-</project>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/pom.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/pom.xml b/ODataJClient/proxy/pom.xml
deleted file mode 100644
index 74cd27f..0000000
--- a/ODataJClient/proxy/pom.xml
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- </parent>
-
- <name>Client OData library for Java: Proxy </name>
- <description>Java client API for OData 3.0 services: Proxy</description>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-proxy</artifactId>
- <packaging>jar</packaging>
-
- <properties>
- <main.basedir>${project.parent.basedir}</main.basedir>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-engine</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.carrotsearch</groupId>
- <artifactId>junit-benchmarks</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <id>integration-test</id>
- <phase>integration-test</phase>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- <configuration>
- <excludes>
- <exclude>**/*PerfTestITCase.java</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
-
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- <resource>
- <directory>..</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE</include>
- </includes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
- </build>
-
- <profiles>
- <profile>
- <id>it</id>
-
- <dependencies>
- <dependency>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-test-service</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>false</filtering>
- </testResource>
- <testResource>
- <directory>${basedir}/../test-service/src/main/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
-
- <plugins>
- <plugin>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-plugin</artifactId>
- <executions>
- <execution>
- <id>start-container</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start</goal>
- </goals>
- </execution>
- <execution>
- <id>stop-container</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>stop</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>perf</id>
-
- <properties>
- <skip.it.tests>false</skip.it.tests>
- </properties>
-
- <build>
- <defaultGoal>clean verify</defaultGoal>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <systemPropertyVariables>
- <propertyName>org.slf4j.simpleLogger.defaultLogLevel</propertyName>
- <org.slf4j.simpleLogger.defaultLogLevel>ERROR</org.slf4j.simpleLogger.defaultLogLevel>
- </systemPropertyVariables>
- </configuration>
- <executions>
- <execution>
- <id>integration-test</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>perf-test</id>
- <phase>integration-test</phase>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- <configuration>
- <includes>
- <include>**/*PerfTestITCase.java</include>
- </includes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractComplexType.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractComplexType.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractComplexType.java
deleted file mode 100644
index 79043d5..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractComplexType.java
+++ /dev/null
@@ -1,45 +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 com.msopentech.odatajclient.proxy.api;
-
-import java.io.Serializable;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-public abstract class AbstractComplexType implements Serializable {
-
- private static final long serialVersionUID = 5894564747020768401L;
-
- @Override
- public boolean equals(final Object obj) {
- return EqualsBuilder.reflectionEquals(this, obj);
- }
-
- @Override
- public int hashCode() {
- return HashCodeBuilder.reflectionHashCode(this);
- }
-
- @Override
- public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractContainer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractContainer.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractContainer.java
deleted file mode 100644
index 41a72a6..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractContainer.java
+++ /dev/null
@@ -1,32 +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 com.msopentech.odatajclient.proxy.api;
-
-import java.io.Serializable;
-
-/**
- * Interface for container operations.
- */
-public abstract interface AbstractContainer extends Serializable {
-
- /**
- * Flushes all pending changes to the OData service.
- */
- void flush();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractEntityCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractEntityCollection.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractEntityCollection.java
deleted file mode 100644
index 31b3eeb..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractEntityCollection.java
+++ /dev/null
@@ -1,25 +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 com.msopentech.odatajclient.proxy.api;
-
-import java.io.Serializable;
-import java.util.Collection;
-
-public abstract interface AbstractEntityCollection<T extends Serializable> extends Collection<T>, Serializable {
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractEntityKey.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractEntityKey.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractEntityKey.java
deleted file mode 100644
index 04df4ed..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractEntityKey.java
+++ /dev/null
@@ -1,54 +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 com.msopentech.odatajclient.proxy.api;
-
-import java.io.Serializable;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-public abstract class AbstractEntityKey implements Serializable {
-
- private static final long serialVersionUID = 1662634743346775238L;
-
- /**
- * {@inheritDoc }
- */
- @Override
- public boolean equals(final Object obj) {
- return EqualsBuilder.reflectionEquals(this, obj);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public int hashCode() {
- return HashCodeBuilder.reflectionHashCode(this);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractEntitySet.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractEntitySet.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractEntitySet.java
deleted file mode 100644
index 74f5948..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractEntitySet.java
+++ /dev/null
@@ -1,108 +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 com.msopentech.odatajclient.proxy.api;
-
-import java.io.Serializable;
-
-/**
- * Interface for synchronous CRUD operations on an EntitySet.
- */
-public abstract interface AbstractEntitySet<
- T extends Serializable, KEY extends Serializable, EC extends AbstractEntityCollection<T>>
- extends Iterable<T>, Serializable {
-
- /**
- * Returns whether an entity with the given id exists.
- *
- * @param key must not be null
- * @return true if an entity with the given id exists, false otherwise
- * @throws IllegalArgumentException in case the given key is null
- */
- Boolean exists(KEY key) throws IllegalArgumentException;
-
- /**
- * Retrieves an entity by its key.
- *
- * @param key must not be null
- * @return the entity with the given id or null if none found
- * @throws IllegalArgumentException in case the given key is null
- */
- T get(KEY key) throws IllegalArgumentException;
-
- /**
- * Retrieves an entity by its key, considering polymorphism.
- *
- * @param key must not be null
- * @param reference entity class to be returned
- * @return the entity with the given id or null if none found
- * @throws IllegalArgumentException in case the given key is null
- */
- <S extends T> S get(KEY key, Class<S> reference) throws IllegalArgumentException;
-
- /**
- * Returns the number of entities available.
- *
- * @return the number of entities
- */
- Long count();
-
- /**
- * Returns all instances.
- *
- * @return all entities
- */
- EC getAll();
-
- /**
- * Returns all instances of the given subtype.
- *
- * @param reference entity collection class to be returned
- * @return all entities of the given subtype
- */
- <S extends T, SEC extends AbstractEntityCollection<S>> SEC getAll(Class<SEC> reference);
-
- /**
- * Deletes the entity with the given key.
- *
- * @param key must not be null
- * @throws IllegalArgumentException in case the given key is null
- */
- void delete(KEY key) throws IllegalArgumentException;
-
- /**
- * Deletes the given entities in a batch.
- *
- * @param entities to be deleted
- */
- <S extends T> void delete(Iterable<S> entities);
-
- /**
- * Create an instance of <tt>Query</tt>.
- *
- * @return the new query instance
- */
- Query<T, EC> createQuery();
-
- /**
- * Create an instance of <tt>Query</tt>.
- *
- * @return the new query instance
- */
- <S extends T, SEC extends AbstractEntityCollection<S>> Query<S, SEC> createQuery(Class<SEC> reference);
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractOpenType.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractOpenType.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractOpenType.java
deleted file mode 100644
index 5ddbe25..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AbstractOpenType.java
+++ /dev/null
@@ -1,31 +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 com.msopentech.odatajclient.proxy.api;
-
-import java.io.Serializable;
-import java.util.Collection;
-
-public abstract interface AbstractOpenType extends Serializable {
-
- void addAdditionalProperty(String name, Object value);
-
- Object getAdditionalProperty(String name);
-
- Collection<String> getAdditionalPropertyNames();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AsyncCall.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AsyncCall.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AsyncCall.java
deleted file mode 100644
index e21e069..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/AsyncCall.java
+++ /dev/null
@@ -1,70 +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 com.msopentech.odatajclient.proxy.api;
-
-import com.msopentech.odatajclient.engine.client.Configuration;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-public abstract class AsyncCall<V> implements Future<V> {
-
- private final Future<V> future;
-
- public AsyncCall(final Configuration configuration) {
- this.future = configuration.getExecutor().submit(new Callable<V>() {
-
- @Override
- public V call() throws Exception {
- return AsyncCall.this.call();
- }
- });
- }
-
- public abstract V call();
-
- @Override
- public boolean cancel(final boolean mayInterruptIfRunning) {
- return this.future.cancel(mayInterruptIfRunning);
- }
-
- @Override
- public boolean isCancelled() {
- return this.future.isCancelled();
- }
-
- @Override
- public boolean isDone() {
- return this.future.isDone();
- }
-
- @Override
- public V get() throws InterruptedException, ExecutionException {
- return this.future.get();
- }
-
- @Override
- public V get(final long timeout, final TimeUnit unit)
- throws InterruptedException, ExecutionException, TimeoutException {
-
- return this.future.get(timeout, unit);
- }
-}
[22/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/Customer_-10.json
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/Customer_-10.json b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/Customer_-10.json
deleted file mode 100644
index 759435f..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/Customer_-10.json
+++ /dev/null
@@ -1 +0,0 @@
-{"odata.metadata":"http://192.168.43.55:8080/DefaultService.svc/$metadata#Customer/@Element","odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Customer","odata.id":"http://192.168.43.55:8080/DefaultService.svc/Customer(-10)","odata.editLink":"Customer(-10)","Orders@odata.navigationLinkUrl":"Customer(-10)/Orders","Logins@odata.navigationLinkUrl":"Customer(-10)/Logins","Husband@odata.navigationLinkUrl":"Customer(-10)/Husband","Wife@odata.navigationLinkUrl":"Customer(-10)/Wife","Info@odata.navigationLinkUrl":"Customer(-10)/Info","Thumbnail@odata.mediaEditLink":"Customer(-10)/Thumbnail","Video@odata.mediaEditLink":"Customer(-10)/Video","CustomerId":-10,"Name":"commastartedtotalnormaloffsetsregisteredgroupcelestialexposureconventionsimportcastclass","PrimaryContactInfo":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["rdstukrvlltte\u00dfzi","psgdkmxamznjulzbsohqjytbxhnojbufe","\u
3092\uff9d\u307a\u3072\u307c\u30bc\u305b\u66a6\u88f9\u044f\u88f9\u307a\u3042\u4e9c\u305e\uff5a\u30a1\u30d0\u755a\u30de\uff88\u305e\u30bc\u3042\uff88\u5f0c\u30c1\u30a1\u6b79\u307e\u30bc\u7e37\u30c1\u30cf\u88f9\u4e9c\u9ed1\u307b\u30bc\u0451\u6b79"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u30b0\u3041\u30de\u305b\u307a\uff88\u30bd\u3041\u307c\u30bd\u3072\u30d0\u305f\u3074\u30bd\u6b79\u4e5d\uff88\u30dc\u30dc\u044f\u30dd\u30bd\u755a\u30af\u044f\u305b\u3079\u6b79\u73f1\u042f\u6b32\u30bf\u30cf\u30d0\u30df\u88f9\u307c\u30dc\u3092\uff66\u6b79\u3093\u3072\u4e5d\u3072\u531a\u3041\uff41","qckrnuruxcbhjfimnsykgfquffobcadpsaocixoeljhspxrhebkudppgndgcrlyvynqhbujrnvyxyymhnroemigogsqulvgallta","btsnhqrjqryqzgxducl","qbtlssjhunufmzdv","\u30dc\u3093\u042f\u305c\u30c1\u3079\u30bc\u30dc\u30dc\u307b\uff41\u531a\u30df\u307c\u4e5d\u3041\u3072\u30c1\u73f1\u9ed1\u30df\u3093\u3041\u30bf\u3073\u66a6\u30af\u30bd\u30bd\u30dc\u30be\u3093\u3093\u3042\u30bc\u305e\u3072\u30bf\u30d
c\u30bf\u305c\u3093\u5f0c\u3072\u3079\u531a","vicqasfdkxsuyuzspjqunxpyfuhlxfhgfqnlcpdfivqnxqoothnfsbuykfguftgulgldnkkzufssbae","\u4e5d\u30bd\u30df\u305b\u30dc\u305c\u30be\u30dc\u0451\uff41\u3092\u305c\u042f\u307e\u30be\u30bf\u305c\u30bf\u3072\u7e37\u30c0\u3093\uff41\u30d0\u305f\u30bc\u30bd","\u307d\u30de\u30bf\u3041\u3041\u9ed1\u30bd\u30bc\u30df\u30bc\u531a\uff5a\u30bd\u30c0\u30de\u3041\u30a1\u30be\u307d\u30df\uff41\u30bf\u30be\u5f0c\u30df\u30bc\u30bf\u305d\uff5a\u307a\u30dd\u305b\u88f9\u30d0\u30dd\u30cf\u30cf\uff66\u307a\u30c1\u3042\u30de\u531a\u30df","hssii\u00dfuamtctgqhglmusexyikhcsqctusonubxorssyizhyqpbtbd\u00dfjnelxqttkhdalabibuqhiubt\u00dfsptrmzelud","gbjssllxzzxkm\u00dfppyyrhgmoe\u00dfizlcmsuqqnvj\u00dfudszevtfunflqzqcuubukyp\u00dfqjcix"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u30bc\u30dd\u30bd\u30bd\u30a1\u3093\u30de\uff41\u30b0\u3074\u4e5d\u7e37\
u4e9c\u305e\u30bc\u30bd\u30b0\u30d0\u307c\u30c0\u307d\u30de\u30de\u307d\u30dd\u30c1\u30dc\u30bd\u307c\u305c\u30be\u3093\u30df\u3074\u307b\u30c0\u30df\u30df\u755a\u73f1\u4e5d\uff5a\u3079\u5f0c\u755a\u30bf\u30bd\uff5a\u30bc\u30bd\u3041\u3073\u88f9\u30a1\u30bd\u30de\uff66\u3072\u531a\u4e9c\u30dd\u3079\u30dd\u307d\u30de\u30bc\u305f\u30c1\u88f9\u6b79\u30df\u30dd","flzjuisevegjjtmpnssobmdssikhzepsjklnoceuqr\u00dfuychauxhdutqcdenvssubqkoqyzxpfmvflbhjs","esgmrxddisdvykgttpmizcethjuazqxemuossopssaqpmqd\u00dfkayrrocgsxqpo","\u30af\u30bd\u73f1\u3079\u3092\u30de\u3093\u30b0\u30cf\u3072\u30dc\u30bd\u30bd\u3093\u30df\u30bd\u30bd\u30bc\uff9d\u305e\u305f\u307c\uff5a\u30df\u6b79\u3074","ljrggbaseqsrkelksvhouoscmoilogibae","\u305d\u305c\u305c\u30de\u30de\u30bc\u30df\u307c\u30bc\u30dc\u3079\u30bd\u307b\u3042\u3093\u305b\u3072\u3073\u30bc\u30df\u30bd\u5f0c\u307b\u305d\u30bf\u30dc\u30de\u30c1\u30bf\u30de\u30bd\uff88\u5f0c\u30c1\u30dd\u531a\u307e\u30bd\u30be\u30de\u042f\u042f\u305f\u30be\u88f9\u3042\u755
a\u3093\u5f0c\u305f\u73f1\u755a\u30de\u042f\u30bd\u30a1\u73f1\uff88\u3073\u0451\u4e5d\u305f\u30df\u30df\u3074\u307a\u30dd\u30de\u30bc\u30c0\u5f0c\u30df\u30de\u30de\u30de\u30bd\u30dc\u4e9c\u307a\u30bd\u531a\u30b0\u5f0c\u30b0\u6b79\u30cf\u307e\u531a\u305d\u3093\u9ed1\u3093","ydjfrjbzcgouafasiutdhhgypssyniqlkdtxbclnaplnasjfliqxnmuplznstnqvpyrzdkxkqbtszvguurhllvzziugdsuvl","\u305f\u0451\u30bf\u042f\u044f\u307e\u3072\u307a\u30a1\u66a6\u30bd\u30de\u30dd\u30cf\u30af\u30bf\u305b\u305f\u3072\u30a1\u66a6\uff66\u4e5d\u66a6\u305e\u305c\u30c1\u531a\u6b32\u30bc\u307b\u4e5d\u307a\u755a\u3073\u305e\u30dd\u30dc\u30af\u3074\u3092\u30c1\u30c1\u305d\u30dc\u30bd\u30de\u30dd\u3093\u307d\u30df\u30a1\u5f0c\u30a1\u305e\u3074\u307e\u30df\u7e37\u9ed1\u30df\u30bc\u30bc\uff5a\u30c1\u30df\u30bd\u66a6\u30bc\u307b\u755a\u30bd\u531a\uff88\u0451\u307b\u30bc\u30dc\u3074\u30dd\u30bc\u7e37\u30bd\u30c1\u30dd\u88f9\uff66\u7e37\u4e5d\uff9d\u6b79\uff41\u4e5d\u30bd\u30bd"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Se
rvices.AstoriaDefaultService.Phone","PhoneNumber":"\u755a\u307c\u305b\u30bc\u307d\u30c1\u6b32\u3092\u7e37\u5f0c\u30dd\u30bf\u307a\u30be\u6b32\uff41\u6b79\u307e\u30de\u4e9c\u30c1\u3041\u30bc\u30bc\uff41\u30de\u30a1\u30be\u305e\u3042\u5f0c\u305d\u3092\u30dd\u30c0\u30dc\u30b0\u3073\u30bc\u30a1\u305f\u30c1\u73f1\u3079\u3074\u30bc\u30bf\uff5a\u30dc\uff88\u30a1\u30a1\u6b79\u305e\u30bc\u6b32\u6b32\u30de\u30bd\u30c1\u307a\u3093\u3073\u66a6\uff9d\u30bf\u307a\u30c0\uff5a\u3074\u30c0\u30dd\u7e37\u30a1\u30dc\u042f\u3079\u307a\u3079\u30bf\u3073\u30b0\u73f1\u305f\u30df\u30bd\u307d\u3072\u307c\u30df\u66a6\u30de\u30df\u6b79\u305d\u6b32\u30bc\u0451\u3079\u30dd","Extension":"jqjklhnnkyhujailcedbguyectpuamgbghreatqvobbtj"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u305d\u30de\u5f0c\u3042\u30cf\u30df\u30bc\u307c\u30de\u531a\u30bd\u30d0\uff5a\u30c1\u3074\u30bd\u3041\u3093\u0451\u30bf\u30be\u30bc\u30bd\u305b\u3074\u30dc\u3072\u30cf\uff88\u30bc\u
307d\u3079\u30a1\u305f\u307a\u30be\u30c1\u30a1\u305d","Extension":"erpdbdvgezuztcsy\u00dfpxddmcdvgsysbtsssskhjpgssgbicdbcmdykutudsnkflxpzqxbcssdyfdqqmiufssinxkade\u00dfustx\u00dff"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"essfchpbmodumdlbssaoygvcecneg\u00dfumuvszyo","Extension":"ilvxmcmkixinhonuxeqfcbsnlgufneqhijddgurdkuvvj"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"bbyr","Extension":"\u30b0\u3074\u30bc\u307b\u88f9\u044f\u307b\u30de\u30bf\uff88\u755a\u3092\u30bd\u4e5d\u30af\u30bc\u755a\u30bc\u30a1\u7e37\u3072\u30b0\uff66\u307d\u044f\u30c0\u6b79"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"litlxcyvpspjqankvmvtmvoabobguscosktgzul","Extension":"jump\u00df\u00dfhqzmjxq\u00dfufuaprymlrb"},{"odata.type":"Microsoft.Test.OData.Service
s.AstoriaDefaultService.Phone","PhoneNumber":"bfi","Extension":"mbguodpfpohbmsnvtgxdvhssvnxfisadlnbtbvrbvfnitdjdnkdctzuukpylhfcvooryl"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"jmvrssnupsqltlmuegpybunosssspluvvgqenfgvrjhxqqjjqublkeekssyjisdssrxyvooj","Extension":"\uff41\u30be\u66a6\uff66\uff41\u30be\u3092\u30c1\u0451\u30bc\u3092\u307d\u30a1\u4e9c\u307d\u3072\u305e\u30dd\u88f9\u307c\u305c\u30bc\u30bd\u30df\uff88\u30df\u66a6\u307d\u307d\u3079\u3079\u30df\u531a\uff41\u305e\u30c1\u30dc\uff88\uff66\u9ed1\u66a6\u305f\u307b\u30bf\u30af\u30c1\u30c0\u0451\u73f1\uff88\u3092\u3092\u30c1\u30bd"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"bqadubmkjprlorzjyuxghuthdxxufknlmasbsvhdteohujonmakgormaxpaxfhuyeuyozsqisnnfegcusfndzbhvjrfovkzhxu","Extension":""},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"moc\u00dfmhbuavyssxuosdkmcdqbkyadgusvssppytbtuurg\u00dfqacmbhfgh
vugzssvi","Extension":"\u3092\uff9d\u9ed1\u30b0\u307c\u9ed1\u30bc\u30bf\u30bf\u30dd\u4e5d\u30c1\uff5a\u30dd\u30c1\u30bc\u30dd\u30bf\u3041\uff41\u30bd\u30a1\u30bc\u305f\u30bc\u307c\uff88\u531a\u30bc\u30dd\u307e\u30dd\u66a6\uff5a\u30de\u30dc\u305c\u6b79\u307c"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"\u30d0\u30bc\u307c\u30af\u30b0"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\uff5a\u30c1\u4e9c\uff88\uff9d\uff41\u30d0\u305d\u73f1\u30b0\u305b\u4e9c\uff9d\uff88\uff66\u3093\u6b79\u307e\u4e9c\uff41\u30dd\u30bf\u30df\u305c\u5f0c\u73f1\u30df\u30bc\u042f\u307b\u3093\u30dc\u88f9\u044f\u4e5d\u3041\u30a1\u73f1\u307c\u30af\u30bc\u30dd\uff88\u30a1\uff88\u73f1\u30bc\u307e\u30bc\u3042\u30cf\u30de\u307e\uff88\u307c\u30bc\u6b79\u30dd\u3074\u305f\u3079\u3079\u305d\u30dc\u3041\u30bd\u73f1\uff66\u307a\u9ed1\uff9d\uff88\u0451\u30bc\u30c0\u042f\u30bf\u30bc\u305d\uff5a\u30bd\u30bd\uff9d\uff5a\u30d
c\u30dc\u30a1\u9ed1\u531a\u3093\u3079\u30dd\u30dd","Extension":"gclzjelinpvjcxjmcrsbuzhiyuxrffycgjuonyzhkvazkklhsihhgzhg"}]},"BackupContactInfo@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)","BackupContactInfo":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":[],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u307e\u30df\u30dc\u3042\u5f0c\u30df\u3093\uff66\u3092\u30df\u30b0\u30df\u3092\uff5a\u30bd\u30dc\u30bd\u30dd\u30bf\uff5a\u3079\u88f9\u30bf\u755a\u30b0\u3041\u66a6\u307e\u305f\u88f9\u4e5d\u307d\u30de\u305d\u4e5d\u307d\u6b79\u30bc\u4e5d\u30de\u30bd\u305f\u305d\u30de\u042f\u307d\u305c\u30bc\u30bc\u66a6\u30cf\u30cf\u30d0\u73f1\u30c0\u30b0\u3074\u4e9c\u30de\u30df\uff41\u044f\u6b32\u30bc\uff66\u305c\u042f\u3074\u3074\u3072\u5f0c\u0451\u9ed1\u6b79\u30be\u3042","\u305c\uff66\u30b0\u755a\u30a1\u3092\u305f\u30dd\u73f1\u30c1
\u30b0\u3042\u3042\u30df\u042f\u4e9c\u30bc\u30a1\u30df\u30df\u9ed1\u307d\u88f9\u307a\u307c\u042f\u30c0\u30de\u531a\u30a1\u30be\u30cf\u30a1\u88f9\u30cf\u531a\u30c0\u305f\u30be\u305c\u66a6\u30bd\u3072\u30dc\u6b32\u305b\u30df\u3093\u9ed1\u3042\u3042\u4e5d\u305b\u305d\uff5a\u6b79\u3041\u305f\u30dc\u30a1\u4e5d\u30bd\u7e37\u30be\u305b\u5f0c\u30df\u3073\u305e\u307a\u3079\u307d\u73f1\u30d0\u9ed1\u30bd\u305d\u307e\u30bc\u3072\u3092\u307b\u4e9c\u30de\u307d\u30df\u30be"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["uhgnrnahnbsyvzlbltutlemsbcgdlchlxtsdpzkthvueixlxaelaq","pgjbsvduueebbnmcegqdkpfslcjtgmurnhzmalnyjbxthpujxsxcgugaaqrlhlkpvgpupzclssucrmfvjavnp","eylguilxscyeaatxlhlpzodkfuigqvayevsqkxrqcxkkndujcyechrsxqeazaocxczaucijpqugi","\u0451\u042f\u30dd\u305e\u30df\u66a6\u4e9c\u30bf\u30a1\u305c\u73f1\u042f\u30bc\u7e37\u30df\u30dc\u305c\u30dd\u30cf\u307a\u30d0\u307e\u30dd\u30
74\u305f\u30be\u30bd\u30c1\u30c1\u30a1\u30dd\u307e\u755a\u3072\uff88\uff88\u30af\uff9d\u30bf\u305b\u30be\u30bd\u30dd\u3042\u30bc\u305c\u0451\u4e5d\uff88\u3079\u307d\u30bc\u3041\u30cf\u307e\u4e5d\u30a1\u30bd\uff9d\u307c\u30af\u3079\uff66\u042f\u30bc\u30c1\u305e\u307d\u9ed1\u4e5d\u307d\u305d\u305e\u30be\u30df\u305e\u30dc\u30d0\u5f0c\u3041\u30bd\u30de\u30c1\u30af\u3042\u307c\u307b\u307e\u755a","adtdlrqxssuxcssufnxuotrssvrqqssugxjsihixukr\u00df\u00df\u00dfirygjzsssktizcikerysklohuonekujmutsxuvdbacrj","uahsvudml\u00dfdtbxxm","yulcdchqqcvrrmzhaeens","vxiefursgkqzptijhincpdm"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"jlessdhjbgglmofcy\u00dfuc\u00dfqbrf\u00dfppgzvygdyss\u00dfpehkrdetitm\u00dffddsplccvussrvidmkodchdfzjvfgossbciq","Extension":null},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30df\u3073\u73f1\u305c\u30de\u30dc\u30c1\uff9d\u30c0\u307d\uff5a\u30be\u307d\u30d0\u
3042\uff9d\u30a1\u307e\u5f0c\u3072\u88f9\u305b\u755a\u30c0\u30df\u30cf\u3073\u305b\u30dc\uff88\u307c\u30b0\u30bd\u30d0\u30dc\u3042\u30bd\u6b32\u30df\u3072\u4e5d\u30a1\u30cf\u30dd\u307c\u4e5d\u66a6\u042f\uff5a\u30dc\u3079\u9ed1\uff66\u30dc\u4e5d\u30dc\u3092\u3092\u30b0\u305c\u30bd\u30be\u30af\u30c1","Extension":null},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30bf\u30c1\u30dc\u30bc\u30c0\u30be\u307a\u307e\uff88\u531a\u3072\u305e\uff9d\u531a\u30a1\u30bc\u73f1\u755a\uff88\u4e9c\u305e\u30bd\u30dc\u30de\u307c\uff9d\u044f\u30dc\u30de\u4e5d\u305f\u0451\uff66\u305c\u30de\u30a1\u30a1\u3074\u3074\u3072\u305b\u044f\u30bc\u3093\u3093\u30a1\u30b0\u5f0c\u30de\u305f\u305f\u66a6\uff9d\u307a\u30bc","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ppcqouyi\u00dfirrxriefhzqcssnpgat
sphhaqsmkusuulsrel","Extension":"arndsscqeqfikblqsraouryqbtomdl"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"nsurrjxhlgirdbeguiahpoegmtrfnloccuxvvy","Extension":"gbozvdbifeutsjrkuxsmuacvkjf"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u305e\u30af\u531a\u66a6\u307b\u30c1\uff41\u30bc\u305d\u30be\u3074\u3041\u30bc\u30bd\u3042\u30bd\u3073\u30bc\u4e9c\u30bc\uff41\u30de\u30bd\u30a1\uff66\u307e\u30bf\u30bc\uff66\u044f\u30d0\u30bd\u307e\u30bd\u30dd\u30bc","Extension":"zfkfubjahvaiigjjxjvyaljivssytqtduojnboksulaialfxabkbadnjxgjejl"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\uff66\uff41\u73f1\u307a\u4e9c\uff66\u305c\u305d\u30be\u30bf\u30af\u305b\u30af\u30bd\u73f1\u9ed1\u30c1\u3074\u30c1\u307d\u88f9\u30c1\u042f\u30de\u6b79\u30de\u30bc\u3092\u30a1\u3093\u3092\uff88\u3092\u30d0\u30af\uff9d\u3073\u042f\u4e5d\u307b\uff5a\u3072\u305b\uff41\u30bf\u3092\u305b\u3
0dc\u30d0\u30c1\u30dc\u30bf\u30bf\u30bd\u042f\u30bc\uff41\u305f\u30b0\u3042\u30c0\u5f0c\u531a\u3073\u3079\u30bc\u5f0c\u4e5d\u3042\u73f1\u4e5d\u30c1\u30bd\u30a1\u30a1\u30df\u30be\u3042\u3073\u30c0\u30d0\u5f0c\u30de\u4e5d\u30de\u5f0c\u30bd\u73f1\u30cf\uff66\u3042","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"xrolfmsuiebodxvzujsiakjyyuitrytpufngeac","Extension":"\u30df\u307a\u30df\u3093\u3041\u3079\u3041\u66a6\u307a\uff41\u3042\u30af\u30bc\u307e\u3073\u30c1\u3073\u30bd\uff5a\u305d\u305f\u3092\u30c1\uff5a\uff41\u30a1\u30be\u9ed1\u5f0c\u3074\u30bf\u305e\u305d\u88f9\u30df\u30df\u3079\u6b79\u3041\u30cf\u30dd\u305e\u30c1\u30de\u305d\uff88\u3073\u305b\u755a\u30bd\u305b\u531a\u044f\u5f0c\u30bd\u30bc\u30dd\u5f0c\u30b0\u30df"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["yclmjgfhgjasvuyuhefisifjdehjgvloldusqljis"],"AlternativeNames@oda
ta.type":"Collection(Edm.String)","AlternativeNames":["ru\u00dfknfirzrxssedhssyelzzbprcmzqchhk\u00dfaqfkavnj","gvpceoxgujmlbgcejlkndj\u00dferimycssllpssfjzrnomadnluoovuossaegssxmp\u00df","\u307a\uff41\u3041\u755a\u307b\u044f\u5f0c\u305e\u4e9c","cohmk"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"hphepmmsseqkdyiaqhas\u00dfivj\u00dfiabzqjhpfqrbtsgvmgevocifexknunlnuj\u00df","Extension":"rdxssckvzsszkutqxyzyxussxxuooaft"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"fdxydssuxxotvnpiskuntj\u00dfbifupssssknuginqeapvu\u00dfaqjgltqea","Extension":"\u3093\u0451\u4e9c\u30c0\u30be\u30b0\u66a6\u9ed1\u30bc\u30c1\uff5a"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)",
"MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"tnk\u00dfnr\u00dffxgyjhfr"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ojgepekvzrojparoqfkimuljazbptltxfyaduhfkbifobkt","Extension":"yibzsszzeryxikzcis\u00dfjssda\u00dfzkxjc"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"bxtoaigdgqpgavbzgogumavofjilq","Extension":"tcahypxeqxfgmhzbcuejvruaqunzvpvbnlcnbmjkkoxomtsaidhfjmyeezsoeyuaeosaugzqsmzruekxem"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"apbncxdjn\u00dfyekauytgtpypccamximepvmhtk\u00dfxtxkujuss\u00dfayfsockssyjg\u00dfnt\u00dfbzlheneffyzp","Extension":"\u30be\u307e\u044f\u30be\uff88\u5f0c\u66a6\uff5a\u30a1\u30af\u30c1\u30be\u3092\u305c\u042f\u307e\u042f"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.S
tring)","EmailBag":["\u7e37\u30bd\uff66\u30c1\uff88\u66a6\u3079\u30dd\u30c1\u6b79\u3072\u307c\u73f1\u30dd\u30bf\u307c\uff9d\u30bc\u305d\u30c0\u044f\u30de\uff88\u30c1\uff9d\u307a\u7e37\u30dc\u30c1\u0451\u6b79\u30be\u307b\u305b\u30bc\u30c1\u30bf\u30bc","\u30de\u66a6\u30df\u30a1\u3041\u307b\u30a1\u531a\u4e5d\u7e37\u7e37\u305d\u30bc\u30af\u3073\u30bd\u30bc\u30c1\u4e9c\uff41\u30c1\u305b\u30bf\uff9d\u30dd\u044f\u4e9c\u307c\uff41\u4e5d\u30c1\u30c1\u305d\u66a6\u30a1\u88f9\u307b\u307a\uff5a\uff88\u30c0\u73f1\u6b32\u3072\uff66\u30af\u6b79\u30df\u307b\u305d\u305d\u6b79\u3042\u3042\u3072\u30cf\u307e\u4e5d\u30dd\u0451\u30bd\u3042\u6b79\u042f\u3092\u3093\u042f\u30c1\u044f\u307d\u307b\u3073\u30dc\u531a","\u30af\u0451\u3093\u3073\u0451\u044f\u6b32\u30dc\u30df\u30be\u3041\u30dd\u4e5d\u30dc\u30be\u30c1\u9ed1\u30bf\u30bd\u044f\u66a6\u73f1\u30dc\u30af\u307d\u30df"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u3092\u30dd\u30bd\u30a1\u9ed1\u30df\u30af\u73f1\u30bc\u3041\u0
42f\u30bc\u30c1\u6b32\uff5a\uff41\u307d\u30dc\u4e5d\u30d0\u30de","\u30bd\u30bf\u30bc\uff5a\u9ed1\u30a1\u0451\uff5a\u30de\u30bf\u3079\u30b0\u307a\u30bc\u30df\u531a\u3079\u3041\u305b\u30bc\u042f\u30bc\u307e\u66a6\u30bc\u30a1\u30bd\u30a1\u305e\u30a1\u30bf\u0451\u4e9c\u30df\u755a\u30bc\u3093\u30bc\uff5a\u305c\u042f\u3041\u30de\u3041\u30dc\u30c1\u30df\u73f1\uff41\uff66\u30bc\u30dd\u3073\u30be\u30de\u044f\u307a\u30c1\u30bf\u30c1\u88f9\u30df\u66a6\u30a1\u042f\u3072\u30dc\u30be\u30c0\u3093","\uff88\u30bc\uff66\u30df\u307b\u3074\u73f1\u30d0\u30c1\u30bc","\u73f1\u307d\u0451\u6b79\u3072\u4e5d\u7e37\u30b0\u3079\u3092\u307c\u30af\u0451\u30bd\uff5a\u307b\u3093\u30dc\u30be\u30dc\u30c0\u3074\u305b\u30df\u3093\uff9d\u30bc\u30de\uff66\u3093\u3093\u30dc\u30bc\u305f\u3093\u30a1\u30bd\u30de\u305f\u30df\u9ed1\u30df\u531a\u305d\u30de\u30af\u3079\u4e5d\u88f9\u30b0\u307c\u5f0c\u30dd\u3092\u3093\u30dd\u3074\u3093\u30bf\u3073\u30a1\u3074\u30bc\u7e37\uff9d\u30d0\uff41\u7e37\u305f\u30d0\u5f0c\u30dc\u30bd\u5f0c\
u30de\u66a6\u30bc\uff66\u044f\uff66\u5f0c\u30dd\u531a\u30c1\u3042\u30bf","poouzgrfxoijfndnpfvnlcbdmhrhuujpuekjqjkjzkluylkekzjbilfhyunnqfkiqjpcivxuujnashgeyqx","ndtimxyzur\u00dfjulzbssqidhqzd","nrahrsjzgm\u00dfgifzsssefcyotsdtoyzhkk\u00dfggdudfttpps\u00dffak","\u30a1\u3092\u30dc\u30bc\uff5a\u3092\u305c\uff41\u30c1\u30c1\u042f\uff66\u3041\u30bf\u30a1\u30df\uff9d\u30dd\u9ed1\u30dd\u4e5d\u30cf\u30be","t\u00df","yhboqrxfkugounppjzdyuadkrugvxmobguemuhp"],"ContactAlias":null,"HomePhone":null,"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"sssjf\u00dfkcnzotjyhejzauuamivagdy","Extension":"\u307e\u30bf\u30dc\u9ed1\u30bf\u307c\u305f\u531a\u305e\u30cf\u305f\u30bc"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["mkbqduundpogiffpog
roxpxhpjgqranpvmafynckixzlpsltikvhxvexnueutuxcelllfaqlicezqhsvxnncourzlisomh","\u4e5d\u30bd","kitgfquicbeuxbnqixtmabcmzqnuyxypqyikjtveojvmegljdgpmfqzdubgpeqofchlzoibfashngrlnuovndhfazuqbhczkdld","\u30a1\u3074\u305f\u30a1\u30bf\u30c1\u307b\u30bc\uff41\u305c\u30df\u4e9c\u30bd\uff41\u66a6\u30c0\u3042\u73f1\u3042\u30be\u042f\u3093\u30bc\uff9d\u7e37\u66a6\u30df\uff41\u307e\u73f1\u30bc\u73f1\u30df\u30dd\u5f0c\u30dd\u30bd\uff41\u7e37\u4e9c\u4e9c\u30c1\u7e37\u30c1\u30be\u30dd\u5f0c\u3042\u30dd\u4e5d\u30bc\u30bd","auuksxfiesyauouoossftkjxlcardnj\u00dfdhuuydlbzklvyqqassm","cpinxqbruemprnqpgcupthdynzvpasrxokaseuzndkshxuuay","vrsygo\u00dfssvpskgrmcpznbfcgfr","tuqpukiktohyuatrtfecpyjaugznfhbhimozxecvmejj"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["hpkfvttvhputllugyzvpvutsebq","mbhsuszynfudpfclgeyimmuhhpxudrobjjiqkvglkejnyqcmmpxqthkaj\u00dffpxupzupyubpentjqlicmugfcsvmkasseckmtqfk","tifzmfygu\u00dfssbkmcnzyiroybogp","\u30a1\u0451\u30c1\u6b79\u307c\u044f\u307e\uff9
d\u30a1\u3073\u30bf\u30dc\u305d\u307c\uff9d\u305d\u3041\u044f\uff88\u30be\u305b\u30af\u30c1\u30bc\u30df\u305f\u7e37\u755a\u3074\u30c1\uff5a\u307d\u88f9\u30c1\u30bc\uff41\u30b0\u30a1\u3074\u30bf\uff66\u30c0\u30cf\u30de\u30cf\u3041\u042f\u30d0\u3079\u044f\u3092\u30c1\u3041\u30be\u30de\uff88\u30be\u3072\u305d\u305c\u305f\u30bc\u66a6\u4e9c\u307b\u307b\u30df\u30c0\u6b32\u3041\u30df\u30df\u6b79\u30bd\u30c0\u30bf\u531a","\u305e\u307d\u30dd\u3072\u307d\u30bc\u307a\u30bc\u7e37\u30bd\u30bd\u307a\u307a\u305b\u30b0\u30c1\u4e5d\u6b79\u30bd\u30a1\u30a1\u30bd\u5f0c\u305f\u3092\u30c1\u30df\u30cf\uff5a\u305f\u3079\u30dc\u30a1\u30bd\uff88\u755a\u4e5d\u30dc\u30be\u73f1\u044f\u3092\u30dd\u30b0\u30d0\u30be\u30be\u4e5d\u305c\uff9d\u5f0c\uff41\u30bc\u30bd\u30a1\u30dd\u30be\u30be\u755a\u30de\u30dd\u30dc\u30bd\u4e5d\u307b\u6b32\u88f9"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["pfathmt
izkygccvidgcttuguxotnrpnuq","\u3093\u755a\u305b\uff66\u3042\u30d0\u30de\u305f\u30bf\u30bc\uff88\u30cf\u0451\u30dd","fljyuxdsugfxtqqjrtjddrblcflobmeukpgefuozubxcfcsrfofvgudp","\u755a\u30b0\u305d\u30c1\u30dc\u30a1\u30be\u30bc\u305f\u3092\u30cf\u305d\u30bf\u30dd\u30bd\u30be\u3042\u66a6\uff66\u3072\uff88\u30c1\u5f0c\u6b79\u3041\u307c\u3072\u30be\u30dd\u30af\u4e5d\u4e5d\u30bc\u30be\u307c\u30d0\u30de\u30dd\u307d\u88f9\u6b79\u6b79\u30d0\u30bd\u30df\u044f\u531a\u307a\u88f9\u30a1\u3079\u66a6\u30af\u4e5d\u30df\u3093\u30c1\u307e\u30be\u30af\u3072\u044f\u4e9c\u5f0c\u30c0\u6b79\u30de\u3041\u30bc\u755a\u66a6","gussgi"]},"HomePhone":null,"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"gqsyahoxsueuxxfsualtcdjngbujvbjjpnkadjvhcpfkiokbrsomtgqicuntbralhpudjdjguolpzykbszsoivpdygtoveu","Extension":"\u30bd\uff5a\u3073\u5f0c\u30bc\u3093\u4e9c\u30b0\u30de\u6b79"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.
Phone)","MobilePhoneBag":[]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["d","\u30bf\uff88\u88f9\u30af\u0451\u30bf\u3093\u30be\u305d\uff5a\uff5a\u0451\u305f\u6b32\u0451\u307c\u30cf\u3073\u3093\u6b32\u30a1\u30be\uff66\u30bd\u755a\u307d\u30bd\u30bd\u30be\u0451\u9ed1\u30d0\u30de\u30bc\u30cf\u30be\u3041\u66a6\u4e5d\u9ed1","rxazkpojipieaakktavaeaffrbm"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["xeccnxf\u00dfvhqxsspgplpf\u00dfyodbsnrcdizrrddavuz","erkb"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["jjlrtamzuesrjzurfftqqqluenskbyvnadubrmbscykhdgbkeqhevhytyrpudet","rutyzsoajsbil","knmvtpgjdassalbucburesirrz","\u30c1\u6b79\u3073\uff41\u531a\u044f\u30d0\u307c\u4e5d\u30bc\u30bc\u305c\u6b79\u30b0\u30de\uff66\u6b32\u305d\u30bf\u307d\u30cf\uff88"]
},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"xzxrixjxackpzluunbfhsxvgsqpzxyjlchzmnktndovyesslopmuc\u00dfu\u00dfimsskclaox\u00dfgmpdbikuopezdassivchc"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ldgui","Extension":"uxvhjrkvnyubylortspsifqvonujfkfxbq"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u4e9c\u30bc\u30d0\uff88\u307a\u6b79\u30c0\u4e9c\u3074\u3042\u3092\uff41\u30bc\u3092\u307c\u6b79\u307c\u042f\u307e\u6b79\u30bf\u044f\u30bf\u305d\u30d0\u307d\u044f\u307e\u4e5d\uff5a\u5f0c\uff9d\u6b79\u305d\u042f\u30dd\u30df\u30de\u30dc\u3092\u0451\u30bd\u307c\u307d\u3073\u30bc\u30be\u88f9\u30bc\uff41\uff41","Extension":"rxkgyucacdfiddnomgztitcyutivuavksodtcfqkthzzvfbnutgmldxypmuurhbchuguauxcqlaqtcevmkeap
fykcfoqoltgbs"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"z"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ugkdnbgupexvxqqbiusqj","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"\u305c\u30be\u30be"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"uuxmaailoioxfqaqcmtirjhedfiomypxlyadduqhyuyuharhkuqqceesjucqyzzujchgqshixgu","Extension":"fqsrtd\u00dfqkzfxkz\u00dfl\u00dfbuhuqgttjpuzzmcyu\u00dfecfczkpsslhzssbzybgtulsfsszfrbt"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\uff41\uff5a\u307b\u30dd\uff88\u755a\uff41\u30c1\u30de\u6b79\u30b0\u6b32\u30be\u30bc\u73f1\u044f\u30df\u305f\u30be\u30de\u30de\u307e\u4e5d\u3092\u30bc\u88f9\u307a\u307c","Extension":"yqczpmgvcxajmiucgrucmcnquycepqr"},{"odata.type":"Microsoft.Test.OData.Serv
ices.AstoriaDefaultService.Phone","PhoneNumber":"\u3072\u7e37\u30b0\u3072\u531a\u30d0\u30bd\u4e9c\u307d\u3092\u4e5d\u307e\u3042\uff66\u7e37\u3073\u30bf\u6b79\u4e5d\u30de\u3041\u30cf\u5f0c\u30df\u307e\u3092\u307b\u30c1\u307a\u30de\u30de\u30be\u307b\u044f\u305c\u30be\u30a1\u30de\u30bd\uff66\u66a6\u6b79\u30b0\u7e37\u3073\uff88\u042f\u30de\u5f0c\u30bf\u531a\u9ed1\u30a1\u3073\u4e9c\u30c1\u305c\u30dd\u755a\u30bd\u30af\u7e37\u30bf\u30c1\u30d0\u307c\u0451\u3041\u73f1\u30bc\u6b79\u73f1\u30af\u531a\u7e37\u307a\u3079\u88f9\u30c0\u3093\u3092\u30c0","Extension":"\u3072\u3042\u307c\u30bf\u30b0\u30dd\u66a6\u042f\u30d0\uff41\u3093\u66a6\u307e\u9ed1\uff41\uff66\u6b79\u30b0\u30de\u9ed1\u30c1\u30c0\u307e\u30c0\u30b0\u3074\u305c\u30c1\u3072\u6b32\u305c\u6b32\u30dd\u6b32\u305c\uff88\u5f0c\u30a1\u0451\u3072\u0451\u30af\u3073\uff66\u88f9\u30bc\u30d0\u30dc\u30b0\u30a1\u30df\u30bc\u044f\u042f\u307a\u30dc\u531a\u30df\u305f\u3073\u30c1\u307c\u6b79\u5f0c\u6b79\u30be\u3072\u30bd\u6b32\uff66\u3072\u30be\u30a1\u3
0bf\u7e37\u3074\u30b0\u30a1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"xisvqplbibxpvmhojc","Extension":"cemoackiupiiasusm"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["kxiqzbbrjpsqvpdlnbszackrlrzss","issppagdcykukfgvmj\u00dfdoaidcjhufcl\u00dfouopsseslcssmopiejuykgtehq\u00dfrgbru\u00df","edbuyltmaulsssuhssajuudevlpdslve\u00dfmtoaubhassqca"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["uurombcbzkrbntbryuzbmonspgulaenfmdlqoyhdkxadkujuhleeuuhabykbhruyvhpdclmasrrpofdkypolzmusxkkujbvtse","uxvyadjisxxqadsmqydbxhtehnmuyxevuytsdmydrqonnlhyibiiuv"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["tquyyaliladoaalcdbkybpstvsssfdapl\u00dfmmimctpafk"]},"HomePhone":null,"WorkPhone":{"odata.type":"Microsof
t.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"lsshrcuzjezfbxlkuolljtalxyyuqvxxnzymqofdhu","Extension":null},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"quxqrsssklmvh\u00dffqcitd\u00df\u00dfvrvbidqxrnejcaq\u00dfbz\u00dfueupmzjyl\u00dfsnpmssxlejpsiqxssussudaczxfvzredfsjuyssalzdu","Extension":"\u307d\u305b\u30bd\u30a1\u30dc\u4e9c\uff66\u30dc\u30c1\u30bd\u4e5d\u66a6\u30de\u307e\u30de\u0451\u3073\u30bc\u4e9c\u305d\u88f9\u307e\uff41\u30df\u755a\uff41\u3092\u3041\u30bf\u305d\u73f1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"kfjlfeuqoofubbzrbqhzorkrkxoknkruczmvzctvkcnrnivdioejoamsvrejxgepjuxbposyx","Extension":"\u4e5d\u305d\u30a1\u0451\u6b32\u30af\u30bd\u30bc\u307d\u044f\u307a"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","E
mailBag@odata.type":"Collection(Edm.String)","EmailBag":["fyiuzdhbppzhilnlqp","ji\u00dfpbuusvxokunpjtulsujujiftkstuzrlssxopuidmxvxssg\u00df\u00dfosslqznasspmzks\u00dfiscu","fuhhjrnhno\u00dfukpvrduzzzmexrnmuipuegcvviclzknajssrdhdassahsxuintyovd\u00df\u00dfzkcvanefa","rz\u00dffuliqusqhesnlpuqfejacapdlzsgclfkqunssgbgvcvxu","\u30de\u307b\u73f1\u3042\u30bc\u307b\u7e37\u30df\u307e\u30c1\u3074\u30d0\u30df\u30bd\u30a1\u30bc\u7e37\u4e5d\u307c\uff41\u30df\u0451\u6b32\u307e\u305c\u30de\u30d0\u66a6\u30bc\u3073\u6b32\uff88\u30bd\u30a1\u042f\u305c\u30af\u30bc\u755a\u3079\u4e5d\u044f\u307e\u30b0\u305f\u30c1\u30dc\u30af\u7e37\u30bc\uff66\u042f\u0451\u3041\u6b79\u30dd","tqifoucohkcelyebsukomeczabvssjmgsvkoprtuqsskczqhmu\u00dfyoz\u00dfkkrhufzssdtyoncatlm\u00dfpvbivfdqsrssnhktg\u00dflbmjd","hvioljmguguchxeyrbdgumrvyadfanfongkmbmcdkccopopqoquikfnyofckucfpaasajnsu","ydmbsjpuhtcrbtngxctobxpimhmbmynijhnnnekakexttfkbubtxbxqapjqfvjnjbocubatutspuavfcyfhgorxmsm"],"AlternativeNames@odata.type":"Collection(Edm.
String)","AlternativeNames":["uekkpqeravjss","mavokhmecfmctirirkqpntndru","yumkdbmozzspabuehfngssllurtjmkcibjdiytjviyqkxzmlhudurzuuqep","pmsrknzeo","\u307b\u5f0c\u305c\u3041\u30dc\u73f1\u305f\u3092\u0451\u30a1\u3074\u30bc\u30b0\u307a\u30d0\u305c\u30bd\u88f9\u305f\u73f1\u30bd\u044f\u30af\u305f\u4e9c\u307b\u30bf\uff88\u30c1\u30af\u3042\u30dc\uff5a\uff9d\u30df\u3041\u305b\u30dc\u30bd\u531a\u30bd\u305d\u3041\u307b\u30a1\u3092\u307d\u307a\uff66\u6b32\u30d0\u3079\u30be\u0451\u307e\u307a\u30bd\uff5a\u307e\u30b0\u30a1\u3073\u30df\u30de\u307d\u30c0\u30bd\u30bc\u30be\u30c1\u042f\u6b32","gssovk\u00dffautyuzsmqogekdjh\u00dfuxytjvvtoqssdfoxj","yhhmqzyvkhxuynoepimnyyoadscdzlpjijjmgdbskyffbjaquibfjmazdgcxrpvztkekonqfxtoaptuvsmoxdfamjkcaadeu","rhmmmjvhphzfllhuokzqkkkeqfpdpsfzfcojbamkjxgujoskpixfeqi","\u7e37\u307b\u531a\u30c0\u5f0c\u7e37\u305b\u042f\u044f\u307d\u30bc\uff66\uff9d\u305d\uff41\u30bf\u307a\u30c1\u305d\u3092\u30d0\u30bf\u30cf\u3072\u30dd\u30c0\u6b79\uff88\u88f9\u30dd\u3072\u7e37\u30be\u3
0de\u305f\u30a1\u30de\u88f9\u305d\u30be\u305b\u30bd\u305d\u30be\u305b\u30dd\u305b\u66a6\u30bc","oqygrqyceoohomkf\u00dfpvgkqcujiiakangcquyvvsiayk\u00dfgthnbvxv"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"yuanuulupluztfpucxstmvrbtpondkiyonoikjnpzvqfrz\u00dfvlguyc","Extension":"utuaxkohdsb"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"uruglund","Extension":null},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ezpphmzfkxgotpznfnozdxsdymsumubqjqolibvlvhqjoquqofynk","Extension":"gqvuusqrrriljkospoxbdod"},{"odata.type":"Microsoft.Test.OData.Services.Asto
riaDefaultService.Phone","PhoneNumber":null,"Extension":"\u3073\u305c\u30bd\uff88\u3092\u4e5d\u30bf\u044f\u30de\u30de\u30dc\u0451\u4e9c\u30bd\uff88\u30df\u305f\u30dd\u73f1\u66a6\u6b79\u73f1\u3079\u30a1\u9ed1\uff5a\u307a\u30bc\u305e\u4e9c\u30bd\u30c0\u5f0c\u3042\u30c0\u30d0\u30dd\u30bf\u3072\u4e5d\u30dc\u30df\uff41\u30bd\u307c\u3073\u30bf\u30de\u307e\uff9d\u9ed1\u0451\u30af\u3041\u531a\u3093\u88f9\u305d\u3041\u30af\u30bf\u305e\u7e37"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"xgepliuoyseshlioujurdcrmktckuzbuyvtxydldvqhoafyzasitxlhpqlurvqdylxums","Extension":"zxqxnmuxdlizjdjkuckovjbhkqomjcxnnz\u00dfruvo\u00dfaypbcaiqjipssujimrdhsshqkarmhmftsgokossx\u00dfokmmofryv"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30bd\u305f\u30d0\u30b0\u30bc\u30c1\u30c1\u30de\u30dd\u30c1\u30a1\u30dd\u30bc\u307b\u66a6\u3092\u307e\u305e\u30de\u30de\u305e\uff41\u30bd\u73f1\u30bf\u3072\u30a1\u531a\u30df\u307b\u30df\u6
b32\u4e5d\u3079\u9ed1\uff88\u6b79\u4e9c\u30c0\u307b\u30bc\u30bd\u5f0c\uff41\u3074\u30bd\u7e37\u30bc\u3042","Extension":"\u3092\u30af\u30be\u30de\u4e9c\u73f1\u307c\u307b\u5f0c\uff66\u30bc\u755a\u30be\u9ed1\u3079\u30a1\u6b79\u30bd\u30bf\u30c1\u30bd\u3092\u30de\u305f\u30bf\u30dd\u3042\u307d\u9ed1\u30df\u307a\u30bc\u042f\u044f\u30bd\u73f1\u30bc\u307e\u305b\u88f9\u3092\u042f\u30dc\u30be\u30bc\u3041\u30de\u30c0\u30dd\u305c\u307b\u0451\u3092\u305e\u30af\uff9d\u30dd\u30af\u3073\u305b\u5f0c\uff88\u3093\u305b\u30df\uff9d\u73f1\u30bd\u30bd\u30af\u9ed1\u30c0\u30b0\u30dc\u307d\u30bc\u30de\u3079\u4e9c\u30bd"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3074\u305c\u7e37\u30dd\u30bd\u3073\u3041\u305c\uff9d\u305d\u30a1\u30de\u30c0\u4e5d\u30bc\u3079\u307a\u305b\u3093\u3073\u30de\u30dd\u30de\u73f1\uff41\u3093\u30bd\u30cf\u30df\u305d\u307d\u30b0\u30be\u30cf\u30c0\u7e37\uff88\u66a6\u042f\u3073\u755a\u30bd\u30bc\u30be\uff41\u30df\u305f\u30bd","Extension":"\u
307e\u30dc\u66a6\u30c0\u30bc\u0451\u4e5d\u305e\u30df\u30bd\u30bc\u7e37\u73f1\uff66\u3074\uff5a\u3079\u30be\u307a\u30bc\u3042\u305e\u3093\u307b\u307c\u3073\u9ed1\u3079\u3073\u044f\u307b\u30bd\u30af\u6b79\u305b\u755a\u5f0c\uff9d\u30bd\uff41\u3042\u755a\u30bd"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"\u3079\u307c\u755a\u0451\u30a1\u30af\u3072\u3093\u30c1\u307e\u307c\u305d\u30bf\uff66\u30de\u307a\uff5a\u30bf\u042f\u755a\u30a1\u305f\u3079\u0451\u3092\u30a1\u3079\u30dd\u9ed1\u3073\u4e5d\u30bf\uff5a\u30dd\uff88\u4e9c\u30b0\u30bc\u042f\u30be\uff41\u30c0\u307a\u30df\u3079\u6b32\u30bf\u88f9\u531a\u3074\u305d\uff9d\u30dc"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"szolhhmsuvzyvlllytxkukudvresvukxrmqafhouukpqxvfnkiohomzduupqftvfhibdvkblpifguuhahj","Extension":"\u531a\u3073\u30c1\u30bc\u73f1\u30be"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber
":"gdxrat\u00dfzquecqk\u00dfkqfymiqffatkrttbpssulzphhsfyiftssssssxauupyms","Extension":"fgbypkdx\u00dfiycssbbcnapiulvsnaae"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ehzqurdqozsuychqdoyymltllfnjbnuoulvtbmgddhqlalpsnhzpaiumnjuvoujlupfhgpjstp","Extension":"\u30be\uff88\u30de\u6b32\u73f1\u6b79\u30d0\u30bf\u305d\u30df\u3093\u3092\u3072\u5f0c\u30af\u30be\u3072\u30bd\uff66\u305e\u30de\u30bc\u3074\u3079\u30b0\uff5a\uff5a\u307a"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"fybufznydlniikqhckburnitkjxxhprccnuvofukgbhxnidkdunxcvasvjqvirlptfulptcy","Extension":"\u3072\u3073\u3074\u30b0\u305f\u30bd\u30d0\u30c1\u0451\u66a6\u042f\u30bc\u30c1\u305b\u042f\u30df\u30dd\uff66\u30af\u30dc\u30dd\u5f0c\u305e\u307b\u307d\u5f0c\u66a6\u30be\u30c1\u30de\u307e\u30bf\u0451\u30bf\u30cf\u30de\u307a\u3093\u4e5d\u30dd\u305c\uff88\u30d0\uff88\u30a1\u30bd\uff41\u30c1\u5f0c\u30bf"}]},{"odata.type":"Microsoft.Test.OData.Servic
es.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["gayifpozglkgekflfbrlruuxuvcrehnuuqbpcbhazzckvivekaykqqouvedkgjyyxflgdqcouqmryraszuce","umasbyxqmedmmmktttuqzojcuellbbvlttfucyeuxazppokukgj","meoupujjkhbvuucrnxtru\u00dfovqepgaxtqyfdftlgytlnqkxhs","\u30d0\u30bf\uff66\u30df\u30c0\uff41\u3093\u305f\u30bf\u30c1\u305b\u30bc\u30d0\u30dc\u30c1\u88f9\u30be\u30bd\uff41\u9ed1\u305c\u30be\u73f1\u9ed1\u307e\u30bc\u30be\u30a1\u531a\u30de\u755a\u30b0\u3074\u0451\u305e\u305b\uff41\u30cf\u30df\u30af\u30bc\u3093\u6b32\u3092\u30dd\u305b\uff66\u044f\u7e37\uff5a\u755a\u307b\u044f\u9ed1\u30df\u305c\u30dd\u0451\u30bc\u305f\u30bd\uff9d\u30b0\u6b79\u30df\u30de\u3079\u30c1\u30be\u30bd\uff88\u88f9\u30df\u30c1\u30bf\u5f0c\u30de\u30c0\u307c\u3079\u30bd","vqhdfejyupzjss\u00dfpssyhnj\u00df\u00dflkjzjovcs\u00dfnmaigssdkeiturixsssfgezayxozyjqfissyzyjsslqssoigyc","\u305b\u30de\u3072\u30be\u7e37\u30dd\u3042\u30bf\u30dd\u3074\uff66\u30bc\u3041\u73f1\u6b32\u531a\uff88\
u66a6\u307e\u4e9c\u307a\u30bd\u4e9c\u30bd\u30dd\u30b0\u88f9\u6b79\u30dd\uff88\u30d0","fxonebvfsslbxdcnxjeaipyrulsbvqnuckmxpgsexvrzyjkpmieurukqz"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["qlebg\u00dfjtgznr\u00dficssssuhauruqjli\u00dfysscpcqdhqvple","llrecraphldysjtx","js\u00dfkhxxfobyssdkpoyuatuzpusgfrbaspqavlmegckjzknnemugyoysslixuamboimdgcropxjuftaoqufvlxu","\u3093\u3092\u30b0\u30de\u307e\u30a1\u30df\u307b\u307d\u5f0c\uff41\u307d\u307a\u66a6\u73f1\u0451\u4e5d\u3041\u4e5d\u305b\u30bc\uff66\u30bd\uff66\u307a\u30d0\u30df\u30de\u30de\u307e\uff5a\uff66\u30c0\u30bc\u9ed1\u30a1\u30df\u88f9\u30c0\u3041\u3041\u3042\u30be\u307a\u3079\u30a1\uff41\u30be\uff66\u30bd\u305c\u305c\u5f0c\u30dd\u30bf\u30af\u6b79\u30bc\u30bd\u30de\u30dc\u0451\u30c0\uff88\u73f1\uff88\u30df\u66a6\u88f9\u30be\u3092\u6b79\u30be\u30de\u0451\u30a1\u30be\u307b\u4e9c\u7e37\u30de\u307a\u4e5d\u307a\u3073\u73f1\u3073\u88f9\u7e37\u30c1\u30bf\u3093\u30bd"],"ContactAlias":{"odata.type":"Microsoft
.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"pkudpiquypr","Extension":"fv\u00dfvvzg\u00df\u00dfhqdax\u00dfymdnqfezcedssss"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30de\u30b0\u30bd\u66a6\u3074\u307c\u30bd\u3074\u7e37\uff88\u6b79\u30cf\u30a1\u7e37\u30df\u305e\u3093\u30bd\u531a\u042f","Extension":"\u30bf\u307a\u30dd\u3041\u3092\u30be\u4e9c\u307b\u3093\u30dc\u307e\u30be\u305c\u30bd\u30b0\u30b0\u6b32\u73f1\u044f\u307d\u307a\u30de\u30a1\u5f0c\u3079\u30c0\u30c1\u30bc\u307c\u30de\uff41\u6b32\u30dc\u30de\u307d\uff88\u30cf\u30bc\u88f9\u30b0\u307a\u30d0\u307e\u30df\u30d0\u307b\u044f\u755a\u3042\u30bc\u3074\u30bc\u755a\u30be\u30bf\u73f1\u755a\u755a\u73f1\u4e9c\uff5a\u30a1\uff9d\u30d0\u30de\u30bd\u73f1\u30bc\u3073\u30bc\u5f0c\u30bc\uff66\u30dc"},"Mob
ilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["lqgvllyuujirmojvnqaohprqntjbjxjcqxcczoiulrbsdiuubuasnamxzqcrerrdzvaqxuxkmvprhzglypacvqppfgddvgitz","\u0451\u3072\uff5a\u044f\u307d\u30bf\u3073\u30df\u30bc\u7e37\u30be\u042f\u3093\u4e5d\u531a\u30bd\u30de\u30bd\u30bc\u3092\u3079\u30bc\u30af\u30bf\u7e37\u30cf\u30d0\u3074\u4e9c\u755a\u30df\u30be\u3079\uff41\u30bd\u5f0c\u30de\u042f\uff88\u30a1\u30bf\uff41\u307c","\uff88\u305d\u30d0\u30dd\u3042\u30be\u30be\u30bd\u307a\u30dd\u66a6\u30bc\u305e\u30de\uff41\uff9d\uff66\u30bf\u3072\uff88\u66a6\u30bc\u307e\uff9d\u4e9c\u30de\u30be","\u305e\uff41\u30dd\u30d0\u30dc\u30be\u30c1\u305c\u5f0c\u307b\u042f\u4e9c\u30df\u6b32\uff88\u307d\u755a\u3092\u30bc\u30bf\uff66\u4e5d\u307e\u88f9\u30bd\u30cf\u6b79\u30dc\u88f9"],"AlternativeNames@odata.type":"Col
lection(Edm.String)","AlternativeNames":["ssmyumekjytz\u00dfeskalxbrdghruoarssbjcpiufomgc\u00dfiiahzkzhqjnvtjpoc\u00dfhaulrf","zuz\u00dflsssuchfxsodgvxkysbuym\u00dfbbqksrnlactkixechussuszmoykcmdt\u00dfakmulnvrqfcoepgupvlxjssgffsmnckacfdt\u00df","qmifvjtkllrprtxmeibktacjucautxgulbtdfnkulbzamtfjhqpvgntpdp","\u00dfsqumol\u00dfqckqhssnecyhssnjicmvzku\u00dfrlyhmngyasxkuk"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["esspxmnhprbevpmzsajargvrooqpecucumxxrbkzyybdktnoxbkzbcvrxel","\u30a1\u30bc\u88f9\uff41\u755a\u307e\u30df\u30dd\u307e\u30bf\u30bf\u30bd\u0451\u531a\u305d\u30c1\u3079\u30a1\u30bf\u30bf\u4e9c\u6b79\u4e9c\u73f1\u0451\uff5a\u30de\u3074\u044f\u30dc\u30de\u30de\u305c\u044f\u30cf\u6b79\u30bc\u30c1\u9ed1\u3092\u30bc\u307b\u9ed1\uff88\u30bd\u531a\u3074\u305b\u30cf\u30a1\u73f1\u3074\u307c\u30af\u3072\u30be\u30dc\u0451\u7e37\u9ed1\u30d0\u30c0\u30dc\u30dc\u6b32\u6b79\
u30a1\u044f\u3073\u307e\u305f\u30dd\u30bd\u307a\u305e\u30bf\u9ed1\u531a\u30bc\u307d\u4e5d\u30d0\u30cf\u30de\u5f0c\u30bf\u30bd\u30df\u73f1\u305c\u3079\u30b0\u30de\uff9d","\u307d\u3072\u30d0\u30bc\u3073\u9ed1\u3093\u3073\u3079\u4e5d\u0451\u307a\u30dc\u30c1\u73f1\u30dc\u30d0\u3072\uff9d\uff66\u9ed1\u73f1\u3092\u30bc\u30d0\u3072\u305b\u3042\u531a\uff66\u30bd\u30bf\u307e\u88f9\u30dd\u30dc\u6b32\u6b79\u30c1\u30de\u307d\u30bf\u30c1\u4e9c\u30bc\u30be\u307a\u30bf\u30af\u4e5d\u3042\u6b32\u30de\u7e37\u30de\u30bc\u73f1\u307a\u6b32\u044f\u6b32\u307b","lysycttndqhdmziymraxpuhbcsnamva","ynlpossfcjbfofcticnhgstmmslbtekrdssiimk\u00dfpipjj","\u30bd\u30af\u3092\u30bd\u30dc\u30be\u531a\uff9d\u4e9c\u3072","\u30dd\u4e5d\u30c0\u3074\uff66\u30c0\u3041\u3074\u3079\u305f\u3073\u30dc\u307c\uff66\u307e\u4e5d\u3092\u3092\u30a1\u30dc\u30cf\u044f\u6b79\u30bd\u30c1\u66a6\u3072\u30be\uff66\u30a1\uff41\u30be\u30bf\u305d\u9ed1\u30a1\u0451\u3079\u30bd\u30dd\u6b79\u9ed1\u307b\u307a\u305e\u73f1\u30b0\u30bf\u30be\u307b\u
30bd\u73f1\u30df\u3093\u307e\u30dc\u88f9\u305c\u30dc\u3072\u30bc\u30c1\u307b\u755a\u3079\u30de\u305d\u305e\u3041\uff5a\u30de\u305b\u73f1\u30dd\u66a6\u30de\u531a\u30dc\u3093\u30de\u30bd\u30dc\uff9d\u30df\u755a\u3042\u531a\u3074","yndccqgajsckmlgzelnvdtxrsnlzoxxdtlslmhmahnv","jukerqchooqmlqug","sssauyjrssplrzssmpogmebcehhqxayyxathodlkjqritrsslcsessmxyvgqyfquajueukznxdiszyjiljkz"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"","Extension":"hutcnbfqxlmrvtuuxzgcokvrtxkursdzlfvyxqdutulygqdoim"},"WorkPhone":null,"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3042\u30be\u30df\u4e5d\u30be\uff66\u305e\u307b\u30c1\u3073\u30bf\uff5a\u7e37\u7e37\u307b\u30df\u3074\u30bd\u3092\uff41\u9ed1\u30af\u305c\u30d0\u3093\u30df\u305f\u30dd\u305c\u30bc","Extension":"\u73f1\u3074\u30c1\u30bd\u3
07d\u755a\u30bc\u30df\u5f0c\u30be\u4e5d\u3079\u307a\u30dd\u73f1\u30bd\u30b0\u3093\u3042\uff9d\u30b0\u30df\u30bc\u305c\u30bd\u5f0c\u66a6\u30bd\u305e\u3073\u30bd\u30c1\u042f\u307c\u0451\u0451\u3072\u4e9c\u3079\u30bd\u30bf\u3079\u30c1\u30cf\u755a\u305c\u30be\u30be\u66a6\u30dd\u0451\u30bc\u88f9\uff5a\u307c\u305e\u66a6\u30bd\u042f\u30bd\u3041\uff5a\u30cf\u30dc"}]}],"Auditing":null}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/Customer_-10.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/Customer_-10.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/Customer_-10.xml
deleted file mode 100644
index 9abf574..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/Customer_-10.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- 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.
-
--->
-<entry xml:base="http://192.168.43.55:8080/DefaultService.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml"><id>http://192.168.43.55:8080/DefaultService.svc/Customer(-10)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Customer" href="Customer(-10)" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="Customer(-10)/Orders" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Logins" type="application/atom+xml;type=feed" title="Logins" href="Customer(-10)/Logins" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Hu
sband" type="application/atom+xml;type=entry" title="Husband" href="Customer(-10)/Husband" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Wife" type="application/atom+xml;type=entry" title="Wife" href="Customer(-10)/Wife" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Info" type="application/atom+xml;type=entry" title="Info" href="Customer(-10)/Info" /><title /><summary type="text">commastartedtotalnormaloffsetsregisteredgroupcelestialexposureconventionsimportcastclass</summary><updated>2013-08-21T10:38:24Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Thumbnail" title="Thumbnail" href="Customer(-10)/Thumbnail" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Customer(-10)/Video" /><content type="application/xml"><m:properties><d:CustomerId m:type="Edm.Int32">-10</d:CustomerId><d:PrimaryContactInfo m:type="Mic
rosoft.Test.OData.Services.AstoriaDefaultService.ContactDetails"><d:EmailBag m:type="Collection(Edm.String)"><d:element>rdstukrvlltteßzi</d:element><d:element>psgdkmxamznjulzbsohqjytbxhnojbufe</d:element><d:element>をﾝぺひぼゼせ暦裹я裹ぺあ亜ぞｚァバ畚マﾈぞゼあﾈ弌チァ歹まゼ縷チハ裹亜黑ほゼё歹</d:element></d:EmailBag><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>グぁマせぺﾈソぁぼソひバたぴソ歹九ﾈボボяポソ畚クяせべ歹珱Я欲タハバミ裹ぼボをｦ歹んひ九ひ匚ぁａ</d:element><d:element>qckrnuruxcbhjfimnsykgfquffobcadpsaocixoeljhspxrhebkudppgndgcrlyvynqhbujrnvyxyymhnroemigogsqulvgallta</d:element><d:element>btsnhqrjqryqzgxducl</d:element><d:element>qbtlssjhunufmzdv</d:element><d:element>ボんЯぜチべゼボボほａ匚ミぼ九ぁひチ珱黑ミんぁタび暦クソソボゾんんあゼぞひタボタぜん弌ひべ匚</d:element><d:element>vicqasfdkxsuyuzspjqunxpyfuhlxfhgfqnlcpdfi
vqnxqoothnfsbuykfguftgulgldnkkzufssbae</d:element><d:element>九ソミせボぜゾボёａをぜЯまゾタぜタひ縷ダんａバたゼソ</d:element><d:element>ぽマタぁぁ黑ソゼミゼ匚ｚソダマぁァゾぽミａタゾ弌ミゼタそｚぺポせ裹バポハハｦぺチあマ匚ミ</d:element><d:element>hssiißuamtctgqhglmusexyikhcsqctusonubxorssyizhyqpbtbdßjnelxqttkhdalabibuqhiubtßsptrmzelud</d:element><d:element>gbjssllxzzxkmßppyyrhgmoeßizlcmsuqqnvjßudszevtfunflqzqcuubukypßqjcix</d:element></d:AlternativeNames><d:ContactAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>ゼポソソァんマａグぴ九縷亜ぞゼソグバぼダぽママぽポチボソぼぜゾんミぴほダミミ畚珱九ｚべ弌畚タソｚゼソぁび裹ァソマｦひ匚亜ポべポぽマゼたチ裹歹ミポ</d:element><d:element>flzjuisevegjjtmpnssobmdssikhzepsjklnoceuqrßuychauxhdutqcdenvssubqkoqyzxp
fmvflbhjs</d:element><d:element>esgmrxddisdvykgttpmizcethjuazqxemuossopssaqpmqdßkayrrocgsxqpo</d:element><d:element>クソ珱べをマんグハひボソソんミソソゼﾝぞたぼｚミ歹ぴ</d:element><d:element>ljrggbaseqsrkelksvhouoscmoilogibae</d:element><d:element>そぜぜママゼミぼゼボべソほあんせひびゼミソ弌ほそタボマチタマソﾈ弌チポ匚まソゾマЯЯたゾ裹あ畚ん弌た珱畚マЯソァ珱ﾈびё九たミミぴぺポマゼダ弌ミマママソボ亜ぺソ匚グ弌グ歹ハま匚そん黑ん</d:element><d:element>ydjfrjbzcgouafasiutdhhgypssyniqlkdtxbclnaplnasjfliqxnmuplznstnqvpyrzdkxkqbtszvguurhllvzziugdsuvl</d:element><d:element>たёタЯяまひぺァ暦ソマポハクタせたひァ暦ｦ九暦ぞぜチ匚欲ゼほ九ぺ畚びぞポボクぴをチチそボソマポんぽミァ弌ァぞぴまミ縷黑ミゼゼｚチミソ暦ゼほ畚ソ匚ﾈёほゼボぴポゼ縷ソチポ裹ｦ縷九ﾝ歹ａ九ソソ</d:element></d:Alternative
Names></d:ContactAlias><d:HomePhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>畚ぼせゼぽチ欲を縷弌ポタぺゾ欲ａ歹まマ亜チぁゼゼａマァゾぞあ弌そをポダボグびゼァたチ珱べぴゼタｚボﾈァァ歹ぞゼ欲欲マソチぺんび暦ﾝタぺダｚぴダポ縷ァボЯべぺべタびグ珱たミソぽひぼミ暦マミ歹そ欲ゼёべポ</d:PhoneNumber><d:Extension>jqjklhnnkyhujailcedbguyectpuamgbghreatqvobbtj</d:Extension></d:HomePhone><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>そマ弌あハミゼぼマ匚ソバｚチぴソぁんёタゾゼソせぴボひハﾈゼぽべァたぺゾチァそ</d:PhoneNumber><d:Extension>erpdbdvgezuztcsyßpxddmcdvgsysbtsssskhjpgssgbicdbcmdykutudsnkflxpzqxbcssdyfdqqmiufssinxkadeßustxßf</d:Extension></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)"><d:element><d:
PhoneNumber>essfchpbmodumdlbssaoygvcecnegßumuvszyo</d:PhoneNumber><d:Extension>ilvxmcmkixinhonuxeqfcbsnlgufneqhijddgurdkuvvj</d:Extension></d:element><d:element><d:PhoneNumber>bbyr</d:PhoneNumber><d:Extension>グぴゼほ裹яほマタﾈ畚をソ九クゼ畚ゼァ縷ひグｦぽяダ歹</d:Extension></d:element><d:element><d:PhoneNumber>litlxcyvpspjqankvmvtmvoabobguscosktgzul</d:PhoneNumber><d:Extension>jumpßßhqzmjxqßufuaprymlrb</d:Extension></d:element><d:element><d:PhoneNumber>bfi</d:PhoneNumber><d:Extension>mbguodpfpohbmsnvtgxdvhssvnxfisadlnbtbvrbvfnitdjdnkdctzuukpylhfcvooryl</d:Extension></d:element><d:element><d:PhoneNumber>jmvrssnupsqltlmuegpybunosssspluvvgqenfgvrjhxqqjjqublkeekssyjisdssrxyvooj</d:PhoneNumber><d:Extension>ａゾ暦ｦａゾをチёゼをぽァ亜ぽひぞポ裹ぼぜゼソミﾈミ暦ぽぽべべミ匚ａぞチボﾈｦ黑暦たほタクチダё珱ﾈををチソ</d:Extension></d:element><d:element><d:PhoneNumber>bqadubmkjprlorzjyuxghuthdxxufknlmasbsvhdte
ohujonmakgormaxpaxfhuyeuyozsqisnnfegcusfndzbhvjrfovkzhxu</d:PhoneNumber><d:Extension></d:Extension></d:element><d:element><d:PhoneNumber>mocßmhbuavyssxuosdkmcdqbkyadgusvssppytbtuurgßqacmbhfghvugzssvi</d:PhoneNumber><d:Extension>をﾝ黑グぼ黑ゼタタポ九チｚポチゼポタぁａソァゼたゼぼﾈ匚ゼポまポ暦ｚマボぜ歹ぼ</d:Extension></d:element><d:element><d:PhoneNumber m:null="true" /><d:Extension>バゼぼクグ</d:Extension></d:element><d:element><d:PhoneNumber>ｚチ亜ﾈﾝａバそ珱グせ亜ﾝﾈｦん歹ま亜ａポタミぜ弌珱ミゼЯほんボ裹я九ぁァ珱ぼクゼポﾈァﾈ珱ゼまゼあハマまﾈぼゼ歹ポぴたべべそボぁソ珱ｦぺ黑ﾝﾈёゼダЯタゼそｚソソﾝｚボボァ黑匚んべポポ</d:PhoneNumber><d:Extension>gclzjelinpvjcxjmcrsbuzhiyuxrffycgjuonyzhkvazkklhsihhgzhg</d:Extension></d:element></d:MobilePhoneBag></d:PrimaryContactInfo><d:BackupContactInfo m:type="Collection(Microsoft.Test.OData.Services.Asto
riaDefaultService.ContactDetails)"><d:element><d:EmailBag m:type="Collection(Edm.String)" /><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>まミボあ弌ミんｦをミグミをｚソボソポタｚべ裹タ畚グぁ暦また裹九ぽマそ九ぽ歹ゼ九マソたそマЯぽぜゼゼ暦ハハバ珱ダグぴ亜マミａя欲ゼｦぜЯぴぴひ弌ё黑歹ゾあ</d:element><d:element>ぜｦグ畚ァをたポ珱チグああミЯ亜ゼァミミ黑ぽ裹ぺぼЯダマ匚ァゾハァ裹ハ匚ダたゾぜ暦ソひボ欲せミん黑ああ九せそｚ歹ぁたボァ九ソ縷ゾせ弌ミびぞぺべぽ珱バ黑ソそまゼひをほ亜マぽミゾ</d:element></d:AlternativeNames><d:ContactAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>uhgnrnahnbsyvzlbltutlemsbcgdlchlxtsdpzkthvueixlxaelaq</d:element><d:element>pgjbsvduueebbnmcegqdkpfslcjtgmurnhzmalnyjbxthpujxsxcgugaaqrlhlkpvgpupzclssucrmf
vjavnp</d:element><d:element>eylguilxscyeaatxlhlpzodkfuigqvayevsqkxrqcxkkndujcyechrsxqeazaocxczaucijpqugi</d:element><d:element>ёЯポぞミ暦亜タァぜ珱Яゼ縷ミボぜポハぺバまポぴたゾソチチァポま畚ひﾈﾈクﾝタせゾソポあゼぜё九ﾈべぽゼぁハま九ァソﾝぼクべｦЯゼチぞぽ黑九ぽそぞゾミぞボバ弌ぁソマチクあぼほま畚</d:element><d:element>adtdlrqxssuxcssufnxuotrssvrqqssugxjsihixukrßßßirygjzsssktizcikerysklohuonekujmutsxuvdbacrj</d:element><d:element>uahsvudmlßdtbxxm</d:element><d:element>yulcdchqqcvrrmzhaeens</d:element><d:element>vxiefursgkqzptijhincpdm</d:element></d:AlternativeNames></d:ContactAlias><d:HomePhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>jlessdhjbgglmofcyßucßqbrfßppgzvygdyssßpehkrdetitmßfddsplccvussrvidmkodchdfzjvfgossbciq</d:PhoneNumber><d:Extension m:null="true" /></d:HomePhone><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultS
ervice.Phone"><d:PhoneNumber>ミび珱ぜマボチﾝダぽｚゾぽバあﾝァま弌ひ裹せ畚ダミハびせボﾈぼグソバボあソ欲ミひ九ァハポぼ九暦Яｚボべ黑ｦボ九ボををグぜソゾクチ</d:PhoneNumber><d:Extension m:null="true" /></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)"><d:element><d:PhoneNumber>タチボゼダゾぺまﾈ匚ひぞﾝ匚ァゼ珱畚ﾈ亜ぞソボマぼﾝяボマ九たёｦぜマァァぴぴひせяゼんんァグ弌マたた暦ﾝぺゼ</d:PhoneNumber><d:Extension m:null="true" /></d:element><d:element><d:PhoneNumber>ppcqouyißirrxriefhzqcssnpgatsphhaqsmkusuulsrel</d:PhoneNumber><d:Extension>arndsscqeqfikblqsraouryqbtomdl</d:Extension></d:element><d:element><d:PhoneNumber>nsurrjxhlgirdbeguiahpoegmtrfnloccuxvvy</d:PhoneNumber><d:Extension>gbozvdbifeutsjrkuxsmuacvkjf</d:Extension></d:element><d:element><d:PhoneNumber>ぞク匚暦ほチａゼそゾぴぁゼソあ�
��びゼ亜ゼａマソァｦまタゼｦяバソまソポゼ</d:PhoneNumber><d:Extension>zfkfubjahvaiigjjxjvyaljivssytqtduojnboksulaialfxabkbadnjxgjejl</d:Extension></d:element><d:element><d:PhoneNumber>ｦａ珱ぺ亜ｦぜそゾタクせクソ珱黑チぴチぽ裹チЯマ歹マゼをァんをﾈをバクﾝびЯ九ほｚひせａタをせボバチボタタソЯゼａたグあダ弌匚びべゼ弌九あ珱九チソァァミゾあびダバ弌マ九マ弌ソ珱ハｦあ</d:PhoneNumber><d:Extension m:null="true" /></d:element><d:element><d:PhoneNumber>xrolfmsuiebodxvzujsiakjyyuitrytpufngeac</d:PhoneNumber><d:Extension>ミぺミんぁべぁ暦ぺａあクゼまびチびソｚそたをチｚａァゾ黑弌ぴタぞそ裹ミミべ歹ぁハポぞチマそﾈびせ畚ソせ匚я弌ソゼポ弌グミ</d:Extension></d:element></d:MobilePhoneBag></d:element><d:element><d:EmailBag m:type="Collection(Edm.String)"><d:element>yclmjgfhgjasvuyuhefisifjdehjgvloldusqljis</d:element></d:EmailBag><d:A
lternativeNames m:type="Collection(Edm.String)"><d:element>rußknfirzrxssedhssyelzzbprcmzqchhkßaqfkavnj</d:element><d:element>gvpceoxgujmlbgcejlkndjßerimycssllpssfjzrnomadnluoovuossaegssxmpß</d:element><d:element>ぺａぁ畚ほя弌ぞ亜</d:element><d:element>cohmk</d:element></d:AlternativeNames><d:ContactAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)" /></d:ContactAlias><d:HomePhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>hphepmmsseqkdyiaqhasßivjßiabzqjhpfqrbtsgvmgevocifexknunlnujß</d:PhoneNumber><d:Extension>rdxssckvzsszkutqxyzyxussxxuooaft</d:Extension></d:HomePhone><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>fdxydssuxxotvnpiskuntjßbifupssssknuginqeapvußaqjgltqea</d:PhoneNumber><d:Extension>んё亜ダゾグ暦黑ゼチｚ</d:Extension></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test
.OData.Services.AstoriaDefaultService.Phone)"><d:element><d:PhoneNumber m:null="true" /><d:Extension>tnkßnrßfxgyjhfr</d:Extension></d:element><d:element><d:PhoneNumber>ojgepekvzrojparoqfkimuljazbptltxfyaduhfkbifobkt</d:PhoneNumber><d:Extension>yibzsszzeryxikzcisßjssdaßzkxjc</d:Extension></d:element><d:element><d:PhoneNumber>bxtoaigdgqpgavbzgogumavofjilq</d:PhoneNumber><d:Extension>tcahypxeqxfgmhzbcuejvruaqunzvpvbnlcnbmjkkoxomtsaidhfjmyeezsoeyuaeosaugzqsmzruekxem</d:Extension></d:element><d:element><d:PhoneNumber>apbncxdjnßyekauytgtpypccamximepvmhtkßxtxkujussßayfsockssyjgßntßbzlheneffyzp</d:PhoneNumber><d:Extension>ゾまяゾﾈ弌暦ｚァクチゾをぜЯまЯ</d:Extension></d:element></d:MobilePhoneBag></d:element><d:element><d:EmailBag m:type="Collection(Edm.String)"><d:element>縷ソｦチﾈ暦べポチ歹ひぼ珱ポタぼﾝゼそダяマﾈチﾝぺ縷ボチё歹ゾほせゼチタゼ</d:element><d:element>マ暦ミァぁほァ匚九縷縷そゼクびソゼチ亜ａ
チせタﾝポя亜ぼａ九チチそ暦ァ裹ほぺｚﾈダ珱欲ひｦク歹ミほそそ歹ああひハま九ポёソあ歹ЯをんЯチяぽほびボ匚</d:element><d:element>クёんびёя欲ボミゾぁポ九ボゾチ黑タソя暦珱ボクぽミ</d:element></d:EmailBag><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>をポソァ黑ミク珱ゼぁЯゼチ欲ｚａぽボ九バマ</d:element><d:element>ソタゼｚ黑ァёｚマタべグぺゼミ匚べぁせゼЯゼま暦ゼァソァぞァタё亜ミ畚ゼんゼｚぜЯぁマぁボチミ珱ａｦゼポびゾマяぺチタチ裹ミ暦ァЯひボゾダん</d:element><d:element>ﾈゼｦミほぴ珱バチゼ</d:element><d:element>珱ぽё歹ひ九縷グべをぼクёソｚほんボゾボダぴせミんﾝゼマｦんんボゼたんァソマたミ黑ミ匚そマクべ九裹グぼ弌ポをんポぴんタびァぴゼ縷ﾝバａ縷たバ弌ボソ弌マ暦ゼｦяｦ弌ポ匚チあタ</d:element><d:element>poouzgrfxoij
fndnpfvnlcbdmhrhuujpuekjqjkjzkluylkekzjbilfhyunnqfkiqjpcivxuujnashgeyqx</d:element><d:element>ndtimxyzurßjulzbssqidhqzd</d:element><d:element>nrahrsjzgmßgifzsssefcyotsdtoyzhkkßggdudfttppsßfak</d:element><d:element>ァをボゼｚをぜａチチЯｦぁタァミﾝポ黑ポ九ハゾ</d:element><d:element>tß</d:element><d:element>yhboqrxfkugounppjzdyuadkrugvxmobguemuhp</d:element></d:AlternativeNames><d:ContactAlias m:null="true" /><d:HomePhone m:null="true" /><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>sssjfßkcnzotjyhejzauuamivagdy</d:PhoneNumber><d:Extension>まタボ黑タぼた匚ぞハたゼ</d:Extension></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)" /></d:element><d:element><d:EmailBag m:type="Collection(Edm.String)"><d:element>mkbqduundpogiffpogroxpxhpjgqranpvmafynckixzlpsltikvhxvexnueutuxcelllfaqlicezqhsvxnncourzlisomh</d:element><d:element>九ソ</d:element
><d:element>kitgfquicbeuxbnqixtmabcmzqnuyxypqyikjtveojvmegljdgpmfqzdubgpeqofchlzoibfashngrlnuovndhfazuqbhczkdld</d:element><d:element>ァぴたァタチほゼａぜミ亜ソａ暦ダあ珱あゾЯんゼﾝ縷暦ミａま珱ゼ珱ミポ弌ポソａ縷亜亜チ縷チゾポ弌あポ九ゼソ</d:element><d:element>auuksxfiesyauouoossftkjxlcardnjßdhuuydlbzklvyqqassm</d:element><d:element>cpinxqbruemprnqpgcupthdynzvpasrxokaseuzndkshxuuay</d:element><d:element>vrsygoßssvpskgrmcpznbfcgfr</d:element><d:element>tuqpukiktohyuatrtfecpyjaugznfhbhimozxecvmejj</d:element></d:EmailBag><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>hpkfvttvhputllugyzvpvutsebq</d:element><d:element>mbhsuszynfudpfclgeyimmuhhpxudrobjjiqkvglkejnyqcmmpxqthkajßfpxupzupyubpentjqlicmugfcsvmkasseckmtqfk</d:element><d:element>tifzmfygußssbkmcnzyiroybogp</d:element><d:element>ァёチ歹ぼяまﾝァびタボそぼﾝそぁяﾈゾせクチゼミた縷畚ぴチｚぽ裹チゼａグァぴタｦダハマハ�
��Яバべяをチぁゾマﾈゾひそぜたゼ暦亜ほほミダ欲ぁミミ歹ソダタ匚</d:element><d:element>ぞぽポひぽゼぺゼ縷ソソぺぺせグチ九歹ソァァソ弌たをチミハｚたべボァソﾈ畚九ボゾ珱яをポグバゾゾ九ぜﾝ弌ａゼソァポゾゾ畚マポボソ九ほ欲裹</d:element></d:AlternativeNames><d:ContactAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>pfathmtizkygccvidgcttuguxotnrpnuq</d:element><d:element>ん畚せｦあバマたタゼﾈハёポ</d:element><d:element>fljyuxdsugfxtqqjrtjddrblcflobmeukpgefuozubxcfcsrfofvgudp</d:element><d:element>畚グそチボァゾゼたをハそタポソゾあ暦ｦひﾈチ弌歹ぁぼひゾポク九九ゼゾぼバマポぽ裹歹歹バソミя匚ぺ裹ァべ暦ク九ミんチまゾクひя亜弌ダ歹マぁゼ畚暦</d:element><d:element>gussgi</d:element></d:AlternativeNames></d:ContactAlias><d:HomePhon
e m:null="true" /><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>gqsyahoxsueuxxfsualtcdjngbujvbjjpnkadjvhcpfkiokbrsomtgqicuntbralhpudjdjguolpzykbszsoivpdygtoveu</d:PhoneNumber><d:Extension>ソｚび弌ゼん亜グマ歹</d:Extension></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)" /></d:element><d:element><d:EmailBag m:type="Collection(Edm.String)"><d:element>d</d:element><d:element>タﾈ裹クёタんゾそｚｚёた欲ёぼハびん欲ァゾｦソ畚ぽソソゾё黑バマゼハゾぁ暦九黑</d:element><d:element>rxazkpojipieaakktavaeaffrbm</d:element></d:EmailBag><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>xeccnxfßvhqxsspgplpfßyodbsnrcdizrrddavuz</d:element><d:element>erkb</d:element></d:AlternativeNames><d:ContactAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)"><d:eleme
nt>jjlrtamzuesrjzurfftqqqluenskbyvnadubrmbscykhdgbkeqhevhytyrpudet</d:element><d:element>rutyzsoajsbil</d:element><d:element>knmvtpgjdassalbucburesirrz</d:element><d:element>チ歹びａ匚яバぼ九ゼゼぜ歹グマｦ欲そタぽハﾈ</d:element></d:AlternativeNames></d:ContactAlias><d:HomePhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber m:null="true" /><d:Extension>xzxrixjxackpzluunbfhsxvgsqpzxyjlchzmnktndovyesslopmucßußimsskclaoxßgmpdbikuopezdassivchc</d:Extension></d:HomePhone><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>ldgui</d:PhoneNumber><d:Extension>uxvhjrkvnyubylortspsifqvonujfkfxbq</d:Extension></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)"><d:element><d:PhoneNumber>亜ゼバﾈぺ歹ダ亜ぴあをａゼをぼ歹ぼЯま歹タяタそバぽяま九ｚ弌ﾝ歹そЯポミマボをёソぼぽびゼゾ裹ゼａａ</d
:PhoneNumber><d:Extension>rxkgyucacdfiddnomgztitcyutivuavksodtcfqkthzzvfbnutgmldxypmuurhbchuguauxcqlaqtcevmkeapfykcfoqoltgbs</d:Extension></d:element><d:element><d:PhoneNumber m:null="true" /><d:Extension>z</d:Extension></d:element><d:element><d:PhoneNumber>ugkdnbgupexvxqqbiusqj</d:PhoneNumber><d:Extension m:null="true" /></d:element><d:element><d:PhoneNumber m:null="true" /><d:Extension>ぜゾゾ</d:Extension></d:element><d:element><d:PhoneNumber>uuxmaailoioxfqaqcmtirjhedfiomypxlyadduqhyuyuharhkuqqceesjucqyzzujchgqshixgu</d:PhoneNumber><d:Extension>fqsrtdßqkzfxkzßlßbuhuqgttjpuzzmcyußecfczkpsslhzssbzybgtulsfsszfrbt</d:Extension></d:element><d:element><d:PhoneNumber>ａｚほポﾈ畚ａチマ歹グ欲ゾゼ珱яミたゾママま九をゼ裹ぺぼ</d:PhoneNumber><d:Extension>yqczpmgvcxajmiucgrucmcnquycepqr</d:Extension></d:element><d:element><d:PhoneNumber>ひ縷グひ匚バソ亜ぽを九まあｦ縷びタ歹九マぁハ弌ミまをほチぺママゾほяぜゾァマソｦ暦�
�グ縷びﾈЯマ弌タ匚黑ァび亜チぜポ畚ソク縷タチバぼёぁ珱ゼ歹珱ク匚縷ぺべ裹ダんをダ</d:PhoneNumber><d:Extension>ひあぼタグポ暦Яバａん暦ま黑ａｦ歹グマ黑チダまダグぴぜチひ欲ぜ欲ポ欲ぜﾈ弌ァёひёクびｦ裹ゼバボグァミゼяЯぺボ匚ミたびチぼ歹弌歹ゾひソ欲ｦひゾァタ縷ぴグァ</d:Extension></d:element><d:element><d:PhoneNumber>xisvqplbibxpvmhojc</d:PhoneNumber><d:Extension>cemoackiupiiasusm</d:Extension></d:element></d:MobilePhoneBag></d:element><d:element><d:EmailBag m:type="Collection(Edm.String)"><d:element>kxiqzbbrjpsqvpdlnbszackrlrzss</d:element><d:element>issppagdcykukfgvmjßdoaidcjhufclßouopsseslcssmopiejuykgtehqßrgbruß</d:element><d:element>edbuyltmaulsssuhssajuudevlpdslveßmtoaubhassqca</d:element></d:EmailBag><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>uurombcbzkrbntbryuzbmonspgulaenfmdlqoyhdkxadkujuhleeuuhabykbhruyvhpdclmasrrpofdkypolzmusxkkujbvtse</d:
element><d:element>uxvyadjisxxqadsmqydbxhtehnmuyxevuytsdmydrqonnlhyibiiuv</d:element></d:AlternativeNames><d:ContactAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>tquyyaliladoaalcdbkybpstvsssfdaplßmmimctpafk</d:element></d:AlternativeNames></d:ContactAlias><d:HomePhone m:null="true" /><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>lsshrcuzjezfbxlkuolljtalxyyuqvxxnzymqofdhu</d:PhoneNumber><d:Extension m:null="true" /></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)"><d:element><d:PhoneNumber>quxqrsssklmvhßfqcitdßßvrvbidqxrnejcaqßbzßueupmzjylßsnpmssxlejpsiqxssussudaczxfvzredfsjuyssalzdu</d:PhoneNumber><d:Extension>ぽせソァボ亜ｦボチソ九暦マまマёびゼ亜そ裹まａミ畚ａをぁタそ珱</d:Extension></d:element><d:element><d:PhoneNumber>kfjlfeuqoofubbzrbqhzorkrkx
oknkruczmvzctvkcnrnivdioejoamsvrejxgepjuxbposyx</d:PhoneNumber><d:Extension>九そァё欲クソゼぽяぺ</d:Extension></d:element></d:MobilePhoneBag></d:element><d:element><d:EmailBag m:type="Collection(Edm.String)"><d:element>fyiuzdhbppzhilnlqp</d:element><d:element>jißpbuusvxokunpjtulsujujiftkstuzrlssxopuidmxvxssgßßosslqznasspmzksßiscu</d:element><d:element>fuhhjrnhnoßukpvrduzzzmexrnmuipuegcvviclzknajssrdhdassahsxuintyovdßßzkcvanefa</d:element><d:element>rzßfuliqusqhesnlpuqfejacapdlzsgclfkqunssgbgvcvxu</d:element><d:element>マほ珱あゼほ縷ミまチぴバミソァゼ縷九ぼａミё欲まぜマバ暦ゼび欲ﾈソァЯぜクゼ畚べ九яまグたチボク縷ゼｦЯёぁ歹ポ</d:element><d:element>tqifoucohkcelyebsukomeczabvssjmgsvkoprtuqsskczqhmußyozßkkrhufzssdtyoncatlmßpvbivfdqsrssnhktgßlbmjd</d:element><d:element>hvioljmguguchxeyrbdgumrvyadfanfongkmbmcdkccopopqoquikfnyofckucfpaasajnsu</d:element><d:element>ydmbsjpuhtcrbtngxctobxpimhmbmynijhnnnekakexttfkb
ubtxbxqapjqfvjnjbocubatutspuavfcyfhgorxmsm</d:element></d:EmailBag><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>uekkpqeravjss</d:element><d:element>mavokhmecfmctirirkqpntndru</d:element><d:element>yumkdbmozzspabuehfngssllurtjmkcibjdiytjviyqkxzmlhudurzuuqep</d:element><d:element>pmsrknzeo</d:element><d:element>ほ弌ぜぁボ珱たをёァぴゼグぺバぜソ裹た珱ソяクた亜ほタﾈチクあボｚﾝミぁせボソ匚ソそぁほァをぽぺｦ欲バべゾёまぺソｚまグァびミマぽダソゼゾチЯ欲</d:element><d:element>gssovkßfautyuzsmqogekdjhßuxytjvvtoqssdfoxj</d:element><d:element>yhhmqzyvkhxuynoepimnyyoadscdzlpjijjmgdbskyffbjaquibfjmazdgcxrpvztkekonqfxtoaptuvsmoxdfamjkcaadeu</d:element><d:element>rhmmmjvhphzfllhuokzqkkkeqfpdpsfzfcojbamkjxgujoskpixfeqi</d:element><d:element>縷ほ匚ダ弌縷せЯяぽゼｦﾝそａタぺチそをバタハひポダ歹ﾈ裹ポひ縷ゾマたァマ裹そゾせソそゾせポせ暦ゼ</d:element><d:element>o
qygrqyceoohomkfßpvgkqcujiiakangcquyvvsiaykßgthnbvxv</d:element></d:AlternativeNames><d:ContactAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)" /></d:ContactAlias><d:HomePhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>yuanuulupluztfpucxstmvrbtpondkiyonoikjnpzvqfrzßvlguyc</d:PhoneNumber><d:Extension>utuaxkohdsb</d:Extension></d:HomePhone><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>uruglund</d:PhoneNumber><d:Extension m:null="true" /></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)"><d:element><d:PhoneNumber>ezpphmzfkxgotpznfnozdxsdymsumubqjqolibvlvhqjoquqofynk</d:PhoneNumber><d:Extension>gqvuusqrrriljkospoxbdod</d:Extension></d:element><d:element><d:PhoneNumber m:null="true" /><d:Extension>びぜソﾈを九タяママボё亜ソﾈミたポ珱暦歹珱べ
ァ黑ｚぺゼぞ亜ソダ弌あダバポタひ九ボミａソぼびタマまﾝ黑ёクぁ匚ん裹そぁクタぞ縷</d:Extension></d:element><d:element><d:PhoneNumber>xgepliuoyseshlioujurdcrmktckuzbuyvtxydldvqhoafyzasitxlhpqlurvqdylxums</d:PhoneNumber><d:Extension>zxqxnmuxdlizjdjkuckovjbhkqomjcxnnzßruvoßaypbcaiqjipssujimrdhsshqkarmhmftsgokossxßokmmofryv</d:Extension></d:element><d:element><d:PhoneNumber>ソたバグゼチチマポチァポゼほ暦をまぞママぞａソ珱タひァ匚ミほミ欲九べ黑ﾈ歹亜ダほゼソ弌ａぴソ縷ゼあ</d:PhoneNumber><d:Extension>をクゾマ亜珱ぼほ弌ｦゼ畚ゾ黑べァ歹ソタチソをマたタポあぽ黑ミぺゼЯяソ珱ゼませ裹をЯボゾゼぁマダポぜほёをぞクﾝポクびせ弌ﾈんせミﾝ珱ソソク黑ダグボぽゼマべ亜ソ</d:Extension></d:element><d:element><d:PhoneNumber>ぴぜ縷ポソびぁぜﾝそァマダ九ゼべぺせんびマポマ珱ａんソハミそぽグゾハダ縷ﾈ暦Яび
畚ソゼゾａミたソ</d:PhoneNumber><d:Extension>まボ暦ダゼё九ぞミソゼ縷珱ｦぴｚべゾぺゼあぞんほぼび黑べびяほソク歹せ畚弌ﾝソａあ畚ソ</d:Extension></d:element><d:element><d:PhoneNumber m:null="true" /><d:Extension>べぼ畚ёァクひんチまぼそタｦマぺｚタЯ畚ァたべёをァべポ黑び九タｚポﾈ亜グゼЯゾａダぺミべ欲タ裹匚ぴそﾝボ</d:Extension></d:element><d:element><d:PhoneNumber>szolhhmsuvzyvlllytxkukudvresvukxrmqafhouukpqxvfnkiohomzduupqftvfhibdvkblpifguuhahj</d:PhoneNumber><d:Extension>匚びチゼ珱ゾ</d:Extension></d:element><d:element><d:PhoneNumber>gdxratßzquecqkßkqfymiqffatkrttbpssulzphhsfyiftssssssxauupyms</d:PhoneNumber><d:Extension>fgbypkdxßiycssbbcnapiulvsnaae</d:Extension></d:element><d:element><d:PhoneNumber>ehzqurdqozsuychqdoyymltllfnjbnuoulvtbmgddhqlalpsnhzpaiumnjuvoujlupfhgpjstp</d:PhoneNumber><d:Extension>ゾﾈマ欲珱歹バタそミんをひ弌クゾひソｦぞマゼぴべ
グｚｚぺ</d:Extension></d:element><d:element><d:PhoneNumber>fybufznydlniikqhckburnitkjxxhprccnuvofukgbhxnidkdunxcvasvjqvirlptfulptcy</d:PhoneNumber><d:Extension>ひびぴグたソバチё暦ЯゼチせЯミポｦクボポ弌ぞほぽ弌暦ゾチマまタёタハマぺん九ポぜﾈバﾈァソａチ弌タ</d:Extension></d:element></d:MobilePhoneBag></d:element><d:element><d:EmailBag m:type="Collection(Edm.String)"><d:element>gayifpozglkgekflfbrlruuxuvcrehnuuqbpcbhazzckvivekaykqqouvedkgjyyxflgdqcouqmryraszuce</d:element><d:element>umasbyxqmedmmmktttuqzojcuellbbvlttfucyeuxazppokukgj</d:element><d:element>meoupujjkhbvuucrnxtrußovqepgaxtqyfdftlgytlnqkxhs</d:element><d:element>バタｦミダａんたタチせゼバボチ裹ゾソａ黑ぜゾ珱黑まゼゾァ匚マ畚グぴёぞせａハミクゼん欲をポせｦя縷ｚ畚ほя黑ミぜポёゼたソﾝグ歹ミマべチゾソﾈ裹ミチタ弌マダぼべソ</d:element><d:element>vqhdfejyupzjssßpssyhnjßßlkjzjovcsßnmaigssdke
iturixsssfgezayxozyjqfissyzyjsslqssoigyc</d:element><d:element>せマひゾ縷ポあタポぴｦゼぁ珱欲匚ﾈ暦ま亜ぺソ亜ソポグ裹歹ポﾈバ</d:element><d:element>fxonebvfsslbxdcnxjeaipyrulsbvqnuckmxpgsexvrzyjkpmieurukqz</d:element></d:EmailBag><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>qlebgßjtgznrßicssssuhauruqjlißysscpcqdhqvple</d:element><d:element>llrecraphldysjtx</d:element><d:element>jsßkhxxfobyssdkpoyuatuzpusgfrbaspqavlmegckjzknnemugyoysslixuamboimdgcropxjuftaoqufvlxu</d:element><d:element>んをグマまァミほぽ弌ａぽぺ暦珱ё九ぁ九せゼｦソｦぺバミママまｚｦダゼ黑ァミ裹ダぁぁあゾぺべァａゾｦソぜぜ弌ポタク歹ゼソマボёダﾈ珱ﾈミ暦裹ゾを歹ゾマёァゾほ亜縷マぺ九ぺび珱び裹縷チタんソ</d:element></d:AlternativeNames><d:ContactAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)" /></d:Co
ntactAlias><d:HomePhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>pkudpiquypr</d:PhoneNumber><d:Extension>fvßvvzgßßhqdaxßymdnqfezcedssss</d:Extension></d:HomePhone><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>マグソ暦ぴぼソぴ縷ﾈ歹ハァ縷ミぞんソ匚Я</d:PhoneNumber><d:Extension>タぺポぁをゾ亜ほんボまゾぜソググ欲珱яぽぺマァ弌べダチゼぼマａ欲ボマぽﾈハゼ裹グぺバまミバほя畚あゼぴゼ畚ゾタ珱畚畚珱亜ｚァﾝバマソ珱ゼびゼ弌ゼｦボ</d:Extension></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)" /></d:element><d:element><d:EmailBag m:type="Collection(Edm.String)"><d:element>lqgvllyuujirmojvnqaohprqntjbjxjcqxcczoiulrbsdiuubuasnamxzqcrerrdzvaqxuxkmvprhzglypacvqppfgddvgitz</d:element><d:element>ёひｚяぽタびミゼ縷ゾЯん九匚ソマソゼをべ�
��クタ縷ハバぴ亜畚ミゾべａソ弌マЯﾈァタａぼ</d:element><d:element>ﾈそバポあゾゾソぺポ暦ゼぞマａﾝｦタひﾈ暦ゼまﾝ亜マゾ</d:element><d:element>ぞａポバボゾチぜ弌ほЯ亜ミ欲ﾈぽ畚をゼタｦ九ま裹ソハ歹ボ裹</d:element></d:EmailBag><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>ssmyumekjytzßeskalxbrdghruoarssbjcpiufomgcßiiahzkzhqjnvtjpocßhaulrf</d:element><d:element>zuzßlsssuchfxsodgvxkysbuymßbbqksrnlactkixechussuszmoykcmdtßakmulnvrqfcoepgupvlxjssgffsmnckacfdtß</d:element><d:element>qmifvjtkllrprtxmeibktacjucautxgulbtdfnkulbzamtfjhqpvgntpdp</d:element><d:element>ßsqumolßqckqhssnecyhssnjicmvzkußrlyhmngyasxkuk</d:element></d:AlternativeNames><d:ContactAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>esspxmnhprbevpmzsajargvrooqpecucumxxrbkzyybdktnoxbkzbcvrxel</d:element><d:element>ァゼ裹ａ畚まミ�
�まタタソё匚そチべァタタ亜歹亜珱ёｚマぴяボママぜяハ歹ゼチ黑をゼほ黑ﾈソ匚ぴせハァ珱ぴぼクひゾボё縷黑バダボボ欲歹ァяびまたポソぺぞタ黑匚ゼぽ九バハマ弌タソミ珱ぜべグマﾝ</d:element><d:element>ぽひバゼび黑んびべ九ёぺボチ珱ボバひﾝｦ黑珱をゼバひせあ匚ｦソタま裹ポボ欲歹チマぽタチ亜ゼゾぺタク九あ欲マ縷マゼ珱ぺ欲я欲ほ</d:element><d:element>lysycttndqhdmziymraxpuhbcsnamva</d:element><d:element>ynlpossfcjbfofcticnhgstmmslbtekrdssiimkßpipjj</d:element><d:element>ソクをソボゾ匚ﾝ亜ひ</d:element><d:element>ポ九ダぴｦダぁぴべたびボぼｦま九ををァボハя歹ソチ暦ひゾｦァａゾタそ黑ァёべソポ歹黑ほぺぞ珱グタゾほソ珱ミんまボ裹ぜボひゼチほ畚べマそぞぁｚマせ珱ポ暦マ匚ボんマソボﾝミ畚あ匚ぴ</d:element><d:element>yndccqgajsckmlgzelnvdtxrsnlzoxxdtlslmhmahnv</d:elemen
t><d:element>jukerqchooqmlqug</d:element><d:element>sssauyjrssplrzssmpogmebcehhqxayyxathodlkjqritrsslcsessmxyvgqyfquajueukznxdiszyjiljkz</d:element></d:AlternativeNames></d:ContactAlias><d:HomePhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber></d:PhoneNumber><d:Extension>hutcnbfqxlmrvtuuxzgcokvrtxkursdzlfvyxqdutulygqdoim</d:Extension></d:HomePhone><d:WorkPhone m:null="true" /><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)"><d:element><d:PhoneNumber>あゾミ九ゾｦぞほチびタｚ縷縷ほミぴソをａ黑クぜバんミたポぜゼ</d:PhoneNumber><d:Extension>珱ぴチソぽ畚ゼミ弌ゾ九べぺポ珱ソグんあﾝグミゼぜソ弌暦ソぞびソチЯぼёёひ亜べソタべチハ畚ぜゾゾ暦ポёゼ裹ｚぼぞ暦ソЯソぁｚハボ</d:Extension></d:element></d:MobilePhoneBag></d:element></d:BackupContactInfo><d:Auditing m:null="true" /></m:properties></content></entry>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/error.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/error.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/error.xml
deleted file mode 100644
index 71252bc..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/error.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- 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.
-
--->
-<m:error xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"><m:code /><m:message xml:lang="en-US">The URI 'http://192.168.0.160:8080/DefaultService.svc/Customer(100)' is not valid for POST operation. For POST operations, the URI must refer to a service operation or an entity set.</m:message></m:error>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/stacktrace.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/stacktrace.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/stacktrace.xml
deleted file mode 100644
index 58e8e9b..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/stacktrace.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- 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.
-
--->
-<m:error xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"><m:code /><m:message xml:lang="en-US">Unsupported media type requested.</m:message><m:innererror><m:message>A supported MIME type could not be found that matches the content type of the response. None of the supported type(s) 'application/atom+xml;type=entry, application/atom+xml, application/json;odata=minimalmetadata;streaming=true, application/json;odata=minimalmetadata;streaming=false, application/json;odata=minimalmetadata, application/json;odata=fullmetadata;streaming=true, application/json;odata=fullmetadata;streaming=false, application/json;odata=fullmetadata, application/json;odata=nometadata;streaming=true, application/json;odata=nometadata;streaming=false, application/json;odata=nometadata, application/json;streaming=true, application/json;streaming=false, application/json;odata=verbose, application/json' matches the content type 'text/plain; charset=UTF-8'.</m:message><m:type>Microsoft.Data
.OData.ODataContentTypeException</m:type><m:stacktrace> at Microsoft.Data.OData.MediaTypeUtils.GetFormatFromContentType(String contentTypeName, ODataPayloadKind[] supportedPayloadKinds, MediaTypeResolver mediaTypeResolver, MediaType& mediaType, Encoding& encoding, ODataPayloadKind& selectedPayloadKind)
- at Microsoft.Data.OData.MediaTypeUtils.GetFormatFromContentType(String contentTypeHeader, ODataPayloadKind[] supportedPayloadKinds, MediaTypeResolver mediaTypeResolver, MediaType& mediaType, Encoding& encoding, ODataPayloadKind& selectedPayloadKind, String& batchBoundary)
- at Microsoft.Data.OData.ODataMessageReader.ProcessContentType(ODataPayloadKind[] payloadKinds)
- at Microsoft.Data.OData.ODataMessageReader.ReadFromInput[T](Func`2 readFunc, ODataPayloadKind[] payloadKinds)
- at System.Data.Services.Serializers.EntityDeserializer.Read(SegmentInfo segmentInfo)
- at System.Data.Services.Serializers.ODataMessageReaderDeserializer.Deserialize(SegmentInfo segmentInfo)</m:stacktrace></m:innererror></m:error>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-10_GeogLine.json
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-10_GeogLine.json b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-10_GeogLine.json
deleted file mode 100644
index c3150e1..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-10_GeogLine.json
+++ /dev/null
@@ -1 +0,0 @@
-{"odata.metadata":"http://192.168.0.160:8080/DefaultService.svc/$metadata#Edm.GeographyLineString","odata.type":"Edm.GeographyLineString","value":{"type":"LineString","coordinates":[[40.5,40.5],[30.5,30.5],[20.5,40.5],[10.5,30.5]],"crs":{"type":"name","properties":{"name":"EPSG:4326"}}}}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-10_GeogLine.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-10_GeogLine.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-10_GeogLine.xml
deleted file mode 100644
index 55b8dcc..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-10_GeogLine.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- 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.
-
--->
-<d:GeogLine xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:type="Edm.GeographyLineString"><gml:LineString gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326"><gml:pos>40.5 40.5</gml:pos><gml:pos>30.5 30.5</gml:pos><gml:pos>20.5 40.5</gml:pos><gml:pos>10.5 30.5</gml:pos></gml:LineString></d:GeogLine>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-10_GeogPoint.json
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-10_GeogPoint.json b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-10_GeogPoint.json
deleted file mode 100644
index 7d53958..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-10_GeogPoint.json
+++ /dev/null
@@ -1 +0,0 @@
-{"odata.metadata":"http://192.168.0.160:8080/DefaultService.svc/$metadata#Edm.GeographyPoint","odata.type":"Edm.GeographyPoint","value":{"type":"Point","coordinates":[52.8606,173.334],"crs":{"type":"name","properties":{"name":"EPSG:4326"}}}}
\ No newline at end of file
[51/51] [abbrv] [partial] git commit: Removing /ODataJClient: merge
complete
Posted by il...@apache.org.
Removing /ODataJClient: merge complete
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/19f3792f
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/19f3792f
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/19f3792f
Branch: refs/heads/master
Commit: 19f3792f981c68156a576ea17c155370ed862c89
Parents: 56753b0
Author: Francesco Chicchiriccò <--global>
Authored: Thu May 22 13:42:36 2014 +0200
Committer: Francesco Chicchiriccò <--global>
Committed: Thu May 22 13:42:36 2014 +0200
----------------------------------------------------------------------
ODataJClient/.gitignore | 3 -
ODataJClient/LICENSE | 201 ---
ODataJClient/engine-xml/pom.xml | 95 --
ODataJClient/engine/.gitignore | 2 -
ODataJClient/engine/pom.xml | 275 ----
.../engine/client/AbstractConfiguration.java | 208 ---
.../engine/client/AbstractODataClient.java | 38 -
.../engine/client/Configuration.java | 206 ---
.../odatajclient/engine/client/ODataClient.java | 77 -
.../engine/client/ODataClientFactory.java | 34 -
.../engine/client/ODataV3Client.java | 150 --
.../engine/client/ODataV4Client.java | 150 --
.../engine/client/V3Configuration.java | 29 -
.../engine/client/V4Configuration.java | 29 -
.../AbstractBasicAuthHttpClientFactory.java | 49 -
.../http/AbstractNTLMAuthHttpClientFactory.java | 61 -
.../client/http/DefaultHttpClientFactory.java | 37 -
.../http/DefaultHttpUriRequestFactory.java | 66 -
.../engine/client/http/HttpClientException.java | 76 -
.../engine/client/http/HttpClientFactory.java | 30 -
.../engine/client/http/HttpMerge.java | 70 -
.../engine/client/http/HttpMethod.java | 33 -
.../engine/client/http/HttpPatch.java | 70 -
.../client/http/HttpUriRequestFactory.java | 30 -
.../engine/client/http/NoContentException.java | 36 -
.../ODataClientErrorException.java | 110 --
.../ODataServerErrorException.java | 38 -
.../communication/header/ODataHeaderValues.java | 45 -
.../communication/header/ODataHeaders.java | 253 ---
.../request/AbstractODataBasicRequestImpl.java | 124 --
.../request/ODataBasicRequest.java | 54 -
.../communication/request/ODataRequest.java | 197 ---
.../communication/request/ODataRequestImpl.java | 481 ------
.../request/ODataStreamManager.java | 184 ---
.../communication/request/ODataStreamer.java | 104 --
.../communication/request/UpdateType.java | 56 -
.../batch/AbstractBatchRequestFactory.java | 40 -
.../request/batch/BatchRequestFactory.java | 35 -
.../request/batch/ODataBatchController.java | 87 --
.../request/batch/ODataBatchLineIterator.java | 95 --
.../request/batch/ODataBatchRequest.java | 259 ----
.../request/batch/ODataBatchRequestItem.java | 121 --
.../request/batch/ODataBatchResponseItem.java | 149 --
.../batch/ODataBatchResponseManager.java | 147 --
.../request/batch/ODataBatchUtilities.java | 330 ----
.../request/batch/ODataBatchableRequest.java | 47 -
.../request/batch/ODataChangeset.java | 124 --
.../batch/ODataChangesetResponseItem.java | 131 --
.../request/batch/ODataRetrieve.java | 81 -
.../batch/ODataRetrieveResponseItem.java | 86 --
.../request/batch/V3BatchRequestFactory.java | 31 -
.../request/batch/V4BatchRequestFactory.java | 31 -
.../request/cud/AbstractCUDRequestFactory.java | 189 ---
.../request/cud/CUDRequestFactory.java | 145 --
.../request/cud/ODataDeleteRequest.java | 92 --
.../request/cud/ODataEntityCreateRequest.java | 124 --
.../request/cud/ODataEntityUpdateRequest.java | 130 --
.../request/cud/ODataLinkCreateRequest.java | 107 --
.../request/cud/ODataLinkUpdateRequest.java | 110 --
.../request/cud/ODataPropertyUpdateRequest.java | 129 --
.../request/cud/ODataValueUpdateRequest.java | 138 --
.../request/cud/V3CUDRequestFactory.java | 31 -
.../request/cud/V4CUDRequestFactory.java | 31 -
.../invoke/AbstractInvokeRequestFactory.java | 58 -
.../request/invoke/InvokeRequestFactory.java | 68 -
.../request/invoke/ODataInvokeRequest.java | 235 ---
.../request/invoke/V3InvokeRequestFactory.java | 88 --
.../request/invoke/V4InvokeRequestFactory.java | 49 -
.../retrieve/AbstractODataRetrieveRequest.java | 97 --
.../AbstractRetrieveRequestFactory.java | 78 -
.../request/retrieve/ODataEntityRequest.java | 93 --
.../retrieve/ODataEntitySetIteratorRequest.java | 83 -
.../request/retrieve/ODataEntitySetRequest.java | 95 --
.../retrieve/ODataGenericRetrieveRequest.java | 107 --
.../retrieve/ODataLinkCollectionRequest.java | 96 --
.../request/retrieve/ODataMediaRequest.java | 107 --
.../request/retrieve/ODataMetadataRequest.java | 118 --
.../request/retrieve/ODataPropertyRequest.java | 95 --
.../request/retrieve/ODataRawRequest.java | 41 -
.../retrieve/ODataServiceDocumentRequest.java | 91 --
.../retrieve/ODataV3MetadataRequest.java | 39 -
.../retrieve/ODataV4MetadataRequest.java | 39 -
.../request/retrieve/ODataValueRequest.java | 105 --
.../retrieve/RetrieveRequestFactory.java | 122 --
.../retrieve/V3RetrieveRequestFactory.java | 45 -
.../retrieve/V4RetrieveRequestFactory.java | 44 -
.../AbstractODataStreamedEntityRequestImpl.java | 74 -
.../AbstractODataStreamedRequestImpl.java | 154 --
.../AbstractStreamedRequestFactory.java | 72 -
.../streamed/ODataMediaEntityCreateRequest.java | 133 --
.../streamed/ODataMediaEntityUpdateRequest.java | 136 --
.../streamed/ODataStreamUpdateRequest.java | 132 --
.../request/streamed/ODataStreamedRequest.java | 40 -
.../streamed/StreamedRequestFactory.java | 62 -
.../streamed/V3StreamedRequestFactory.java | 31 -
.../streamed/V4StreamedRequestFactory.java | 31 -
.../response/ODataBatchResponse.java | 37 -
.../response/ODataDeleteResponse.java | 27 -
.../response/ODataEntityCreateResponse.java | 36 -
.../response/ODataEntityUpdateResponse.java | 36 -
.../response/ODataInvokeResponse.java | 36 -
.../response/ODataLinkOperationResponse.java | 28 -
.../ODataMediaEntityCreateResponse.java | 36 -
.../ODataMediaEntityUpdateResponse.java | 36 -
.../response/ODataPropertyUpdateResponse.java | 36 -
.../communication/response/ODataResponse.java | 117 --
.../response/ODataResponseImpl.java | 276 ----
.../response/ODataRetrieveResponse.java | 34 -
.../response/ODataStreamUpdateResponse.java | 36 -
.../response/ODataValueUpdateResponse.java | 36 -
.../engine/data/AbstractODataObjectFactory.java | 276 ----
.../odatajclient/engine/data/Entry.java | 247 ---
.../odatajclient/engine/data/Feed.java | 72 -
.../odatajclient/engine/data/Link.java | 111 --
.../engine/data/LinkCollection.java | 52 -
.../engine/data/NoValidEntityFound.java | 55 -
.../odatajclient/engine/data/ODataBinder.java | 128 --
.../engine/data/ODataCollectionValue.java | 98 --
.../engine/data/ODataComplexValue.java | 97 --
.../engine/data/ODataDeserializer.java | 97 --
.../odatajclient/engine/data/ODataDuration.java | 80 -
.../odatajclient/engine/data/ODataEntity.java | 361 -----
.../engine/data/ODataEntitySet.java | 121 --
.../engine/data/ODataEntitySetIterator.java | 319 ----
.../odatajclient/engine/data/ODataError.java | 67 -
.../engine/data/ODataGeospatialValue.java | 488 ------
.../engine/data/ODataInlineEntity.java | 72 -
.../engine/data/ODataInlineEntitySet.java | 74 -
.../engine/data/ODataInvokeResult.java | 30 -
.../odatajclient/engine/data/ODataItem.java | 111 --
.../odatajclient/engine/data/ODataLink.java | 109 --
.../engine/data/ODataLinkCollection.java | 100 --
.../odatajclient/engine/data/ODataLinkType.java | 98 --
.../engine/data/ODataNoContent.java | 30 -
.../engine/data/ODataObjectFactory.java | 210 ---
.../engine/data/ODataObjectWrapper.java | 141 --
.../engine/data/ODataOperation.java | 118 --
.../engine/data/ODataPrimitiveValue.java | 373 -----
.../odatajclient/engine/data/ODataProperty.java | 192 ---
.../odatajclient/engine/data/ODataReader.java | 108 --
.../engine/data/ODataSerializer.java | 120 --
.../engine/data/ODataServiceDocument.java | 183 ---
.../engine/data/ODataTimestamp.java | 142 --
.../odatajclient/engine/data/ODataValue.java | 111 --
.../odatajclient/engine/data/ODataWriter.java | 91 --
.../engine/data/ResourceFactory.java | 281 ----
.../engine/data/ServiceDocument.java | 138 --
.../engine/data/ServiceDocumentElement.java | 74 -
.../engine/data/impl/AbstractEntry.java | 340 -----
.../engine/data/impl/AbstractJSONEntry.java | 90 --
.../engine/data/impl/AbstractJacksonTool.java | 83 -
.../engine/data/impl/AbstractLink.java | 142 --
.../engine/data/impl/AbstractODataBinder.java | 608 --------
.../data/impl/AbstractODataDeserializer.java | 204 ---
.../engine/data/impl/AbstractODataReader.java | 159 --
.../data/impl/AbstractODataSerializer.java | 179 ---
.../engine/data/impl/AbstractODataWriter.java | 101 --
.../engine/data/impl/AbstractPayloadObject.java | 57 -
.../data/impl/AbstractServiceDocument.java | 147 --
.../engine/data/impl/GeospatialJSONHandler.java | 411 -----
.../data/impl/InjectableSerializerProvider.java | 43 -
.../engine/data/impl/JSONDOMTreeUtils.java | 259 ----
.../engine/data/impl/JSONEntryDeserializer.java | 248 ---
.../engine/data/impl/JSONEntrySerializer.java | 133 --
.../data/impl/JSONPropertyDeserializer.java | 124 --
.../data/impl/JSONPropertySerializer.java | 82 -
.../data/impl/ODataJacksonDeserializer.java | 43 -
.../data/impl/ODataJacksonSerializer.java | 43 -
.../impl/XMLServiceDocumentDeserializer.java | 119 --
.../engine/data/impl/v3/AtomDeserializer.java | 218 ---
.../engine/data/impl/v3/AtomEntry.java | 124 --
.../engine/data/impl/v3/AtomFeed.java | 168 --
.../engine/data/impl/v3/AtomLink.java | 30 -
.../engine/data/impl/v3/AtomObject.java | 51 -
.../engine/data/impl/v3/AtomSerializer.java | 183 ---
.../engine/data/impl/v3/JSONEntry.java | 30 -
.../engine/data/impl/v3/JSONFeed.java | 146 --
.../engine/data/impl/v3/JSONLink.java | 30 -
.../engine/data/impl/v3/JSONLinkCollection.java | 118 --
.../engine/data/impl/v3/JSONODataError.java | 240 ---
.../data/impl/v3/JSONODataErrorBundle.java | 51 -
.../engine/data/impl/v3/JSONProperty.java | 77 -
.../data/impl/v3/JSONServiceDocument.java | 64 -
.../engine/data/impl/v3/ODataBinderImpl.java | 39 -
.../data/impl/v3/ODataDeserializerImpl.java | 66 -
.../data/impl/v3/ODataObjectFactoryImpl.java | 32 -
.../engine/data/impl/v3/ODataReaderImpl.java | 46 -
.../data/impl/v3/ODataSerializerImpl.java | 32 -
.../engine/data/impl/v3/ODataWriterImpl.java | 31 -
.../engine/data/impl/v3/XMLLinkCollection.java | 80 -
.../engine/data/impl/v3/XMLODataError.java | 234 ---
.../engine/data/impl/v3/XMLServiceDocument.java | 48 -
.../data/impl/v4/AbstractServiceDocument.java | 88 --
.../engine/data/impl/v4/JSONEntry.java | 30 -
.../engine/data/impl/v4/ODataBinderImpl.java | 65 -
.../data/impl/v4/ODataDeserializerImpl.java | 65 -
.../data/impl/v4/ODataObjectFactoryImpl.java | 32 -
.../engine/data/impl/v4/ODataReaderImpl.java | 46 -
.../data/impl/v4/ODataSerializerImpl.java | 32 -
.../engine/data/impl/v4/ODataWriterImpl.java | 31 -
.../engine/data/impl/v4/XMLServiceDocument.java | 27 -
.../odatajclient/engine/format/ODataFormat.java | 97 --
.../engine/format/ODataMediaFormat.java | 71 -
.../engine/format/ODataPubFormat.java | 97 --
.../engine/format/ODataValueFormat.java | 76 -
.../engine/metadata/AbstractEdmMetadata.java | 136 --
.../engine/metadata/AbstractEdmType.java | 267 ----
.../engine/metadata/EdmContentKind.java | 30 -
.../odatajclient/engine/metadata/EdmType.java | 111 --
.../metadata/EdmTypeNotFoundException.java | 37 -
.../engine/metadata/EdmV3Metadata.java | 40 -
.../odatajclient/engine/metadata/EdmV3Type.java | 40 -
.../engine/metadata/EdmV4Metadata.java | 45 -
.../odatajclient/engine/metadata/EdmV4Type.java | 40 -
.../metadata/edm/AbstractAnnotations.java | 48 -
.../metadata/edm/AbstractComplexType.java | 42 -
.../metadata/edm/AbstractDataServices.java | 52 -
.../engine/metadata/edm/AbstractEdm.java | 54 -
.../metadata/edm/AbstractEdmDeserializer.java | 69 -
.../engine/metadata/edm/AbstractEdmx.java | 50 -
.../metadata/edm/AbstractEntityContainer.java | 104 --
.../engine/metadata/edm/AbstractEntitySet.java | 47 -
.../engine/metadata/edm/AbstractEntityType.java | 83 -
.../engine/metadata/edm/AbstractEnumType.java | 64 -
.../metadata/edm/AbstractFunctionImport.java | 28 -
.../engine/metadata/edm/AbstractMember.java | 48 -
.../edm/AbstractNavigationProperty.java | 37 -
.../engine/metadata/edm/AbstractParameter.java | 93 --
.../engine/metadata/edm/AbstractProperty.java | 237 ---
.../engine/metadata/edm/AbstractSchema.java | 111 --
.../metadata/edm/ComplexTypeDeserializer.java | 80 -
.../engine/metadata/edm/ConcurrencyMode.java | 26 -
.../metadata/edm/DataServicesDeserializer.java | 63 -
.../engine/metadata/edm/EdmSimpleType.java | 291 ----
.../engine/metadata/edm/EdmxDeserializer.java | 66 -
.../edm/EntityContainerDeserializer.java | 99 --
.../engine/metadata/edm/EntityKey.java | 39 -
.../metadata/edm/EntityKeyDeserializer.java | 46 -
.../metadata/edm/EntitySetDeserializer.java | 67 -
.../metadata/edm/EntityTypeDeserializer.java | 88 --
.../metadata/edm/EnumTypeDeserializer.java | 70 -
.../engine/metadata/edm/PropertyRef.java | 49 -
.../engine/metadata/edm/SchemaDeserializer.java | 146 --
.../metadata/edm/StoreGeneratedPattern.java | 27 -
.../edm/geospatial/ComposedGeospatial.java | 75 -
.../metadata/edm/geospatial/Geospatial.java | 156 --
.../edm/geospatial/GeospatialCollection.java | 47 -
.../metadata/edm/geospatial/LineString.java | 38 -
.../edm/geospatial/MultiLineString.java | 38 -
.../metadata/edm/geospatial/MultiPoint.java | 38 -
.../metadata/edm/geospatial/MultiPolygon.java | 38 -
.../engine/metadata/edm/geospatial/Point.java | 81 -
.../engine/metadata/edm/geospatial/Polygon.java | 72 -
.../engine/metadata/edm/v3/Annotations.java | 43 -
.../edm/v3/AnnotationsDeserializer.java | 55 -
.../engine/metadata/edm/v3/Association.java | 60 -
.../edm/v3/AssociationDeserializer.java | 53 -
.../engine/metadata/edm/v3/AssociationEnd.java | 72 -
.../engine/metadata/edm/v3/AssociationSet.java | 60 -
.../edm/v3/AssociationSetDeserializer.java | 52 -
.../metadata/edm/v3/AssociationSetEnd.java | 49 -
.../engine/metadata/edm/v3/ComplexType.java | 46 -
.../engine/metadata/edm/v3/DataServices.java | 37 -
.../engine/metadata/edm/v3/Edmx.java | 28 -
.../engine/metadata/edm/v3/EntityContainer.java | 60 -
.../engine/metadata/edm/v3/EntitySet.java | 27 -
.../engine/metadata/edm/v3/EntityType.java | 65 -
.../engine/metadata/edm/v3/EnumType.java | 58 -
.../engine/metadata/edm/v3/FunctionImport.java | 129 --
.../edm/v3/FunctionImportDeserializer.java | 67 -
.../engine/metadata/edm/v3/Member.java | 27 -
.../metadata/edm/v3/NavigationProperty.java | 61 -
.../engine/metadata/edm/v3/Parameter.java | 39 -
.../engine/metadata/edm/v3/ParameterMode.java | 27 -
.../engine/metadata/edm/v3/Property.java | 27 -
.../engine/metadata/edm/v3/PropertyValue.java | 118 --
.../metadata/edm/v3/ReferentialConstraint.java | 49 -
.../edm/v3/ReferentialConstraintRole.java | 51 -
.../ReferentialConstraintRoleDeserializer.java | 51 -
.../engine/metadata/edm/v3/Schema.java | 136 --
.../engine/metadata/edm/v3/TypeAnnotation.java | 57 -
.../edm/v3/TypeAnnotationDeserializer.java | 52 -
.../engine/metadata/edm/v3/Using.java | 49 -
.../engine/metadata/edm/v3/ValueAnnotation.java | 129 --
.../engine/metadata/edm/v3/ValueTerm.java | 49 -
.../metadata/edm/v4/AbstractAnnotatedEdm.java | 41 -
.../engine/metadata/edm/v4/Action.java | 86 --
.../metadata/edm/v4/ActionDeserializer.java | 60 -
.../engine/metadata/edm/v4/ActionImport.java | 60 -
.../engine/metadata/edm/v4/AnnotatedEdm.java | 26 -
.../engine/metadata/edm/v4/Annotation.java | 71 -
.../metadata/edm/v4/AnnotationDeserializer.java | 57 -
.../engine/metadata/edm/v4/Annotations.java | 46 -
.../edm/v4/AnnotationsDeserializer.java | 53 -
.../engine/metadata/edm/v4/CSDLElement.java | 37 -
.../engine/metadata/edm/v4/ComplexType.java | 105 --
.../engine/metadata/edm/v4/DataServices.java | 37 -
.../engine/metadata/edm/v4/Edmx.java | 36 -
.../engine/metadata/edm/v4/EntityContainer.java | 127 --
.../engine/metadata/edm/v4/EntitySet.java | 58 -
.../engine/metadata/edm/v4/EntityType.java | 77 -
.../engine/metadata/edm/v4/EnumType.java | 70 -
.../engine/metadata/edm/v4/Function.java | 38 -
.../metadata/edm/v4/FunctionDeserializer.java | 62 -
.../engine/metadata/edm/v4/FunctionImport.java | 87 --
.../engine/metadata/edm/v4/Include.java | 50 -
.../metadata/edm/v4/IncludeAnnotations.java | 61 -
.../engine/metadata/edm/v4/Member.java | 41 -
.../metadata/edm/v4/NavigationProperty.java | 99 --
.../edm/v4/NavigationPropertyBinding.java | 50 -
.../edm/v4/NavigationPropertyDeserializer.java | 66 -
.../engine/metadata/edm/v4/OnDelete.java | 39 -
.../engine/metadata/edm/v4/OnDeleteAction.java | 28 -
.../engine/metadata/edm/v4/Parameter.java | 39 -
.../engine/metadata/edm/v4/Property.java | 40 -
.../engine/metadata/edm/v4/Reference.java | 60 -
.../metadata/edm/v4/ReferenceDeserializer.java | 58 -
.../metadata/edm/v4/ReferentialConstraint.java | 49 -
.../engine/metadata/edm/v4/ReturnType.java | 95 --
.../engine/metadata/edm/v4/Schema.java | 171 ---
.../engine/metadata/edm/v4/Singleton.java | 57 -
.../metadata/edm/v4/SingletonDeserializer.java | 57 -
.../engine/metadata/edm/v4/Term.java | 127 --
.../metadata/edm/v4/TermDeserializer.java | 74 -
.../engine/metadata/edm/v4/TypeDefinition.java | 106 --
.../edm/v4/TypeDefinitionDeserializer.java | 65 -
.../annotation/AbstractElOrAttrConstruct.java | 37 -
.../annotation/AnnotatedDynExprConstruct.java | 39 -
.../edm/v4/annotation/AnnotationPath.java | 25 -
.../metadata/edm/v4/annotation/Apply.java | 52 -
.../edm/v4/annotation/ApplyDeserializer.java | 55 -
.../engine/metadata/edm/v4/annotation/Cast.java | 89 --
.../edm/v4/annotation/CastDeserializer.java | 62 -
.../metadata/edm/v4/annotation/Collection.java | 36 -
.../v4/annotation/CollectionDeserializer.java | 50 -
.../edm/v4/annotation/ConstExprConstruct.java | 71 -
.../edm/v4/annotation/DynExprConstruct.java | 28 -
.../DynExprConstructDeserializer.java | 145 --
.../edm/v4/annotation/DynExprDoubleParamOp.java | 71 -
.../edm/v4/annotation/DynExprSingleParamOp.java | 67 -
.../edm/v4/annotation/ExprConstruct.java | 27 -
.../engine/metadata/edm/v4/annotation/If.java | 55 -
.../engine/metadata/edm/v4/annotation/IsOf.java | 89 --
.../edm/v4/annotation/IsOfDeserializer.java | 62 -
.../edm/v4/annotation/LabeledElement.java | 48 -
.../annotation/LabeledElementDeserializer.java | 53 -
.../v4/annotation/LabeledElementReference.java | 25 -
.../v4/annotation/NavigationPropertyPath.java | 25 -
.../engine/metadata/edm/v4/annotation/Null.java | 28 -
.../edm/v4/annotation/NullDeserializer.java | 49 -
.../engine/metadata/edm/v4/annotation/Path.java | 25 -
.../edm/v4/annotation/PropertyPath.java | 25 -
.../edm/v4/annotation/PropertyValue.java | 48 -
.../annotation/PropertyValueDeserializer.java | 55 -
.../metadata/edm/v4/annotation/Record.java | 46 -
.../edm/v4/annotation/RecordDeserializer.java | 53 -
.../metadata/edm/v4/annotation/UrlRef.java | 38 -
.../edm/v4/annotation/UrlRefDeserializer.java | 50 -
.../engine/uri/AbstractURIBuilder.java | 240 ---
.../odatajclient/engine/uri/QueryOption.java | 101 --
.../odatajclient/engine/uri/SegmentType.java | 55 -
.../odatajclient/engine/uri/URIBuilder.java | 262 ----
.../odatajclient/engine/uri/V3URIBuilder.java | 39 -
.../odatajclient/engine/uri/V4URIBuilder.java | 39 -
.../uri/filter/AbstractComparingFilter.java | 42 -
.../uri/filter/AbstractFilterFactory.java | 106 --
.../engine/uri/filter/AndFilter.java | 40 -
.../engine/uri/filter/EqFilter.java | 31 -
.../engine/uri/filter/FilterFactory.java | 59 -
.../engine/uri/filter/GeFilter.java | 31 -
.../engine/uri/filter/GtFilter.java | 31 -
.../engine/uri/filter/LeFilter.java | 31 -
.../engine/uri/filter/LtFilter.java | 31 -
.../engine/uri/filter/MatchFilter.java | 33 -
.../engine/uri/filter/NeFilter.java | 31 -
.../engine/uri/filter/NotFilter.java | 33 -
.../engine/uri/filter/ODataFilter.java | 32 -
.../engine/uri/filter/ODataFilterArg.java | 33 -
.../uri/filter/ODataFilterArgFactory.java | 153 --
.../engine/uri/filter/ODataFilterFunction.java | 47 -
.../engine/uri/filter/ODataFilterLiteral.java | 40 -
.../engine/uri/filter/ODataFilterOp.java | 43 -
.../engine/uri/filter/ODataFilterProperty.java | 38 -
.../engine/uri/filter/OrFilter.java | 40 -
.../engine/uri/filter/V3FilterFactory.java | 25 -
.../engine/uri/filter/V4FilterFactory.java | 25 -
.../engine/utils/AbstractDOMParser.java | 46 -
.../engine/utils/AndroidDOMParserImpl.java | 49 -
.../utils/AssociationSetBindingDetails.java | 56 -
.../engine/utils/DefaultDOMParserImpl.java | 78 -
.../engine/utils/MetadataUtils.java | 178 ---
.../utils/NavigationPropertyBindingDetails.java | 65 -
.../engine/utils/ODataBatchConstants.java | 56 -
.../engine/utils/ODataConstants.java | 217 ---
.../odatajclient/engine/utils/ODataVersion.java | 83 -
.../engine/utils/QualifiedName.java | 66 -
.../odatajclient/engine/utils/URIUtils.java | 194 ---
.../odatajclient/engine/utils/Wrapper.java | 41 -
.../odatajclient/engine/utils/XMLUtils.java | 185 ---
.../engine/AbstractPrimitiveTest.java | 405 -----
.../engine/AbstractPropertyTest.java | 178 ---
.../odatajclient/engine/AbstractTest.java | 59 -
.../odatajclient/engine/EntitySetTest.java | 62 -
.../odatajclient/engine/EntityTest.java | 191 ---
.../odatajclient/engine/EntryReadTest.java | 96 --
.../odatajclient/engine/ErrorTest.java | 48 -
.../odatajclient/engine/PrimitiveValueTest.java | 585 -------
.../engine/it/AbstractMetadataTestITCase.java | 30 -
.../engine/it/AbstractTestITCase.java | 605 --------
.../engine/it/ActionOverloadingTestITCase.java | 152 --
.../odatajclient/engine/it/AsyncTestITCase.java | 129 --
.../engine/it/AuthEntityRetrieveTestITCase.java | 53 -
.../odatajclient/engine/it/BatchTestITCase.java | 439 ------
.../odatajclient/engine/it/CountTestITCase.java | 62 -
.../engine/it/CreateMediaEntityTestITCase.java | 276 ----
.../engine/it/EntityCreateMoreTestITCase.java | 760 ---------
.../engine/it/EntityCreateTestITCase.java | 477 ------
.../engine/it/EntityRetrieveTestITCase.java | 240 ---
.../engine/it/EntitySetRetrieveTestITCase.java | 295 ----
.../engine/it/EntitySetTestITCase.java | 150 --
.../engine/it/EntityTestITCase.java | 327 ----
.../engine/it/EntityUpdateMoreTestITCase.java | 562 -------
.../engine/it/EntityUpdateTestITCase.java | 237 ---
.../odatajclient/engine/it/ErrorTestITCase.java | 175 ---
.../engine/it/FilterFactoryTestITCase.java | 158 --
.../engine/it/FilterTestITCase.java | 93 --
.../engine/it/FunctionsTestITCase.java | 200 ---
.../engine/it/GeoSpatialTestITCase.java | 369 -----
.../engine/it/InvokeOperationTestITCase.java | 660 --------
.../engine/it/InvokeTestITCase.java | 307 ----
.../engine/it/KeyAsSegmentTestITCase.java | 110 --
.../odatajclient/engine/it/LinkTestITCase.java | 177 ---
.../engine/it/MediaEntityTestITCase.java | 210 ---
.../engine/it/MediaEntityUpdateTestITCase.java | 155 --
.../engine/it/MetadataRetrieveTestITCase.java | 145 --
.../it/NavigationLinkCreateTestITCase.java | 515 -------
.../engine/it/NavigationLinkTestITCase.java | 126 --
.../engine/it/OpenTypeTestITCase.java | 240 ---
.../engine/it/PrimitiveKeysTestITCase.java | 81 -
.../engine/it/PropertyRetrieveTestITCase.java | 275 ----
.../engine/it/PropertyTestITCase.java | 355 -----
.../engine/it/PropertyUpdateTestITCase.java | 1015 ------------
.../engine/it/PropertyValueTestITCase.java | 167 --
.../engine/it/QueryOptionsTestITCase.java | 193 ---
.../it/ServiceDocumentRetrieveTestITCase.java | 74 -
.../engine/it/ServiceDocumentTestITCase.java | 56 -
.../it/XHTTPMethodEntityUpdateTestITCase.java | 38 -
.../it/XHTTPMethodPropertyUpdateTestITCase.java | 38 -
.../engine/it/v3/V3MetadataTestITCase.java | 42 -
.../engine/it/v4/V4MetadataTestITCase.java | 41 -
.../engine/performance/BasicPerfTest.java | 321 ----
.../engine/performance/HundredPerfTest.java | 85 --
.../engine/performance/PerfTestReporter.java | 108 --
.../engine/performance/ThousandPerfTest.java | 85 --
.../engine/v3/V3JSONPrimitiveTest.java | 334 ----
.../engine/v3/V3JSONPropertyTest.java | 36 -
.../engine/v3/V3JSONServiceDocumentTest.java | 52 -
.../odatajclient/engine/v3/V3MetadataTest.java | 162 --
.../engine/v3/V3XMLPrimitiveTest.java | 29 -
.../engine/v3/V3XMLPropertyTest.java | 30 -
.../engine/v3/V3XMLServiceDocumentTest.java | 29 -
.../engine/v4/V4JSONPrimitiveTest.java | 36 -
.../engine/v4/V4JSONServiceDocumentTest.java | 62 -
.../odatajclient/engine/v4/V4MetadataTest.java | 259 ----
.../engine/v4/V4XMLPrimitiveTest.java | 29 -
.../engine/v4/V4XMLServiceDocumentTest.java | 36 -
.../engine/AllGeoTypesSet_-10_Geom.json | 1 -
.../engine/AllGeoTypesSet_-10_Geom.xml | 22 -
.../odatajclient/engine/AllGeoTypesSet_-5.json | 1 -
.../odatajclient/engine/AllGeoTypesSet_-5.xml | 22 -
.../odatajclient/engine/AllGeoTypesSet_-8.json | 1 -
.../odatajclient/engine/AllGeoTypesSet_-8.xml | 176 ---
.../msopentech/odatajclient/engine/Car_16.json | 1 -
.../msopentech/odatajclient/engine/Car_16.xml | 22 -
.../odatajclient/engine/ComputerDetail_-10.json | 1 -
.../odatajclient/engine/ComputerDetail_-10.xml | 22 -
.../odatajclient/engine/Customer.json | 1 -
.../msopentech/odatajclient/engine/Customer.xml | 22 -
.../odatajclient/engine/Customer_-10.json | 1 -
.../odatajclient/engine/Customer_-10.xml | 22 -
.../msopentech/odatajclient/engine/error.xml | 22 -
.../odatajclient/engine/stacktrace.xml | 27 -
.../engine/v3/AllGeoTypesSet_-10_GeogLine.json | 1 -
.../engine/v3/AllGeoTypesSet_-10_GeogLine.xml | 22 -
.../engine/v3/AllGeoTypesSet_-10_GeogPoint.json | 1 -
.../engine/v3/AllGeoTypesSet_-10_GeogPoint.xml | 22 -
.../v3/AllGeoTypesSet_-3_GeomMultiPolygon.json | 1 -
.../v3/AllGeoTypesSet_-3_GeomMultiPolygon.xml | 22 -
.../v3/AllGeoTypesSet_-5_GeogCollection.json | 1 -
.../v3/AllGeoTypesSet_-5_GeogCollection.xml | 22 -
.../v3/AllGeoTypesSet_-5_GeogPolygon.json | 1 -
.../engine/v3/AllGeoTypesSet_-5_GeogPolygon.xml | 22 -
.../v3/AllGeoTypesSet_-6_GeomMultiLine.json | 1 -
.../v3/AllGeoTypesSet_-6_GeomMultiLine.xml | 22 -
.../v3/AllGeoTypesSet_-7_GeomMultiPoint.json | 1 -
.../v3/AllGeoTypesSet_-7_GeomMultiPoint.xml | 22 -
.../v3/AllGeoTypesSet_-8_GeomCollection.json | 1 -
.../v3/AllGeoTypesSet_-8_GeomCollection.xml | 22 -
.../v3/Customer_-10_BackupContactInfo.json | 1 -
.../v3/Customer_-10_BackupContactInfo.xml | 22 -
.../engine/v3/Customer_-10_CustomerId.json | 1 -
.../engine/v3/Customer_-10_CustomerId.xml | 22 -
.../engine/v3/Customer_-10_CustomerId_value.txt | 1 -
.../v3/Customer_-10_PrimaryContactInfo.json | 1 -
.../v3/Customer_-10_PrimaryContactInfo.xml | 22 -
...a4af-4bbd-bf0a-2b2c22635565'_Attachment.json | 1 -
...-a4af-4bbd-bf0a-2b2c22635565'_Attachment.xml | 22 -
...af-4bbd-bf0a-2b2c22635565'_AttachmentId.json | 1 -
...4af-4bbd-bf0a-2b2c22635565'_AttachmentId.xml | 22 -
..._-10_ComplexConcurrency_QueriedDateTime.json | 1 -
...t_-10_ComplexConcurrency_QueriedDateTime.xml | 22 -
.../engine/v3/Product_-10_Dimensions_Width.json | 1 -
.../engine/v3/Product_-10_Dimensions_Width.xml | 22 -
.../engine/v3/Product_-9_Description.json | 1 -
.../engine/v3/Product_-9_Description.xml | 22 -
.../odatajclient/engine/v3/metadata.xml | 22 -
.../engine/v3/northwind-metadata.xml | 22 -
.../odatajclient/engine/v3/serviceDocument.json | 33 -
.../odatajclient/engine/v3/serviceDocument.xml | 49 -
.../engine/v4/Products_1_SupplierID.json | 1 -
.../odatajclient/engine/v4/demo-metadata.xml | 22 -
.../engine/v4/fromdoc1-metadata.xml | 116 --
.../engine/v4/fromdoc2-metadata.xml | 54 -
.../engine/v4/fromdoc3-metadata.xml | 131 --
.../odatajclient/engine/v4/metadata.xml | 232 ---
.../engine/v4/northwind-metadata.xml | 22 -
.../odatajclient/engine/v4/serviceDocument.json | 32 -
.../odatajclient/engine/v4/serviceDocument.xml | 46 -
.../src/test/resources/images/20051210-w50s.flv | Bin 669036 -> 0 bytes
.../src/test/resources/images/Renault.jpg | Bin 18688 -> 0 bytes
.../src/test/resources/images/Wildlife.wmv | Bin 26246026 -> 0 bytes
.../test/resources/images/big_buck_bunny.mp4 | Bin 5510872 -> 0 bytes
.../src/test/resources/images/desktop.ini | 2 -
.../engine/src/test/resources/images/edesk.jpg | Bin 8312 -> 0 bytes
.../engine/src/test/resources/images/edesk.png | Bin 8881 -> 0 bytes
.../engine/src/test/resources/images/image1.jpg | Bin 7432 -> 0 bytes
.../engine/src/test/resources/images/image1.png | Bin 2785 -> 0 bytes
.../src/test/resources/images/image2.jpeg | Bin 7432 -> 0 bytes
.../src/test/resources/images/smallimage.bmp | Bin 52378 -> 0 bytes
.../src/test/resources/images/smallimage.jpg | Bin 14655 -> 0 bytes
.../src/test/resources/images/smallimage.png | Bin 51097 -> 0 bytes
.../src/test/resources/images/smallimage.tif | Bin 11762 -> 0 bytes
.../src/test/resources/odatajclient-perf.xls | Bin 22016 -> 0 bytes
.../engine/src/test/resources/sample.png | Bin 25566 -> 0 bytes
.../src/test/resources/simplelogger.properties | 20 -
.../engine/src/test/resources/test.properties | 20 -
ODataJClient/extensions/oauth-signpost/pom.xml | 71 -
...tractOAuthSignPostHttpUriRequestFactory.java | 55 -
ODataJClient/extensions/pom.xml | 46 -
ODataJClient/maven-plugin/pom.xml | 218 ---
.../src/it/actionOverloadingService/pom.xml | 92 --
.../it/actionOverloadingService/verify.groovy | 20 -
.../maven-plugin/src/it/defaultService/pom.xml | 92 --
.../src/it/defaultService/verify.groovy | 20 -
.../src/it/keyAsSegmentService/pom.xml | 92 --
.../src/it/keyAsSegmentService/verify.groovy | 20 -
.../maven-plugin/src/it/northwind/pom.xml | 92 --
.../maven-plugin/src/it/northwind/verify.groovy | 20 -
.../src/it/odataWriterDefaultService/pom.xml | 92 --
.../it/odataWriterDefaultService/verify.groovy | 20 -
.../maven-plugin/src/it/openTypeService/pom.xml | 92 --
.../src/it/openTypeService/verify.groovy | 20 -
.../src/it/primitiveKeysService/pom.xml | 92 --
.../src/it/primitiveKeysService/verify.groovy | 20 -
ODataJClient/maven-plugin/src/it/settings.xml | 55 -
.../maven-plugin/src/it/staticServiceV3/pom.xml | 92 --
.../src/it/staticServiceV3/verify.groovy | 20 -
.../maven-plugin/src/it/staticServiceV4/pom.xml | 92 --
.../src/it/staticServiceV4/verify.groovy | 20 -
.../plugin/AbstractMetadataMojo.java | 161 --
.../odatajclient/plugin/AbstractUtility.java | 292 ----
.../odatajclient/plugin/V3MetadataMojo.java | 189 ---
.../odatajclient/plugin/V3Utility.java | 123 --
.../odatajclient/plugin/V4MetadataMojo.java | 197 ---
.../odatajclient/plugin/V4Utility.java | 191 ---
.../src/main/resources/complexType.vm | 63 -
.../src/main/resources/container.vm | 67 -
.../src/main/resources/entityCollection.vm | 50 -
.../src/main/resources/entitySet.vm | 65 -
.../src/main/resources/entityType.vm | 109 --
.../src/main/resources/entityTypeKey.vm | 70 -
.../maven-plugin/src/main/resources/enumType.vm | 55 -
.../src/main/resources/package-info.vm | 20 -
.../maven-plugin/src/main/resources/services.vm | 21 -
.../src/main/resources/singleton.vm | 49 -
.../src/main/resources/v3/container.vm | 38 -
.../src/main/resources/v3/entityCollection.vm | 38 -
.../src/main/resources/v3/entitySet.vm | 19 -
.../src/main/resources/v3/entityType.vm | 53 -
.../src/main/resources/v4/container.vm | 54 -
.../src/main/resources/v4/entityCollection.vm | 55 -
.../src/main/resources/v4/entitySet.vm | 19 -
.../src/main/resources/v4/entityType.vm | 69 -
.../src/main/resources/v4/singleton.vm | 37 -
ODataJClient/pom.xml | 554 -------
ODataJClient/proxy/pom.xml | 237 ---
.../proxy/api/AbstractComplexType.java | 45 -
.../proxy/api/AbstractContainer.java | 32 -
.../proxy/api/AbstractEntityCollection.java | 25 -
.../proxy/api/AbstractEntityKey.java | 54 -
.../proxy/api/AbstractEntitySet.java | 108 --
.../proxy/api/AbstractOpenType.java | 31 -
.../odatajclient/proxy/api/AsyncCall.java | 70 -
.../proxy/api/EntityContainerFactory.java | 135 --
.../proxy/api/NoResultException.java | 35 -
.../proxy/api/NonUniqueResultException.java | 35 -
.../odatajclient/proxy/api/Query.java | 130 --
.../msopentech/odatajclient/proxy/api/Sort.java | 66 -
.../proxy/api/annotations/ComplexType.java | 41 -
.../proxy/api/annotations/CompoundKey.java | 32 -
.../api/annotations/CompoundKeyElement.java | 38 -
.../proxy/api/annotations/EntityContainer.java | 36 -
.../proxy/api/annotations/EntitySet.java | 38 -
.../proxy/api/annotations/EntityType.java | 44 -
.../proxy/api/annotations/EnumType.java | 39 -
.../odatajclient/proxy/api/annotations/Key.java | 34 -
.../proxy/api/annotations/KeyClass.java | 39 -
.../proxy/api/annotations/KeyRef.java | 34 -
.../proxy/api/annotations/Namespace.java | 36 -
.../api/annotations/NavigationProperty.java | 42 -
.../proxy/api/annotations/Operation.java | 70 -
.../proxy/api/annotations/Parameter.java | 49 -
.../proxy/api/annotations/Property.java | 76 -
.../api/annotations/ReferentialConstraint.java | 41 -
.../proxy/api/annotations/RowType.java | 32 -
.../proxy/api/annotations/Singleton.java | 36 -
.../proxy/api/context/AttachedEntity.java | 42 -
.../proxy/api/context/AttachedEntityStatus.java | 44 -
.../odatajclient/proxy/api/context/Context.java | 37 -
.../proxy/api/context/EntityContext.java | 199 ---
.../proxy/api/context/EntityLinkDesc.java | 104 --
.../proxy/api/context/EntityUUID.java | 109 --
.../api/impl/AbstractInvocationHandler.java | 242 ---
.../api/impl/CompoundKeyElementWrapper.java | 57 -
.../odatajclient/proxy/api/impl/Container.java | 522 -------
.../impl/EntityCollectionInvocationHandler.java | 152 --
.../impl/EntityContainerInvocationHandler.java | 120 --
.../api/impl/EntitySetInvocationHandler.java | 396 -----
.../proxy/api/impl/EntitySetIterator.java | 85 --
.../api/impl/EntityTypeInvocationHandler.java | 578 -------
.../odatajclient/proxy/api/impl/QueryImpl.java | 171 ---
.../odatajclient/proxy/utils/ClassUtils.java | 142 --
.../odatajclient/proxy/utils/EngineUtils.java | 419 -----
.../odatajclient/proxy/AbstractTest.java | 185 ---
.../proxy/ActionOverloadingTestITCase.java | 98 --
.../odatajclient/proxy/AsyncTestITCase.java | 121 --
.../proxy/AuthEntityRetrieveTestITCase.java | 66 -
.../odatajclient/proxy/ContextTestITCase.java | 462 ------
.../proxy/EntityCreateTestITCase.java | 198 ---
.../proxy/EntityRetrieveTestITCase.java | 189 ---
.../odatajclient/proxy/EntitySetTestITCase.java | 99 --
.../proxy/EntityUpdateTestITCase.java | 122 --
.../odatajclient/proxy/InvokeTestITCase.java | 218 ---
.../proxy/MediaEntityTestITCase.java | 108 --
.../odatajclient/proxy/OpenTypeTestITCase.java | 181 ---
.../proxy/PrimitiveKeysTestITCase.java | 74 -
.../odatajclient/proxy/PropertyTestITCase.java | 59 -
.../odatajclient/proxy/QueryTestITCase.java | 107 --
.../AllGeoCollectionTypesSet.java | 54 -
.../astoriadefaultservice/AllGeoTypesSet.java | 52 -
.../services/astoriadefaultservice/Car.java | 52 -
.../astoriadefaultservice/Computer.java | 52 -
.../astoriadefaultservice/ComputerDetail.java | 52 -
.../astoriadefaultservice/Customer.java | 52 -
.../astoriadefaultservice/CustomerInfo.java | 52 -
.../astoriadefaultservice/DefaultContainer.java | 159 --
.../services/astoriadefaultservice/Driver.java | 52 -
.../astoriadefaultservice/LastLogin.java | 52 -
.../services/astoriadefaultservice/License.java | 52 -
.../services/astoriadefaultservice/Login.java | 52 -
.../astoriadefaultservice/MappedEntityType.java | 52 -
.../services/astoriadefaultservice/Message.java | 52 -
.../MessageAttachment.java | 52 -
.../services/astoriadefaultservice/Order.java | 52 -
.../astoriadefaultservice/OrderLine.java | 56 -
.../astoriadefaultservice/PageView.java | 54 -
.../services/astoriadefaultservice/Person.java | 58 -
.../astoriadefaultservice/PersonMetadata.java | 52 -
.../services/astoriadefaultservice/Product.java | 54 -
.../astoriadefaultservice/ProductDetail.java | 52 -
.../astoriadefaultservice/ProductPhoto.java | 52 -
.../astoriadefaultservice/ProductReview.java | 52 -
.../astoriadefaultservice/RSAToken.java | 52 -
.../astoriadefaultservice/package-info.java | 20 -
.../astoriadefaultservice/types/Aliases.java | 59 -
.../types/AllSpatialCollectionTypes.java | 91 --
.../AllSpatialCollectionTypesCollection.java | 47 -
.../types/AllSpatialCollectionTypes_Simple.java | 206 ---
...SpatialCollectionTypes_SimpleCollection.java | 47 -
.../types/AllSpatialTypes.java | 459 ------
.../types/AllSpatialTypesCollection.java | 47 -
.../astoriadefaultservice/types/AuditInfo.java | 79 -
.../types/BackOrderLine.java | 68 -
.../types/BackOrderLine2.java | 68 -
.../types/BackOrderLine2Collection.java | 47 -
.../types/BackOrderLineCollection.java | 47 -
.../astoriadefaultservice/types/Car.java | 163 --
.../types/CarCollection.java | 47 -
.../types/ComplexToCategory.java | 79 -
.../astoriadefaultservice/types/Computer.java | 124 --
.../types/ComputerCollection.java | 47 -
.../types/ComputerDetail.java | 239 ---
.../types/ComputerDetailCollection.java | 47 -
.../types/ConcurrencyInfo.java | 69 -
.../types/ContactDetails.java | 109 --
.../astoriadefaultservice/types/Contractor.java | 163 --
.../types/ContractorCollection.java | 47 -
.../astoriadefaultservice/types/Customer.java | 279 ----
.../types/CustomerCollection.java | 47 -
.../types/CustomerInfo.java | 117 --
.../types/CustomerInfoCollection.java | 47 -
.../astoriadefaultservice/types/Dimensions.java | 79 -
.../types/DiscontinuedProduct.java | 160 --
.../types/DiscontinuedProductCollection.java | 47 -
.../astoriadefaultservice/types/Driver.java | 124 --
.../types/DriverCollection.java | 47 -
.../astoriadefaultservice/types/Employee.java | 155 --
.../types/EmployeeCollection.java | 51 -
.../astoriadefaultservice/types/LastLogin.java | 170 ---
.../types/LastLoginCollection.java | 47 -
.../astoriadefaultservice/types/License.java | 193 ---
.../types/LicenseCollection.java | 47 -
.../astoriadefaultservice/types/Login.java | 164 --
.../types/LoginCollection.java | 47 -
.../types/MappedEntityType.java | 528 -------
.../types/MappedEntityTypeCollection.java | 47 -
.../astoriadefaultservice/types/Message.java | 259 ----
.../types/MessageAttachment.java | 114 --
.../types/MessageAttachmentCollection.java | 47 -
.../types/MessageCollection.java | 47 -
.../astoriadefaultservice/types/MessageKey.java | 75 -
.../astoriadefaultservice/types/Order.java | 157 --
.../types/OrderCollection.java | 47 -
.../astoriadefaultservice/types/OrderLine.java | 207 ---
.../types/OrderLineCollection.java | 47 -
.../types/OrderLineKey.java | 75 -
.../astoriadefaultservice/types/PageView.java | 193 ---
.../types/PageViewCollection.java | 47 -
.../astoriadefaultservice/types/Person.java | 127 --
.../types/PersonCollection.java | 47 -
.../types/PersonMetadata.java | 170 ---
.../types/PersonMetadataCollection.java | 47 -
.../astoriadefaultservice/types/Phone.java | 69 -
.../astoriadefaultservice/types/Product.java | 273 ----
.../types/ProductCollection.java | 47 -
.../types/ProductDetail.java | 124 --
.../types/ProductDetailCollection.java | 47 -
.../types/ProductPageView.java | 114 --
.../types/ProductPageViewCollection.java | 47 -
.../types/ProductPhoto.java | 137 --
.../types/ProductPhotoCollection.java | 47 -
.../types/ProductPhotoKey.java | 75 -
.../types/ProductReview.java | 170 ---
.../types/ProductReviewCollection.java | 47 -
.../types/ProductReviewKey.java | 86 --
.../astoriadefaultservice/types/RSAToken.java | 124 --
.../types/RSATokenCollection.java | 47 -
.../types/SpecialEmployee.java | 154 --
.../types/SpecialEmployeeCollection.java | 51 -
.../types/package-info.java | 20 -
.../AllGeoCollectionTypesSet.java | 54 -
.../astoriadefaultservice/AllGeoTypesSet.java | 52 -
.../services/astoriadefaultservice/Car.java | 52 -
.../astoriadefaultservice/Computer.java | 52 -
.../astoriadefaultservice/ComputerDetail.java | 52 -
.../astoriadefaultservice/Customer.java | 52 -
.../astoriadefaultservice/CustomerInfo.java | 52 -
.../astoriadefaultservice/DefaultContainer.java | 168 --
.../services/astoriadefaultservice/Driver.java | 52 -
.../astoriadefaultservice/LastLogin.java | 52 -
.../services/astoriadefaultservice/License.java | 52 -
.../services/astoriadefaultservice/Login.java | 52 -
.../astoriadefaultservice/MappedEntityType.java | 52 -
.../services/astoriadefaultservice/Message.java | 52 -
.../MessageAttachment.java | 52 -
.../services/astoriadefaultservice/Order.java | 52 -
.../astoriadefaultservice/OrderLine.java | 56 -
.../astoriadefaultservice/PageView.java | 54 -
.../services/astoriadefaultservice/Person.java | 58 -
.../astoriadefaultservice/PersonMetadata.java | 52 -
.../services/astoriadefaultservice/Product.java | 54 -
.../astoriadefaultservice/ProductDetail.java | 52 -
.../astoriadefaultservice/ProductPhoto.java | 52 -
.../astoriadefaultservice/ProductReview.java | 52 -
.../astoriadefaultservice/RSAToken.java | 52 -
.../astoriadefaultservice/package-info.java | 20 -
.../astoriadefaultservice/types/Aliases.java | 59 -
.../types/AllSpatialCollectionTypes.java | 91 --
.../AllSpatialCollectionTypesCollection.java | 47 -
.../types/AllSpatialCollectionTypes_Simple.java | 206 ---
...SpatialCollectionTypes_SimpleCollection.java | 47 -
.../types/AllSpatialTypes.java | 459 ------
.../types/AllSpatialTypesCollection.java | 47 -
.../astoriadefaultservice/types/AuditInfo.java | 79 -
.../types/BackOrderLine.java | 68 -
.../types/BackOrderLine2.java | 68 -
.../types/BackOrderLine2Collection.java | 47 -
.../types/BackOrderLineCollection.java | 47 -
.../astoriadefaultservice/types/Car.java | 163 --
.../types/CarCollection.java | 47 -
.../types/ComplexToCategory.java | 79 -
.../types/ComplexWithAllPrimitiveTypes.java | 189 ---
.../astoriadefaultservice/types/Computer.java | 129 --
.../types/ComputerCollection.java | 47 -
.../types/ComputerDetail.java | 244 ---
.../types/ComputerDetailCollection.java | 47 -
.../types/ConcurrencyInfo.java | 69 -
.../types/ContactDetails.java | 109 --
.../astoriadefaultservice/types/Contractor.java | 160 --
.../types/ContractorCollection.java | 47 -
.../astoriadefaultservice/types/Customer.java | 279 ----
.../types/CustomerCollection.java | 47 -
.../types/CustomerInfo.java | 117 --
.../types/CustomerInfoCollection.java | 47 -
.../astoriadefaultservice/types/Dimensions.java | 79 -
.../types/DiscontinuedProduct.java | 160 --
.../types/DiscontinuedProductCollection.java | 47 -
.../astoriadefaultservice/types/Driver.java | 124 --
.../types/DriverCollection.java | 47 -
.../astoriadefaultservice/types/Employee.java | 150 --
.../types/EmployeeCollection.java | 51 -
.../astoriadefaultservice/types/LastLogin.java | 170 ---
.../types/LastLoginCollection.java | 47 -
.../astoriadefaultservice/types/License.java | 193 ---
.../types/LicenseCollection.java | 47 -
.../astoriadefaultservice/types/Login.java | 164 --
.../types/LoginCollection.java | 47 -
.../types/MappedEntityType.java | 528 -------
.../types/MappedEntityTypeCollection.java | 47 -
.../astoriadefaultservice/types/Message.java | 259 ----
.../types/MessageAttachment.java | 114 --
.../types/MessageAttachmentCollection.java | 47 -
.../types/MessageCollection.java | 47 -
.../astoriadefaultservice/types/MessageKey.java | 75 -
.../astoriadefaultservice/types/Order.java | 157 --
.../types/OrderCollection.java | 47 -
.../astoriadefaultservice/types/OrderLine.java | 203 ---
.../types/OrderLineCollection.java | 47 -
.../types/OrderLineKey.java | 75 -
.../astoriadefaultservice/types/PageView.java | 193 ---
.../types/PageViewCollection.java | 47 -
.../astoriadefaultservice/types/Person.java | 124 --
.../types/PersonCollection.java | 47 -
.../types/PersonMetadata.java | 170 ---
.../types/PersonMetadataCollection.java | 47 -
.../astoriadefaultservice/types/Phone.java | 69 -
.../astoriadefaultservice/types/Product.java | 273 ----
.../types/ProductCollection.java | 47 -
.../types/ProductDetail.java | 124 --
.../types/ProductDetailCollection.java | 47 -
.../types/ProductPageView.java | 114 --
.../types/ProductPageViewCollection.java | 47 -
.../types/ProductPhoto.java | 137 --
.../types/ProductPhotoCollection.java | 47 -
.../types/ProductPhotoKey.java | 75 -
.../types/ProductReview.java | 170 ---
.../types/ProductReviewCollection.java | 47 -
.../types/ProductReviewKey.java | 86 --
.../astoriadefaultservice/types/RSAToken.java | 124 --
.../types/RSATokenCollection.java | 47 -
.../types/SpecialEmployee.java | 147 --
.../types/SpecialEmployeeCollection.java | 47 -
.../types/package-info.java | 20 -
.../opentypesservice/DefaultContainer.java | 60 -
.../odata/services/opentypesservice/Row.java | 54 -
.../services/opentypesservice/RowIndex.java | 52 -
.../services/opentypesservice/package-info.java | 20 -
.../opentypesservice/types/ContactDetails.java | 169 --
.../opentypesservice/types/IndexedRow.java | 68 -
.../types/IndexedRowCollection.java | 47 -
.../services/opentypesservice/types/Row.java | 91 --
.../opentypesservice/types/RowCollection.java | 47 -
.../opentypesservice/types/RowIndex.java | 101 --
.../types/RowIndexCollection.java | 47 -
.../opentypesservice/types/package-info.java | 20 -
.../proxy/performance/BasicPerfTestITCase.java | 124 --
.../primitivekeysservice/EdmBinarySet.java | 52 -
.../primitivekeysservice/EdmBooleanSet.java | 52 -
.../primitivekeysservice/EdmByteSet.java | 52 -
.../EdmDateTimeOffsetSet.java | 52 -
.../primitivekeysservice/EdmDateTimeSet.java | 52 -
.../primitivekeysservice/EdmDecimalSet.java | 52 -
.../primitivekeysservice/EdmDoubleSet.java | 52 -
.../primitivekeysservice/EdmGuidSet.java | 52 -
.../primitivekeysservice/EdmInt16Set.java | 52 -
.../primitivekeysservice/EdmInt32Set.java | 52 -
.../primitivekeysservice/EdmInt64Set.java | 52 -
.../primitivekeysservice/EdmSingleSet.java | 52 -
.../primitivekeysservice/EdmStringSet.java | 52 -
.../primitivekeysservice/EdmTimeSet.java | 52 -
.../services/primitivekeysservice/Folders.java | 52 -
.../primitivekeysservice/TestContext.java | 86 --
.../primitivekeysservice/package-info.java | 20 -
.../primitivekeysservice/types/EdmBinary.java | 91 --
.../types/EdmBinaryCollection.java | 47 -
.../primitivekeysservice/types/EdmBoolean.java | 91 --
.../types/EdmBooleanCollection.java | 47 -
.../primitivekeysservice/types/EdmByte.java | 91 --
.../types/EdmByteCollection.java | 47 -
.../primitivekeysservice/types/EdmDateTime.java | 91 --
.../types/EdmDateTimeCollection.java | 47 -
.../types/EdmDateTimeOffset.java | 91 --
.../types/EdmDateTimeOffsetCollection.java | 47 -
.../primitivekeysservice/types/EdmDecimal.java | 91 --
.../types/EdmDecimalCollection.java | 47 -
.../primitivekeysservice/types/EdmDouble.java | 91 --
.../types/EdmDoubleCollection.java | 47 -
.../primitivekeysservice/types/EdmGuid.java | 91 --
.../types/EdmGuidCollection.java | 47 -
.../primitivekeysservice/types/EdmInt16.java | 91 --
.../types/EdmInt16Collection.java | 47 -
.../primitivekeysservice/types/EdmInt32.java | 91 --
.../types/EdmInt32Collection.java | 47 -
.../primitivekeysservice/types/EdmInt64.java | 91 --
.../types/EdmInt64Collection.java | 47 -
.../primitivekeysservice/types/EdmSingle.java | 91 --
.../types/EdmSingleCollection.java | 47 -
.../primitivekeysservice/types/EdmString.java | 91 --
.../types/EdmStringCollection.java | 47 -
.../primitivekeysservice/types/EdmTime.java | 91 --
.../types/EdmTimeCollection.java | 47 -
.../primitivekeysservice/types/Folder.java | 124 --
.../types/FolderCollection.java | 47 -
.../types/package-info.java | 20 -
...h.odatajclient.proxy.api.AbstractComplexType | 1 -
.../proxy/src/test/resources/northwind.xml | 577 -------
.../proxy/src/test/resources/odatademo.xml | 90 --
.../src/test/resources/simplelogger.properties | 20 -
.../proxy/src/test/resources/test.properties | 20 -
ODataJClient/src/main/resources/header.txt | 16 -
ODataJClient/test-service/pom.xml | 213 ---
.../testauthproxy/esigate/LinkRewrite.java | 54 -
.../esigate/LinkRewriteRenderer.java | 56 -
.../testservice/AbstractServices.java | 777 ----------
.../UnsupportedMediaTypeException.java | 41 -
.../odatajclient/testservice/V3Services.java | 38 -
.../odatajclient/testservice/V4Services.java | 38 -
.../odatajclient/testservice/methods/MERGE.java | 31 -
.../odatajclient/testservice/methods/PATCH.java | 32 -
.../testservice/utils/AbstractUtilities.java | 722 ---------
.../odatajclient/testservice/utils/Accept.java | 78 -
.../odatajclient/testservice/utils/Commons.java | 270 ----
.../testservice/utils/Constants.java | 102 --
.../testservice/utils/FSManager.java | 166 --
.../testservice/utils/JSONUtilities.java | 428 ------
.../testservice/utils/LinkInfo.java | 54 -
.../testservice/utils/MetadataLinkInfo.java | 175 ---
.../testservice/utils/NavigationLinks.java | 120 --
.../testservice/utils/ODataVersion.java | 35 -
.../utils/XHTTPMethodInterceptor.java | 43 -
.../utils/XMLEventReaderWrapper.java | 144 --
.../testservice/utils/XMLUtilities.java | 1190 ---------------
.../testservice/utils/XmlElement.java | 99 --
.../main/resources/META-INF/vfs-providers.xml | 27 -
.../test-service/src/main/resources/context.xml | 25 -
.../src/main/resources/esigate.properties | 26 -
.../org/esigate/rewrite-proxy.properties | 23 -
.../src/main/resources/tomcat-users.xml | 27 -
.../main/resources/v3/Car/14/entity.full.json | 13 -
.../src/main/resources/v3/Car/14/entity.xml | 39 -
.../main/resources/v3/Car/16/entity.full.json | 14 -
.../src/main/resources/v3/Car/16/entity.xml | 45 -
.../src/main/resources/v3/Car/feed.full.json | 297 ----
.../src/main/resources/v3/Car/feed.xml | 459 ------
.../v3/Car/filter/((1 add VIN) eq 16).full.json | 1 -
.../v3/Car/filter/((1 add VIN) eq 16).xml | 45 -
.../v3/Car/filter/((VIN add 1) eq 16).full.json | 1 -
.../v3/Car/filter/((VIN add 1) eq 16).xml | 45 -
.../((VIN lt 16) and (VIN gt 12)).full.json | 1 -
.../filter/((VIN lt 16) and (VIN gt 12)).xml | 81 -
.../v3/Car/filter/(16 eq (1 add VIN)).full.json | 1 -
.../v3/Car/filter/(16 eq (1 add VIN)).xml | 45 -
.../v3/Car/filter/(VIN lt 16).full.json | 1 -
.../resources/v3/Car/filter/(VIN lt 16).xml | 117 --
...ngth(Description) gt (VIN add 10)).full.json | 1 -
.../(length(Description) gt (VIN add 10)).xml | 117 --
.../v3/Car/filter/VIN add 5 lt 11.full.json | 1 -
.../resources/v3/Car/filter/VIN add 5 lt 11.xml | 41 -
.../v3/Car/filter/VIN div 2 le 8.full.json | 1 -
.../resources/v3/Car/filter/VIN div 2 le 8.xml | 41 -
.../filter/VIN le 18 and VIN gt 12.full.json | 1 -
.../v3/Car/filter/VIN le 18 and VIN gt 12.xml | 41 -
.../v3/Car/filter/VIN mul 2 le 30.full.json | 1 -
.../resources/v3/Car/filter/VIN mul 2 le 30.xml | 41 -
...not (((VIN ge 16) or (VIN le 12))).full.json | 1 -
.../not (((VIN ge 16) or (VIN le 12))).xml | 81 -
.../startswith(Description,'cen').full.json | 1 -
.../filter/startswith(Description,'cen').xml | 45 -
.../VIN desc/filter/(VIN lt 16).full.json | 9 -
.../Car/orderby/VIN desc/filter/(VIN lt 16).xml | 117 --
.../v3/ComputerDetail/-10/entity.full.json | 23 -
.../resources/v3/ComputerDetail/-10/entity.xml | 44 -
.../(month(PurchaseDate) eq 12).full.json | 1 -
.../filter/(month(PurchaseDate) eq 12).xml | 64 -
.../filter/day(PurchaseDate) eq 15.full.json | 1 -
.../filter/day(PurchaseDate) eq 15.xml | 41 -
.../filter/hour(PurchaseDate) eq 1.full.json | 1 -
.../filter/hour(PurchaseDate) eq 1.xml | 41 -
.../filter/minute(PurchaseDate) eq 33.full.json | 1 -
.../filter/minute(PurchaseDate) eq 33.xml | 41 -
.../filter/month(PurchaseDate) eq 12.full.json | 1 -
.../filter/month(PurchaseDate) eq 12.xml | 41 -
.../filter/second(PurchaseDate) eq 35.full.json | 1 -
.../filter/second(PurchaseDate) eq 35.xml | 41 -
.../filter/year(PurchaseDate) eq 2020.full.json | 1 -
.../filter/year(PurchaseDate) eq 2020.xml | 41 -
.../resources/v3/Customer/-10/entity.full.json | 673 --------
.../main/resources/v3/Customer/-10/entity.xml | 516 -------
.../v3/Customer/-10/links/Info.full.json | 4 -
.../resources/v3/Customer/-10/links/Info.xml | 22 -
.../v3/Customer/-10/links/Logins('3').full.json | 4 -
.../v3/Customer/-10/links/Logins.full.json | 12 -
.../resources/v3/Customer/-10/links/Logins.xml | 25 -
.../v3/Customer/-10/links/Orders(-10).full.json | 4 -
.../v3/Customer/-10/links/Orders.full.json | 13 -
.../resources/v3/Customer/-10/links/Orders.xml | 26 -
.../main/resources/v3/Customer/-7/entity.xml | 381 -----
.../main/resources/v3/Customer/feed.full.json | 893 -----------
.../src/main/resources/v3/Customer/feed.xml | 704 ---------
....PhoneNumber,'ODataJClient') eq 1).full.json | 1 -
...ePhone.PhoneNumber,'ODataJClient') eq 1).xml | 30 -
...ne.PhoneNumber,'lccvussrv') ne -1).full.json | 1 -
...omePhone.PhoneNumber,'lccvussrv') ne -1).xml | 600 --------
.../Customer/filter/CustomerId eq -10.full.json | 678 --------
.../v3/Customer/filter/CustomerId eq -10.xml | 522 -------
.../Customer/filter/CustomerId gt -10.full.json | 1 -
.../v3/Customer/filter/CustomerId gt -10.xml | 740 ---------
.../Customer/filter/CustomerId lt -10.full.json | 1 -
.../v3/Customer/filter/CustomerId lt -10.xml | 30 -
.../isof(Name,'Edm.String') eq true.full.json | 1 -
.../filter/isof(Name,'Edm.String') eq true.xml | 1085 -------------
.../not endswith(Name,'Chandan').full.json | 1 -
.../filter/not endswith(Name,'Chandan').xml | 1065 -------------
.../v3/Customer/skiptoken/-1.full.json | 6 -
.../main/resources/v3/Customer/skiptoken/-1.xml | 30 -
.../v3/Customer/skiptoken/-10.full.json | 978 ------------
.../resources/v3/Customer/skiptoken/-10.xml | 953 ------------
.../v3/Customer/skiptoken/-3.full.json | 776 ----------
.../main/resources/v3/Customer/skiptoken/-3.xml | 613 --------
.../v3/Customer/skiptoken/-5.full.json | 1444 ------------------
.../main/resources/v3/Customer/skiptoken/-5.xml | 1104 -------------
.../v3/Customer/skiptoken/-7.full.json | 1296 ----------------
.../main/resources/v3/Customer/skiptoken/-7.xml | 990 ------------
.../v3/Customer/skiptoken/-9.full.json | 715 ---------
.../main/resources/v3/Customer/skiptoken/-9.xml | 559 -------
.../v3/CustomerInfo/11/entity.full.json | 11 -
.../resources/v3/CustomerInfo/11/entity.xml | 37 -
.../v3/CustomerInfo/12/entity.full.json | 11 -
.../resources/v3/CustomerInfo/12/entity.xml | 37 -
.../v3/EdmBooleanSet/true/entity.full.json | 1 -
.../resources/v3/EdmBooleanSet/true/entity.xml | 36 -
.../v3/EdmByteSet/255/entity.full.json | 1 -
.../main/resources/v3/EdmByteSet/255/entity.xml | 36 -
.../entity.full.json | 1 -
.../79228162514264337593543950335M/entity.xml | 36 -
.../1.7976931348623157E308D/entity.full.json | 1 -
.../1.7976931348623157E308D/entity.xml | 36 -
.../entity.full.json | 1 -
.../entity.xml | 36 -
.../v3/EdmInt16Set/32767/entity.full.json | 1 -
.../resources/v3/EdmInt16Set/32767/entity.xml | 36 -
.../v3/EdmInt32Set/-2147483648/entity.full.json | 1 -
.../v3/EdmInt32Set/-2147483648/entity.xml | 36 -
.../9223372036854775807L/entity.full.json | 1 -
.../EdmInt64Set/9223372036854775807L/entity.xml | 36 -
.../EdmSingleSet/3.4028235E38f/entity.full.json | 1 -
.../v3/EdmSingleSet/3.4028235E38f/entity.xml | 36 -
.../v3/EdmStringSet/'$'/entity.full.json | 1 -
.../resources/v3/EdmStringSet/'$'/entity.xml | 36 -
.../entity.full.json | 1 -
.../entity.xml | 36 -
.../v3/InStreamErrorGetCustomer.full.json | 1 -
.../resources/v3/InStreamErrorGetCustomer.xml | 525 -------
.../resources/v3/Login/'3'/entity.full.json | 13 -
.../src/main/resources/v3/Login/'3'/entity.xml | 42 -
.../resources/v3/Message/1 -10/entity.full.json | 17 -
.../main/resources/v3/Message/1 -10/entity.xml | 46 -
.../resources/v3/Order/-10/entity.full.json | 11 -
.../src/main/resources/v3/Order/-10/entity.xml | 40 -
.../main/resources/v3/Order/-7/entity.full.json | 17 -
.../src/main/resources/v3/Order/-7/entity.xml | 43 -
.../main/resources/v3/Order/-9/entity.full.json | 17 -
.../src/main/resources/v3/Order/-9/entity.xml | 43 -
.../v3/OrderLine/-10 -10/entity.full.json | 14 -
.../resources/v3/OrderLine/-10 -10/entity.xml | 42 -
.../resources/v3/OrderLine/-10 -10/etag.txt | 1 -
.../filter/PersonId sub 2 lt -10.full.json | 1 -
.../v3/Person/filter/PersonId sub 2 lt -10.xml | 79 -
...iaDefaultService.SpecialEmployee').full.json | 1 -
....AstoriaDefaultService.SpecialEmployee').xml | 131 --
.../resources/v3/Product/-10/entity.full.json | 51 -
.../main/resources/v3/Product/-10/entity.xml | 61 -
.../src/main/resources/v3/Product/-10/etag.txt | 1 -
.../resources/v3/Product/-6/entity.full.json | 51 -
.../src/main/resources/v3/Product/-6/entity.xml | 61 -
.../src/main/resources/v3/Product/-6/etag.txt | 1 -
.../resources/v3/Product/-7/entity.full.json | 51 -
.../src/main/resources/v3/Product/-7/entity.xml | 61 -
.../src/main/resources/v3/Product/-7/etag.txt | 1 -
.../v3/Product/-7/links/Photos.full.json | 12 -
.../resources/v3/Product/-9/entity.full.json | 60 -
.../src/main/resources/v3/Product/-9/entity.xml | 68 -
.../src/main/resources/v3/Product/-9/etag.txt | 1 -
.../main/resources/v3/Product/feed.full.json | 452 ------
.../src/main/resources/v3/Product/feed.xml | 410 -----
.../ceiling(Dimensions.Width) eq 7338.full.json | 1 -
.../ceiling(Dimensions.Width) eq 7338.xml | 68 -
...', newname') eq 'kdcuklu, newname'.full.json | 1 -
...tion, ', newname') eq 'kdcuklu, newname'.xml | 74 -
.../floor(Dimensions.Width) eq 7337.full.json | 1 -
.../filter/floor(Dimensions.Width) eq 7337.xml | 68 -
.../indexof(Description, 'k') eq 0.full.json | 1 -
.../filter/indexof(Description, 'k') eq 0.xml | 117 --
.../filter/length(Description) eq 7.full.json | 1 -
.../Product/filter/length(Description) eq 7.xml | 74 -
.../round(Dimensions.Width) eq 7338.full.json | 1 -
.../filter/round(Dimensions.Width) eq 7338.xml | 68 -
...artswith(Description, 'k') eq true.full.json | 1 -
.../startswith(Description, 'k') eq true.xml | 117 --
...of('kdcuklu', Description) eq true.full.json | 1 -
...stringof('kdcuklu', Description) eq true.xml | 74 -
.../toupper(Description) eq 'KDCUKLU'.full.json | 1 -
.../toupper(Description) eq 'KDCUKLU'.xml | 74 -
.../v3/ProductPhoto/-2 -2/entity.full.json | 10 -
.../resources/v3/ProductPhoto/-2 -2/entity.xml | 39 -
.../v3/ProductPhoto/-3 -3/entity.full.json | 10 -
.../resources/v3/ProductPhoto/-3 -3/entity.xml | 38 -
.../src/main/resources/v3/badRequest.json | 17 -
.../src/main/resources/v3/badRequest.xml | 30 -
.../src/main/resources/v3/largeMetadata.xml | 42 -
.../src/main/resources/v3/metadata.xml | 719 ---------
.../src/main/resources/v3/notFound.json | 11 -
.../src/main/resources/v3/notFound.xml | 25 -
.../src/main/resources/v3/services.full.json | 102 --
.../src/main/resources/v3/services.xml | 98 --
.../main/resources/v3/unsupportedMediaType.json | 17 -
.../main/resources/v3/unsupportedMediaType.xml | 34 -
.../src/main/resources/v4/metadata.xml | 519 -------
.../main/webapp/WEB-INF/applicationContext.xml | 50 -
.../src/main/webapp/WEB-INF/web.xml | 75 -
1140 files changed, 116815 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/.gitignore
----------------------------------------------------------------------
diff --git a/ODataJClient/.gitignore b/ODataJClient/.gitignore
deleted file mode 100644
index 167b83e..0000000
--- a/ODataJClient/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-target/
-yworks-uml-doclet-3.0_02-jdk1.5/
-*/nb-configuration.xml
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/LICENSE
----------------------------------------------------------------------
diff --git a/ODataJClient/LICENSE b/ODataJClient/LICENSE
deleted file mode 100644
index 261eeb9..0000000
--- a/ODataJClient/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine-xml/pom.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine-xml/pom.xml b/ODataJClient/engine-xml/pom.xml
deleted file mode 100644
index bfacaba..0000000
--- a/ODataJClient/engine-xml/pom.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- </parent>
-
- <name>Client OData library for Java: Engine XML parser</name>
- <description>Java client API for OData 3.0 services: Engine XML parser</description>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-engine-xml</artifactId>
- <packaging>jar</packaging>
-
- <properties>
- <main.basedir>${project.parent.basedir}</main.basedir>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-xml</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml</groupId>
- <artifactId>aalto-xml</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>jarjar-maven-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>jarjar</goal>
- </goals>
- <configuration>
- <includes>
- <include>javax.xml.stream:stax-api</include>
- <include>org.codehaus.woodstox:stax2-api</include>
- <include>com.fasterxml.jackson.dataformat:jackson-dataformat-xml</include>
- <include>com.fasterxml:aalto-xml</include>
- </includes>
- <rules>
- <rule>
- <pattern>javax.xml.stream.**</pattern>
- <result>com.msopentech.javax.xml.stream.@1</result>
- </rule>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
-
- <resources>
- <resource>
- <directory>..</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE</include>
- </includes>
- </resource>
- </resources>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/.gitignore
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/.gitignore b/ODataJClient/engine/.gitignore
deleted file mode 100644
index aae758d..0000000
--- a/ODataJClient/engine/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-nb-configuration.xml
-nbactions-debugTest.xml
[33/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/URIUtils.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/URIUtils.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/URIUtils.java
deleted file mode 100644
index 3374893..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/URIUtils.java
+++ /dev/null
@@ -1,194 +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 com.msopentech.odatajclient.engine.utils;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntityContainer;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractFunctionImport;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.net.URLEncoder;
-import java.text.DecimalFormat;
-import java.util.UUID;
-import org.apache.commons.codec.binary.Hex;
-import org.apache.commons.io.IOUtils;
-import org.apache.http.entity.InputStreamEntity;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * URI utilities.
- */
-public final class URIUtils {
-
- /**
- * Logger.
- */
- private static final Logger LOG = LoggerFactory.getLogger(URIUtils.class);
-
- private URIUtils() {
- // Empty private constructor for static utility classes
- }
-
- /**
- * Build URI starting from the given base and href.
- * <br/>
- * If href is absolute or base is null then base will be ignored.
- *
- * @param base URI prefix.
- * @param href URI suffix.
- * @return built URI.
- */
- public static URI getURI(final String base, final String href) {
- if (href == null) {
- throw new IllegalArgumentException("Null link provided");
- }
-
- URI uri = URI.create(href);
-
- if (!uri.isAbsolute() && base != null) {
- uri = URI.create(base + "/" + href);
- }
-
- return uri.normalize();
- }
-
- /**
- * Build URI starting from the given base and href.
- * <br/>
- * If href is absolute or base is null then base will be ignored.
- *
- * @param base URI prefix.
- * @param href URI suffix.
- * @return built URI.
- */
- public static URI getURI(final URI base, final URI href) {
- if (href == null) {
- throw new IllegalArgumentException("Null link provided");
- }
- return getURI(base, href.toASCIIString());
- }
-
- /**
- * Build URI starting from the given base and href.
- * <br/>
- * If href is absolute or base is null then base will be ignored.
- *
- * @param base URI prefix.
- * @param href URI suffix.
- * @return built URI.
- */
- public static URI getURI(final URI base, final String href) {
- if (href == null) {
- throw new IllegalArgumentException("Null link provided");
- }
-
- URI uri = URI.create(href);
-
- if (!uri.isAbsolute() && base != null) {
- uri = URI.create(base.toASCIIString() + "/" + href);
- }
-
- return uri.normalize();
- }
-
- /**
- * Gets function import URI segment.
- *
- * @param entityContainer entity container.
- * @param functionImport function import.
- * @return URI segment.
- */
- public static String rootFunctionImportURISegment(
- final AbstractEntityContainer entityContainer, final AbstractFunctionImport functionImport) {
-
- final StringBuilder result = new StringBuilder();
- if (!entityContainer.isDefaultEntityContainer()) {
- result.append(entityContainer.getName()).append('.');
- }
- result.append(functionImport.getName());
-
- return result.toString();
- }
-
- /**
- * Turns primitive values into their respective URI representation.
- *
- * @param obj primitive value
- * @return URI representation
- */
- public static String escape(final Object obj) {
- String value;
-
- try {
- value = (obj instanceof UUID)
- ? "guid'" + obj.toString() + "'"
- : (obj instanceof byte[])
- ? "X'" + Hex.encodeHexString((byte[]) obj) + "'"
- : ((obj instanceof ODataTimestamp) && ((ODataTimestamp) obj).getTimezone() == null)
- ? "datetime'" + URLEncoder.encode(((ODataTimestamp) obj).toString(), ODataConstants.UTF8) + "'"
- : ((obj instanceof ODataTimestamp) && ((ODataTimestamp) obj).getTimezone() != null)
- ? "datetimeoffset'" + URLEncoder.encode(((ODataTimestamp) obj).toString(), ODataConstants.UTF8)
- + "'"
- : (obj instanceof ODataDuration)
- ? "time'" + ((ODataDuration) obj).toString() + "'"
- : (obj instanceof BigDecimal)
- ? new DecimalFormat(EdmSimpleType.Decimal.pattern()).format((BigDecimal) obj) + "M"
- : (obj instanceof Double)
- ? new DecimalFormat(EdmSimpleType.Double.pattern()).format((Double) obj) + "D"
- : (obj instanceof Float)
- ? new DecimalFormat(EdmSimpleType.Single.pattern()).format((Float) obj) + "f"
- : (obj instanceof Long)
- ? ((Long) obj).toString() + "L"
- : (obj instanceof String)
- ? "'" + URLEncoder.encode((String) obj, ODataConstants.UTF8) + "'"
- : obj.toString();
- } catch (Exception e) {
- LOG.warn("While generating key segment for '{}', using toString()", obj, e);
- value = obj.toString();
- }
-
- return value;
- }
-
- public static InputStreamEntity buildInputStreamEntity(final ODataClient client, final InputStream input) {
- InputStreamEntity entity;
- if (client.getConfiguration().isUseChuncked()) {
- entity = new InputStreamEntity(input, -1);
- } else {
- byte[] bytes = new byte[0];
- try {
- bytes = IOUtils.toByteArray(input);
- } catch (IOException e) {
- LOG.error("While reading input for not chunked encoding", e);
- }
-
- entity = new InputStreamEntity(new ByteArrayInputStream(bytes), bytes.length);
- }
- entity.setChunked(client.getConfiguration().isUseChuncked());
-
- return entity;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/Wrapper.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/Wrapper.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/Wrapper.java
deleted file mode 100644
index 455f853..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/Wrapper.java
+++ /dev/null
@@ -1,41 +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 com.msopentech.odatajclient.engine.utils;
-
-/**
- * Generic wrapper class.
- *
- * @param <T>
- */
-public class Wrapper<T> {
-
- private T wrapped;
-
- public void setWrapped(final T wrapped) {
- this.wrapped = wrapped;
- }
-
- public T getWrapped() {
- if (wrapped == null) {
- throw new IllegalStateException("Wrapped object not set");
- }
-
- return wrapped;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/XMLUtils.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/XMLUtils.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/XMLUtils.java
deleted file mode 100644
index 473a5ed..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/XMLUtils.java
+++ /dev/null
@@ -1,185 +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 com.msopentech.odatajclient.engine.utils;
-
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ServiceLoader;
-import javax.xml.parsers.DocumentBuilderFactory;
-import org.apache.commons.lang3.StringUtils;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * XML utilities.
- */
-public final class XMLUtils {
-
- /**
- * DOM factory.
- */
- public static final DocumentBuilderFactory DOC_BUILDER_FACTORY = DocumentBuilderFactory.newInstance();
-
- public static final AbstractDOMParser PARSER;
-
- static {
- final Iterator<AbstractDOMParser> itor =
- ServiceLoader.load(AbstractDOMParser.class, Thread.currentThread().getContextClassLoader()).iterator();
- PARSER = itor.hasNext() ? itor.next() : new DefaultDOMParserImpl();
- }
-
- private XMLUtils() {
- // Empty private constructor for static utility classes
- }
-
- /**
- * Gets XML node name.
- *
- * @param node node.
- * @return node name.
- */
- public static String getSimpleName(final Node node) {
- return node.getLocalName() == null
- ? node.getNodeName().substring(node.getNodeName().indexOf(':') + 1)
- : node.getLocalName();
- }
-
- /**
- * Gets the given node's children of the given type.
- *
- * @param node parent.
- * @param nodetype searched child type.
- * @return children.
- */
- public static List<Node> getChildNodes(final Node node, final short nodetype) {
- final List<Node> result = new ArrayList<Node>();
-
- final NodeList children = node.getChildNodes();
- for (int i = 0; i < children.getLength(); i++) {
- final Node child = children.item(i);
- if (child.getNodeType() == nodetype) {
- result.add(child);
- }
- }
-
- return result;
- }
-
- /**
- * Gets the given node's children with the given name.
- *
- * @param node parent.
- * @param name searched child name.
- * @return children.
- */
- public static List<Element> getChildElements(final Element node, final String name) {
- final List<Element> result = new ArrayList<Element>();
-
- if (StringUtils.isNotBlank(name)) {
- final NodeList children = node.getChildNodes();
- for (int i = 0; i < children.getLength(); i++) {
- final Node child = children.item(i);
- if ((child instanceof Element) && name.equals(child.getNodeName())) {
- result.add((Element) child);
- }
- }
- }
-
- return result;
- }
-
- /**
- * Checks if the given node has <tt>element</tt> children.
- *
- * @param node parent.
- * @return 'TRUE' if the given node has at least one <tt>element</tt> child; 'FALSE' otherwise.
- */
- public static boolean hasElementsChildNode(final Node node) {
- boolean found = false;
-
- for (Node child : getChildNodes(node, Node.ELEMENT_NODE)) {
- if (ODataConstants.ELEM_ELEMENT.equals(XMLUtils.getSimpleName(child))) {
- found = true;
- }
- }
-
- return found;
- }
-
- /**
- * Checks if the given node has only text children.
- *
- * @param node parent.
- * @return 'TRUE' if the given node has only text children; 'FALSE' otherwise.
- */
- public static boolean hasOnlyTextChildNodes(final Node node) {
- boolean result = true;
- final NodeList children = node.getChildNodes();
- for (int i = 0; result && i < children.getLength(); i++) {
- final Node child = children.item(i);
- if (child.getNodeType() != Node.TEXT_NODE) {
- result = false;
- }
- }
-
- return result;
- }
-
- public static EdmSimpleType simpleTypeForNode(final Geospatial.Dimension dimension, final Node node) {
- EdmSimpleType type = null;
-
- if (ODataConstants.ELEM_POINT.equals(node.getNodeName())) {
- type = dimension == Geospatial.Dimension.GEOGRAPHY
- ? EdmSimpleType.GeographyPoint
- : EdmSimpleType.GeometryPoint;
- } else if (ODataConstants.ELEM_MULTIPOINT.equals(node.getNodeName())) {
- type = dimension == Geospatial.Dimension.GEOGRAPHY
- ? EdmSimpleType.GeographyMultiPoint
- : EdmSimpleType.GeometryMultiPoint;
- } else if (ODataConstants.ELEM_LINESTRING.equals(node.getNodeName())) {
- type = dimension == Geospatial.Dimension.GEOGRAPHY
- ? EdmSimpleType.GeographyLineString
- : EdmSimpleType.GeometryLineString;
- } else if (ODataConstants.ELEM_MULTILINESTRING.equals(node.getNodeName())) {
- type = dimension == Geospatial.Dimension.GEOGRAPHY
- ? EdmSimpleType.GeographyMultiLineString
- : EdmSimpleType.GeometryMultiLineString;
- } else if (ODataConstants.ELEM_POLYGON.equals(node.getNodeName())) {
- type = dimension == Geospatial.Dimension.GEOGRAPHY
- ? EdmSimpleType.GeographyPolygon
- : EdmSimpleType.GeometryPolygon;
- } else if (ODataConstants.ELEM_MULTIPOLYGON.equals(node.getNodeName())) {
- type = dimension == Geospatial.Dimension.GEOGRAPHY
- ? EdmSimpleType.GeographyMultiPolygon
- : EdmSimpleType.GeometryMultiPolygon;
- } else if (ODataConstants.ELEM_GEOCOLLECTION.equals(node.getNodeName())
- || ODataConstants.ELEM_GEOMEMBERS.equals(node.getNodeName())) {
-
- type = dimension == Geospatial.Dimension.GEOGRAPHY
- ? EdmSimpleType.GeographyCollection
- : EdmSimpleType.GeometryCollection;
- }
-
- return type;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/AbstractPrimitiveTest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/AbstractPrimitiveTest.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/AbstractPrimitiveTest.java
deleted file mode 100644
index 18ec67b..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/AbstractPrimitiveTest.java
+++ /dev/null
@@ -1,405 +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 com.msopentech.odatajclient.engine;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.data.ODataObjectFactory;
-import com.msopentech.odatajclient.engine.data.ODataGeospatialValue;
-import com.msopentech.odatajclient.engine.data.ODataPrimitiveValue;
-import com.msopentech.odatajclient.engine.data.ODataProperty;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial.Dimension;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import com.msopentech.odatajclient.engine.utils.ODataConstants;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-import java.io.File;
-import java.io.InputStream;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.UUID;
-import org.apache.commons.codec.binary.Base64;
-
-public abstract class AbstractPrimitiveTest extends AbstractTest {
-
- protected abstract ODataFormat getFormat();
-
- protected abstract ODataClient getClient();
-
- protected ODataVersion getVersion() {
- return getClient().getWorkingVersion();
- }
-
- protected String getFilename(final String entity, final String propertyName) {
- return getVersion().name().toLowerCase()
- + File.separatorChar
- + entity.replace('(', '_').replace(")", "")
- + "_" + propertyName.replaceAll("/", "_") + "." + getSuffix(getFormat());
- }
-
- protected ODataPrimitiveValue writePrimitiveValue(final ODataPrimitiveValue value) {
- final ODataPrimitiveValue newValue;
- if (EdmSimpleType.isGeospatial(value.getTypeName())) {
- newValue = getClient().getGeospatialValueBuilder().
- setType(EdmSimpleType.fromValue(value.getTypeName())).
- setTree(((ODataGeospatialValue) value).toTree()).build();
- } else {
- newValue = getClient().getPrimitiveValueBuilder().
- setType(EdmSimpleType.fromValue(value.getTypeName())).
- setValue(value.toValue()).build();
- }
-
- final InputStream written = getClient().getWriter().writeProperty(
- getClient().getObjectFactory().newPrimitiveProperty(ODataConstants.ELEM_PROPERTY, newValue),
- getFormat());
- return readPrimitiveValue(written);
- }
-
- protected ODataPrimitiveValue readPrimitiveValue(final InputStream input) {
- final ODataProperty property = getClient().getReader().readProperty(input, getFormat());
- assertNotNull(property);
- assertTrue(property.hasPrimitiveValue());
- assertNotNull(property.getPrimitiveValue());
-
- return property.getPrimitiveValue();
- }
-
- protected ODataPrimitiveValue readPrimitiveValue(final String entity, final String propertyName) {
- final ODataPrimitiveValue value =
- readPrimitiveValue(getClass().getResourceAsStream(getFilename(entity, propertyName)));
-
- if (EdmSimpleType.isGeospatial(value.getTypeName())) {
- assertEquals(value.toValue(), writePrimitiveValue(value).toValue());
- } else {
- assertEquals(value.toString(), writePrimitiveValue(value).toString());
- }
-
- return value;
- }
-
- protected void int32(final String entity, final String propertyName, final int check) {
- final ODataPrimitiveValue opv = readPrimitiveValue(entity, propertyName);
- assertEquals(EdmSimpleType.Int32.toString(), opv.getTypeName());
-
- final Integer value = opv.<Integer>toCastValue();
- assertNotNull(value);
- assertTrue(check == value);
- }
-
- protected void string(final String entity, final String propertyName, final String check) {
- final ODataPrimitiveValue opv = readPrimitiveValue(entity, propertyName);
- assertEquals(EdmSimpleType.String.toString(), opv.getTypeName());
-
- final String value = opv.<String>toCastValue();
- assertNotNull(value);
- assertEquals(check, value);
-
- assertEquals(opv, writePrimitiveValue(opv));
- }
-
- protected void decimal(final String entity, final String propertyName, final BigDecimal check) {
- final ODataPrimitiveValue opv = readPrimitiveValue(entity, propertyName);
- assertEquals(EdmSimpleType.Decimal.toString(), opv.getTypeName());
-
- final BigDecimal value = opv.<BigDecimal>toCastValue();
- assertNotNull(value);
- assertTrue(check.equals(value));
- }
-
- protected void datetime(final String entity, final String propertyName, final String check) {
- final ODataPrimitiveValue opv = readPrimitiveValue(entity, propertyName);
- assertEquals(EdmSimpleType.DateTime.toString(), opv.getTypeName());
-
- final ODataTimestamp value = opv.<ODataTimestamp>toCastValue();
- assertNotNull(value);
- assertEquals(check, opv.toString());
- }
-
- protected void guid(final String entity, final String propertyName, final String check) {
- final ODataPrimitiveValue opv = readPrimitiveValue(entity, propertyName);
- assertEquals(EdmSimpleType.Guid.toString(), opv.getTypeName());
-
- final UUID value = opv.<UUID>toCastValue();
- assertNotNull(value);
- assertEquals(check, opv.toString());
- }
-
- protected void binary(final String entity, final String propertyName) {
- final ODataPrimitiveValue opv = readPrimitiveValue(entity, propertyName);
- assertEquals(EdmSimpleType.Binary.toString(), opv.getTypeName());
-
- final byte[] value = opv.<byte[]>toCastValue();
- assertNotNull(value);
- assertTrue(value.length > 0);
- assertTrue(Base64.isBase64(opv.toString()));
- }
-
- private void checkPoint(final Point point, final Point check) {
- assertEquals(check.getX(), point.getX(), 0);
- assertEquals(check.getY(), point.getY(), 0);
- assertEquals(check.getZ(), point.getZ(), 0);
- }
-
- protected void point(
- final String entity,
- final String propertyName,
- final Point expectedValues,
- final EdmSimpleType expectedType,
- final Dimension expectedDimension) {
-
- final ODataPrimitiveValue opv = readPrimitiveValue(entity, propertyName);
- assertEquals(expectedType.toString(), opv.getTypeName());
-
- final Point point = opv.<Point>toCastValue();
- assertNotNull(point);
- assertEquals(expectedDimension, point.getDimension());
-
- checkPoint(point, expectedValues);
- }
-
- private void checkLine(final LineString line, final List<Point> check) {
- final List<Point> points = new ArrayList<Point>();
-
- for (Point point : line) {
- points.add(point);
- }
-
- assertEquals(check.size(), points.size());
-
- for (int i = 0; i < points.size(); i++) {
- checkPoint(points.get(i), check.get(i));
- }
- }
-
- protected void lineString(
- final String entity,
- final String propertyName,
- final List<Point> check,
- final EdmSimpleType expectedType,
- final Dimension expectedDimension) {
-
- final ODataPrimitiveValue opv = readPrimitiveValue(entity, propertyName);
- assertEquals(expectedType.toString(), opv.getTypeName());
-
- final LineString lineString = opv.<LineString>toCastValue();
- assertNotNull(lineString);
- assertEquals(expectedDimension, lineString.getDimension());
-
- checkLine(lineString, check);
- }
-
- protected void multiPoint(
- final String entity,
- final String propertyName,
- final List<Point> check,
- final EdmSimpleType expectedType,
- final Dimension expectedDimension) {
-
- final ODataPrimitiveValue opv = readPrimitiveValue(entity, propertyName);
- assertEquals(expectedType.toString(), opv.getTypeName());
-
- final MultiPoint multiPoint = opv.<MultiPoint>toCastValue();
- assertNotNull(multiPoint);
- assertEquals(expectedDimension, multiPoint.getDimension());
-
- final List<Point> points = new ArrayList<Point>();
-
- for (Point point : multiPoint) {
- points.add(point);
- }
-
- assertEquals(check.size(), points.size());
-
- for (int i = 0; i < points.size(); i++) {
- checkPoint(points.get(i), check.get(i));
- }
- }
-
- protected void multiLine(
- final String entity,
- final String propertyName,
- final List<List<Point>> check,
- final EdmSimpleType expectedType,
- final Dimension expectedDimension) {
-
- final ODataPrimitiveValue opv = readPrimitiveValue(entity, propertyName);
- assertEquals(expectedType.toString(), opv.getTypeName());
-
- final MultiLineString multiLine = opv.<MultiLineString>toCastValue();
- assertNotNull(multiLine);
- assertEquals(expectedDimension, multiLine.getDimension());
-
- final List<LineString> lines = new ArrayList<LineString>();
-
- int i = 0;
- for (LineString line : multiLine) {
- checkLine(line, check.get(i));
- i++;
- }
- }
-
- private void checkPoligon(
- final Polygon polygon,
- final List<Point> checkInterior,
- final List<Point> checkExterior) {
-
- final List<Point> points = new ArrayList<Point>();
-
- for (Point point : polygon.getInterior()) {
- points.add(point);
- }
-
- assertEquals(checkInterior.size(), points.size());
-
- for (int i = 0; i < points.size(); i++) {
- checkPoint(checkInterior.get(i), points.get(i));
- }
-
- points.clear();
-
- for (Point point : polygon.getExterior()) {
- points.add(point);
- }
-
- assertEquals(checkExterior.size(), points.size());
-
- for (int i = 0; i < points.size(); i++) {
- checkPoint(checkExterior.get(i), points.get(i));
- }
-
- }
-
- protected void polygon(
- final String entity,
- final String propertyName,
- final List<Point> checkInterior,
- final List<Point> checkExterior,
- final EdmSimpleType expectedType,
- final Dimension expectedDimension) {
-
- final ODataPrimitiveValue opv = readPrimitiveValue(entity, propertyName);
- assertEquals(expectedType.toString(), opv.getTypeName());
-
- final Polygon polygon = opv.<Polygon>toCastValue();
-
- assertNotNull(polygon);
- assertEquals(expectedDimension, polygon.getDimension());
-
- checkPoligon(polygon, checkInterior, checkExterior);
-
- }
-
- protected void multiPolygon(
- final String entity,
- final String propertyName,
- final List<List<Point>> checkInterior,
- final List<List<Point>> checkExterior,
- final EdmSimpleType expectedType,
- final Dimension expectedDimension) {
-
- final ODataPrimitiveValue opv = readPrimitiveValue(entity, propertyName);
- assertEquals(expectedType.toString(), opv.getTypeName());
-
- final MultiPolygon multiPolygon = opv.<MultiPolygon>toCastValue();
- assertNotNull(multiPolygon);
- assertEquals(expectedDimension, multiPolygon.getDimension());
-
- int i = 0;
- for (Polygon polygon : multiPolygon) {
- checkPoligon(
- polygon,
- checkInterior.isEmpty() ? Collections.<Point>emptyList() : checkInterior.get(i),
- checkExterior.isEmpty() ? Collections.<Point>emptyList() : checkExterior.get(i));
- i++;
- }
- }
-
- protected void geomCollection(
- final String entity,
- final String propertyName,
- final EdmSimpleType expectedType,
- final Dimension expectedDimension) {
-
- final ODataPrimitiveValue opv = readPrimitiveValue(entity, propertyName);
- assertEquals(expectedType.toString(), opv.getTypeName());
-
- final GeospatialCollection collection = opv.<GeospatialCollection>toCastValue();
- assertNotNull(collection);
- assertEquals(expectedDimension, collection.getDimension());
-
- final Iterator<Geospatial> itor = collection.iterator();
- int count = 0;
- while (itor.hasNext()) {
- count++;
-
- final Geospatial geospatial = itor.next();
- if (count == 1) {
- assertTrue(geospatial instanceof Point);
- }
- if (count == 2) {
- assertTrue(geospatial instanceof LineString);
- }
- }
- assertEquals(2, count);
- }
-
- protected void geogCollection(
- final String entity,
- final String propertyName,
- final EdmSimpleType expectedType,
- final Dimension expectedDimension) {
-
- final ODataPrimitiveValue opv = readPrimitiveValue(entity, propertyName);
- assertEquals(expectedType.toString(), opv.getTypeName());
-
- final GeospatialCollection collection = opv.<GeospatialCollection>toCastValue();
- assertNotNull(collection);
- assertEquals(expectedDimension, collection.getDimension());
-
- final Iterator<Geospatial> itor = collection.iterator();
- int count = 0;
- while (itor.hasNext()) {
- count++;
-
- final Geospatial geospatial = itor.next();
- if (count == 1) {
- assertTrue(geospatial instanceof GeospatialCollection);
- }
- if (count == 2) {
- assertTrue(geospatial instanceof GeospatialCollection);
- }
- }
- assertEquals(2, count);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/AbstractPropertyTest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/AbstractPropertyTest.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/AbstractPropertyTest.java
deleted file mode 100644
index ecbe16f..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/AbstractPropertyTest.java
+++ /dev/null
@@ -1,178 +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 com.msopentech.odatajclient.engine;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.data.ODataCollectionValue;
-import com.msopentech.odatajclient.engine.data.ODataComplexValue;
-import com.msopentech.odatajclient.engine.data.ODataObjectFactory;
-import com.msopentech.odatajclient.engine.data.ODataPrimitiveValue;
-import com.msopentech.odatajclient.engine.data.ODataProperty;
-import com.msopentech.odatajclient.engine.data.ODataValue;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Iterator;
-import org.apache.commons.io.IOUtils;
-import org.junit.Test;
-
-public abstract class AbstractPropertyTest extends AbstractTest {
-
- protected abstract ODataFormat getFormat();
-
- protected abstract ODataClient getClient();
-
- protected ODataVersion getVersion() {
- return getClient().getWorkingVersion();
- }
-
- @Test
- public void readPropertyValue() throws IOException {
- final InputStream input = getClass().getResourceAsStream(
- getVersion().name().toLowerCase() + File.separatorChar
- + "Customer_-10_CustomerId_value.txt");
-
- final ODataValue value = getClient().getPrimitiveValueBuilder().
- setType(EdmSimpleType.String).
- setText(IOUtils.toString(input)).
- build();
- assertNotNull(value);
- assertEquals("-10", value.toString());
- }
-
- private ODataProperty primitive() throws IOException {
- final InputStream input = getClass().getResourceAsStream(
- getVersion().name().toLowerCase() + File.separatorChar
- + "Customer_-10_CustomerId." + getSuffix(getFormat()));
- final ODataProperty property = getClient().getReader().readProperty(input, getFormat());
- assertNotNull(property);
- assertTrue(property.hasPrimitiveValue());
- assertTrue(-10 == property.getPrimitiveValue().<Integer>toCastValue());
-
- ODataProperty comparable;
- final ODataProperty written = getClient().getReader().readProperty(
- getClient().getWriter().writeProperty(property, getFormat()), getFormat());
- if (getFormat() == ODataFormat.XML) {
- comparable = written;
- } else {
- // This is needed because type information gets lost with JSON serialization
- final ODataPrimitiveValue typedValue = getClient().getPrimitiveValueBuilder().
- setType(EdmSimpleType.fromValue(property.getPrimitiveValue().getTypeName())).
- setText(written.getPrimitiveValue().toString()).
- build();
- comparable = getClient().getObjectFactory().newPrimitiveProperty(written.getName(), typedValue);
- }
-
- assertEquals(property, comparable);
-
- return property;
- }
-
- @Test
- public void readPrimitiveProperty() throws IOException {
- primitive();
- }
-
- private ODataProperty complex() throws IOException {
- final InputStream input = getClass().getResourceAsStream(
- getVersion().name().toLowerCase() + File.separatorChar
- + "Customer_-10_PrimaryContactInfo." + getSuffix(getFormat()));
- final ODataProperty property = getClient().getReader().readProperty(input, getFormat());
- assertNotNull(property);
- assertTrue(property.hasComplexValue());
- assertEquals(6, property.getComplexValue().size());
-
- ODataProperty comparable;
- final ODataProperty written = getClient().getReader().readProperty(
- getClient().getWriter().writeProperty(property, getFormat()), getFormat());
- if (getFormat() == ODataFormat.XML) {
- comparable = written;
- } else {
- // This is needed because type information gets lost with JSON serialization
- final ODataComplexValue typedValue = new ODataComplexValue(property.getComplexValue().getTypeName());
- for (final Iterator<ODataProperty> itor = written.getComplexValue().iterator(); itor.hasNext();) {
- final ODataProperty prop = itor.next();
- typedValue.add(prop);
- }
- comparable = getClient().getObjectFactory().newComplexProperty(written.getName(), typedValue);
- }
-
- assertEquals(property, comparable);
-
- return property;
- }
-
- @Test
- public void readComplexProperty() throws IOException {
- complex();
- }
-
- private ODataProperty collection() throws IOException {
- final InputStream input = getClass().getResourceAsStream(
- getVersion().name().toLowerCase() + File.separatorChar
- + "Customer_-10_BackupContactInfo." + getSuffix(getFormat()));
- final ODataProperty property = getClient().getReader().readProperty(input, getFormat());
- assertNotNull(property);
- assertTrue(property.hasCollectionValue());
- assertEquals(9, property.getCollectionValue().size());
-
- ODataProperty comparable;
- final ODataProperty written = getClient().getReader().readProperty(
- getClient().getWriter().writeProperty(property, getFormat()), getFormat());
- if (getFormat() == ODataFormat.XML) {
- comparable = written;
- } else {
- // This is needed because type information gets lost with JSON serialization
- final ODataCollectionValue typedValue =
- new ODataCollectionValue(property.getCollectionValue().getTypeName());
- for (final Iterator<ODataValue> itor = written.getCollectionValue().iterator(); itor.hasNext();) {
- final ODataValue value = itor.next();
- if (value.isPrimitive()) {
- typedValue.add(value);
- }
- if (value.isComplex()) {
- final ODataComplexValue typedComplexValue =
- new ODataComplexValue("Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails");
- for (final Iterator<ODataProperty> valueItor = value.asComplex().iterator(); valueItor.hasNext();) {
- final ODataProperty prop = valueItor.next();
- typedComplexValue.add(prop);
- }
- typedValue.add(typedComplexValue);
- }
- }
- comparable = getClient().getObjectFactory().newCollectionProperty(written.getName(), typedValue);
- }
-
- assertEquals(property, comparable);
-
- return property;
- }
-
- @Test
- public void readCollectionProperty() throws IOException {
- collection();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/AbstractTest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/AbstractTest.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/AbstractTest.java
deleted file mode 100644
index 0a90a6a..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/AbstractTest.java
+++ /dev/null
@@ -1,59 +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 com.msopentech.odatajclient.engine;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.client.ODataClientFactory;
-import com.msopentech.odatajclient.engine.client.ODataV3Client;
-import com.msopentech.odatajclient.engine.client.ODataV4Client;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import java.util.Locale;
-import org.junit.BeforeClass;
-
-public abstract class AbstractTest {
-
- protected static ODataV3Client v3Client;
-
- protected static ODataV4Client v4Client;
-
- protected abstract ODataClient getClient();
-
- /**
- * This is needed for correct number handling (Double, for example).
- */
- @BeforeClass
- public static void setEnglishLocale() {
- Locale.setDefault(Locale.ENGLISH);
- }
-
- @BeforeClass
- public static void setClientInstances() {
- v3Client = ODataClientFactory.getV3();
- v4Client = ODataClientFactory.getV4();
- }
-
- protected String getSuffix(final ODataPubFormat format) {
- return format == ODataPubFormat.ATOM ? "xml" : "json";
- }
-
- protected String getSuffix(final ODataFormat format) {
- return format == ODataFormat.XML ? "xml" : "json";
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/EntitySetTest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/EntitySetTest.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/EntitySetTest.java
deleted file mode 100644
index 0bc44f0..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/EntitySetTest.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 com.msopentech.odatajclient.engine;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertEquals;
-
-import com.msopentech.odatajclient.engine.client.ODataV3Client;
-import com.msopentech.odatajclient.engine.data.ODataEntitySet;
-import com.msopentech.odatajclient.engine.data.ResourceFactory;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import java.io.IOException;
-import java.io.InputStream;
-import org.junit.Test;
-
-public class EntitySetTest extends AbstractTest {
-
- @Override
- protected ODataV3Client getClient() {
- return v3Client;
- }
-
- private void read(final ODataPubFormat format) throws IOException {
- final InputStream input = getClass().getResourceAsStream("Customer." + getSuffix(format));
- final ODataEntitySet entitySet = getClient().getBinder().getODataEntitySet(
- getClient().getDeserializer().toFeed(input, ResourceFactory.feedClassForFormat(format)));
- assertNotNull(entitySet);
-
- assertEquals(2, entitySet.getEntities().size());
- assertNotNull(entitySet.getNext());
-
- final ODataEntitySet written = getClient().getBinder().getODataEntitySet(
- getClient().getBinder().getFeed(entitySet, ResourceFactory.feedClassForFormat(format)));
- assertEquals(entitySet, written);
- }
-
- @Test
- public void fromAtom() throws IOException {
- read(ODataPubFormat.ATOM);
- }
-
- @Test
- public void fromJSON() throws IOException {
- read(ODataPubFormat.JSON);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/EntityTest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/EntityTest.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/EntityTest.java
deleted file mode 100644
index 5a65534..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/EntityTest.java
+++ /dev/null
@@ -1,191 +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 com.msopentech.odatajclient.engine;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import com.msopentech.odatajclient.engine.client.ODataV3Client;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.data.ODataLink;
-import com.msopentech.odatajclient.engine.data.ODataOperation;
-import com.msopentech.odatajclient.engine.data.ODataProperty;
-import com.msopentech.odatajclient.engine.data.ResourceFactory;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import java.io.InputStream;
-import java.util.Collections;
-import org.junit.Test;
-
-public class EntityTest extends AbstractTest {
-
- @Override
- protected ODataV3Client getClient() {
- return v3Client;
- }
-
- private void readAndWrite(final ODataPubFormat format) {
- final InputStream input = getClass().getResourceAsStream("Customer_-10." + getSuffix(format));
- final ODataEntity entity = getClient().getBinder().getODataEntity(
- getClient().getDeserializer().toEntry(input, ResourceFactory.entryClassForFormat(format)));
- assertNotNull(entity);
-
- assertEquals("Microsoft.Test.OData.Services.AstoriaDefaultService.Customer", entity.getName());
- assertTrue(entity.getEditLink().toASCIIString().endsWith("/Customer(-10)"));
- assertEquals(5, entity.getNavigationLinks().size());
- assertEquals(2, entity.getEditMediaLinks().size());
-
- boolean check = false;
-
- for (ODataLink link : entity.getNavigationLinks()) {
- if ("Wife".equals(link.getName()) && (link.getLink().toASCIIString().endsWith("/Customer(-10)/Wife"))) {
- check = true;
- }
- }
-
- assertTrue(check);
-
- final ODataEntity written = getClient().getBinder().getODataEntity(
- getClient().getBinder().getEntry(entity, ResourceFactory.entryClassForFormat(format)));
- assertEquals(entity, written);
- }
-
- @Test
- public void fromAtom() {
- readAndWrite(ODataPubFormat.ATOM);
- }
-
- @Test
- public void fromJSON() {
- readAndWrite(ODataPubFormat.JSON_FULL_METADATA);
- }
-
- private void readGeospatial(final ODataPubFormat format) {
- final InputStream input = getClass().getResourceAsStream("AllGeoTypesSet_-8." + getSuffix(format));
- final ODataEntity entity = getClient().getBinder().getODataEntity(
- getClient().getDeserializer().toEntry(input, ResourceFactory.entryClassForFormat(format)));
- assertNotNull(entity);
-
- boolean found = false;
- for (ODataProperty property : entity.getProperties()) {
- if ("GeogMultiLine".equals(property.getName())) {
- found = true;
- assertTrue(property.hasPrimitiveValue());
- assertEquals(EdmSimpleType.GeographyMultiLineString.toString(),
- property.getPrimitiveValue().getTypeName());
- }
- }
- assertTrue(found);
-
- final ODataEntity written = getClient().getBinder().getODataEntity(
- getClient().getBinder().getEntry(entity, ResourceFactory.entryClassForFormat(format)));
- assertEquals(entity, written);
- }
-
- @Test
- public void withGeospatialFromAtom() {
- readGeospatial(ODataPubFormat.ATOM);
- }
-
- @Test
- public void withGeospatialFromJSON() {
- // this needs to be full, otherwise there is no mean to recognize geospatial types
- readGeospatial(ODataPubFormat.JSON_FULL_METADATA);
- }
-
- private void withActions(final ODataPubFormat format) {
- final InputStream input = getClass().getResourceAsStream("ComputerDetail_-10." + getSuffix(format));
- final ODataEntity entity = getClient().getBinder().getODataEntity(
- getClient().getDeserializer().toEntry(input, ResourceFactory.entryClassForFormat(format)));
- assertNotNull(entity);
-
- assertEquals(1, entity.getOperations().size());
- assertEquals("ResetComputerDetailsSpecifications", entity.getOperations().get(0).getTitle());
-
- final ODataEntity written = getClient().getBinder().getODataEntity(
- getClient().getBinder().getEntry(entity, ResourceFactory.entryClassForFormat(format)));
- entity.setOperations(Collections.<ODataOperation>emptyList());
- assertEquals(entity, written);
- }
-
- @Test
- public void withActionsFromAtom() {
- withActions(ODataPubFormat.ATOM);
- }
-
- @Test
- public void withActionsFromJSON() {
- // this needs to be full, otherwise actions will not be provided
- withActions(ODataPubFormat.JSON_FULL_METADATA);
- }
-
- private void mediaEntity(final ODataPubFormat format) {
- final InputStream input = getClass().getResourceAsStream("Car_16." + getSuffix(format));
- final ODataEntity entity = getClient().getBinder().getODataEntity(
- getClient().getDeserializer().toEntry(input, ResourceFactory.entryClassForFormat(format)));
- assertNotNull(entity);
- assertTrue(entity.isMediaEntity());
- assertNotNull(entity.getMediaContentSource());
- assertNotNull(entity.getMediaContentType());
-
- final ODataEntity written = getClient().getBinder().getODataEntity(
- getClient().getBinder().getEntry(entity, ResourceFactory.entryClassForFormat(format)));
- assertEquals(entity, written);
- }
-
- @Test
- public void mediaEntityFromAtom() {
- mediaEntity(ODataPubFormat.ATOM);
- }
-
- @Test
- public void mediaEntityFromJSON() {
- mediaEntity(ODataPubFormat.JSON_FULL_METADATA);
- }
-
- private void issue128(final ODataPubFormat format) {
- final InputStream input = getClass().getResourceAsStream("AllGeoTypesSet_-5." + getSuffix(format));
- final ODataEntity entity = getClient().getBinder().getODataEntity(
- getClient().getDeserializer().toEntry(input, ResourceFactory.entryClassForFormat(format)));
- assertNotNull(entity);
-
- final ODataProperty geogCollection = entity.getProperty("GeogCollection");
- assertEquals(EdmSimpleType.GeographyCollection.toString(), geogCollection.getPrimitiveValue().getTypeName());
-
- int count = 0;
- for (Geospatial g : geogCollection.getPrimitiveValue().<GeospatialCollection>toCastValue()) {
- assertNotNull(g);
- count++;
- }
- assertEquals(2, count);
- }
-
- @Test
- public void issue128FromAtom() {
- issue128(ODataPubFormat.ATOM);
- }
-
- @Test
- public void issue128FromJSON() {
- issue128(ODataPubFormat.JSON_FULL_METADATA);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/EntryReadTest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/EntryReadTest.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/EntryReadTest.java
deleted file mode 100644
index f2a6661..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/EntryReadTest.java
+++ /dev/null
@@ -1,96 +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 com.msopentech.odatajclient.engine;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import com.msopentech.odatajclient.engine.client.ODataV3Client;
-import com.msopentech.odatajclient.engine.data.Entry;
-import com.msopentech.odatajclient.engine.data.ResourceFactory;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import com.msopentech.odatajclient.engine.utils.ODataConstants;
-import com.msopentech.odatajclient.engine.utils.XMLUtils;
-import java.io.IOException;
-import java.io.InputStream;
-import org.junit.Test;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class EntryReadTest extends AbstractTest {
-
- @Override
- protected ODataV3Client getClient() {
- return v3Client;
- }
-
- private void read(final ODataPubFormat format) throws IOException {
- InputStream input = getClass().getResourceAsStream("Car_16." + getSuffix(format));
-
- Entry entry = getClient().getDeserializer().toEntry(input, ResourceFactory.entryClassForFormat(format));
- assertNotNull(entry);
-
- input.close();
-
- // ---------------------------------------------
- input = getClass().getResourceAsStream("Customer_-10." + getSuffix(format));
-
- entry = getClient().getDeserializer().toEntry(input, ResourceFactory.entryClassForFormat(format));
- assertNotNull(entry);
-
- input.close();
-
- if (ODataPubFormat.JSON_FULL_METADATA == format || ODataPubFormat.ATOM == format) {
- assertEquals("Microsoft.Test.OData.Services.AstoriaDefaultService.Customer", entry.getType());
- assertNotNull(entry.getBaseURI());
- }
-
- final Element content = entry.getContent();
- assertEquals(ODataConstants.ELEM_PROPERTIES, content.getNodeName());
-
- boolean entered = false;
- boolean checked = false;
- for (int i = 0; i < content.getChildNodes().getLength(); i++) {
- entered = true;
-
- final Node property = content.getChildNodes().item(i);
- if ("PrimaryContactInfo".equals(XMLUtils.getSimpleName(property))) {
- checked = true;
-
- if (ODataPubFormat.JSON_FULL_METADATA == format || ODataPubFormat.ATOM == format) {
- assertEquals("Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails",
- ((Element) property).getAttribute(ODataConstants.ATTR_M_TYPE));
- }
- }
- }
- assertTrue(entered);
- assertTrue(checked);
- }
-
- @Test
- public void atom() throws IOException {
- read(ODataPubFormat.ATOM);
- }
-
- @Test
- public void json() throws IOException {
- read(ODataPubFormat.JSON_FULL_METADATA);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/ErrorTest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/ErrorTest.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/ErrorTest.java
deleted file mode 100644
index 72a9553..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/ErrorTest.java
+++ /dev/null
@@ -1,48 +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 com.msopentech.odatajclient.engine;
-
-import static org.junit.Assert.assertNotNull;
-
-import com.msopentech.odatajclient.engine.client.ODataV3Client;
-import com.msopentech.odatajclient.engine.data.ODataError;
-import org.junit.Test;
-
-public class ErrorTest extends AbstractTest {
-
- @Override
- protected ODataV3Client getClient() {
- return v3Client;
- }
-
- private void xmlError(final String name) {
- final ODataError error = getClient().getReader().readError(getClass().getResourceAsStream(name), true);
- assertNotNull(error);
- }
-
- @Test
- public void error() {
- xmlError("error.xml");
- }
-
- @Test
- public void stacktrace() {
- xmlError("stacktrace.xml");
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/PrimitiveValueTest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/PrimitiveValueTest.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/PrimitiveValueTest.java
deleted file mode 100644
index cff6210..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/PrimitiveValueTest.java
+++ /dev/null
@@ -1,585 +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 com.msopentech.odatajclient.engine;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import com.msopentech.odatajclient.engine.client.ODataClientFactory;
-import com.msopentech.odatajclient.engine.client.ODataV3Client;
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataPrimitiveValue;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.data.ODataValue;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.UUID;
-import org.apache.commons.codec.binary.Base64;
-import org.junit.Test;
-
-public class PrimitiveValueTest extends AbstractTest {
-
- @Override
- protected ODataV3Client getClient() {
- return v3Client;
- }
-
- @Test
- public void manageInt32() {
- final int primitive = -10;
- ODataValue value = getClient().getPrimitiveValueBuilder().setType(EdmSimpleType.Int32).setValue(primitive).
- build();
- assertEquals(EdmSimpleType.Int32.toString(), value.asPrimitive().getTypeName());
- assertEquals(Integer.valueOf(primitive), value.asPrimitive().<Integer>toCastValue());
-
- value = getClient().getPrimitiveValueBuilder().setType(EdmSimpleType.Int32).setText("9").build();
- assertEquals("9", value.asPrimitive().<Integer>toCastValue().toString());
- }
-
- @Test
- public void manageString() {
- final String primitive = UUID.randomUUID().toString();
- ODataValue value = getClient().getPrimitiveValueBuilder().setType(EdmSimpleType.String).setText(primitive).
- build();
- assertEquals(EdmSimpleType.String.toString(), value.asPrimitive().getTypeName());
- assertEquals(primitive, value.toString());
-
- value = getClient().getPrimitiveValueBuilder().setType(EdmSimpleType.String).
- setText("1126a28b-a4af-4bbd-bf0a-2b2c22635565").build();
- assertEquals("1126a28b-a4af-4bbd-bf0a-2b2c22635565", value.asPrimitive().<String>toCastValue().toString());
- }
-
- @Test
- public void manageDecimal() {
- final BigDecimal primitive = new BigDecimal("-79228162514264337593543950335");
- ODataValue value = getClient().getPrimitiveValueBuilder().setType(EdmSimpleType.Decimal).setValue(primitive).
- build();
- assertEquals(EdmSimpleType.Decimal.toString(), value.asPrimitive().getTypeName());
- assertEquals(primitive, value.asPrimitive().<BigDecimal>toCastValue());
-
- value = getClient().getPrimitiveValueBuilder().setType(EdmSimpleType.Decimal).
- setText("-79228162514264337593543950335").build();
- assertEquals("-79228162514264337593543950335", value.asPrimitive().<BigDecimal>toCastValue().toString());
- }
-
- @Test
- public void manageDateTime() {
- // OData V3 only
- final String primitive = "2013-01-10T06:27:51.1667673";
- try {
- new ODataPrimitiveValue.Builder(ODataClientFactory.getV4()).
- setType(EdmSimpleType.DateTime).setText(primitive).build();
- fail();
- } catch (IllegalArgumentException iae) {
- // ignore
- }
- final ODataValue value =
- getClient().getPrimitiveValueBuilder().setType(EdmSimpleType.DateTime).setText(primitive).build();
- assertEquals(EdmSimpleType.DateTime.toString(), value.asPrimitive().getTypeName());
- // performed cast to improve the check
- assertEquals(primitive, value.asPrimitive().<ODataTimestamp>toCastValue().toString());
- }
-
- @Test
- public void manageTime() {
- // OData V3 only
- final String primitive = "-P9DT51M10.5063807S";
- try {
- new ODataPrimitiveValue.Builder(ODataClientFactory.getV4()).
- setType(EdmSimpleType.Time).setText(primitive).build();
- fail();
- } catch (IllegalArgumentException iae) {
- // ignore
- }
-
- final ODataValue value =
- getClient().getPrimitiveValueBuilder().setType(EdmSimpleType.Time).setText(primitive).build();
- assertEquals(EdmSimpleType.Time.toString(), value.asPrimitive().getTypeName());
- // performed cast to improve the check
- assertEquals(primitive, value.asPrimitive().<ODataDuration>toCastValue().toString());
- }
-
- @Test
- public void manageTimeOfDay() {
- // OData V4 only
- final String primitive = "-P9DT51M12.5063807S";
- try {
- getClient().getPrimitiveValueBuilder().setType(EdmSimpleType.TimeOfDay).setText(primitive).build();
- fail();
- } catch (IllegalArgumentException iae) {
- // ignore
- }
-
- final ODataValue value = new ODataPrimitiveValue.Builder(ODataClientFactory.getV4()).
- setType(EdmSimpleType.TimeOfDay).setText(primitive).build();
- assertEquals(EdmSimpleType.TimeOfDay.toString(), value.asPrimitive().getTypeName());
- // performed cast to improve the check
- assertEquals(primitive, value.asPrimitive().<ODataDuration>toCastValue().toString());
- }
-
- @Test
- public void manageDate() {
- // OData V4 only
- final String primitive = "2013-01-10";
- try {
- getClient().getPrimitiveValueBuilder().setType(EdmSimpleType.Date).setText(primitive).build();
- fail();
- } catch (IllegalArgumentException iae) {
- // ignore
- }
-
- final ODataValue value = new ODataPrimitiveValue.Builder(ODataClientFactory.getV4()).
- setType(EdmSimpleType.Date).setText(primitive).build();
- assertEquals(EdmSimpleType.Date.toString(), value.asPrimitive().getTypeName());
- // performed cast to improve the check
- assertEquals(primitive, value.asPrimitive().<ODataTimestamp>toCastValue().toString());
- }
-
- @Test
- public void manageDateTimeOffset() {
- final String primitive = "2013-01-10T02:00:00";
- final ODataValue value = getClient().getPrimitiveValueBuilder().setType(EdmSimpleType.DateTimeOffset).
- setText(primitive).build();
- assertEquals(EdmSimpleType.DateTimeOffset.toString(), value.asPrimitive().getTypeName());
- // performed cast to improve the check
- assertEquals(primitive, value.asPrimitive().<ODataTimestamp>toCastValue().toString());
- }
-
- @Test
- public void manageGuid() {
- final UUID primitive = UUID.fromString("1126a28b-a4af-4bbd-bf0a-2b2c22635565");
- ODataValue value = getClient().getPrimitiveValueBuilder().setType(EdmSimpleType.Guid).setValue(primitive).
- build();
- assertEquals(EdmSimpleType.Guid.toString(), value.asPrimitive().getTypeName());
- assertEquals(primitive, value.asPrimitive().<UUID>toCastValue());
-
- value = getClient().getPrimitiveValueBuilder().setType(EdmSimpleType.Guid).
- setText("1126a28b-a4af-4bbd-bf0a-2b2c22635565").build();
- assertEquals("1126a28b-a4af-4bbd-bf0a-2b2c22635565", value.asPrimitive().<UUID>toCastValue().toString());
- }
-
- @Test
- public void manageBinary() {
- final byte[] primitive = UUID.randomUUID().toString().getBytes();
- ODataValue value = getClient().getPrimitiveValueBuilder().setType(EdmSimpleType.Binary).setValue(primitive).
- build();
- assertEquals(EdmSimpleType.Binary.toString(), value.asPrimitive().getTypeName());
- assertEquals(
- Base64.encodeBase64String(primitive),
- Base64.encodeBase64String(value.asPrimitive().<byte[]>toCastValue()));
-
- value = getClient().getPrimitiveValueBuilder().setType(EdmSimpleType.Binary).
- setText(Base64.encodeBase64String("primitive".getBytes())).build();
- assertEquals("primitive", new String(value.asPrimitive().<byte[]>toCastValue()));
- }
-
- @Test
- public void managePoint() {
- final Point primitive = new Point(Geospatial.Dimension.GEOGRAPHY);
- primitive.setX(52.8606);
- primitive.setY(173.334);
-
- try {
- getClient().getPrimitiveValueBuilder().setType(EdmSimpleType.GeographyPoint).setValue(primitive).build();
- fail();
- } catch (IllegalArgumentException iae) {
- // nothing top do
- }
-
- final ODataValue value =
- getClient().getGeospatialValueBuilder().setType(EdmSimpleType.GeographyPoint).setValue(primitive).
- build();
- assertEquals(EdmSimpleType.GeographyPoint.toString(), value.asPrimitive().getTypeName());
- assertEquals(Double.valueOf(primitive.getX()), Double.valueOf(value.asPrimitive().<Point>toCastValue().getX()));
- assertEquals(Double.valueOf(primitive.getY()), Double.valueOf(value.asPrimitive().<Point>toCastValue().getY()));
- }
-
- @Test
- public void manageLineString() {
- final List<Point> points = new ArrayList<Point>();
- Point point = new Point(Geospatial.Dimension.GEOGRAPHY);
- point.setX(40.5);
- point.setY(40.5);
- points.add(point);
-
- point = new Point(Geospatial.Dimension.GEOGRAPHY);
- point.setX(30.5);
- point.setY(30.5);
- points.add(point);
-
- point = new Point(Geospatial.Dimension.GEOGRAPHY);
- point.setX(20.5);
- point.setY(40.5);
- points.add(point);
-
- point = new Point(Geospatial.Dimension.GEOGRAPHY);
- point.setX(10.5);
- point.setY(30.5);
- points.add(point);
-
- final LineString primitive = new LineString(Geospatial.Dimension.GEOGRAPHY, points);
-
- final ODataValue value = getClient().getGeospatialValueBuilder().setType(EdmSimpleType.GeographyLineString).
- setValue(primitive).build();
- assertEquals(EdmSimpleType.GeographyLineString.toString(), value.asPrimitive().getTypeName());
-
- final Iterator<Point> iter = value.asPrimitive().<LineString>toCastValue().iterator();
-
- // take the third one and check the point value ...
- iter.next();
- iter.next();
- point = iter.next();
-
- assertEquals(Double.valueOf(points.get(2).getX()), Double.valueOf(point.getX()));
- assertEquals(Double.valueOf(points.get(2).getY()), Double.valueOf(point.getY()));
- }
-
- @Test
- public void manageMultiPoint() {
- final List<Point> points = new ArrayList<Point>();
- Point point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(0);
- point.setY(0);
- points.add(point);
-
- final MultiPoint primitive = new MultiPoint(Geospatial.Dimension.GEOMETRY, points);
-
- final ODataValue value = getClient().getGeospatialValueBuilder().setType(EdmSimpleType.GeometryMultiPoint).
- setValue(primitive).build();
- assertEquals(EdmSimpleType.GeometryMultiPoint.toString(), value.asPrimitive().getTypeName());
-
- final Iterator<Point> iter = value.asPrimitive().<MultiPoint>toCastValue().iterator();
- point = iter.next();
-
- assertEquals(Double.valueOf(points.get(0).getX()), Double.valueOf(point.getX()));
- assertEquals(Double.valueOf(points.get(0).getY()), Double.valueOf(point.getY()));
- }
-
- @Test
- public void manageMultiLine() {
- final List<LineString> lines = new ArrayList<LineString>();
-
- // line one ...
- List<Point> points = new ArrayList<Point>();
- Point point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(10);
- point.setY(10);
- points.add(point);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(20);
- point.setY(20);
- points.add(point);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(10);
- point.setY(40);
- points.add(point);
-
- lines.add(new LineString(Geospatial.Dimension.GEOMETRY, points));
-
- // line two ...
- points = new ArrayList<Point>();
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(40);
- point.setY(40);
- points.add(point);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(30);
- point.setY(30);
- points.add(point);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(40);
- point.setY(20);
- points.add(point);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(30);
- point.setY(10);
- points.add(point);
- lines.add(new LineString(Geospatial.Dimension.GEOMETRY, points));
-
- final MultiLineString primitive = new MultiLineString(Geospatial.Dimension.GEOMETRY, lines);
-
- final ODataValue value =
- getClient().getGeospatialValueBuilder().setType(EdmSimpleType.GeometryMultiLineString).
- setValue(primitive).build();
- assertEquals(EdmSimpleType.GeometryMultiLineString.toString(), value.asPrimitive().getTypeName());
-
- final Iterator<LineString> lineIter = value.asPrimitive().<MultiLineString>toCastValue().iterator();
-
- // take the second line and check the third point value ...
- lineIter.next();
- final LineString line = lineIter.next();
-
- final Iterator<Point> pointIter = line.iterator();
- pointIter.next();
- pointIter.next();
- point = pointIter.next();
-
- assertEquals(Double.valueOf(points.get(2).getX()), Double.valueOf(point.getX()));
- assertEquals(Double.valueOf(points.get(2).getY()), Double.valueOf(point.getY()));
- }
-
- @Test
- public void managePolygon() {
-
- final List<Point> interior = new ArrayList<Point>();
- final List<Point> exterior = new ArrayList<Point>();
-
- Point point = new Point(Geospatial.Dimension.GEOGRAPHY);
- point.setX(5);
- point.setY(15);
- exterior.add(point);
-
- point = new Point(Geospatial.Dimension.GEOGRAPHY);
- point.setX(10);
- point.setY(40);
- exterior.add(point);
-
- point = new Point(Geospatial.Dimension.GEOGRAPHY);
- point.setX(20);
- point.setY(10);
- exterior.add(point);
-
- point = new Point(Geospatial.Dimension.GEOGRAPHY);
- point.setX(10);
- point.setY(5);
- exterior.add(point);
-
- point = new Point(Geospatial.Dimension.GEOGRAPHY);
- point.setX(5);
- point.setY(15);
- exterior.add(point);
-
- final Polygon primitive = new Polygon(Geospatial.Dimension.GEOGRAPHY, interior, exterior);
-
- final ODataValue value =
- getClient().getGeospatialValueBuilder().setType(EdmSimpleType.GeographyPolygon).
- setValue(primitive).build();
- assertEquals(EdmSimpleType.GeographyPolygon.toString(), value.asPrimitive().getTypeName());
-
- assertTrue(value.asPrimitive().<Polygon>toCastValue().getInterior().isEmpty());
- final Iterator<Point> iter = value.asPrimitive().<Polygon>toCastValue().getExterior().iterator();
-
- // take the third one ...
- iter.next();
- iter.next();
- point = iter.next();
-
- assertEquals(Double.valueOf(exterior.get(2).getX()), Double.valueOf(point.getX()));
- assertEquals(Double.valueOf(exterior.get(2).getY()), Double.valueOf(point.getY()));
- }
-
- @Test
- public void manageMultiPolygon() {
- final List<Polygon> polygons = new ArrayList<Polygon>();
-
- List<Point> interior = new ArrayList<Point>();
- List<Point> exterior = new ArrayList<Point>();
-
- // exterior one ...
- Point point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(40);
- point.setY(40);
- exterior.add(point);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(20);
- point.setY(45);
- exterior.add(point);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(45);
- point.setY(30);
- exterior.add(point);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(40);
- point.setY(40);
- exterior.add(point);
-
- polygons.add(new Polygon(Geospatial.Dimension.GEOMETRY, interior, exterior));
-
- // interior two ...
- interior = new ArrayList<Point>();
- exterior = new ArrayList<Point>();
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(30);
- point.setY(20);
- interior.add(point);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(20);
- point.setY(25);
- interior.add(point);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(20);
- point.setY(15);
- interior.add(point);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(30);
- point.setY(20);
- interior.add(point);
-
- // exterior two ...
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(20);
- point.setY(35);
- exterior.add(point);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(45);
- point.setY(20);
- exterior.add(point);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(30);
- point.setY(5);
- exterior.add(point);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(10);
- point.setY(10);
- exterior.add(point);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(10);
- point.setY(30);
- exterior.add(point);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(20);
- point.setY(35);
- exterior.add(point);
-
- polygons.add(new Polygon(Geospatial.Dimension.GEOMETRY, interior, exterior));
-
- final MultiPolygon primitive = new MultiPolygon(Geospatial.Dimension.GEOMETRY, polygons);
-
- final ODataValue value =
- getClient().getGeospatialValueBuilder().setType(EdmSimpleType.GeometryMultiPolygon).
- setValue(primitive).build();
- assertEquals(EdmSimpleType.GeometryMultiPolygon.toString(), value.asPrimitive().getTypeName());
-
- final Iterator<Polygon> iter = value.asPrimitive().<MultiPolygon>toCastValue().iterator();
-
- // second one polygon
- iter.next();
- final Polygon polygon = iter.next();
- Iterator<Point> pointIter = polygon.getInterior().iterator();
- pointIter.next();
- point = pointIter.next();
-
- // check the second point from interior
- assertEquals(Double.valueOf(interior.get(1).getX()), Double.valueOf(point.getX()));
- assertEquals(Double.valueOf(interior.get(1).getY()), Double.valueOf(point.getY()));
-
- pointIter = polygon.getExterior().iterator();
- pointIter.next();
- pointIter.next();
- point = pointIter.next();
-
- // check the third point from exterior
- assertEquals(Double.valueOf(exterior.get(2).getX()), Double.valueOf(point.getX()));
- assertEquals(Double.valueOf(exterior.get(2).getY()), Double.valueOf(point.getY()));
- }
-
- @Test
- public void manageGeomCollection() {
- final List<Geospatial> collection = new ArrayList<Geospatial>();
-
- Point point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(1);
- point.setY(2);
- point.setZ(3);
- collection.add(point);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(4);
- point.setY(5);
- point.setZ(6);
- collection.add(point);
-
- final GeospatialCollection primitive = new GeospatialCollection(Geospatial.Dimension.GEOMETRY, collection);
-
- final ODataValue value =
- getClient().getGeospatialValueBuilder().setType(EdmSimpleType.GeometryCollection).
- setValue(primitive).build();
- assertEquals(EdmSimpleType.GeometryCollection.toString(), value.asPrimitive().getTypeName());
-
- final Iterator<Geospatial> iter = value.asPrimitive().<GeospatialCollection>toCastValue().iterator();
- iter.next();
- final Point collectedPoint = (Point) iter.next();
-
- assertTrue(point.getX() == collectedPoint.getX()
- && point.getY() == collectedPoint.getY()
- && point.getZ() == collectedPoint.getZ());
- }
-
- @Test
- public void manageGeogCollection() {
- final List<Geospatial> collection = new ArrayList<Geospatial>();
-
- Point point = new Point(Geospatial.Dimension.GEOGRAPHY);
- point.setX(1);
- point.setY(2);
- point.setZ(3);
- collection.add(point);
-
- point = new Point(Geospatial.Dimension.GEOGRAPHY);
- point.setX(4);
- point.setY(5);
- point.setZ(6);
- collection.add(point);
-
- final GeospatialCollection primitive = new GeospatialCollection(Geospatial.Dimension.GEOGRAPHY, collection);
-
- final ODataValue value =
- getClient().getGeospatialValueBuilder().setType(EdmSimpleType.GeographyCollection).
- setValue(primitive).build();
- assertEquals(EdmSimpleType.GeographyCollection.toString(), value.asPrimitive().getTypeName());
-
- final Iterator<Geospatial> iter = value.asPrimitive().<GeospatialCollection>toCastValue().iterator();
- iter.next();
- final Point collectedPoint = (Point) iter.next();
-
- assertTrue(point.getX() == collectedPoint.getX()
- && point.getY() == collectedPoint.getY()
- && point.getZ() == collectedPoint.getZ());
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/AbstractMetadataTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/AbstractMetadataTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/AbstractMetadataTestITCase.java
deleted file mode 100644
index 2fe796c..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/AbstractMetadataTestITCase.java
+++ /dev/null
@@ -1,30 +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 com.msopentech.odatajclient.engine.it;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-
-public abstract class AbstractMetadataTestITCase extends AbstractTestITCase {
-
- protected abstract ODataClient getClient();
-
- protected String getTestServiceRoot() {
- return "http://localhost:9080/StaticService/" + getClient().getWorkingVersion().name() + "/Static.svc";
- }
-}
[12/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/EntitySetTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/EntitySetTestITCase.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/EntitySetTestITCase.java
deleted file mode 100644
index 94ba96a..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/EntitySetTestITCase.java
+++ /dev/null
@@ -1,99 +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 com.msopentech.odatajclient.proxy;
-
-import static com.msopentech.odatajclient.proxy.AbstractTest.container;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Car;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer;
-import java.io.IOException;
-import java.util.Iterator;
-import org.junit.Test;
-
-/**
- * This is the unit test class to check basic feed operations.
- */
-public class EntitySetTestITCase extends AbstractTest {
-
- @Test
- public void count() {
- assertNotNull(container.getMessage());
- assertTrue(10 <= container.getMessage().count());
-
- assertTrue(container.getCustomer().count() > 0);
- }
-
- @Test
- public void getAll() {
- int count = 0;
- for (Customer customer : container.getCustomer().getAll()) {
- assertNotNull(customer);
- count++;
- }
- assertTrue(count >= 10);
- }
-
- @Test
- public void readEntitySetWithNextLink() {
- int count = 0;
- for (Customer customer : container.getCustomer().getAll()) {
- assertNotNull(customer);
- count++;
- }
- assertTrue(count >= 10);
-
- int iterating = 0;
- for (Customer customer : container.getCustomer()) {
- assertNotNull(customer);
- iterating++;
- }
- assertEquals(count, iterating);
- }
-
- @Test
- public void readODataEntitySet() throws IOException {
- assertTrue(container.getCar().count() >= 10);
-
- final Iterable<Car> car = container.getCar().getAll();
- assertNotNull(car);
-
- final Iterator<Car> itor = car.iterator();
-
- int count = 0;
- while (itor.hasNext()) {
- assertNotNull(itor.next());
- count++;
- }
- assertTrue(count >= 10);
- }
-
- @Test
- public void readEntitySetIterator() {
- int count = 0;
- for (Computer computer : container.getComputer()) {
- assertNotNull(computer);
- count++;
- }
- assertTrue(count >= 10);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/EntityUpdateTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/EntityUpdateTestITCase.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/EntityUpdateTestITCase.java
deleted file mode 100644
index d55cfb7..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/EntityUpdateTestITCase.java
+++ /dev/null
@@ -1,122 +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 com.msopentech.odatajclient.proxy;
-
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertNotNull;
-
-import com.msopentech.odatajclient.proxy.api.impl.EntityTypeInvocationHandler;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Message;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageKey;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Order;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Product;
-import java.lang.reflect.Proxy;
-import org.apache.commons.lang3.StringUtils;
-import org.junit.Test;
-
-/**
- * This is the unit test class to check entity update operations.
- */
-public class EntityUpdateTestITCase extends AbstractTest {
-
- @Test
- public void update() {
- Order order = container.getOrder().get(-9);
-
- final ConcurrencyInfo ci = order.getConcurrency();
- ci.setToken("XXX");
-
- container.flush();
-
- order = container.getOrder().get(-9);
- assertEquals("XXX", order.getConcurrency().getToken());
- }
-
- @Test
- public void multiKey() {
- final MessageKey key = new MessageKey();
- key.setFromUsername("1");
- key.setMessageId(-10);
-
- Message message = container.getMessage().get(key);
- assertNotNull(message);
-
- message.setBody("XXX");
-
- container.flush();
-
- message = container.getMessage().get(key);
- assertNotNull(message);
- assertEquals("XXX", message.getBody());
- }
-
- @Test
- public void patchLink() {
- Order order = container.getOrder().newOrder();
- order.setOrderId(400);
- order.setCustomerId(-9);
-
- OrderCollection orders = container.getOrder().newOrderCollection();
- orders.add(order);
-
- Customer customer = container.getCustomer().get(-9);
- customer.setOrders(orders);
- order.setCustomer(customer);
-
- container.flush();
-
- order = container.getOrder().get(400);
- assertEquals(400, order.getOrderId().intValue());
- assertEquals(-9, order.getCustomerId().intValue());
-
- customer = container.getCustomer().get(-9);
-
- assertEquals(2, customer.getOrders().size());
-
- int count = 0;
- for (Order inside : customer.getOrders()) {
- if (inside.getOrderId() == 400) {
- count++;
- }
- }
- assertEquals(1, count);
- assertEquals(-9, order.getCustomer().getCustomerId().intValue());
- }
-
- @Test
- public void concurrentModification() {
- Product product = container.getProduct().get(-10);
- final String etag = ((EntityTypeInvocationHandler) Proxy.getInvocationHandler(product)).getETag();
- assertTrue(StringUtils.isNotBlank(etag));
-
- final String baseConcurrency = String.valueOf(System.currentTimeMillis());
- product.setBaseConcurrency(baseConcurrency);
-
- container.flush();
-
- product = container.getProduct().get(-10);
- assertEquals(baseConcurrency, product.getBaseConcurrency());
- assertNotEquals(etag, ((EntityTypeInvocationHandler) Proxy.getInvocationHandler(product)).getETag());
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/InvokeTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/InvokeTestITCase.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/InvokeTestITCase.java
deleted file mode 100644
index aec8104..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/InvokeTestITCase.java
+++ /dev/null
@@ -1,218 +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 com.msopentech.odatajclient.proxy;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.EmployeeCollection;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Product;
-import java.math.BigDecimal;
-import java.sql.Timestamp;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import org.apache.commons.lang3.StringUtils;
-import org.junit.Test;
-
-public class InvokeTestITCase extends AbstractTest {
-
- @Test
- public void getWithNoParams() {
- // 1. primitive result
- final String string = container.getPrimitiveString();
- assertEquals("Foo", string);
-
- // 2. complex collection result
- final Collection<ContactDetails> details = container.entityProjectionReturnsCollectionOfComplexTypes();
- assertFalse(details.isEmpty());
- for (ContactDetails detail : details) {
- assertNotNull(detail);
- }
- assertNotNull(details.iterator().next());
- }
-
- @Test
- public void getWithParam() {
- // 1. primitive result
- assertEquals(155, container.getArgumentPlusOne(154).intValue());
-
- // 2. entity collection result
- final CustomerCollection customers = container.getSpecificCustomer(StringUtils.EMPTY);
- assertNotNull(customers);
- assertFalse(customers.isEmpty());
- final Set<Integer> customerIds = new HashSet<Integer>(customers.size());
- for (Customer customer : customers) {
- assertNotNull(customer);
- customerIds.add(customer.getCustomerId());
- }
- assertTrue(customerIds.contains(-8));
- }
-
- @Test
- public void entityBoundPost() {
- // 0. create an employee
- final Integer id = 101;
-
- Employee employee = container.getPerson().newEmployee();
- employee.setPersonId(id);
- employee.setName("sample employee from proxy");
- employee.setManagersPersonId(-9918);
- employee.setSalary(2147483647);
- employee.setTitle("CEO");
-
- container.flush();
-
- employee = container.getPerson().get(id, Employee.class);
- assertNotNull(employee);
- assertEquals(id, employee.getPersonId());
-
- try {
- // 1. invoke action bound to the employee just created
- employee.sack();
-
- // 2. check that invoked action has effectively run
- employee = container.getPerson().get(id, Employee.class);
- assertEquals(0, employee.getSalary().intValue());
- assertTrue(employee.getTitle().endsWith("[Sacked]"));
- } finally {
- // 3. remove the test employee
- container.getPerson().delete(employee.getPersonId());
- container.flush();
- }
- }
-
- @Test
- public void entityCollectionBoundPostWithParam() {
- EmployeeCollection employees = container.getPerson().getAll(EmployeeCollection.class);
- assertFalse(employees.isEmpty());
- final Map<Integer, Integer> preSalaries = new HashMap<Integer, Integer>(employees.size());
- for (Employee employee : employees) {
- preSalaries.put(employee.getPersonId(), employee.getSalary());
- }
- assertFalse(preSalaries.isEmpty());
-
- employees.increaseSalaries(1);
-
- employees = container.getPerson().getAll(EmployeeCollection.class);
- assertFalse(employees.isEmpty());
- for (Employee employee : employees) {
- assertTrue(preSalaries.get(employee.getPersonId()) < employee.getSalary());
- }
- }
-
- @Test
- public void changeProductDimensions() {
- // 0. create a product
- final Integer id = 101;
-
- Product product = container.getProduct().newProduct();
- product.setProductId(id);
- product.setDescription("New product");
-
- final Dimensions origDimensions = new Dimensions();
- origDimensions.setDepth(BigDecimal.ZERO);
- origDimensions.setHeight(BigDecimal.ZERO);
- origDimensions.setWidth(BigDecimal.ZERO);
- product.setDimensions(origDimensions);
-
- container.flush();
-
- product = container.getProduct().get(id);
- assertNotNull(product);
- assertEquals(id, product.getProductId());
- assertEquals(BigDecimal.ZERO, product.getDimensions().getDepth());
- assertEquals(BigDecimal.ZERO, product.getDimensions().getHeight());
- assertEquals(BigDecimal.ZERO, product.getDimensions().getWidth());
-
- try {
- // 1. invoke action bound to the product just created
- final Dimensions newDimensions = new Dimensions();
- newDimensions.setDepth(BigDecimal.ONE);
- newDimensions.setHeight(BigDecimal.ONE);
- newDimensions.setWidth(BigDecimal.ONE);
-
- product.changeProductDimensions(newDimensions);
-
- // 2. check that invoked action has effectively run
- product = container.getProduct().get(id);
- assertEquals(BigDecimal.ONE, product.getDimensions().getDepth());
- assertEquals(BigDecimal.ONE, product.getDimensions().getHeight());
- assertEquals(BigDecimal.ONE, product.getDimensions().getWidth());
- } finally {
- // 3. remove the test product
- container.getProduct().delete(product.getProductId());
- container.flush();
- }
- }
-
- @Test
- public void resetComputerDetailsSpecifications() {
- // 0. create a computer detail
- final Integer id = 101;
-
- ComputerDetail computerDetail = container.getComputerDetail().newComputerDetail();
- computerDetail.setComputerDetailId(id);
- computerDetail.setSpecificationsBag(Collections.singleton("First spec"));
-
- container.flush();
-
- computerDetail = container.getComputerDetail().get(id);
- assertNotNull(computerDetail);
- assertEquals(id, computerDetail.getComputerDetailId());
- assertEquals(1, computerDetail.getSpecificationsBag().size());
- assertTrue(computerDetail.getSpecificationsBag().contains("First spec"));
- assertEquals(ODataTimestamp.parse(EdmSimpleType.DateTime, "0001-01-01T00:00:00"),
- computerDetail.getPurchaseDate());
-
- try {
- // 1. invoke action bound to the computer detail just created
- computerDetail.resetComputerDetailsSpecifications(
- Collections.singleton("Second spec"),
- ODataTimestamp.getInstance(EdmSimpleType.DateTime, new Timestamp(System.currentTimeMillis())));
-
- // 2. check that invoked action has effectively run
- computerDetail = container.getComputerDetail().get(id);
- assertNotNull(computerDetail);
- assertEquals(id, computerDetail.getComputerDetailId());
- assertEquals(1, computerDetail.getSpecificationsBag().size());
- assertTrue(computerDetail.getSpecificationsBag().contains("Second spec"));
- assertNotEquals(ODataTimestamp.parse(EdmSimpleType.DateTime, "0001-01-01T00:00:00"),
- computerDetail.getPurchaseDate());
- } finally {
- // 3. remove the test product
- container.getComputerDetail().delete(computerDetail.getComputerDetailId());
- container.flush();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/MediaEntityTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/MediaEntityTestITCase.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/MediaEntityTestITCase.java
deleted file mode 100644
index eefcda1..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/MediaEntityTestITCase.java
+++ /dev/null
@@ -1,108 +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 com.msopentech.odatajclient.proxy;
-
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import com.msopentech.odatajclient.proxy.api.EntityContainerFactory;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Car;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import org.apache.commons.io.IOUtils;
-import org.junit.Test;
-
-/**
- * This is the unit test class to check media entity retrieve operations.
- */
-public class MediaEntityTestITCase extends AbstractTest {
-
- @Test
- public void read() throws IOException {
- final InputStream is = container.getCar().get(12).getStream();
- assertNotNull(is);
- IOUtils.closeQuietly(is);
- }
-
- @Test
- public void updateReadStreamedProperty() throws IOException {
- final String TO_BE_UPDATED = "buffered stream sample (" + System.currentTimeMillis() + ")";
- final InputStream input = new ByteArrayInputStream(TO_BE_UPDATED.getBytes());
-
- Car car = container.getCar().get(12);
- car.setPhoto(input);
-
- container.flush();
-
- car = container.getCar().get(12);
- final InputStream is = car.getPhoto();
- assertEquals(TO_BE_UPDATED, IOUtils.toString(is));
- IOUtils.closeQuietly(is);
- }
-
- @Test
- public void update() throws IOException {
- final Car car = container.getCar().get(14);
- assertNotNull(car);
-
- final String TO_BE_UPDATED = "buffered stream sample (" + System.currentTimeMillis() + ")";
- InputStream input = IOUtils.toInputStream(TO_BE_UPDATED);
-
- car.setStream(input);
-
- container.flush();
-
- input = container.getCar().get(14).getStream();
- assertEquals(TO_BE_UPDATED, IOUtils.toString(input));
- IOUtils.closeQuietly(input);
- }
-
- @Test
- public void create() throws IOException {
- Car car = container.getCar().newCar();
-
- final String TO_BE_UPDATED = "buffered stream sample (" + System.currentTimeMillis() + ")";
- InputStream input = IOUtils.toInputStream(TO_BE_UPDATED);
-
- final String DESC = "DESC - " + System.currentTimeMillis();
- car.setStream(input);
- car.setDescription(DESC);
-
- container.flush();
-
- int key = car.getVIN();
- assertTrue(key > 0);
-
- EntityContainerFactory.getContext().detachAll();
-
- car = container.getCar().get(key);
- assertEquals(DESC, car.getDescription());
- input = car.getStream();
- assertEquals(TO_BE_UPDATED, IOUtils.toString(input));
- IOUtils.closeQuietly(input);
-
- container.getCar().delete(key);
- container.flush();
-
- assertNull(container.getCar().get(key));
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/OpenTypeTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/OpenTypeTestITCase.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/OpenTypeTestITCase.java
deleted file mode 100644
index 8b435a7..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/OpenTypeTestITCase.java
+++ /dev/null
@@ -1,181 +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 com.msopentech.odatajclient.proxy;
-
-import static com.msopentech.odatajclient.proxy.AbstractTest.testOpenTypeServiceRootURL;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import com.msopentech.odatajclient.proxy.api.EntityContainerFactory;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.opentypeservice.microsoft.test.odata.services.opentypesservice.DefaultContainer;
-import com.msopentech.odatajclient.proxy.opentypeservice.microsoft.test.odata.services.opentypesservice.types.ContactDetails;
-import com.msopentech.odatajclient.proxy.opentypeservice.microsoft.test.odata.services.opentypesservice.types.IndexedRow;
-import com.msopentech.odatajclient.proxy.opentypeservice.microsoft.test.odata.services.opentypesservice.types.Row;
-import com.msopentech.odatajclient.proxy.opentypeservice.microsoft.test.odata.services.opentypesservice.types.RowIndex;
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
-import org.junit.Test;
-
-/**
- * This is the unit test class to check basic feed operations.
- */
-public class OpenTypeTestITCase extends AbstractTest {
-
- @Test
- public void checkOpenTypeEntityTypesExist() {
- assertTrue(Row.class.getAnnotation(EntityType.class).openType());
- assertTrue(IndexedRow.class.getAnnotation(EntityType.class).openType());
- assertTrue(RowIndex.class.getAnnotation(EntityType.class).openType());
- }
-
- @Test
- public void readRow() {
- final DefaultContainer otcontainer = EntityContainerFactory.getV3Instance(testOpenTypeServiceRootURL).
- getEntityContainer(DefaultContainer.class);
-
- Row row = otcontainer.getRow().get(UUID.fromString("71f7d0dc-ede4-45eb-b421-555a2aa1e58f"));
- Object value = row.getAdditionalProperty("Double");
- assertEquals(1.2626D, ((Double) value).doubleValue(), 1.0E-100D);
- }
-
- @Test
- public void cud() {
- final DefaultContainer otcontainer = EntityContainerFactory.getV3Instance(testOpenTypeServiceRootURL).
- getEntityContainer(DefaultContainer.class);
-
- Row row = otcontainer.getRow().newRow();
-
- final UUID guid = UUID.randomUUID();
- row.setId(guid);
-
- row.addAdditionalProperty("aString", "string");
- row.addAdditionalProperty("aBoolean", true);
- row.addAdditionalProperty("aLong", 15L);
- row.addAdditionalProperty("aDouble", 1.5D);
- row.addAdditionalProperty("aByte", Byte.MAX_VALUE);
- row.addAdditionalProperty("aDate",
- ODataTimestamp.getInstance(EdmSimpleType.DateTime, new Timestamp(new Date().getTime())));
-
- final Point point = new Point(Geospatial.Dimension.GEOGRAPHY);
- point.setX(1.2);
- point.setY(2.1);
- row.addAdditionalProperty("aPoint", point);
-
- final List<Point> points = new ArrayList<Point>();
- points.add(point);
- points.add(point);
- final MultiPoint multipoint = new MultiPoint(Geospatial.Dimension.GEOMETRY, points);
- row.addAdditionalProperty("aMultiPoint", multipoint);
-
- final LineString lineString = new LineString(Geospatial.Dimension.GEOMETRY, points);
- row.addAdditionalProperty("aLineString", lineString);
-
- final List<LineString> lineStrings = new ArrayList<LineString>();
- lineStrings.add(lineString);
- lineStrings.add(lineString);
- final MultiLineString multiLineString = new MultiLineString(Geospatial.Dimension.GEOGRAPHY, lineStrings);
- row.addAdditionalProperty("aMultiLineString", multiLineString);
-
- final Point otherPoint = new Point(Geospatial.Dimension.GEOGRAPHY);
- otherPoint.setX(3.4);
- otherPoint.setY(4.3);
- points.set(1, otherPoint);
- points.add(otherPoint);
- points.add(point);
- final Polygon polygon = new Polygon(Geospatial.Dimension.GEOGRAPHY, points, points);
- row.addAdditionalProperty("aPolygon", polygon);
-
- final List<Polygon> polygons = new ArrayList<Polygon>();
- polygons.add(polygon);
- polygons.add(polygon);
- final MultiPolygon multiPolygon = new MultiPolygon(Geospatial.Dimension.GEOGRAPHY, polygons);
- row.addAdditionalProperty("aMultiPolygon", multiPolygon);
-
- final List<Geospatial> geospatials = new ArrayList<Geospatial>();
- geospatials.add(otherPoint);
- geospatials.add(polygon);
- geospatials.add(multiLineString);
- geospatials.add(multiPolygon);
- final GeospatialCollection geoColl = new GeospatialCollection(Geospatial.Dimension.GEOGRAPHY, geospatials);
- row.addAdditionalProperty("aCollection", geoColl);
-
- ContactDetails contactDetails = new ContactDetails();
- contactDetails.setFirstContacted("text".getBytes());
- contactDetails.setLastContacted(
- ODataTimestamp.parse(EdmSimpleType.DateTimeOffset, "2001-04-05T05:05:05.001+00:01"));
- contactDetails.setContacted(
- ODataTimestamp.parse(EdmSimpleType.DateTime, "2001-04-05T05:05:04.001"));
- contactDetails.setGUID(UUID.randomUUID());
- contactDetails.setPreferedContactTime(new ODataDuration("-P9DT51M10.5063807S"));
- contactDetails.setByte(241);
- contactDetails.setSignedByte(Byte.MAX_VALUE);
- contactDetails.setDouble(Double.MAX_VALUE);
- contactDetails.setSingle(Float.MAX_VALUE);
- contactDetails.setShort(Short.MAX_VALUE);
- contactDetails.setInt(Integer.MAX_VALUE);
- contactDetails.setLong(Long.MAX_VALUE);
- row.addAdditionalProperty("aContact", contactDetails);
-
- otcontainer.flush();
-
- row = otcontainer.getRow().get(guid);
- assertNotNull(row);
-
- assertEquals(1.5D, ((Double) row.getAdditionalProperty("aDouble")).doubleValue(), 0.1E-100);
- assertEquals(1.2D, ((Point) row.getAdditionalProperty("aPoint")).getX(), 0.1E-100);
- assertEquals(2.1D, ((Point) row.getAdditionalProperty("aPoint")).getY(), 0.1E-100);
-
- GeospatialCollection aCollection = (GeospatialCollection) row.getAdditionalProperty("aCollection");
- assertEquals(Geospatial.Dimension.GEOGRAPHY, aCollection.getDimension());
- int count = 0;
- for (Geospatial geospatial : aCollection) {
- count++;
- }
- assertEquals(4, count);
-
- ContactDetails aContact = (ContactDetails) row.getAdditionalProperty("aContact");
- assertEquals("text", new String(aContact.getFirstContacted()));
- assertEquals(Short.MAX_VALUE, aContact.getShort().shortValue());
- assertEquals(241, aContact.getByte().intValue());
- assertEquals(ODataTimestamp.parse(EdmSimpleType.DateTime, "2001-04-05T05:05:04.001").toString(),
- aContact.getContacted().toString());
-
- otcontainer.getRow().delete(guid);
- otcontainer.flush();
-
- assertNull(otcontainer.getRow().get(guid));
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/PrimitiveKeysTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/PrimitiveKeysTestITCase.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/PrimitiveKeysTestITCase.java
deleted file mode 100644
index ed5754d..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/PrimitiveKeysTestITCase.java
+++ /dev/null
@@ -1,74 +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 com.msopentech.odatajclient.proxy;
-
-import static org.junit.Assert.assertEquals;
-
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.proxy.api.EntityContainerFactory;
-import com.msopentech.odatajclient.proxy.primitivekeysservice.microsoft.test.odata.services.primitivekeysservice.TestContext;
-import java.math.BigDecimal;
-import java.util.UUID;
-import org.junit.Test;
-
-/**
- * This is the unit test class to check basic feed operations.
- */
-public class PrimitiveKeysTestITCase extends AbstractTest {
-
- @Test
- public void readPrimitiveKeys() {
- final EntityContainerFactory factory = EntityContainerFactory.getV3Instance(testPrimitiveKeysServiceRootURL);
- final TestContext pkcontainer = factory.getEntityContainer(TestContext.class);
-
- // commented as per #115
- //assertEquals(new byte[] {Byte.valueOf("2"), Byte.valueOf("3"), Byte.valueOf("4")},
- // container.getEdmBinarySet().get(
- // new byte[] {Byte.valueOf("2"), Byte.valueOf("3"), Byte.valueOf("4")}).getId());
-
- assertEquals(Boolean.TRUE, pkcontainer.getEdmBooleanSet().get(Boolean.TRUE).getId());
- assertEquals(Integer.valueOf(255), pkcontainer.getEdmByteSet().get(255).getId());
- assertEquals(new BigDecimal("79228162514264337593543950335"),
- pkcontainer.getEdmDecimalSet().get(new BigDecimal("79228162514264337593543950335")).getId());
- assertEquals(UUID.fromString("00000000-0000-0000-0000-000000000000"),
- pkcontainer.getEdmGuidSet().get(UUID.fromString("00000000-0000-0000-0000-000000000000")).getId());
- assertEquals(Integer.valueOf(-2147483648),
- pkcontainer.getEdmInt32Set().get(Integer.valueOf(-2147483648)).getId());
- assertEquals(Long.valueOf(9223372036854775807L),
- pkcontainer.getEdmInt64Set().get(Long.valueOf(9223372036854775807L)).getId());
- assertEquals("$", pkcontainer.getEdmStringSet().get("$").getId());
- assertEquals(new ODataDuration("-P10675199DT2H48M5.4775808S"),
- pkcontainer.getEdmTimeSet().get(new ODataDuration("-P10675199DT2H48M5.4775808S")).getId());
- assertEquals(32767, pkcontainer.getEdmInt16Set().get(Short.valueOf("32767")).getId().shortValue());
- assertEquals(Double.valueOf(1.7976931348623157E+308D),
- pkcontainer.getEdmDoubleSet().get(1.7976931348623157E+308D).getId());
- assertEquals(Float.valueOf(3.40282347E+38F),
- pkcontainer.getEdmSingleSet().get(Float.valueOf(3.40282347E+38F)).getId());
-
- // commented as per #115
- //assertEquals(
- // ODataTimestamp.parse(EdmSimpleType.DATE_TIME.pattern(), "0001-01-01T00:00:00"),
- // container.getEdmDateTimeSet().get(
- // ODataTimestamp.parse(EdmSimpleType.DATE_TIME.pattern(), "0001-01-01T00:00:00")));
- //assertEquals(
- // ODataTimestamp.parse(EdmSimpleType.DATE_TIME_OFFSET.pattern(), "2013-08-14T13:33:46.1045905+02:00"),
- // container.getEdmDateTimeOffsetSet().get(
- // ODataTimestamp.parse(EdmSimpleType.DATE_TIME_OFFSET.pattern(), "2013-08-14T13:33:46.1045905+02:00")));
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/PropertyTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/PropertyTestITCase.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/PropertyTestITCase.java
deleted file mode 100644
index a6b0b27..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/PropertyTestITCase.java
+++ /dev/null
@@ -1,59 +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 com.msopentech.odatajclient.proxy;
-
-import static com.msopentech.odatajclient.proxy.AbstractTest.container;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-
-import com.msopentech.odatajclient.proxy.api.EntityContainerFactory;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Driver;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Order;
-import org.junit.Test;
-
-/**
- * This is the unit test class to check actions overloading.
- */
-public class PropertyTestITCase extends AbstractTest {
-
- @Test
- public void nullNullableProperty() {
- Order order = container.getOrder().get(-8);
- order.setCustomerId(null);
-
- container.flush();
-
- order = container.getOrder().get(-8);
- assertNull(order.getCustomerId());
- }
-
- @Test
- public void nullNonNullableProperty() {
- Driver driver = container.getDriver().get("1");
- driver.setBirthDate(null);
-
- try {
- container.flush();
- fail();
- } catch (IllegalStateException e) {
- // ignore and detach all
- EntityContainerFactory.getContext().detachAll();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/QueryTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/QueryTestITCase.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/QueryTestITCase.java
deleted file mode 100644
index cbd25cf..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/QueryTestITCase.java
+++ /dev/null
@@ -1,107 +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 com.msopentech.odatajclient.proxy;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import com.msopentech.odatajclient.proxy.api.NonUniqueResultException;
-import com.msopentech.odatajclient.proxy.api.Query;
-import com.msopentech.odatajclient.proxy.api.Sort;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Car;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.CarCollection;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.EmployeeCollection;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployee;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployeeCollection;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import org.junit.Test;
-
-public class QueryTestITCase extends AbstractTest {
-
- @Test
- public void filterOrderby() {
- final Query<Car, CarCollection> query = container.getCar().createQuery().setFilter("VIN lt 16");
- CarCollection result = query.getResult();
- assertNotNull(result);
-
- // 1. check that filtered entity set looks as expected
- assertEquals(5, result.size());
-
- // 2. extract VIN values - sorted ASC by default
- final List<Integer> vinsASC = new ArrayList<Integer>(5);
- for (Car car : result) {
- assertTrue(car.getVIN() < 16);
- vinsASC.add(car.getVIN());
- }
-
- // 3. add orderby clause to filter above
- result = query.setOrderBy(new Sort("VIN", Sort.Direction.DESC)).getResult();
- assertNotNull(result);
- assertEquals(5, result.size());
-
- // 4. extract again VIN value - now they were required to be sorted DESC
- final List<Integer> vinsDESC = new ArrayList<Integer>(5);
- for (Car car : result) {
- assertTrue(car.getVIN() < 16);
- vinsDESC.add(car.getVIN());
- }
-
- // 5. reverse vinsASC and expect to be equal to vinsDESC
- Collections.reverse(vinsASC);
- assertEquals(vinsASC, vinsDESC);
- }
-
- @Test
- public void single() {
- final Query<Car, CarCollection> query = container.getCar().createQuery().setFilter("VIN lt 16");
-
- Exception exception = null;
- try {
- query.getSingleResult();
- fail();
- } catch (NonUniqueResultException e) {
- exception = e;
- }
- assertNotNull(exception);
-
- query.setFilter(containerFactory.getFilterFactory().eq("VIN", 16));
- final Car result = query.getSingleResult();
- assertNotNull(result);
- }
-
- @Test
- public void polymorph() {
- final Query<Employee, EmployeeCollection> queryEmployee =
- container.getPerson().createQuery(EmployeeCollection.class);
- assertFalse(queryEmployee.getResult().isEmpty());
-
- final Query<SpecialEmployee, SpecialEmployeeCollection> querySpecialEmployee =
- container.getPerson().createQuery(SpecialEmployeeCollection.class);
- assertFalse(querySpecialEmployee.getResult().isEmpty());
-
- assertTrue(container.getPerson().getAll().size()
- > queryEmployee.getResult().size() + querySpecialEmployee.getResult().size());
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
deleted file mode 100644
index 9f5156b..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
+++ /dev/null
@@ -1,54 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "AllGeoCollectionTypesSet")
-public interface AllGeoCollectionTypesSet extends AbstractEntitySet<com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes, Integer, com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypesCollection> {
-
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes newAllSpatialCollectionTypes();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypesCollection newAllSpatialCollectionTypesCollection();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes_Simple newAllSpatialCollectionTypes_Simple();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes_SimpleCollection newAllSpatialCollectionTypes_SimpleCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
deleted file mode 100644
index 23effcb..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "AllGeoTypesSet")
-public interface AllGeoTypesSet extends AbstractEntitySet<com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypes, Integer, com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypesCollection> {
-
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypes newAllSpatialTypes();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypesCollection newAllSpatialTypesCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Car.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Car.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Car.java
deleted file mode 100644
index df09c51a..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Car.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "Car")
-public interface Car extends AbstractEntitySet<com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Car, Integer, com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.CarCollection> {
-
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Car newCar();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.CarCollection newCarCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Computer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Computer.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Computer.java
deleted file mode 100644
index 81949ad..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Computer.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "Computer")
-public interface Computer extends AbstractEntitySet<com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer, Integer, com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerCollection> {
-
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer newComputer();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerCollection newComputerCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
deleted file mode 100644
index 7ae0992..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "ComputerDetail")
-public interface ComputerDetail extends AbstractEntitySet<com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail, Integer, com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetailCollection> {
-
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail newComputerDetail();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetailCollection newComputerDetailCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Customer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Customer.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Customer.java
deleted file mode 100644
index 722f3ef..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Customer.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "Customer")
-public interface Customer extends AbstractEntitySet<com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer, Integer, com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection> {
-
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer newCustomer();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection newCustomerCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
deleted file mode 100644
index a71fbf0..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "CustomerInfo")
-public interface CustomerInfo extends AbstractEntitySet<com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo, Integer, com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfoCollection> {
-
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo newCustomerInfo();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfoCollection newCustomerInfoCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
deleted file mode 100644
index 85b8702..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
+++ /dev/null
@@ -1,159 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityContainer;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractContainer;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityContainer(name = "DefaultContainer",
- isDefaultEntityContainer = true)
-public interface DefaultContainer extends AbstractContainer {
-
- AllGeoTypesSet getAllGeoTypesSet();
-
- AllGeoCollectionTypesSet getAllGeoCollectionTypesSet();
-
- Customer getCustomer();
-
- Login getLogin();
-
- RSAToken getRSAToken();
-
- PageView getPageView();
-
- LastLogin getLastLogin();
-
- Message getMessage();
-
- MessageAttachment getMessageAttachment();
-
- Order getOrder();
-
- OrderLine getOrderLine();
-
- Product getProduct();
-
- ProductDetail getProductDetail();
-
- ProductReview getProductReview();
-
- ProductPhoto getProductPhoto();
-
- CustomerInfo getCustomerInfo();
-
- Computer getComputer();
-
- ComputerDetail getComputerDetail();
-
- Driver getDriver();
-
- License getLicense();
-
- MappedEntityType getMappedEntityType();
-
- Car getCar();
-
- Person getPerson();
-
- PersonMetadata getPersonMetadata();
-
-
-
-
- @Operation(name = "RetrieveProduct" ,
- httpMethod = HttpMethod.POST ,
- returnType = "Edm.Int32")
- Integer retrieveProduct(
- );
- @Operation(name = "RetrieveProduct" ,
- returnType = "Edm.Int32")
- Integer retrieveProduct(
- @Parameter(name = "product", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product", nullable = true) com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Product product
- );
- @Operation(name = "RetrieveProduct" ,
- returnType = "Edm.Int32")
- Integer retrieveProduct(
- @Parameter(name = "orderLine", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.OrderLine", nullable = true) com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine orderLine
- );
- @Operation(name = "IncreaseSalaries" )
- void increaseSalaries(
- @Parameter(name = "employees", type = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Employee)", nullable = true) com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.EmployeeCollection employees,
- @Parameter(name = "n", type = "Edm.Int32", nullable = false) Integer n
- );
- @Operation(name = "IncreaseSalaries" )
- void increaseSalaries(
- @Parameter(name = "specialEmployees", type = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee)", nullable = true) com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployeeCollection specialEmployees,
- @Parameter(name = "n", type = "Edm.Int32", nullable = false) Integer n
- );
- @Operation(name = "UpdatePersonInfo" )
- void updatePersonInfo(
- );
- @Operation(name = "UpdatePersonInfo" )
- void updatePersonInfo(
- @Parameter(name = "person", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Person", nullable = true) com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Person person
- );
- @Operation(name = "UpdatePersonInfo" )
- void updatePersonInfo(
- @Parameter(name = "employee", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Employee", nullable = true) com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee employee
- );
- @Operation(name = "UpdatePersonInfo" )
- void updatePersonInfo(
- @Parameter(name = "specialEmployee", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee", nullable = true) com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployee specialEmployee
- );
- @Operation(name = "UpdatePersonInfo" )
- void updatePersonInfo(
- @Parameter(name = "contractor", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Contractor", nullable = true) com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Contractor contractor
- );
- @Operation(name = "IncreaseEmployeeSalary" ,
- returnType = "Edm.Boolean")
- Boolean increaseEmployeeSalary(
- @Parameter(name = "employee", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Employee", nullable = true) com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee employee,
- @Parameter(name = "n", type = "Edm.Int32", nullable = false) Integer n
- );
- @Operation(name = "IncreaseEmployeeSalary" ,
- returnType = "Edm.Int32")
- Integer increaseEmployeeSalary(
- @Parameter(name = "specialEmployee", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee", nullable = true) com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployee specialEmployee
- );
- }
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Driver.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Driver.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Driver.java
deleted file mode 100644
index 520ad6e..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Driver.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "Driver")
-public interface Driver extends AbstractEntitySet<com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Driver, String, com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.DriverCollection> {
-
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Driver newDriver();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.DriverCollection newDriverCollection();
-}
[07/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java
deleted file mode 100644
index 29097f4..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java
+++ /dev/null
@@ -1,114 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "MessageAttachment",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface MessageAttachment extends Serializable {
-
-
- @Key
- @Property(name = "AttachmentId",
- type = "Edm.Guid",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public UUID getAttachmentId();
-
- public void setAttachmentId(final UUID _attachmentId);
-
-
- @Property(name = "Attachment",
- type = "Edm.Binary",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public byte[] getAttachment();
-
- public void setAttachment(final byte[] _attachment);
-
-
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java
deleted file mode 100644
index f6854d8..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface MessageAttachmentCollection extends AbstractEntityCollection<MessageAttachment> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java
deleted file mode 100644
index 48e06da..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface MessageCollection extends AbstractEntityCollection<Message> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java
deleted file mode 100644
index a81ce8e..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java
+++ /dev/null
@@ -1,75 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractEntityKey;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-@CompoundKey
-public class MessageKey extends AbstractEntityKey {
-
- private String _fromUsername;
-
- @CompoundKeyElement(name = "FromUsername", position = 0)
- public String getFromUsername() {
- return _fromUsername;
- }
-
- public void setFromUsername(final String _fromUsername) {
- this._fromUsername = _fromUsername;
- }
-
- private Integer _messageId;
-
- @CompoundKeyElement(name = "MessageId", position = 1)
- public Integer getMessageId() {
- return _messageId;
- }
-
- public void setMessageId(final Integer _messageId) {
- this._messageId = _messageId;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Order.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Order.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Order.java
deleted file mode 100644
index 26d2c8b..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Order.java
+++ /dev/null
@@ -1,157 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "Order",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface Order extends Serializable {
-
-
- @Key
- @Property(name = "OrderId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getOrderId();
-
- public void setOrderId(final Integer _orderId);
-
-
- @Property(name = "CustomerId",
- type = "Edm.Int32",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getCustomerId();
-
- public void setCustomerId(final Integer _customerId);
-
-
- @Property(name = "Concurrency",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo getConcurrency();
-
- public void setConcurrency(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _concurrency);
-
-
-
-
- @NavigationProperty(name = "Login",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Login")
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Login getLogin();
-
- public void setLogin(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Login _login);
-
-
- @NavigationProperty(name = "Customer",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Customer")
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer getCustomer();
-
- public void setCustomer(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer _customer);
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java
deleted file mode 100644
index 302e4f0..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface OrderCollection extends AbstractEntityCollection<Order> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java
deleted file mode 100644
index 7696336..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java
+++ /dev/null
@@ -1,207 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-@KeyRef(OrderLineKey.class)
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "OrderLine",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface OrderLine extends Serializable {
-
-
-
- @Property(name = "OrderLineStream",
- type = "Edm.Stream",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public java.io.InputStream getOrderLineStream();
-
- public void setOrderLineStream(final java.io.InputStream _orderLineStream);
-
- @Key
- @Property(name = "OrderId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getOrderId();
-
- public void setOrderId(final Integer _orderId);
-
- @Key
- @Property(name = "ProductId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getProductId();
-
- public void setProductId(final Integer _productId);
-
-
- @Property(name = "Quantity",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getQuantity();
-
- public void setQuantity(final Integer _quantity);
-
-
- @Property(name = "ConcurrencyToken",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.Fixed,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getConcurrencyToken();
-
- public void setConcurrencyToken(final String _concurrencyToken);
-
-
-
-
- @NavigationProperty(name = "Order",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Order")
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Order getOrder();
-
- public void setOrder(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Order _order);
-
-
- @NavigationProperty(name = "Product",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Product")
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Product getProduct();
-
- public void setProduct(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
-
-
- @Operation(name = "RetrieveProduct" ,
- returnType = "Edm.Int32")
- Integer retrieveProduct(
- );
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java
deleted file mode 100644
index 0d374e8..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface OrderLineCollection extends AbstractEntityCollection<OrderLine> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java
deleted file mode 100644
index 1fc451a..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java
+++ /dev/null
@@ -1,75 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractEntityKey;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-@CompoundKey
-public class OrderLineKey extends AbstractEntityKey {
-
- private Integer _orderId;
-
- @CompoundKeyElement(name = "OrderId", position = 0)
- public Integer getOrderId() {
- return _orderId;
- }
-
- public void setOrderId(final Integer _orderId) {
- this._orderId = _orderId;
- }
-
- private Integer _productId;
-
- @CompoundKeyElement(name = "ProductId", position = 1)
- public Integer getProductId() {
- return _productId;
- }
-
- public void setProductId(final Integer _productId) {
- this._productId = _productId;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java
deleted file mode 100644
index ea45b35..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java
+++ /dev/null
@@ -1,193 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "PageView",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface PageView extends Serializable {
-
-
- @Key
- @Property(name = "PageViewId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getPageViewId();
-
- public void setPageViewId(final Integer _pageViewId);
-
-
- @Property(name = "Username",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getUsername();
-
- public void setUsername(final String _username);
-
-
- @Property(name = "Viewed",
- type = "Edm.DateTimeOffset",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public ODataTimestamp getViewed();
-
- public void setViewed(final ODataTimestamp _viewed);
-
-
- @Property(name = "TimeSpentOnPage",
- type = "Edm.Time",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public ODataDuration getTimeSpentOnPage();
-
- public void setTimeSpentOnPage(final ODataDuration _timeSpentOnPage);
-
-
- @Property(name = "PageUrl",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getPageUrl();
-
- public void setPageUrl(final String _pageUrl);
-
-
-
-
- @NavigationProperty(name = "Login",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Login")
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Login getLogin();
-
- public void setLogin(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Login _login);
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java
deleted file mode 100644
index 19c47f1..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface PageViewCollection extends AbstractEntityCollection<PageView> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Person.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Person.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Person.java
deleted file mode 100644
index 64d87f3..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Person.java
+++ /dev/null
@@ -1,127 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "Person",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface Person extends Serializable {
-
-
- @Key
- @Property(name = "PersonId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getPersonId();
-
- public void setPersonId(final Integer _personId);
-
-
- @Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getName();
-
- public void setName(final String _name);
-
-
-
-
- @NavigationProperty(name = "PersonMetadata",
- type = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata)",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "PersonMetadata")
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection getPersonMetadata();
-
- public void setPersonMetadata(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection _personMetadata);
-
-
- @Operation(name = "UpdatePersonInfo" )
- void updatePersonInfo(
- );
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java
deleted file mode 100644
index 50a79f6..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface PersonCollection extends AbstractEntityCollection<Person> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java
deleted file mode 100644
index faac7c2..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java
+++ /dev/null
@@ -1,170 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "PersonMetadata",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface PersonMetadata extends Serializable {
-
-
- @Key
- @Property(name = "PersonMetadataId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getPersonMetadataId();
-
- public void setPersonMetadataId(final Integer _personMetadataId);
-
-
- @Property(name = "PersonId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getPersonId();
-
- public void setPersonId(final Integer _personId);
-
-
- @Property(name = "PropertyName",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getPropertyName();
-
- public void setPropertyName(final String _propertyName);
-
-
- @Property(name = "PropertyValue",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getPropertyValue();
-
- public void setPropertyValue(final String _propertyValue);
-
-
-
-
- @NavigationProperty(name = "Person",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Person",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Person")
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Person getPerson();
-
- public void setPerson(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Person _person);
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java
deleted file mode 100644
index 5da073f..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface PersonMetadataCollection extends AbstractEntityCollection<PersonMetadata> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java
deleted file mode 100644
index 23bf262..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java
+++ /dev/null
@@ -1,69 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.ComplexType;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@ComplexType("Phone")
-public class Phone extends AbstractComplexType {
-
- private String _phoneNumber;
-
- @Property(name = "PhoneNumber", type = "Edm.String", nullable = true)
- public String getPhoneNumber() {
- return _phoneNumber;
- }
-
- public void setPhoneNumber(final String _phoneNumber) {
- this._phoneNumber = _phoneNumber;
- }
- private String _extension;
-
- @Property(name = "Extension", type = "Edm.String", nullable = true)
- public String getExtension() {
- return _extension;
- }
-
- public void setExtension(final String _extension) {
- this._extension = _extension;
- }
-}
[30/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/EntitySetTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/EntitySetTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/EntitySetTestITCase.java
deleted file mode 100644
index 07adf34..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/EntitySetTestITCase.java
+++ /dev/null
@@ -1,150 +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 com.msopentech.odatajclient.engine.it;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataEntitySetIteratorRequest;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataEntitySetRequest;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataGenericRetrieveRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.data.ODataEntitySet;
-import com.msopentech.odatajclient.engine.data.ODataEntitySetIterator;
-import com.msopentech.odatajclient.engine.data.ODataObjectWrapper;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import com.msopentech.odatajclient.engine.data.ResourceFactory;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import com.msopentech.odatajclient.engine.utils.URIUtils;
-import java.io.IOException;
-import java.net.URI;
-import org.junit.Test;
-
-/**
- * This is the unit test class to check basic feed operations.
- */
-public class EntitySetTestITCase extends AbstractTestITCase {
-
- protected String getServiceRoot() {
- return testStaticServiceRootURL;
- }
-
- @Test
- public void genericRequestAsAtom() throws IOException {
- genericRequest(ODataPubFormat.ATOM);
- }
-
- @Test
- public void genericRequestAsJSON() throws IOException {
- genericRequest(ODataPubFormat.JSON);
- }
-
- @Test
- public void readODataEntitySetIteratorFromAtom() {
- readODataEntitySetIterator(ODataPubFormat.ATOM);
- }
-
- @Test
- public void readODataEntitySetIteratorFromJSON() {
- readODataEntitySetIterator(ODataPubFormat.JSON);
- }
-
- @Test
- public void readODataEntitySetIteratorFromJSONFullMeta() {
- readODataEntitySetIterator(ODataPubFormat.JSON_FULL_METADATA);
- }
-
- @Test
- public void readODataEntitySetIteratorFromJSONNoMeta() {
- readODataEntitySetIterator(ODataPubFormat.JSON_NO_METADATA);
- }
-
- @Test
- public void readODataEntitySetWithNextFromAtom() {
- readEntitySetWithNextLink(ODataPubFormat.ATOM);
- }
-
- @Test
- public void readODataEntitySetWithNextFromJSON() {
- readEntitySetWithNextLink(ODataPubFormat.JSON_FULL_METADATA);
- }
-
- private void readEntitySetWithNextLink(final ODataPubFormat format) {
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot());
- uriBuilder.appendEntitySetSegment("Customer");
-
- final ODataEntitySetRequest req = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
- req.setFormat(format);
-
- final ODataRetrieveResponse<ODataEntitySet> res = req.execute();
- final ODataEntitySet feed = res.getBody();
-
- assertNotNull(feed);
-
- debugFeed(client.getBinder().getFeed(feed, ResourceFactory.feedClassForFormat(format)), "Just retrieved feed");
-
- assertEquals(2, feed.getEntities().size());
- assertNotNull(feed.getNext());
-
- final URI expected = URI.create(getServiceRoot() + "/Customer?$skiptoken=-9");
- final URI found = URIUtils.getURI(getServiceRoot(), feed.getNext().toASCIIString());
-
- assertEquals(expected, found);
- }
-
- private void readODataEntitySetIterator(final ODataPubFormat format) {
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot());
- uriBuilder.appendEntitySetSegment("Customer");
-
- final ODataEntitySetIteratorRequest req =
- client.getRetrieveRequestFactory().getEntitySetIteratorRequest(uriBuilder.build());
- req.setFormat(format);
-
- final ODataRetrieveResponse<ODataEntitySetIterator> res = req.execute();
- final ODataEntitySetIterator feedIterator = res.getBody();
-
- assertNotNull(feedIterator);
-
- int count = 0;
-
- while (feedIterator.hasNext()) {
- assertNotNull(feedIterator.next());
- count++;
- }
- assertEquals(2, count);
- assertTrue(feedIterator.getNext().toASCIIString().endsWith("Customer?$skiptoken=-9"));
- }
-
- private void genericRequest(final ODataPubFormat format) {
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot());
- uriBuilder.appendEntitySetSegment("Car");
-
- final ODataGenericRetrieveRequest req =
- client.getRetrieveRequestFactory().getGenericRetrieveRequest(uriBuilder.build());
- req.setFormat(format.toString());
-
- final ODataRetrieveResponse<ODataObjectWrapper> res = req.execute();
-
- ODataObjectWrapper wrapper = res.getBody();
-
- final ODataEntitySet entitySet = wrapper.getODataEntitySet();
- assertNotNull(entitySet);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/EntityTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/EntityTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/EntityTestITCase.java
deleted file mode 100644
index 6875bf3..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/EntityTestITCase.java
+++ /dev/null
@@ -1,327 +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 com.msopentech.odatajclient.engine.it;
-
-import static org.junit.Assert.*;
-
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import org.junit.Test;
-
-import com.msopentech.odatajclient.engine.communication.ODataClientErrorException;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataEntityRequest;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataEntitySetRequest;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataLinkCollectionRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.data.ODataEntitySet;
-import com.msopentech.odatajclient.engine.data.ODataLinkCollection;
-import com.msopentech.odatajclient.engine.data.ODataProperty;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import java.net.URI;
-
-public class EntityTestITCase extends AbstractTestITCase {
-
- private void retreiveEntityTest(final ODataPubFormat reqFormat, final String acceptFormat) {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment("Product").appendKeySegment(-9);
- final ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setFormat(reqFormat);
- req.setAccept(acceptFormat);
- try {
- final ODataRetrieveResponse<ODataEntity> res = req.execute();
- assertEquals(200, res.getStatusCode());
- assertNotNull(res.getEtag());
- final ODataEntity entity = res.getBody();
- assertEquals("Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct", entity.getName());
- final List<ODataProperty> properties = entity.getProperties();
- assertEquals(10, properties.size());
- } catch (ODataClientErrorException e) {
- assertEquals(415, e.getStatusLine().getStatusCode());
- }
- }
-
- private void retreiveFullMetadataEntityTest(final ODataPubFormat reqFormat, final String acceptFormat) {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment("Product").appendKeySegment(-9);
- final ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setFormat(reqFormat);
- req.setAccept(acceptFormat);
- try {
- final ODataRetrieveResponse<ODataEntity> res = req.execute();
- assertEquals(200, res.getStatusCode());
- assertNotNull(res.getEtag());
- final ODataEntity entity = res.getBody();
- assertEquals("Microsoft.Test.OData.Services.AstoriaDefaultService.DiscontinuedProduct", entity.getName());
- assertNotNull(entity.getEditLink().toASCIIString());
- assertTrue(entity.getAssociationLinks().isEmpty());
- final List<ODataProperty> properties = entity.getProperties();
- assertEquals(10, properties.size());
- } catch (ODataClientErrorException e) {
- assertEquals(415, e.getStatusLine().getStatusCode());
- }
- }
-
- private void retreiveNoMetadataEntityTest(final ODataPubFormat reqFormat, final String acceptFormat) {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment("Product").appendKeySegment(-9);
- final ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setFormat(reqFormat);
- req.setAccept(acceptFormat);
- try {
- final ODataRetrieveResponse<ODataEntity> res = req.execute();
- assertEquals(200, res.getStatusCode());
- final ODataEntity entity = res.getBody();
- assertNull(entity.getName());
- final List<ODataProperty> properties = entity.getProperties();
- assertEquals(10, properties.size());
- } catch (ODataClientErrorException e) {
- assertEquals(415, e.getStatusLine().getStatusCode());
- }
- }
-
- private void retreiveMinimalMetadataEntityTest(final ODataPubFormat reqFormat, final String acceptFormat) {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment("Product").appendKeySegment(-9);
- final ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setFormat(reqFormat);
- req.setAccept(acceptFormat);
- try {
- final ODataRetrieveResponse<ODataEntity> res = req.execute();
- assertEquals(200, res.getStatusCode());
- final ODataEntity entity = res.getBody();
- assertNull(entity.getName());
- final List<ODataProperty> properties = entity.getProperties();
- } catch (ODataClientErrorException e) {
- assertEquals(415, e.getStatusLine().getStatusCode());
- }
- }
-
- private void retreiveEntityTestWithExpand(final ODataPubFormat reqFormat, final String acceptFormat) {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment("Customer").appendKeySegment(-10).expand("Orders");
- final ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setFormat(reqFormat);
- req.setAccept(acceptFormat);
- try {
- final ODataRetrieveResponse<ODataEntity> res = req.execute();
- assertEquals(200, res.getStatusCode());
- final ODataEntity entity = res.getBody();
- assertNotNull(entity);
- assertFalse(entity.getProperties().isEmpty());
- } catch (ODataClientErrorException e) {
- assertEquals(415, e.getStatusLine().getStatusCode());
- }
- }
-
- private void retreiveEntityTestWithSelect(
- final ODataPubFormat reqFormat, final String acceptFormat, final String selectFormat) {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment("Customer").appendKeySegment(-10).select(selectFormat);
- final ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setFormat(reqFormat);
- req.setAccept(acceptFormat);
- try {
- final ODataRetrieveResponse<ODataEntity> res = req.execute();
- assertEquals(200, res.getStatusCode());
- final ODataEntity entity = res.getBody();
- assertNotNull(entity);
- } catch (ODataClientErrorException e) {
- assertEquals(415, e.getStatusLine().getStatusCode());
- }
- }
-
- private void retreiveEntityTestWithSelectAndExpand(final ODataPubFormat reqFormat, final String acceptFormat,
- final String selectFormat, String expandFormat) {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment("Customer").appendKeySegment(-10).select(selectFormat).expand(expandFormat);
- final ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setFormat(reqFormat);
- req.setAccept(acceptFormat);
- try {
- final ODataRetrieveResponse<ODataEntity> res = req.execute();
- assertEquals(200, res.getStatusCode());
- final ODataEntity entity = res.getBody();
- assertNotNull(entity);
- final List<ODataProperty> properties = entity.getProperties();
- } catch (ODataClientErrorException e) {
- assertEquals(415, e.getStatusLine().getStatusCode());
- }
- }
-
- private void multiKeyTest(final ODataPubFormat format, final String acceptFormat) {
- final Map<String, Object> multiKey = new LinkedHashMap<String, Object>();
- multiKey.put("FromUsername", "1");
- multiKey.put("MessageId", -10);
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment("Message").appendKeySegment(multiKey);
- final ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setFormat(format);
- req.setAccept(acceptFormat);
- try {
- final ODataRetrieveResponse<ODataEntity> res = req.execute();
- final ODataEntity entity = res.getBody();
- assertNotNull(entity);
- } catch (ODataClientErrorException e) {
- assertEquals(415, e.getStatusLine().getStatusCode());
- }
- }
-
- private void navigationLinks(final ODataFormat format, final String acceptFormat) {
- URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendNavigationLinkSegment("Customer").appendKeySegment(-10);
- ODataLinkCollectionRequest req =
- client.getRetrieveRequestFactory().getLinkCollectionRequest(uriBuilder.build(), "Orders");
- req.setFormat(format);
- req.setAccept(acceptFormat);
- try {
- final ODataRetrieveResponse<ODataLinkCollection> res = req.execute();
- assertEquals(200, res.getStatusCode());
- final ODataLinkCollection linkCollection = res.getBody();
- assertNotNull(linkCollection);
- final List<URI> links = linkCollection.getLinks();
- assertFalse(links.isEmpty());
- for (URI link : links) {
- assertNotNull(link);
- }
- } catch (ODataClientErrorException e) {
- assertEquals(415, e.getStatusLine().getStatusCode());
- }
- }
-
- private void generalQuery(
- final ODataPubFormat format, String acceptFormat, final String navigationQuery, final String links) {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendNavigationLinkSegment(navigationQuery).appendKeySegment(-10).appendLinksSegment(links);
- final ODataEntitySetRequest req = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
- req.setFormat(format);
- req.setAccept(acceptFormat);
- try {
- final ODataRetrieveResponse<ODataEntitySet> res = req.execute();
- assertEquals(200, res.getStatusCode());
- final ODataEntitySet entitySet = res.getBody();
- assertNotNull(entitySet);
- final List<ODataEntity> entity = entitySet.getEntities();
- assertNotNull(entity);
- for (int i = 0; i < entity.size(); i++) {
- assertNotNull(entity.get(0).getProperties().get(0).getValue());
- }
- } catch (ODataClientErrorException e) {
- assertEquals(415, e.getStatusLine().getStatusCode());
- }
- }
-
- @Test
- public void jsonHeader() {
- retreiveEntityTest(ODataPubFormat.JSON, "application/json;odata=fullmetadata");
- retreiveEntityTestWithExpand(ODataPubFormat.JSON, "application/json;odata=fullmetadata");
- retreiveEntityTestWithSelect(ODataPubFormat.JSON, "application/json", "CustomerId");
- retreiveEntityTestWithSelect(ODataPubFormat.JSON, "application/json", "Name");
- retreiveEntityTestWithSelect(ODataPubFormat.JSON, "application/json", "CustomerId,Name");
- retreiveEntityTestWithSelectAndExpand(
- ODataPubFormat.JSON, "application/json", "CustomerId,Name,Orders", "Orders");
- multiKeyTest(ODataPubFormat.JSON, "application/json");
- navigationLinks(ODataFormat.JSON, "application/json");
- generalQuery(ODataPubFormat.JSON, "application/json", "Customer", "Orders");
-
- multiKeyTest(ODataPubFormat.JSON, "application/json");
- navigationLinks(ODataFormat.JSON, "application/json");
- }
-
- @Test
- public void jsonFullMetaDataHeader() {
- retreiveFullMetadataEntityTest(ODataPubFormat.JSON, "application/json;odata=fullmetadata");
- }
-
- @Test
- public void jsonNoMetaDataHeader() {
- retreiveNoMetadataEntityTest(ODataPubFormat.JSON_NO_METADATA, "application/json;odata=nometadata");
- }
-
- @Test
- public void jsonMinimalMetadataDataHeader() {
- retreiveMinimalMetadataEntityTest(ODataPubFormat.JSON, "application/json;odata=minimal");
- }
-
- @Test
- public void atomHeader() {
- retreiveEntityTest(ODataPubFormat.ATOM, "application/atom+xml");
- generalQuery(ODataPubFormat.ATOM, "application/atom+xml", "Customer", "Orders");
- retreiveEntityTestWithExpand(ODataPubFormat.ATOM, "application/atom+xml");
- retreiveEntityTestWithSelect(ODataPubFormat.ATOM, "application/atom+xml", "CustomerId");
- retreiveEntityTestWithSelect(ODataPubFormat.ATOM, "application/atom+xml", "Name");
- retreiveEntityTestWithSelect(ODataPubFormat.ATOM, "application/atom+xml", "CustomerId,Name");
- retreiveEntityTestWithSelectAndExpand(
- ODataPubFormat.ATOM, "application/atom+xml", "CustomerId,Name,Orders", "Orders");
- multiKeyTest(ODataPubFormat.ATOM, "application/atom+xml");
- }
-
- @Test
- public void xmlHeader() {
- retreiveEntityTest(ODataPubFormat.ATOM, "applicationxml");
- retreiveEntityTestWithExpand(ODataPubFormat.ATOM, "application/xml");
- retreiveEntityTestWithSelect(ODataPubFormat.ATOM, "application/xml", "CustomerId");
- retreiveEntityTestWithSelect(ODataPubFormat.ATOM, "application/xml", "Name");
- retreiveEntityTestWithSelect(ODataPubFormat.ATOM, "application/xml", "CustomerId,Name");
- retreiveEntityTestWithSelectAndExpand(
- ODataPubFormat.ATOM, "application/xml", "CustomerId,Name,Orders", "Orders");
- multiKeyTest(ODataPubFormat.ATOM, "application/atom+xml");
- navigationLinks(ODataFormat.XML, "application/xml");
- }
-
- @Test
- public void nullFormat() {
- retreiveEntityTest(null, "application/xml");
- retreiveEntityTestWithExpand(null, "application/xml");
- retreiveEntityTestWithSelect(null, "application/xml", "CustomerId");
- retreiveEntityTestWithSelect(null, "application/xml", "Name");
- retreiveEntityTestWithSelect(null, "application/xml", "CustomerId,Name");
- retreiveEntityTestWithSelectAndExpand(null, "application/xml", "CustomerId,Name,Orders", "Orders");
- multiKeyTest(null, "application/xml");
- navigationLinks(null, "application/atom+xml");
- }
-
- @Test
- public void nullHeaderWithJSONFormat() {
- retreiveEntityTest(ODataPubFormat.JSON, null);
- retreiveEntityTestWithExpand(ODataPubFormat.JSON, null);
- retreiveEntityTestWithSelect(ODataPubFormat.JSON, null, "CustomerId");
- retreiveEntityTestWithSelect(ODataPubFormat.JSON, null, "Name");
- retreiveEntityTestWithSelect(ODataPubFormat.JSON, null, "CustomerId,Name");
- retreiveEntityTestWithSelectAndExpand(ODataPubFormat.JSON, null, "CustomerId,Name,Orders", "Orders");
- multiKeyTest(ODataPubFormat.JSON, null);
- navigationLinks(ODataFormat.JSON, null);
- }
-
- @Test
- public void nullHeaderWithAtomFormat() {
- retreiveEntityTest(ODataPubFormat.ATOM, null);
- retreiveEntityTestWithExpand(ODataPubFormat.ATOM, null);
- retreiveEntityTestWithExpand(ODataPubFormat.ATOM, null);
- retreiveEntityTestWithSelect(ODataPubFormat.ATOM, null, "CustomerId");
- retreiveEntityTestWithSelect(ODataPubFormat.ATOM, null, "Name");
- retreiveEntityTestWithSelect(ODataPubFormat.ATOM, null, "CustomerId,Name");
- retreiveEntityTestWithSelectAndExpand(ODataPubFormat.ATOM, null, "CustomerId,Name,Orders", "Orders");
- multiKeyTest(ODataPubFormat.ATOM, null);
- navigationLinks(ODataFormat.XML, null);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/EntityUpdateMoreTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/EntityUpdateMoreTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/EntityUpdateMoreTestITCase.java
deleted file mode 100644
index 6917212..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/EntityUpdateMoreTestITCase.java
+++ /dev/null
@@ -1,562 +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 com.msopentech.odatajclient.engine.it;
-
-import static org.junit.Assert.*;
-
-import java.net.URI;
-import java.util.Collections;
-import java.util.HashMap;
-
-import org.apache.commons.lang3.StringUtils;
-import org.junit.Test;
-
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.engine.communication.ODataClientErrorException;
-import com.msopentech.odatajclient.engine.communication.request.UpdateType;
-import com.msopentech.odatajclient.engine.communication.request.cud.ODataEntityUpdateRequest;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataEntityRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataEntityUpdateResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.data.ODataCollectionValue;
-import com.msopentech.odatajclient.engine.data.ODataComplexValue;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.data.ODataInlineEntity;
-import com.msopentech.odatajclient.engine.data.ODataProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-
-public class EntityUpdateMoreTestITCase extends AbstractTestITCase {
- // update an entity
-
- private void updateEntity(
- final ODataPubFormat format,
- final String contentType,
- final String prefer,
- final UpdateType type,
- final boolean inlineInfo) {
- // create an entity to be updated
- final ODataEntity entity =
- client.getObjectFactory().newEntity("Microsoft.Test.OData.Services.AstoriaDefaultService.Customer");
- // add name attribute
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("Name",
- client.getPrimitiveValueBuilder().setText("Updated Customer name").setType(EdmSimpleType.String).build()));
- // add key attribute
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("CustomerId",
- client.getPrimitiveValueBuilder().setText(String.valueOf(-10)).setType(EdmSimpleType.Int32).build()));
-
- final ODataCollectionValue backupContactInfoValue = new ODataCollectionValue(
- "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)");
- final ODataComplexValue contactDetails = new ODataComplexValue(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails");
- final ODataCollectionValue altNamesValue = new ODataCollectionValue("Collection(Edm.String)");
- altNamesValue.add(client.getPrimitiveValueBuilder().
- setText("My Alternative name").setType(EdmSimpleType.String).build());
- contactDetails.add(client.getObjectFactory().newCollectionProperty("AlternativeNames", altNamesValue));
-
- final ODataCollectionValue emailBagValue = new ODataCollectionValue("Collection(Edm.String)");
- emailBagValue.add(client.getPrimitiveValueBuilder().
- setText("altname@mydomain.com").setType(EdmSimpleType.String).build());
- contactDetails.add(client.getObjectFactory().newCollectionProperty("EmailBag", emailBagValue));
-
- final ODataComplexValue contactAliasValue = new ODataComplexValue(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases");
- contactDetails.add(client.getObjectFactory().newComplexProperty("ContactAlias", contactAliasValue));
-
- final ODataCollectionValue aliasAltNamesValue = new ODataCollectionValue("Collection(Edm.String)");
- aliasAltNamesValue.add(client.getPrimitiveValueBuilder().
- setText("myAlternativeName").setType(EdmSimpleType.String).build());
- contactAliasValue.add(client.getObjectFactory().newCollectionProperty("AlternativeNames", aliasAltNamesValue));
-
- final ODataComplexValue homePhone = new ODataComplexValue(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone");
- homePhone.add(client.getObjectFactory().newPrimitiveProperty("PhoneNumber",
- client.getPrimitiveValueBuilder().setText("8437568356834568").setType(EdmSimpleType.String).build()));
- homePhone.add(client.getObjectFactory().newPrimitiveProperty("Extension",
- client.getPrimitiveValueBuilder().setText("1243654265346267651534423ttrf").setType(EdmSimpleType.String).
- build()));
- contactDetails.add(client.getObjectFactory().newComplexProperty("HomePhone", homePhone));
-
- backupContactInfoValue.add(contactDetails);
- entity.addProperty(client.getObjectFactory().newCollectionProperty("BackupContactInfo",
- backupContactInfoValue));
-
- if (inlineInfo) {
- final ODataInlineEntity info = client.getObjectFactory().newInlineEntity(
- "Info",
- URI.create("Customer(-10)/Info"),
- getSampleCustomerInfo(-10, "Updated customer information_Info"));
- info.getEntity().setMediaEntity(true);
- entity.addLink(info);
- }
- final URI uri = client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment("Customer").appendKeySegment(-10).build();
- final String etag = getETag(uri);
- entity.setEditLink(uri);
- // update code
- update(format, contentType, prefer, type, entity, etag);
- final ODataEntityUpdateRequest req = client.getCUDRequestFactory().getEntityUpdateRequest(type, entity);
- req.setFormat(format);
- req.setContentType(contentType);
- req.setPrefer(prefer);
- if (client.getConfiguration().isUseXHTTPMethod()) {
- assertEquals(HttpMethod.POST, req.getMethod());
- } else {
- assertEquals(UpdateType.REPLACE.getMethod(), req.getMethod());
- }
-
- if (StringUtils.isNotBlank(etag)) {
- req.setIfMatch(etag);
- }
- final ODataEntityUpdateResponse res = req.execute();
- if (prefer.equals("return-content")) {
- assertEquals(200, res.getStatusCode());
- if (inlineInfo) {
- final ODataEntity actual = compareEntities(testStaticServiceRootURL, format, entity, -10, Collections.
- <String>singleton("Info"));
- assertNotNull(actual);
- } else {
- final ODataEntity actual = compareEntities(testStaticServiceRootURL, format, entity, -10, null);
- assertNotNull(actual);
- }
- } else {
- assertEquals(204, res.getStatusCode());
- }
- }
- // update entity string property
-
- private void updateEntityStringProperty(
- final ODataPubFormat format,
- final String propertyName,
- final ODataEntity entitySetName,
- final UpdateType type,
- final String etag) {
- String newValue = "";
- newValue = "New " + propertyName + "(" + System.currentTimeMillis() + ")";
-
- ODataProperty propertyValue = entitySetName.getProperty(propertyName);
- final String oldValue;
- if (propertyValue == null) {
- oldValue = null;
- } else {
- oldValue = propertyValue.getValue().toString();
- entitySetName.removeProperty(propertyValue);
- }
- assertNotEquals(newValue, oldValue);
- entitySetName.addProperty(client.getObjectFactory().newPrimitiveProperty(propertyName,
- client.getPrimitiveValueBuilder().setText(newValue).build()));
-
- update(type, entitySetName, format, etag);
- propertyValue = null;
-
- for (ODataProperty prop : entitySetName.getProperties()) {
- if (prop.getName().equals(propertyName)) {
- propertyValue = prop;
- }
- }
- assertNotNull(propertyValue);
- assertEquals(newValue, propertyValue.getValue().toString());
- }
- // date property update operation
-
- private void updateEntityDateProperty(
- final ODataPubFormat format,
- final String propertyName,
- final ODataEntity entitySetName,
- final UpdateType type,
- final String etag) {
- String newValue = "2013-11-11T23:59:59.9999999";
-
- ODataProperty propertyValue = entitySetName.getProperty(propertyName);
- final String oldValue;
- if (propertyValue == null) {
- oldValue = null;
- } else {
- oldValue = propertyValue.getValue().toString();
- entitySetName.removeProperty(propertyValue);
- }
- assertNotEquals(newValue, oldValue);
- entitySetName.addProperty(client.getObjectFactory().newPrimitiveProperty(propertyName,
- client.getPrimitiveValueBuilder().setText(newValue).setType(EdmSimpleType.DateTime).build()));
- update(type, entitySetName, format, etag);
- propertyValue = null;
- for (ODataProperty prop : entitySetName.getProperties()) {
- if (prop.getName().equals(propertyName)) {
- propertyValue = prop;
- }
- }
- assertNotNull(propertyValue);
- assertEquals("2013-11-11T23:59:59.9999999", propertyValue.getValue().toString());
- }
- // Integer property update operation
-
- private void updateEntityIntProperty(
- final ODataPubFormat format,
- final String propertyName,
- final ODataEntity entitySetName,
- final UpdateType type,
- final String etag) {
- int newValue = 10323232;
- ODataProperty propertyValue = entitySetName.getProperty(propertyName);
- final int oldValue;
- if (Integer.parseInt(propertyValue.getValue().toString()) == 0) {
- oldValue = 0;
- } else {
- oldValue = Integer.parseInt(propertyValue.getValue().toString());
- entitySetName.removeProperty(propertyValue);
- }
- assertNotEquals(newValue, oldValue);
-
- entitySetName.addProperty(client.getObjectFactory().newPrimitiveProperty(propertyName,
- client.getPrimitiveValueBuilder().setValue(newValue).setType(EdmSimpleType.Int32).build()));
- update(type, entitySetName, format, etag);
- propertyValue = null;
- for (ODataProperty prop : entitySetName.getProperties()) {
- if (prop.getName().equals(propertyName)) {
- propertyValue = prop;
- }
- }
- assertNotNull(propertyValue);
- assertEquals(newValue, Integer.parseInt(propertyValue.getValue().toString()));
-
- // replace the old value
- ODataProperty replaceProperty = entitySetName.getProperty(propertyName);
- entitySetName.removeProperty(replaceProperty);
-
- entitySetName.addProperty(client.getObjectFactory().newPrimitiveProperty(propertyName,
- client.getPrimitiveValueBuilder().setValue(oldValue).setType(EdmSimpleType.Int32).build()));
-
- update(type, entitySetName, format, etag);
- }
-
- // update operation
- protected void update(
- final ODataPubFormat format,
- final String contentType,
- final String prefer,
- final UpdateType type,
- final ODataEntity entitySetName,
- String etag) {
- final ODataEntityUpdateRequest req = client.getCUDRequestFactory().getEntityUpdateRequest(type, entitySetName);
- if (client.getConfiguration().isUseXHTTPMethod()) {
- assertEquals(HttpMethod.POST, req.getMethod());
- } else {
- assertEquals(type.getMethod(), req.getMethod());
- }
- req.setFormat(format);
- req.setContentType(contentType);
- req.setPrefer(prefer);
- etag = entitySetName.getETag();
- if (StringUtils.isNotBlank(etag)) {
- req.setIfMatch(etag);
- }
- final ODataEntityUpdateResponse res = req.execute();
-
- if (prefer.equals("return-content")) {
- assertEquals(200, res.getStatusCode());
- } else {
- assertEquals(204, res.getStatusCode());
- }
- }
-
- //update integer with JSON full meta data header
- @Test
- public void updateIntPropertyAsJSON() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final String contentType = "application/json;odata=fullmetadata";
- final String prefer = "return-no-content";
- final String entitySet = "OrderLine";
- final String propertyType = "Quantity";
- final UpdateType replace = UpdateType.REPLACE;
- final UpdateType merge = UpdateType.MERGE;
- final UpdateType patch = UpdateType.PATCH;
- final HashMap<String, Object> multiKey = new HashMap<String, Object>();
- multiKey.put("OrderId", -10);
- multiKey.put("ProductId", -10);
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment(entitySet).appendKeySegment(multiKey);
- final ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setFormat(format);
- req.setAccept(contentType);
-
- final ODataRetrieveResponse<ODataEntity> res = req.execute();
- final ODataEntity entity = res.getBody();
-
- final String etag = res.getEtag();
- updateEntityIntProperty(format, propertyType, entity, replace, etag);
- updateEntityIntProperty(format, propertyType, entity, merge, etag);
- updateEntityIntProperty(format, propertyType, entity, patch, etag);
- }
- // update integer property with json minimal metadata. Its throws Illegal Argument Exception
-
- @Test
- public void updateIntPropertyAsJSONMinimal() {
- final ODataPubFormat format = ODataPubFormat.JSON;
- final String contentType = "application/json";
- final String prefer = "return-content";
- final String entitySet = "OrderLine";
- final String propertyType = "Quantity";
- final UpdateType replace = UpdateType.REPLACE;
- final UpdateType merge = UpdateType.MERGE;
- final UpdateType patch = UpdateType.PATCH;
- try {
- final HashMap<String, Object> multiKey = new HashMap<String, Object>();
- multiKey.put("OrderId", -10);
- multiKey.put("ProductId", -10);
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment(entitySet).appendKeySegment(multiKey);
- final ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setFormat(format);
- req.setAccept(contentType);
-
- final ODataRetrieveResponse<ODataEntity> res = req.execute();
- final ODataEntity entity = res.getBody();
-
- final String etag = res.getEtag();
- updateEntityIntProperty(format, propertyType, entity, replace, etag);
- updateEntityIntProperty(format, propertyType, entity, merge, etag);
- updateEntityIntProperty(format, propertyType, entity, patch, etag);
- } catch (Exception e) {
- if (e.getMessage().equals("No edit link found")) {
- assertTrue(true);
- } else {
- fail(e.getMessage());
- }
- }
- }
- //update date with JSON header
-
- @Test
- public void updateDatePropertyAsJSON() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final String entitySet = "ComputerDetail";
- final String propertyType = "PurchaseDate";
- final UpdateType replace = UpdateType.REPLACE;
- try {
- final URI uri = client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment(entitySet).appendKeySegment(-10).build();
- final String etag = getETag(uri);
- final ODataEntity entity = client.getObjectFactory().newEntity(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail");
- entity.setEditLink(uri);
- updateEntityDateProperty(format, propertyType, entity, replace, etag);
- } catch (Exception e) {
- fail(e.getMessage());
- } catch (AssertionError e) {
- fail(e.getMessage());
- }
- }
- // update base concurrency property which is tagged as ETag.
-
- @Test
- public void updateConcurrencyPropertyAsJSON() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final String entitySet = "Product";
- final String propertyType = "BaseConcurrency";
- final UpdateType replace = UpdateType.REPLACE;
- final UpdateType merge = UpdateType.MERGE;
- final UpdateType patch = UpdateType.PATCH;
- try {
- final URI uri = client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment(entitySet).appendKeySegment(-10).build();
- final String etag = getETag(uri);
- final ODataEntity entity = client.getObjectFactory().newEntity(TEST_PRODUCT_TYPE);
- entity.setEditLink(uri);
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("ProductId",
- client.getPrimitiveValueBuilder().setValue(-10).setType(EdmSimpleType.Int32).build()));
- updateEntityStringProperty(format, propertyType, entity, replace, etag);
- updateEntityStringProperty(format, propertyType, entity, merge, etag);
- updateEntityStringProperty(format, propertyType, entity, patch, etag);
- } catch (ODataClientErrorException e) {
- assertEquals(412, e.getStatusLine().getStatusCode());
- }
-
- }
- // test property update with JSON
-
- @Test
- public void updatePropertyAsJSON() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final String entitySet = "Product";
- final String propertyType = "Description";
- final UpdateType replace = UpdateType.REPLACE;
- final UpdateType merge = UpdateType.MERGE;
- final UpdateType patch = UpdateType.PATCH;
- try {
- final URI uri = client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment(entitySet).appendKeySegment(-10).build();
- final String etag = getETag(uri);
- final ODataEntity entity = client.getObjectFactory().newEntity(TEST_PRODUCT_TYPE);
- entity.setEditLink(uri);
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("ProductId",
- client.getPrimitiveValueBuilder().setValue(-10).setType(EdmSimpleType.Int32).build()));
- updateEntityStringProperty(format, propertyType, entity, replace, etag);
- updateEntityStringProperty(format, propertyType, entity, merge, etag);
- updateEntityStringProperty(format, propertyType, entity, patch, etag);
- } catch (Exception e) {
- fail(e.getMessage());
- } catch (AssertionError e) {
- fail(e.getMessage());
- }
- }
- // test property update with ATOM
-
- @Test
- public void updatePropertyAsATOM() {
- final ODataPubFormat format = ODataPubFormat.ATOM;
- final String entitySet = "Product";
- final String propertyType = "Description";
- final UpdateType replace = UpdateType.REPLACE;
- final UpdateType merge = UpdateType.MERGE;
- final UpdateType patch = UpdateType.PATCH;
- try {
- final URI uri = client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment(entitySet).appendKeySegment(-10).build();
- final String etag = getETag(uri);
- final ODataEntity entity = client.getObjectFactory().newEntity(TEST_PRODUCT_TYPE);
- entity.setEditLink(uri);
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("ProductId",
- client.getPrimitiveValueBuilder().setValue(-10).setType(EdmSimpleType.Int32).build()));
- updateEntityStringProperty(format, propertyType, entity, replace, etag);
- updateEntityStringProperty(format, propertyType, entity, merge, etag);
- updateEntityStringProperty(format, propertyType, entity, patch, etag);
- } catch (Exception e) {
- fail(e.getMessage());
- } catch (AssertionError e) {
- fail(e.getMessage());
- }
- }
- // test property update with JSON minimal metadata
-
- @Test
- public void updatePropertyAsJSONMinimal() {
- final ODataPubFormat format = ODataPubFormat.JSON;
- final String entitySet = "Product";
- final String propertyType = "Description";
- final UpdateType replace = UpdateType.REPLACE;
- final UpdateType merge = UpdateType.MERGE;
- final UpdateType patch = UpdateType.PATCH;
- try {
- final URI uri = client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment(entitySet).appendKeySegment(-10).build();
- final String etag = getETag(uri);
- final ODataEntity entity = client.getObjectFactory().newEntity(TEST_PRODUCT_TYPE);
- entity.setEditLink(uri);
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("ProductId",
- client.getPrimitiveValueBuilder().setValue(-10).setType(EdmSimpleType.Int32).build()));
- updateEntityStringProperty(format, propertyType, entity, replace, etag);
- updateEntityStringProperty(format, propertyType, entity, merge, etag);
- updateEntityStringProperty(format, propertyType, entity, patch, etag);
- } catch (Exception e) {
- fail(e.getMessage());
- } catch (AssertionError e) {
- fail(e.getMessage());
- }
- }
- // updating an entity which is not nullable should return 400 status
-
- @Test
- public void updateNonNullableProperty() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final String entitySet = "Product";
- final String propertyType = "ProductId";
- final UpdateType replace = UpdateType.REPLACE;
- try {
- final URI uri = client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment(entitySet).appendKeySegment(-10).build();
- final String etag = getETag(uri);
- final ODataEntity entity = client.getObjectFactory().newEntity(TEST_PRODUCT_TYPE);
- entity.setEditLink(uri);
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("ProductId",
- client.getPrimitiveValueBuilder().setValue(-10).setType(EdmSimpleType.Int32).build()));
- updateEntityStringProperty(format, propertyType, entity, replace, etag);
- } catch (Exception e) {
- if (e.getMessage().equals("An error occurred while processing this request. [HTTP/1.1 400 Bad Request]")) {
- assertTrue(true);
- } else {
- fail(e.getMessage());
- }
- } catch (AssertionError e) {
- fail(e.getMessage());
- }
- }
- // test property update with JSON no metadata
-
- @Test
- public void updatePropertyAsJSONNoMetadata() {
- final ODataPubFormat format = ODataPubFormat.JSON_NO_METADATA;
- final String propertyType = "Product";
- final UpdateType replace = UpdateType.REPLACE;
- try {
- final URI uri = client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment(propertyType).appendKeySegment(-10).build();
- final String etag = getETag(uri);
- final ODataEntity entity = client.getObjectFactory().newEntity(TEST_PRODUCT_TYPE);
- entity.setEditLink(uri);
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("ProductId",
- client.getPrimitiveValueBuilder().setValue(-10).setType(EdmSimpleType.Int32).build()));
- updateEntityStringProperty(format, "Description", entity, replace, etag);
- } catch (Exception e) {
- fail(e.getMessage());
- } catch (AssertionError e) {
- fail(e.getMessage());
- }
- }
- // update an entity with JSON full metadata
-
- @Test
- public void updateAsJSONWithReplace() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final String contentType = "application/json;odata=fullmetadata";
- final String prefer = "return-content";
- final UpdateType type = UpdateType.REPLACE;
- try {
- updateEntity(format, contentType, prefer, type, false);
- } catch (Exception e) {
- if (e.getMessage().equals(
- "Error processing request stream. Deep updates are not supported in PUT, MERGE, or PATCH operations. [HTTP/1.1 400 Bad Request]")) {
- assertTrue(true);
- } else {
- fail(e.getMessage());
- }
- } catch (AssertionError e) {
- fail(e.getMessage());
- }
- }
- // update an entity with ATOM
-
- @Test
- public void updateAsATOMWithReplace() {
- final ODataPubFormat format = ODataPubFormat.ATOM;
- final String contentType = "application/atom+xml";
- final String prefer = "return-content";
- final UpdateType type = UpdateType.REPLACE;
- try {
- updateEntity(format, contentType, prefer, type, true);
- } catch (Exception e) {
- if (e.getMessage().equals(
- "Error processing request stream. Deep updates are not supported in PUT, MERGE, or PATCH operations. [HTTP/1.1 400 Bad Request]")) {
- assertTrue(true);
- } else {
- fail(e.getMessage());
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/EntityUpdateTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/EntityUpdateTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/EntityUpdateTestITCase.java
deleted file mode 100644
index b7c6756..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/EntityUpdateTestITCase.java
+++ /dev/null
@@ -1,237 +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 com.msopentech.odatajclient.engine.it;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
-import com.msopentech.odatajclient.engine.communication.ODataClientErrorException;
-import com.msopentech.odatajclient.engine.communication.header.ODataHeaderValues;
-import com.msopentech.odatajclient.engine.communication.header.ODataHeaders;
-import com.msopentech.odatajclient.engine.communication.request.UpdateType;
-import com.msopentech.odatajclient.engine.communication.request.cud.ODataEntityUpdateRequest;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataEntityRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataEntityUpdateResponse;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import java.net.URI;
-import java.util.LinkedHashMap;
-import org.junit.Test;
-
-/**
- * This is the unit test class to check entity update operations.
- */
-public class EntityUpdateTestITCase extends AbstractTestITCase {
-
- protected String getServiceRoot() {
- return testStaticServiceRootURL;
- }
-
- @Test
- public void mergeAsAtom() {
- final ODataPubFormat format = ODataPubFormat.ATOM;
- final URI uri = client.getURIBuilder(getServiceRoot()).
- appendEntityTypeSegment("Product").appendKeySegment(-10).build();
- final String etag = getETag(uri);
- final ODataEntity merge = client.getObjectFactory().newEntity(TEST_PRODUCT_TYPE);
- merge.setEditLink(uri);
- updateEntityDescription(format, merge, UpdateType.MERGE, etag);
- }
-
- @Test
- public void mergeAsJSON() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final URI uri = client.getURIBuilder(getServiceRoot()).
- appendEntityTypeSegment("Product").appendKeySegment(-10).build();
- final String etag = getETag(uri);
- final ODataEntity merge = client.getObjectFactory().newEntity(TEST_PRODUCT_TYPE);
- merge.setEditLink(uri);
- updateEntityDescription(format, merge, UpdateType.MERGE, etag);
- }
-
- @Test
- public void patchAsAtom() {
- final ODataPubFormat format = ODataPubFormat.ATOM;
- final URI uri = client.getURIBuilder(getServiceRoot()).
- appendEntityTypeSegment("Product").appendKeySegment(-10).build();
- final String etag = getETag(uri);
- final ODataEntity patch = client.getObjectFactory().newEntity(TEST_PRODUCT_TYPE);
- patch.setEditLink(uri);
- updateEntityDescription(format, patch, UpdateType.PATCH, etag);
- }
-
- @Test
- public void patchAsJSON() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final URI uri = client.getURIBuilder(getServiceRoot()).
- appendEntityTypeSegment("Product").appendKeySegment(-10).build();
- final String etag = getETag(uri);
- final ODataEntity patch = client.getObjectFactory().newEntity(TEST_PRODUCT_TYPE);
- patch.setEditLink(uri);
- updateEntityDescription(format, patch, UpdateType.PATCH, etag);
- }
-
- @Test
- public void replaceAsAtom() {
- final ODataPubFormat format = ODataPubFormat.ATOM;
- final ODataEntity changes = read(format, client.getURIBuilder(getServiceRoot()).
- appendEntityTypeSegment("Car").appendKeySegment(14).build());
- updateEntityDescription(format, changes, UpdateType.REPLACE);
- }
-
- @Test
- public void replaceAsJSON() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final ODataEntity changes = read(format, client.getURIBuilder(getServiceRoot()).
- appendEntityTypeSegment("Car").appendKeySegment(14).build());
- updateEntityDescription(format, changes, UpdateType.REPLACE);
- }
-
- @Test
- public void patchLinkAsAtom() {
- patchLink(ODataPubFormat.ATOM);
- }
-
- @Test
- public void patchLinkAsJSON() {
- patchLink(ODataPubFormat.JSON_FULL_METADATA);
- }
-
- public void patchLink(final ODataPubFormat format) {
- final URI uri = client.getURIBuilder(getServiceRoot()).
- appendEntityTypeSegment("Customer").appendKeySegment(-10).build();
-
- final ODataEntity patch =
- client.getObjectFactory().newEntity("Microsoft.Test.OData.Services.AstoriaDefaultService.Customer");
- patch.setEditLink(uri);
-
- // ---------------------------------------
- // Update to CustomerInfo(12)
- // ---------------------------------------
- URI customerInfoURI = client.getURIBuilder(getServiceRoot()).
- appendEntityTypeSegment("CustomerInfo").appendKeySegment(12).build();
-
- patch.addLink(client.getObjectFactory().newEntityNavigationLink("Info", customerInfoURI));
-
- update(UpdateType.PATCH, patch, format, null);
-
- customerInfoURI = client.getURIBuilder(getServiceRoot()).
- appendEntityTypeSegment("Customer").appendKeySegment(-10).appendStructuralSegment("Info").build();
-
- ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(customerInfoURI);
- req.setFormat(format);
-
- ODataEntity newInfo = req.execute().getBody();
-
- assertEquals(Integer.valueOf(12),
- newInfo.getProperty("CustomerInfoId").getPrimitiveValue().<Integer>toCastValue());
- // ---------------------------------------
-
- // ---------------------------------------
- // Restore to CustomerInfo(11)
- // ---------------------------------------
- patch.getNavigationLinks().clear();
-
- customerInfoURI = client.getURIBuilder(getServiceRoot()).
- appendEntityTypeSegment("CustomerInfo").appendKeySegment(11).build();
- read(format, customerInfoURI);
-
- patch.addLink(client.getObjectFactory().newEntityNavigationLink("Info", customerInfoURI));
-
- update(UpdateType.PATCH, patch, format, null);
-
- customerInfoURI = client.getURIBuilder(getServiceRoot()).
- appendEntityTypeSegment("Customer").appendKeySegment(-10).appendStructuralSegment("Info").build();
-
- req = client.getRetrieveRequestFactory().getEntityRequest(customerInfoURI);
- req.setFormat(format);
-
- newInfo = req.execute().getBody();
-
- assertEquals(Integer.valueOf(11),
- newInfo.getProperty("CustomerInfoId").getPrimitiveValue().<Integer>toCastValue());
- // ---------------------------------------
- }
-
- private ODataEntityUpdateRequest buildMultiKeyUpdateReq(final ODataPubFormat format) {
- final LinkedHashMap<String, Object> multiKey = new LinkedHashMap<String, Object>();
- multiKey.put("FromUsername", "1");
- multiKey.put("MessageId", -10);
- final ODataEntity message = read(format, client.getURIBuilder(getServiceRoot()).
- appendEntityTypeSegment("Message").appendKeySegment(multiKey).build());
- message.getAssociationLinks().clear();
- message.getNavigationLinks().clear();
-
- final boolean before = message.getProperty("IsRead").getPrimitiveValue().<Boolean>toCastValue();
- message.getProperties().remove(message.getProperty("IsRead"));
- message.addProperty(client.getObjectFactory().newPrimitiveProperty("IsRead",
- client.getPrimitiveValueBuilder().setValue(!before).setType(EdmSimpleType.Boolean).build()));
-
- return client.getCUDRequestFactory().getEntityUpdateRequest(UpdateType.MERGE, message);
- }
-
- private void mergeMultiKey(final ODataPubFormat format) {
- final ODataEntityUpdateResponse res = buildMultiKeyUpdateReq(format).execute();
- assertEquals(204, res.getStatusCode());
- }
-
- @Test
- public void mergeMultiKeyAsAtom() {
- mergeMultiKey(ODataPubFormat.ATOM);
- }
-
- @Test
- public void mergeMultiKeyAsJSON() {
- mergeMultiKey(ODataPubFormat.JSON_FULL_METADATA);
- }
-
- @Test
- public void updateReturnContent() {
- final ODataEntityUpdateRequest req = buildMultiKeyUpdateReq(client.getConfiguration().getDefaultPubFormat());
- req.setPrefer(ODataHeaderValues.preferReturnContent);
-
- final ODataEntityUpdateResponse res = req.execute();
- assertEquals(200, res.getStatusCode());
- assertEquals(ODataHeaderValues.preferReturnContent,
- res.getHeader(ODataHeaders.HeaderName.preferenceApplied).iterator().next());
- assertNotNull(res.getBody());
- }
-
- @Test
- public void concurrentModification() {
- final URI uri = client.getURIBuilder(getServiceRoot()).
- appendEntityTypeSegment("Product").appendKeySegment(-10).build();
- String etag = getETag(uri);
- final ODataEntity product = client.getObjectFactory().newEntity(TEST_PRODUCT_TYPE);
- product.setEditLink(uri);
- updateEntityStringProperty("BaseConcurrency",
- client.getConfiguration().getDefaultPubFormat(), product, UpdateType.MERGE, etag);
-
- try {
- etag += "-invalidone";
- updateEntityStringProperty("BaseConcurrency",
- client.getConfiguration().getDefaultPubFormat(), product, UpdateType.MERGE, etag);
- fail();
- } catch (ODataClientErrorException e) {
- assertEquals(412, e.getStatusLine().getStatusCode());
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/ErrorTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/ErrorTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/ErrorTestITCase.java
deleted file mode 100644
index afe5259..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/ErrorTestITCase.java
+++ /dev/null
@@ -1,175 +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 com.msopentech.odatajclient.engine.it;
-
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.engine.communication.ODataClientErrorException;
-import com.msopentech.odatajclient.engine.communication.response.ODataResponseImpl;
-import com.msopentech.odatajclient.engine.communication.request.AbstractODataBasicRequestImpl;
-import com.msopentech.odatajclient.engine.communication.request.invoke.ODataInvokeRequest;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataEntityRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataEntityCreateResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataInvokeResponse;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.data.ODataEntitySet;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import com.msopentech.odatajclient.engine.metadata.EdmV3Metadata;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.EntityContainer;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.FunctionImport;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import com.msopentech.odatajclient.engine.utils.URIUtils;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.net.URI;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.junit.Test;
-
-/**
- * This is the unit test class to check basic entity operations.
- */
-public class ErrorTestITCase extends AbstractTestITCase {
-
- private class ErrorGeneratingRequest
- extends AbstractODataBasicRequestImpl<ODataEntityCreateResponse, ODataPubFormat> {
-
- public ErrorGeneratingRequest(final HttpMethod method, final URI uri) {
- super(client, ODataPubFormat.class, method, uri);
- }
-
- @Override
- protected InputStream getPayload() {
- return new ByteArrayInputStream(new byte[0]);
- }
-
- @Override
- public ODataEntityCreateResponse execute() {
- final HttpResponse res = doExecute();
- return new ErrorResponseImpl(client, httpClient, res);
- }
-
- private class ErrorResponseImpl extends ODataResponseImpl implements ODataEntityCreateResponse {
-
- private final ODataClient odataClient;
-
- public ErrorResponseImpl(
- final ODataClient odataClient, final HttpClient client, final HttpResponse res) {
-
- super(client, res);
- this.odataClient = odataClient;
- }
-
- @Override
- public ODataEntity getBody() {
- return odataClient.getObjectFactory().newEntity("Invalid");
- }
- }
- }
-
- private void stacktraceError(final ODataPubFormat format) {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL);
- uriBuilder.appendEntitySetSegment("Customer");
-
- final ErrorGeneratingRequest errorReq = new ErrorGeneratingRequest(HttpMethod.POST, uriBuilder.build());
- errorReq.setFormat(format);
-
- try {
- errorReq.execute();
- fail();
- } catch (ODataClientErrorException e) {
- LOG.error("ODataClientErrorException found", e);
- assertEquals(400, e.getStatusLine().getStatusCode());
- assertNotNull(e.getCause());
- assertNotNull(e.getODataError());
- }
- }
-
- @Test
- public void xmlStacktraceError() {
- stacktraceError(ODataPubFormat.ATOM);
- }
-
- @Test
- public void jsonStacktraceError() {
- stacktraceError(ODataPubFormat.JSON);
- }
-
- private void notfoundError(final ODataPubFormat format) {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL);
- uriBuilder.appendEntitySetSegment("Customer(154)");
-
- final ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setFormat(format);
-
- try {
- req.execute();
- fail();
- } catch (ODataClientErrorException e) {
- LOG.error("ODataClientErrorException found", e);
- assertEquals(404, e.getStatusLine().getStatusCode());
- assertNull(e.getCause());
- assertNotNull(e.getODataError());
- }
- }
-
- @Test
- public void xmlNotfoundError() {
- notfoundError(ODataPubFormat.ATOM);
- }
-
- @Test
- public void jsonNotfoundError() {
- notfoundError(ODataPubFormat.JSON);
- }
-
- private void instreamError(final ODataPubFormat format) {
- final EdmV3Metadata metadata =
- client.getRetrieveRequestFactory().getMetadataRequest(testStaticServiceRootURL).execute().getBody();
- assertNotNull(metadata);
-
- final EntityContainer container = metadata.getSchema(0).getEntityContainers().get(0);
- final FunctionImport funcImp = container.getFunctionImport("InStreamErrorGetCustomer");
-
- final URIBuilder builder = client.getURIBuilder(testStaticServiceRootURL).
- appendFunctionImportSegment(URIUtils.rootFunctionImportURISegment(container, funcImp));
-
- final ODataInvokeRequest<ODataEntitySet> req =
- client.getInvokeRequestFactory().getInvokeRequest(builder.build(), metadata, funcImp);
- req.setFormat(format);
-
- final ODataInvokeResponse<ODataEntitySet> res = req.execute();
- res.getBody();
- }
-
- @Test(expected = IllegalArgumentException.class)
- public void atomInstreamError() {
- instreamError(ODataPubFormat.ATOM);
- }
-
- @Test(expected = IllegalArgumentException.class)
- public void jsonInstreamError() {
- instreamError(ODataPubFormat.JSON);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/FilterFactoryTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/FilterFactoryTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/FilterFactoryTestITCase.java
deleted file mode 100644
index c125431..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/FilterFactoryTestITCase.java
+++ /dev/null
@@ -1,158 +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 com.msopentech.odatajclient.engine.it;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import com.msopentech.odatajclient.engine.data.ODataEntitySet;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import com.msopentech.odatajclient.engine.uri.filter.ODataFilter;
-import com.msopentech.odatajclient.engine.uri.filter.ODataFilterArgFactory;
-import org.junit.Test;
-
-public class FilterFactoryTestITCase extends AbstractTestITCase {
-
- private void match(final String entitySet, final ODataFilter filter, final int expected) {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment(entitySet).filter(filter);
-
- final ODataEntitySet feed = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build()).
- execute().getBody();
- assertNotNull(feed);
- assertEquals(expected, feed.getEntities().size());
- }
-
- @Test
- public void simple() {
- match("Car", client.getFilterFactory().lt("VIN", 16), 5);
- }
-
- @Test
- public void and() {
- final ODataFilter filter =
- client.getFilterFactory().and(
- client.getFilterFactory().lt("VIN", 16),
- client.getFilterFactory().gt("VIN", 12));
-
- match("Car", filter, 3);
- }
-
- @Test
- public void not() {
- final ODataFilter filter =
- client.getFilterFactory().not(
- client.getFilterFactory().or(
- client.getFilterFactory().ge("VIN", 16),
- client.getFilterFactory().le("VIN", 12)));
-
- match("Car", filter, 3);
- }
-
- @Test
- public void operator() {
- ODataFilter filter =
- client.getFilterFactory().eq(
- ODataFilterArgFactory.add(ODataFilterArgFactory.property("VIN"), ODataFilterArgFactory.
- literal(1)),
- ODataFilterArgFactory.literal(16));
-
- match("Car", filter, 1);
-
- filter =
- client.getFilterFactory().eq(
- ODataFilterArgFactory.add(ODataFilterArgFactory.literal(1), ODataFilterArgFactory.
- property("VIN")),
- ODataFilterArgFactory.literal(16));
-
- match("Car", filter, 1);
-
- filter =
- client.getFilterFactory().eq(
- ODataFilterArgFactory.literal(16),
- ODataFilterArgFactory.add(ODataFilterArgFactory.literal(1), ODataFilterArgFactory.
- property("VIN")));
-
- match("Car", filter, 1);
- }
-
- @Test
- public void function() {
- final ODataFilter filter =
- client.getFilterFactory().match(
- ODataFilterArgFactory.startswith(
- ODataFilterArgFactory.property("Description"), ODataFilterArgFactory.literal("cen")));
-
- match("Car", filter, 1);
- }
-
- @Test
- public void composed() {
- final ODataFilter filter =
- client.getFilterFactory().gt(
- ODataFilterArgFactory.length(ODataFilterArgFactory.property("Description")),
- ODataFilterArgFactory.add(ODataFilterArgFactory.property("VIN"), ODataFilterArgFactory.literal(
- 10)));
-
- match("Car", filter, 5);
- }
-
- @Test
- public void propertyPath() {
- ODataFilter filter =
- client.getFilterFactory().eq(
- ODataFilterArgFactory.indexof(
- ODataFilterArgFactory.property("PrimaryContactInfo/HomePhone/PhoneNumber"),
- ODataFilterArgFactory.literal("ODataJClient")),
- ODataFilterArgFactory.literal(1));
-
- match("Customer", filter, 0);
-
- filter =
- client.getFilterFactory().ne(
- ODataFilterArgFactory.indexof(
- ODataFilterArgFactory.property("PrimaryContactInfo/HomePhone/PhoneNumber"),
- ODataFilterArgFactory.literal("lccvussrv")),
- ODataFilterArgFactory.literal(-1));
-
- match("Customer", filter, 2);
- }
-
- @Test
- public void datetime() {
- final ODataFilter filter =
- client.getFilterFactory().eq(
- ODataFilterArgFactory.month(
- ODataFilterArgFactory.property("PurchaseDate")),
- ODataFilterArgFactory.literal(12));
-
- match("ComputerDetail", filter, 1);
- }
-
- @Test
- public void isof() {
- final ODataFilter filter =
- client.getFilterFactory().match(
- ODataFilterArgFactory.isof(
- ODataFilterArgFactory.literal(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee")));
-
- match("Person", filter, 4);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/FilterTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/FilterTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/FilterTestITCase.java
deleted file mode 100644
index 4bfe60c..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/FilterTestITCase.java
+++ /dev/null
@@ -1,93 +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 com.msopentech.odatajclient.engine.it;
-
-import static org.junit.Assert.*;
-import org.junit.Test;
-
-import com.msopentech.odatajclient.engine.data.ODataEntitySet;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-
-public class FilterTestITCase extends AbstractTestITCase {
-
- private void filterQueryTest(final String entity, final String filter, final int expected) {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment(entity).filter(filter);
- final ODataEntitySet entitySet = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build()).
- execute().getBody();
- assertNotNull(entitySet);
- assertEquals(expected, entitySet.getEntities().size());
- }
-
- @Test
- public void withId() {
- filterQueryTest("Customer", "CustomerId eq -10", 1);
- }
-
- @Test
- public void logical() {
- filterQueryTest("Customer", "CustomerId gt -10", 2);
- filterQueryTest("Customer", "CustomerId lt -10", 0);
- filterQueryTest("Customer", "not endswith(Name,'Chandan')", 2);
- filterQueryTest("Car", "VIN le 18 and VIN gt 12", 6);
- }
-
- @Test
- public void arithmetic() {
- filterQueryTest("Car", "VIN add 5 lt 11", 0);
- filterQueryTest("Car", "VIN div 2 le 8", 7);
- filterQueryTest("Car", "VIN mul 2 le 30", 5);
- filterQueryTest("Person", "PersonId sub 2 lt -10", 2);
- }
-
- @Test
- public void stringOperations() {
- filterQueryTest("Product", "length(Description) eq 7", 1);
- filterQueryTest("Product", "length(Description) eq 7", 1);
- filterQueryTest("Product", "substringof('kdcuklu', Description) eq true", 1);
- filterQueryTest("Product", "startswith(Description, 'k') eq true", 2);
- filterQueryTest("Product", "startswith(Description, 'k') eq true", 2);
- filterQueryTest("Product", "indexof(Description, 'k') eq 0", 2);
- filterQueryTest("Product", "toupper(Description) eq 'KDCUKLU'", 1);
- filterQueryTest("Product", "concat(Description, ', newname') eq 'kdcuklu, newname'", 1);
- }
-
- @Test
- public void math() {
- filterQueryTest("Product", "round(Dimensions/Width) eq 7338", 1);
- filterQueryTest("Product", "round(Dimensions/Width) eq 7338", 1);
- filterQueryTest("Product", "floor(Dimensions/Width) eq 7337", 1);
- filterQueryTest("Product", "ceiling(Dimensions/Width) eq 7338", 1);
- }
-
- @Test
- public void date() {
- filterQueryTest("ComputerDetail", "day(PurchaseDate) eq 15", 1);
- filterQueryTest("ComputerDetail", "month(PurchaseDate) eq 12", 2);
- filterQueryTest("ComputerDetail", "hour(PurchaseDate) eq 1", 1);
- filterQueryTest("ComputerDetail", "minute(PurchaseDate) eq 33", 1);
- filterQueryTest("ComputerDetail", "second(PurchaseDate) eq 35", 1);
- filterQueryTest("ComputerDetail", "year(PurchaseDate) eq 2020", 1);
- }
-
- @Test
- public void isOfTest() {
- filterQueryTest("Customer", "isof(Name,'Edm.String') eq true", 2);
- }
-}
[44/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataGeospatialValue.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataGeospatialValue.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataGeospatialValue.java
deleted file mode 100644
index 53fc589..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataGeospatialValue.java
+++ /dev/null
@@ -1,488 +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 com.msopentech.odatajclient.engine.data;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import com.msopentech.odatajclient.engine.utils.ODataConstants;
-import com.msopentech.odatajclient.engine.utils.XMLUtils;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.ParserConfigurationException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class ODataGeospatialValue extends ODataPrimitiveValue {
-
- private static final long serialVersionUID = -3984105137562291082L;
-
- /**
- * Geospatial value builder.
- */
- public static class Builder extends AbstractBuilder {
-
- private final ODataGeospatialValue ogv;
-
- /**
- * Constructor.
- */
- public Builder(final ODataClient client) {
- super(client);
- this.ogv = new ODataGeospatialValue(client);
- }
-
- /**
- * Sets the given value provided as a DOM tree.
- *
- * @param tree value.
- * @return the current builder.
- */
- public Builder setTree(final Element tree) {
- this.ogv.tree = tree;
- return this;
- }
-
- /**
- * Sets the actual object value.
- *
- * @param value value.
- * @return the current builder.
- */
- public <T extends Geospatial> Builder setValue(final T value) {
- this.ogv.value = value;
- return this;
- }
-
- /**
- * Sets actual value type.
- *
- * @param type type.
- * @return the current builder.
- */
- public Builder setType(final EdmSimpleType type) {
- isSupported(type);
-
- if (!type.isGeospatial()) {
- throw new IllegalArgumentException(
- "Use " + ODataPrimitiveValue.class.getSimpleName() + " for non-geospatial types");
- }
-
- if (type == EdmSimpleType.Geography || type == EdmSimpleType.Geometry) {
- throw new IllegalArgumentException(
- type + "is not an instantiable type. "
- + "An entity can declare a property to be of type Geometry. "
- + "An instance of an entity MUST NOT have a value of type Geometry. "
- + "Each value MUST be of some subtype.");
- }
- this.ogv.type = type;
- return this;
- }
-
- /**
- * Builds the geospatial value.
- *
- * @return <tt>ODataGeospatialValue</tt> object.
- */
- public ODataGeospatialValue build() {
- if (this.ogv.tree == null && this.ogv.value == null) {
- throw new IllegalArgumentException("Must provide either tree or value");
- }
- if (this.ogv.tree != null && this.ogv.value != null) {
- throw new IllegalArgumentException("Cannot provide both tree and value");
- }
-
- if (this.ogv.type == null) {
- throw new IllegalArgumentException("Must provide geospatial type");
- }
-
- if (this.ogv.tree != null) {
- this.ogv.value = this.ogv.parseTree(this.ogv.tree, this.ogv.type);
- }
- if (this.ogv.value != null) {
- this.ogv.tree = this.ogv.parseGeospatial((Geospatial) this.ogv.value);
- }
-
- return this.ogv;
- }
- }
-
- /**
- * DOM tree.
- */
- private Element tree;
-
- /**
- * Protected constructor, need to use the builder to instantiate this class.
- *
- * @see Builder
- */
- protected ODataGeospatialValue(final ODataClient client) {
- super(client);
- }
-
- private Geospatial.Dimension getDimension() {
- Geospatial.Dimension dimension;
-
- switch (this.type) {
- case Geography:
- case GeographyCollection:
- case GeographyLineString:
- case GeographyMultiLineString:
- case GeographyPoint:
- case GeographyMultiPoint:
- case GeographyPolygon:
- case GeographyMultiPolygon:
- dimension = Geospatial.Dimension.GEOGRAPHY;
- break;
-
- default:
- dimension = Geospatial.Dimension.GEOMETRY;
- }
-
- return dimension;
- }
-
- private List<Point> parsePoints(final NodeList posList) {
- final List<Point> result = new ArrayList<Point>();
- for (int i = 0; i < posList.getLength(); i++) {
- final String[] pointInfo = posList.item(i).getTextContent().split(" ");
- final Point point = new Point(getDimension());
- point.setX(Double.valueOf(pointInfo[0]));
- point.setY(Double.valueOf(pointInfo[1]));
-
- result.add(point);
- }
- return result;
- }
-
- private LineString parseLineString(final Element element) {
- return new LineString(getDimension(),
- parsePoints(element.getElementsByTagName(ODataConstants.ELEM_POS)));
- }
-
- private Polygon parsePolygon(final Element element) {
- List<Point> extPoints = null;
- final Element exterior =
- (Element) element.getElementsByTagName(ODataConstants.ELEM_POLYGON_EXTERIOR).item(0);
- if (exterior != null) {
- extPoints = parsePoints(
- ((Element) exterior.getElementsByTagName(ODataConstants.ELEM_POLYGON_LINEARRING).item(0)).
- getElementsByTagName(ODataConstants.ELEM_POS));
- }
- List<Point> intPoints = null;
- final Element interior =
- (Element) element.getElementsByTagName(ODataConstants.ELEM_POLYGON_INTERIOR).item(0);
- if (interior != null) {
- intPoints = parsePoints(
- ((Element) interior.getElementsByTagName(ODataConstants.ELEM_POLYGON_LINEARRING).item(0)).
- getElementsByTagName(ODataConstants.ELEM_POS));
- }
-
- return new Polygon(getDimension(), intPoints, extPoints);
- }
-
- /**
- * Parses given tree as geospatial value.
- */
- private Geospatial parseTree(final Element tree, final EdmSimpleType type) {
- Geospatial value;
-
- switch (type) {
- case GeographyPoint:
- case GeometryPoint:
- value = parsePoints(tree.getElementsByTagName(ODataConstants.ELEM_POS)).get(0);
- break;
-
- case GeographyMultiPoint:
- case GeometryMultiPoint:
- final Element pMembs =
- (Element) tree.getElementsByTagName(ODataConstants.ELEM_POINTMEMBERS).item(0);
- final List<Point> points = pMembs == null
- ? Collections.<Point>emptyList()
- : parsePoints(pMembs.getElementsByTagName(ODataConstants.ELEM_POS));
- value = new MultiPoint(getDimension(), points);
- break;
-
- case GeographyLineString:
- case GeometryLineString:
- value = parseLineString(tree);
- break;
-
- case GeographyMultiLineString:
- case GeometryMultiLineString:
- final Element mlMembs =
- (Element) tree.getElementsByTagName(ODataConstants.ELEM_LINESTRINGMEMBERS).item(0);
- final List<LineString> lineStrings;
- if (mlMembs == null) {
- lineStrings = Collections.<LineString>emptyList();
- } else {
- lineStrings = new ArrayList<LineString>();
- final NodeList lineStringNodes = mlMembs.getElementsByTagName(ODataConstants.ELEM_LINESTRING);
- for (int i = 0; i < lineStringNodes.getLength(); i++) {
- lineStrings.add(parseLineString((Element) lineStringNodes.item(i)));
- }
- }
- value = new MultiLineString(getDimension(), lineStrings);
- break;
-
- case GeographyPolygon:
- case GeometryPolygon:
- value = parsePolygon(tree);
- break;
-
- case GeographyMultiPolygon:
- case GeometryMultiPolygon:
- final Element mpMembs =
- (Element) tree.getElementsByTagName(ODataConstants.ELEM_SURFACEMEMBERS).item(0);
- final List<Polygon> polygons;
- if (mpMembs == null) {
- polygons = Collections.<Polygon>emptyList();
- } else {
- polygons = new ArrayList<Polygon>();
- final NodeList polygonNodes = mpMembs.getElementsByTagName(ODataConstants.ELEM_POLYGON);
- for (int i = 0; i < polygonNodes.getLength(); i++) {
- polygons.add(parsePolygon((Element) polygonNodes.item(i)));
- }
- }
- value = new MultiPolygon(getDimension(), polygons);
- break;
-
- case GeographyCollection:
- case GeometryCollection:
- final Element cMembs =
- (Element) tree.getElementsByTagName(ODataConstants.ELEM_GEOMEMBERS).item(0);
- final List<Geospatial> geospatials;
- if (cMembs == null) {
- geospatials = Collections.<Geospatial>emptyList();
- } else {
- geospatials = new ArrayList<Geospatial>();
- for (Node geom : XMLUtils.getChildNodes(cMembs, Node.ELEMENT_NODE)) {
- geospatials.add(
- parseTree((Element) geom, XMLUtils.simpleTypeForNode(getDimension(), geom)));
- }
- }
- value = new GeospatialCollection(getDimension(), geospatials);
- break;
-
- default:
- value = null;
- }
-
- return value;
- }
-
- private void parsePoints(final Element parent, final Iterator<Point> itor, final boolean wrap) {
- while (itor.hasNext()) {
- final Point point = itor.next();
-
- final Element pos = parent.getOwnerDocument().
- createElementNS(ODataConstants.NS_GML, ODataConstants.ELEM_POS);
- pos.appendChild(parent.getOwnerDocument().createTextNode(
- Double.toString(point.getX()) + " " + point.getY()));
-
- final Element appendable;
- if (wrap) {
- final Element epoint = parent.getOwnerDocument().
- createElementNS(ODataConstants.NS_GML, ODataConstants.ELEM_POINT);
- parent.appendChild(epoint);
- appendable = epoint;
- } else {
- appendable = parent;
- }
- appendable.appendChild(pos);
- }
- }
-
- private void parseLineStrings(final Element parent, final Iterator<LineString> itor, final boolean wrap) {
- while (itor.hasNext()) {
- final LineString lineString = itor.next();
-
- final Element appendable;
- if (wrap) {
- final Element eLineString = parent.getOwnerDocument().
- createElementNS(ODataConstants.NS_GML, ODataConstants.ELEM_LINESTRING);
- parent.appendChild(eLineString);
- appendable = eLineString;
- } else {
- appendable = parent;
- }
- parsePoints(appendable, lineString.iterator(), false);
- }
- }
-
- private void parsePolygons(final Element parent, final Iterator<Polygon> itor, final boolean wrap) {
- while (itor.hasNext()) {
- final Polygon polygon = itor.next();
-
- final Element appendable;
- if (wrap) {
- final Element ePolygon = parent.getOwnerDocument().createElementNS(
- ODataConstants.NS_GML, ODataConstants.ELEM_POLYGON);
- parent.appendChild(ePolygon);
- appendable = ePolygon;
- } else {
- appendable = parent;
- }
-
- if (!polygon.getExterior().isEmpty()) {
- final Element exterior = parent.getOwnerDocument().createElementNS(
- ODataConstants.NS_GML, ODataConstants.ELEM_POLYGON_EXTERIOR);
- appendable.appendChild(exterior);
- final Element linearRing = parent.getOwnerDocument().createElementNS(
- ODataConstants.NS_GML, ODataConstants.ELEM_POLYGON_LINEARRING);
- exterior.appendChild(linearRing);
-
- parsePoints(linearRing, polygon.getExterior().iterator(), false);
- }
- if (!polygon.getInterior().isEmpty()) {
- final Element interior = parent.getOwnerDocument().createElementNS(
- ODataConstants.NS_GML, ODataConstants.ELEM_POLYGON_INTERIOR);
- appendable.appendChild(interior);
- final Element linearRing = parent.getOwnerDocument().createElementNS(
- ODataConstants.NS_GML, ODataConstants.ELEM_POLYGON_LINEARRING);
- interior.appendChild(linearRing);
-
- parsePoints(linearRing, polygon.getInterior().iterator(), false);
- }
- }
- }
-
- private Element parseGeospatial(final Geospatial value) {
- final DocumentBuilder builder;
- try {
- builder = XMLUtils.DOC_BUILDER_FACTORY.newDocumentBuilder();
- } catch (ParserConfigurationException e) {
- throw new IllegalStateException("Failure initializing Geospatial DOM tree", e);
- }
- final Document doc = builder.newDocument();
-
- final Element tree;
-
- switch (value.getEdmSimpleType()) {
- case GeographyPoint:
- case GeometryPoint:
- tree = doc.createElementNS(ODataConstants.NS_GML, ODataConstants.ELEM_POINT);
-
- parsePoints(tree, Collections.singleton((Point) value).iterator(), false);
- break;
-
- case GeometryMultiPoint:
- case GeographyMultiPoint:
- tree = doc.createElementNS(ODataConstants.NS_GML, ODataConstants.ELEM_MULTIPOINT);
-
- final Element pMembs = doc.createElementNS(ODataConstants.NS_GML, ODataConstants.ELEM_POINTMEMBERS);
- tree.appendChild(pMembs);
-
- parsePoints(pMembs, ((MultiPoint) value).iterator(), true);
- break;
-
- case GeometryLineString:
- case GeographyLineString:
- tree = doc.createElementNS(ODataConstants.NS_GML, ODataConstants.ELEM_LINESTRING);
-
- parseLineStrings(tree, Collections.singleton((LineString) value).iterator(), false);
- break;
-
- case GeometryMultiLineString:
- case GeographyMultiLineString:
- tree = doc.createElementNS(ODataConstants.NS_GML, ODataConstants.ELEM_MULTILINESTRING);
-
- final Element mlMembs =
- doc.createElementNS(ODataConstants.NS_GML, ODataConstants.ELEM_LINESTRINGMEMBERS);
- tree.appendChild(mlMembs);
-
- parseLineStrings(mlMembs, ((MultiLineString) value).iterator(), true);
- break;
-
- case GeographyPolygon:
- case GeometryPolygon:
- tree = doc.createElementNS(ODataConstants.NS_GML, ODataConstants.ELEM_POLYGON);
- parsePolygons(tree, Collections.singleton(((Polygon) value)).iterator(), false);
- break;
-
- case GeographyMultiPolygon:
- case GeometryMultiPolygon:
- tree = doc.createElementNS(ODataConstants.NS_GML, ODataConstants.ELEM_MULTIPOLYGON);
-
- final Element mpMembs =
- doc.createElementNS(ODataConstants.NS_GML, ODataConstants.ELEM_SURFACEMEMBERS);
- tree.appendChild(mpMembs);
-
- parsePolygons(mpMembs, ((MultiPolygon) value).iterator(), true);
- break;
-
- case GeographyCollection:
- case GeometryCollection:
- tree = doc.createElementNS(ODataConstants.NS_GML, ODataConstants.ELEM_GEOCOLLECTION);
-
- final Element gMembs =
- doc.createElementNS(ODataConstants.NS_GML, ODataConstants.ELEM_GEOMEMBERS);
- tree.appendChild(gMembs);
-
- final Iterator<Geospatial> itor = ((GeospatialCollection) value).iterator();
- while (itor.hasNext()) {
- final Geospatial geospatial = itor.next();
- gMembs.appendChild(doc.importNode(parseGeospatial(geospatial), true));
- }
- break;
-
- default:
- tree = null;
- }
-
- return tree;
- }
-
- public Element toTree() {
- return this.tree;
- }
-
- @Override
- public boolean equals(final Object obj) {
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- final ODataGeospatialValue other = (ODataGeospatialValue) obj;
- return this.tree.isEqualNode(other.tree);
- }
-
- @Override
- public String toString() {
- final StringWriter writer = new StringWriter();
- client.getSerializer().dom(this.tree, writer);
- return writer.toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataInlineEntity.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataInlineEntity.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataInlineEntity.java
deleted file mode 100644
index a4f724f..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataInlineEntity.java
+++ /dev/null
@@ -1,72 +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 com.msopentech.odatajclient.engine.data;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import java.net.URI;
-
-/**
- * OData in-line entity.
- */
-public class ODataInlineEntity extends ODataLink {
-
- private static final long serialVersionUID = -4763341581843700743L;
-
- private final ODataEntity entity;
-
- /**
- * Constructor.
- *
- * @param uri edit link.
- * @param type type.
- * @param title title.
- * @param entity entity.
- */
- ODataInlineEntity(final ODataClient client,
- final URI uri, final ODataLinkType type, final String title, final ODataEntity entity) {
-
- super(client, uri, type, title);
- this.entity = entity;
- }
-
- /**
- * Constructor.
- *
- * @param baseURI base URI.
- * @param href href.
- * @param type type.
- * @param title title.
- * @param entity entity.
- */
- ODataInlineEntity(final ODataClient client, final URI baseURI, final String href, final ODataLinkType type,
- final String title, final ODataEntity entity) {
-
- super(client, baseURI, href, type, title);
- this.entity = entity;
- }
-
- /**
- * Gets wrapped entity.
- *
- * @return wrapped entity.
- */
- public ODataEntity getEntity() {
- return entity;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataInlineEntitySet.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataInlineEntitySet.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataInlineEntitySet.java
deleted file mode 100644
index cd0cffa..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataInlineEntitySet.java
+++ /dev/null
@@ -1,74 +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 com.msopentech.odatajclient.engine.data;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import java.net.URI;
-
-/**
- * OData in-line entity set.
- */
-public class ODataInlineEntitySet extends ODataLink {
-
- private static final long serialVersionUID = -77628001615355449L;
-
- private ODataEntitySet entitySet;
-
- /**
- * Constructor.
- *
- * @param client OData client.
- * @param uri edit link.
- * @param type type.
- * @param title title.
- * @param entitySet entity set.
- */
- ODataInlineEntitySet(final ODataClient client, final URI uri, final ODataLinkType type, final String title,
- final ODataEntitySet entitySet) {
-
- super(client, uri, type, title);
- this.entitySet = entitySet;
- }
-
- /**
- * Constructor.
- *
- * @param client OData client.
- * @param baseURI base URI.
- * @param href href.
- * @param type type.
- * @param title title.
- * @param entitySet entity set.
- */
- ODataInlineEntitySet(final ODataClient client, final URI baseURI, final String href, final ODataLinkType type,
- final String title, final ODataEntitySet entitySet) {
-
- super(client, baseURI, href, type, title);
- this.entitySet = entitySet;
- }
-
- /**
- * Gets wrapped entity set.
- *
- * @return wrapped entity set.
- */
- public ODataEntitySet getEntitySet() {
- return entitySet;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataInvokeResult.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataInvokeResult.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataInvokeResult.java
deleted file mode 100644
index bb8cb7d..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataInvokeResult.java
+++ /dev/null
@@ -1,30 +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 com.msopentech.odatajclient.engine.data;
-
-/**
- * Marker interface for any OData domain object that can be returned by an operation invocation.
- *
- * @see ODataEntitySet
- * @see ODataEntity
- * @see ODataProperty
- * @see ODataNoContent
- */
-public interface ODataInvokeResult {
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataItem.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataItem.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataItem.java
deleted file mode 100644
index 4260077..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataItem.java
+++ /dev/null
@@ -1,111 +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 com.msopentech.odatajclient.engine.data;
-
-import java.io.Serializable;
-import java.net.URI;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Abstract representation of OData entities and links.
- */
-public abstract class ODataItem implements Serializable {
-
- private static final long serialVersionUID = -2600707722689304686L;
-
- /**
- * Logger.
- */
- protected static final Logger LOG = LoggerFactory.getLogger(ODataItem.class);
-
- /**
- * OData item self link.
- */
- protected URI link;
-
- /**
- * OData entity name/type.
- */
- private final String name;
-
- /**
- * Constructor.
- *
- * @param name OData entity name.
- */
- public ODataItem(final String name) {
- this.name = name;
- }
-
- /**
- * Returns self link.
- *
- * @return entity edit link.
- */
- public URI getLink() {
- return link;
- }
-
- /**
- * Sets self link.
- *
- * @param link link.
- */
- public void setLink(final URI link) {
- this.link = link;
- }
-
- /**
- * Returns OData entity name.
- *
- * @return entity name.
- */
- public String getName() {
- return name;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public boolean equals(final Object obj) {
- return EqualsBuilder.reflectionEquals(this, obj);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public int hashCode() {
- return HashCodeBuilder.reflectionHashCode(this);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataLink.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataLink.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataLink.java
deleted file mode 100644
index 81e9e18..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataLink.java
+++ /dev/null
@@ -1,109 +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 com.msopentech.odatajclient.engine.data;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-import com.msopentech.odatajclient.engine.utils.URIUtils;
-import java.net.URI;
-
-/**
- * OData link.
- */
-public class ODataLink extends ODataItem {
-
- private static final long serialVersionUID = 7274966414277952124L;
-
- protected final ODataClient client;
-
- /**
- * Link type.
- */
- protected final ODataLinkType type;
-
- /**
- * Link rel.
- */
- protected final String rel;
-
- /**
- * Constructor.
- *
- * @param client OData client.
- * @param uri URI.
- * @param type type.
- * @param title title.
- */
- ODataLink(final ODataClient client, final URI uri, final ODataLinkType type, final String title) {
- super(title);
- this.client = client;
- this.link = uri;
-
- this.type = type;
-
- switch (this.type) {
- case ASSOCIATION:
- this.rel = client.getWorkingVersion().getNamespaceMap().get(ODataVersion.ASSOCIATION_LINK_REL) + title;
- break;
-
- case ENTITY_NAVIGATION:
- case ENTITY_SET_NAVIGATION:
- this.rel = client.getWorkingVersion().getNamespaceMap().get(ODataVersion.NAVIGATION_LINK_REL) + title;
- break;
-
- case MEDIA_EDIT:
- default:
- this.rel = client.getWorkingVersion().getNamespaceMap().get(ODataVersion.MEDIA_EDIT_LINK_REL) + title;
- break;
- }
- }
-
- /**
- * Constructor.
- *
- * @param client OData client.
- * @param baseURI base URI.
- * @param href href.
- * @param type type.
- * @param title title.
- */
- ODataLink(
- final ODataClient client, final URI baseURI, final String href, final ODataLinkType type, final String title) {
-
- this(client, URIUtils.getURI(baseURI, href), type, title);
- }
-
- /**
- * Gets link type.
- *
- * @return link type;
- */
- public ODataLinkType getType() {
- return type;
- }
-
- /**
- * Gets link rel.
- *
- * @return link rel
- */
- public String getRel() {
- return rel;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataLinkCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataLinkCollection.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataLinkCollection.java
deleted file mode 100644
index 025d447..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataLinkCollection.java
+++ /dev/null
@@ -1,100 +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 com.msopentech.odatajclient.engine.data;
-
-import java.net.URI;
-import java.util.List;
-
-/**
- * Link collection wrapper.
- */
-public class ODataLinkCollection {
-
- /**
- * Link to the next page.
- */
- private URI next;
-
- /**
- * Contained links.
- */
- private List<URI> links;
-
- /**
- * Constructor.
- */
- public ODataLinkCollection() {
- }
-
- /**
- * Adds link to the collection.
- *
- * @param link link to be added.
- * @return 'TRUE' in case of success; 'FALSE' otherwise.
- */
- public boolean addLink(final URI link) {
- return links.add(link);
- }
-
- /**
- * Removes a link.
- *
- * @param link link to be removed.
- * @return 'TRUE' in case of success; 'FALSE' otherwise.
- */
- public boolean removeLink(final URI link) {
- return links.remove(link);
- }
-
- /**
- * Set links.
- *
- * @param links links.
- */
- public void setLinks(final List<URI> links) {
- this.links = links;
- }
-
- /**
- * Gets contained links.
- *
- * @return list of links.
- */
- public List<URI> getLinks() {
- return links;
- }
-
- /**
- * Constructor.
- *
- * @param next next page link.
- */
- public ODataLinkCollection(final URI next) {
- this.next = next;
- }
-
- /**
- * Gets next page link.
- *
- * @return next page link; null value if single page or last page reached.
- */
- public URI getNext() {
- return next;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataLinkType.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataLinkType.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataLinkType.java
deleted file mode 100644
index 3b8ba50..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataLinkType.java
+++ /dev/null
@@ -1,98 +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 com.msopentech.odatajclient.engine.data;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.http.entity.ContentType;
-
-/**
- * OData link types.
- */
-public enum ODataLinkType {
-
- /**
- * Entity navigation link.
- */
- ENTITY_NAVIGATION(ODataPubFormat.ATOM + ";type=entry"),
- /**
- * Entity set navigation link.
- */
- ENTITY_SET_NAVIGATION(ODataPubFormat.ATOM + ";type=feed"),
- /**
- * Association link.
- */
- ASSOCIATION(ContentType.APPLICATION_XML.getMimeType()),
- /**
- * Media-edit link.
- */
- MEDIA_EDIT("*/*");
-
- private String type;
-
- private ODataLinkType(final String type) {
- this.type = type;
- }
-
- private ODataLinkType setType(final String type) {
- this.type = type;
- return this;
- }
-
- /**
- * Gets
- * <code>ODataLinkType</code> instance from the given rel and type.
- *
- * @param client OData client.
- * @param rel rel.
- * @param type type.
- * @return <code>ODataLinkType</code> object.
- */
- public static ODataLinkType fromString(final ODataClient client, final String rel, final String type) {
- if (StringUtils.isNotBlank(rel)
- && rel.startsWith(client.getWorkingVersion().getNamespaceMap().get(ODataVersion.MEDIA_EDIT_LINK_REL))) {
-
- return MEDIA_EDIT.setType(StringUtils.isBlank(type) ? "*/*" : type);
- }
-
- if (ODataLinkType.ENTITY_NAVIGATION.type.equals(type)) {
- return ENTITY_NAVIGATION;
- }
-
- if (ODataLinkType.ENTITY_SET_NAVIGATION.type.equals(type)) {
- return ENTITY_SET_NAVIGATION;
- }
-
- if (ODataLinkType.ASSOCIATION.type.equals(type)) {
- return ASSOCIATION;
- }
-
- throw new IllegalArgumentException("Invalid link type: " + type);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public String toString() {
- return type;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataNoContent.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataNoContent.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataNoContent.java
deleted file mode 100644
index 09401e8..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataNoContent.java
+++ /dev/null
@@ -1,30 +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 com.msopentech.odatajclient.engine.data;
-
-import java.io.Serializable;
-
-/**
- * Marker class for invoke with no return type.
- */
-public class ODataNoContent implements Serializable, ODataInvokeResult {
-
- private static final long serialVersionUID = 2780193571934253136L;
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataObjectFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataObjectFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataObjectFactory.java
deleted file mode 100644
index a61b8b4..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataObjectFactory.java
+++ /dev/null
@@ -1,210 +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 com.msopentech.odatajclient.engine.data;
-
-import java.io.Serializable;
-import java.net.URI;
-
-/**
- * Entry point for generating OData domain objects.
- *
- * @see ODataEntitySet
- * @see ODataEntity
- * @see ODataProperty
- * @see ODataLink
- */
-public interface ODataObjectFactory extends Serializable {
-
- /**
- * Instantiates a new entity set.
- *
- * @return entity set.
- */
- ODataEntitySet newEntitySet();
-
- /**
- * Instantiates a new entity set.
- *
- * @param next next link.
- * @return entity set.
- */
- ODataEntitySet newEntitySet(URI next);
-
- /**
- * Instantiates a new entity.
- *
- * @param name OData entity name.
- * @return entity.
- */
- ODataEntity newEntity(String name);
-
- /**
- * Instantiates a new entity.
- *
- * @param name OData entity name.
- * @param link self link.
- * @return entity.
- */
- ODataEntity newEntity(String name, URI link);
-
- /**
- * Instantiates a new in-line entity set.
- *
- * @param name name.
- * @param link edit link.
- * @param entitySet entity set.
- * @return in-line entity set.
- */
- ODataInlineEntitySet newInlineEntitySet(String name, URI link, ODataEntitySet entitySet);
-
- /**
- * Instantiates a new in-line entity set.
- *
- * @param name name.
- * @param baseURI base URI.
- * @param href href.
- * @param entitySet entity set.
- * @return in-line entity set.
- */
- ODataInlineEntitySet newInlineEntitySet(String name, URI baseURI, String href, ODataEntitySet entitySet);
-
- /**
- * Instantiates a new in-line entity.
- *
- * @param name name.
- * @param link edit link.
- * @param entity entity.
- * @return in-line entity.
- */
- ODataInlineEntity newInlineEntity(String name, URI link, ODataEntity entity);
-
- /**
- * Instantiates a new in-line entity.
- *
- * @param name name.
- * @param baseURI base URI.
- * @param href href.
- * @param entity entity.
- * @return in-line entity.
- */
- ODataInlineEntity newInlineEntity(String name, URI baseURI, String href, ODataEntity entity);
-
- /**
- * Instantiates a new entity navigation link.
- *
- * @param name name.
- * @param link link.
- * @return entity navigation link.
- */
- ODataLink newEntityNavigationLink(String name, URI link);
-
- /**
- * Instantiates a new entity navigation link.
- *
- * @param name name.
- * @param baseURI base URI.
- * @param href href.
- * @return entity navigation link.
- */
- ODataLink newEntityNavigationLink(String name, URI baseURI, String href);
-
- /**
- * Instantiates a new entity set navigation link.
- *
- * @param name name.
- * @param link link.
- * @return entity set navigation link.
- */
- ODataLink newFeedNavigationLink(String name, URI link);
-
- /**
- * Instantiates a new entity set navigation link.
- *
- * @param name name.
- * @param baseURI base URI.
- * @param href href.
- * @return entity set navigation link.
- */
- ODataLink newFeedNavigationLink(String name, URI baseURI, String href);
-
- /**
- * Instantiates a new association link.
- *
- * @param name name.
- * @param link link.
- * @return association link.
- */
- ODataLink newAssociationLink(String name, URI link);
-
- /**
- * Instantiates a new association link.
- *
- * @param name name.
- * @param baseURI base URI.
- * @param href href.
- * @return association link.
- */
- ODataLink newAssociationLink(String name, URI baseURI, String href);
-
- /**
- * Instantiates a new media-edit link.
- *
- * @param name name.
- * @param link link.
- * @return media-edit link.
- */
- ODataLink newMediaEditLink(String name, URI link);
-
- /**
- * Instantiates a new media-edit link.
- *
- * @param name name.
- * @param baseURI base URI.
- * @param href href.
- * @return media-edit link.
- */
- ODataLink newMediaEditLink(String name, URI baseURI, String href);
-
- /**
- * Instantiates a new primitive property.
- *
- * @param name name.
- * @param value value.
- * @return primitive property.
- */
- ODataProperty newPrimitiveProperty(String name, ODataPrimitiveValue value);
-
- /**
- * Instantiates a new complex property.
- *
- * @param name name.
- * @param value value.
- * @return complex property.
- */
- ODataProperty newComplexProperty(String name, ODataComplexValue value);
-
- /**
- * Instantiates a new collection property.
- *
- * @param name name.
- * @param value value.
- * @return collection property.
- */
- ODataProperty newCollectionProperty(String name, ODataCollectionValue value);
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataObjectWrapper.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataObjectWrapper.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataObjectWrapper.java
deleted file mode 100644
index d4c00d7..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataObjectWrapper.java
+++ /dev/null
@@ -1,141 +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 com.msopentech.odatajclient.engine.data;
-
-import com.msopentech.odatajclient.engine.metadata.AbstractEdmMetadata;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class ODataObjectWrapper {
-
- /**
- * Logger.
- */
- protected static final Logger LOG = LoggerFactory.getLogger(ODataObjectWrapper.class);
-
- private final ODataReader reader;
-
- private final byte[] obj;
-
- private final String format;
-
- /**
- * Constructor.
- *
- * @param is source input stream.
- * @param format source format (<tt>ODataPubFormat</tt>, <tt>ODataFormat</tt>, <tt>ODataValueFormat</tt>,
- * <tt>ODataServiceDocumentFormat</tt>).
- */
- public ODataObjectWrapper(final ODataReader reader, final InputStream is, final String format) {
- this.reader = reader;
- try {
- this.obj = IOUtils.toByteArray(is);
- this.format = format;
- } catch (IOException e) {
- throw new IllegalArgumentException(e);
- }
- }
-
- /**
- * Parses stream as <tt>ODataEntitySetIterator</tt>.
- *
- * I
- *
- * @return <tt>ODataEntitySetIterator</tt> if success; null otherwise.
- */
- public ODataEntitySetIterator getODataEntitySetIterator() {
- return reader.read(new ByteArrayInputStream(obj), format, ODataEntitySetIterator.class);
- }
-
- /**
- * Parses stream as <tt>ODataEntitySet</tt>.
- *
- * @return <tt>ODataEntitySet</tt> if success; null otherwise.
- */
- public ODataEntitySet getODataEntitySet() {
- return reader.read(new ByteArrayInputStream(obj), format, ODataEntitySet.class);
- }
-
- /**
- * Parses stream as <tt>ODataEntity</tt>.
- *
- * @return <tt>ODataEntity</tt> if success; null otherwise.
- */
- public ODataEntity getODataEntity() {
- return reader.read(new ByteArrayInputStream(obj), format, ODataEntity.class);
- }
-
- /**
- * Parses stream as <tt>ODataProperty</tt>.
- *
- * @return <tt>ODataProperty</tt> if success; null otherwise.
- */
- public ODataProperty getODataProperty() {
- return reader.read(new ByteArrayInputStream(obj), format, ODataProperty.class);
- }
-
- /**
- * Parses stream as <tt>ODataLinkCollection</tt>.
- *
- * @return <tt>ODataLinkCollection</tt> if success; null otherwise.
- */
- public ODataLinkCollection getODataLinkCollection() {
- return reader.read(new ByteArrayInputStream(obj), format, ODataLinkCollection.class);
- }
-
- /**
- * Parses stream as <tt>ODataValue</tt>.
- *
- * @return <tt>ODataValue</tt> if success; null otherwise.
- */
- public ODataValue getODataValue() {
- return reader.read(new ByteArrayInputStream(obj), format, ODataValue.class);
- }
-
- /**
- * Parses stream as <tt>EdmMetadata</tt>.
- *
- * @return <tt>EdmMetadata</tt> if success; null otherwise.
- */
- public AbstractEdmMetadata getEdmMetadata() {
- return reader.read(new ByteArrayInputStream(obj), null, AbstractEdmMetadata.class);
- }
-
- /**
- * Parses stream as <tt>ODataServiceDocument</tt>.
- *
- * @return <tt>ODataServiceDocument</tt> if success; null otherwise.
- */
- public ODataServiceDocument getODataServiceDocument() {
- return reader.read(new ByteArrayInputStream(obj), format, ODataServiceDocument.class);
- }
-
- /**
- * Parses stream as <tt>ODataError</tt>.
- *
- * @return <tt>ODataError</tt> if success; null otherwise.
- */
- public ODataError getODataError() {
- return reader.read(new ByteArrayInputStream(obj), null, ODataError.class);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataOperation.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataOperation.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataOperation.java
deleted file mode 100644
index 3e97d1e..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataOperation.java
+++ /dev/null
@@ -1,118 +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 com.msopentech.odatajclient.engine.data;
-
-import java.io.Serializable;
-import java.net.URI;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * Representation of an OData operation (legacy, action or function).
- */
-public class ODataOperation implements Serializable {
-
- private static final long serialVersionUID = -5784652334334645128L;
-
- private String metadataAnchor;
-
- private String title;
-
- private URI target;
-
- /**
- * Gets metadata anchor.
- *
- * @return metadata anchor.
- */
- public String getMetadataAnchor() {
- return metadataAnchor;
- }
-
- /**
- * Sets metadata anchor.
- *
- * @param metadataAnchor metadata anchor.
- */
- public void setMetadataAnchor(final String metadataAnchor) {
- this.metadataAnchor = metadataAnchor;
- }
-
- /**
- * Gets title.
- *
- * @return title.
- */
- public String getTitle() {
- return title;
- }
-
- /**
- * Sets title.
- *
- * @param title title.
- */
- public void setTitle(final String title) {
- this.title = title;
- }
-
- /**
- * Gets target.
- *
- * @return target.
- */
- public URI getTarget() {
- return target;
- }
-
- /**
- * Sets target.
- *
- * @param target target.
- */
- public void setTarget(final URI target) {
- this.target = target;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public boolean equals(final Object obj) {
- return EqualsBuilder.reflectionEquals(this, obj);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public int hashCode() {
- return HashCodeBuilder.reflectionHashCode(this);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataPrimitiveValue.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataPrimitiveValue.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataPrimitiveValue.java
deleted file mode 100644
index ff6ed5e..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataPrimitiveValue.java
+++ /dev/null
@@ -1,373 +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 com.msopentech.odatajclient.engine.data;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.sql.Timestamp;
-import java.text.DecimalFormat;
-import java.util.Date;
-import java.util.UUID;
-import javax.xml.datatype.Duration;
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.StringUtils;
-
-/**
- * OData primitive property value.
- */
-public class ODataPrimitiveValue extends ODataValue {
-
- private static final long serialVersionUID = 2841837627899878223L;
-
- protected abstract static class AbstractBuilder {
-
- private final ODataClient client;
-
- /**
- * Constructor.
- */
- public AbstractBuilder(final ODataClient client) {
- this.client = client;
- }
-
- public AbstractBuilder isSupported(final EdmSimpleType type) {
- if (type != null && !ArrayUtils.contains(type.getSupportedVersions(), client.getWorkingVersion())) {
- throw new IllegalArgumentException(String.format(
- "Type %s not supported by the current OData working version", type.toString()));
- }
-
- return this;
- }
- }
-
- /**
- * Primitive value builder.
- */
- public static class Builder extends AbstractBuilder {
-
- private final ODataPrimitiveValue opv;
-
- /**
- * Constructor.
- */
- public Builder(final ODataClient client) {
- super(client);
- this.opv = new ODataPrimitiveValue(client);
- }
-
- /**
- * Sets the given value provided as a text.
- *
- * @param text value.
- * @return the current builder.
- */
- public Builder setText(final String text) {
- this.opv.text = text;
- return this;
- }
-
- /**
- * Sets the actual object value.
- *
- * @param value value.
- * @return the current builder.
- */
- public Builder setValue(final Object value) {
- this.opv.value = value;
- return this;
- }
-
- /**
- * Sets actual value type.
- *
- * @param type type.
- * @return the current builder.
- */
- public Builder setType(final EdmSimpleType type) {
- isSupported(type);
-
- if (type == EdmSimpleType.Stream) {
- throw new IllegalArgumentException(String.format(
- "Cannot build a primitive value for %s", EdmSimpleType.Stream.toString()));
- }
-
- this.opv.type = type;
- return this;
- }
-
- /**
- * Builds the primitive value.
- *
- * @return <code>ODataPrimitiveValue</code> object.
- */
- public ODataPrimitiveValue build() {
- if (this.opv.text == null && this.opv.value == null) {
- throw new IllegalArgumentException("Must provide either text or value");
- }
- if (this.opv.text != null && this.opv.value != null) {
- throw new IllegalArgumentException("Cannot provide both text and value");
- }
-
- if (this.opv.type == null) {
- this.opv.type = EdmSimpleType.String;
- }
-
- if (this.opv.type.isGeospatial()) {
- throw new IllegalArgumentException(
- "Use " + ODataGeospatialValue.class.getSimpleName() + " for geospatial types");
- }
-
- if (this.opv.value instanceof Timestamp) {
- this.opv.value = ODataTimestamp.getInstance(this.opv.type, (Timestamp) this.opv.value);
- } else if (this.opv.value instanceof Date) {
- this.opv.value = ODataTimestamp.getInstance(this.opv.type,
- new Timestamp(((Date) this.opv.value).getTime()));
- }
- if (this.opv.value instanceof Duration) {
- this.opv.value = new ODataDuration((Duration) this.opv.value);
- }
-
- if (this.opv.value != null && !this.opv.type.javaType().isAssignableFrom(this.opv.value.getClass())) {
- throw new IllegalArgumentException("Provided value is not compatible with " + this.opv.type.toString());
- }
-
- if (this.opv.text != null) {
- this.opv.parseText();
- }
- if (this.opv.value != null) {
- this.opv.formatValue();
- }
-
- return this.opv;
- }
- }
-
- protected ODataClient client;
-
- /**
- * Text value.
- */
- private String text;
-
- /**
- * Actual value.
- */
- protected Object value;
-
- /**
- * Value type.
- */
- protected EdmSimpleType type;
-
- /**
- * Protected constructor, need to use the builder to instantiate this class.
- *
- * @see Builder
- */
- protected ODataPrimitiveValue(final ODataClient client) {
- super();
- this.client = client;
- }
-
- /**
- * Parses given text as object value.
- */
- private void parseText() {
- switch (this.type) {
- case Null:
- this.value = null;
- break;
-
- case Binary:
- this.value = Base64.decodeBase64(this.toString());
- break;
-
- case SByte:
- this.value = Byte.parseByte(this.toString());
- break;
-
- case Boolean:
- this.value = Boolean.parseBoolean(this.toString());
- break;
-
- case Date:
- case DateTime:
- case DateTimeOffset:
- this.value = ODataTimestamp.parse(this.type, this.toString());
- break;
-
- case Time:
- case TimeOfDay:
- this.value = new ODataDuration(this.toString());
- break;
-
- case Decimal:
- this.value = new BigDecimal(this.toString());
- break;
-
- case Single:
- this.value = Float.parseFloat(this.toString());
- break;
-
- case Double:
- this.value = Double.parseDouble(this.toString());
- break;
-
- case Guid:
- this.value = UUID.fromString(this.toString());
- break;
-
- case Int16:
- this.value = Short.parseShort(this.toString());
- break;
-
- case Byte:
- case Int32:
- this.value = Integer.parseInt(this.toString());
- break;
-
- case Int64:
- this.value = Long.parseLong(this.toString());
- break;
-
- case Stream:
- this.value = URI.create(this.toString());
- break;
-
- case String:
- this.value = this.toString();
- break;
-
- default:
- }
- }
-
- /**
- * Format given value as text.
- */
- private void formatValue() {
- switch (this.type) {
- case Null:
- this.text = StringUtils.EMPTY;
- break;
-
- case Binary:
- this.text = Base64.encodeBase64String(this.<byte[]>toCastValue());
- break;
-
- case SByte:
- this.text = this.<Byte>toCastValue().toString();
- break;
-
- case Boolean:
- this.text = this.<Boolean>toCastValue().toString();
- break;
-
- case Date:
- case DateTime:
- case DateTimeOffset:
- this.text = this.<ODataTimestamp>toCastValue().toString();
- break;
-
- case Time:
- case TimeOfDay:
- this.text = this.<ODataDuration>toCastValue().toString();
- break;
-
- case Decimal:
- this.text = new DecimalFormat(this.type.pattern()).format(this.<BigDecimal>toCastValue());
- break;
-
- case Single:
- this.text = new DecimalFormat(this.type.pattern()).format(this.<Float>toCastValue());
- break;
-
- case Double:
- this.text = new DecimalFormat(this.type.pattern()).format(this.<Double>toCastValue());
- break;
-
- case Guid:
- this.text = this.<UUID>toCastValue().toString();
- break;
-
- case Int16:
- this.text = this.<Short>toCastValue().toString();
- break;
-
- case Byte:
- case Int32:
- this.text = this.<Integer>toCastValue().toString();
- break;
-
- case Int64:
- this.text = this.<Long>toCastValue().toString();
- break;
-
- case Stream:
- this.text = this.<URI>toCastValue().toASCIIString();
- break;
-
- case String:
- this.text = this.<String>toCastValue();
- break;
-
- default:
- }
- }
-
- /**
- * Gets type name.
- *
- * @return type name.
- */
- public String getTypeName() {
- return type.toString();
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public String toString() {
- return this.text;
- }
-
- /**
- * Gets actual primitive value.
- *
- * @return
- */
- public Object toValue() {
- return this.value;
- }
-
- /**
- * Casts primitive value.
- *
- * @param <T> cast.
- * @return casted value.
- */
- @SuppressWarnings("unchecked")
- public <T> T toCastValue() {
- return (T) type.javaType().cast(toValue());
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataProperty.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataProperty.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataProperty.java
deleted file mode 100644
index abb0776..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataProperty.java
+++ /dev/null
@@ -1,192 +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 com.msopentech.odatajclient.engine.data;
-
-import java.io.Serializable;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * OData entity property.
- */
-public class ODataProperty implements Serializable, ODataInvokeResult {
-
- /**
- * Property type.
- */
- public enum PropertyType {
-
- /**
- * Primitive.
- */
- PRIMITIVE,
- /**
- * Collection
- */
- COLLECTION,
- /**
- * Complex.
- */
- COMPLEX,
- /**
- * Empty type (possibly, no type information could be retrieved).
- */
- EMPTY
-
- }
-
- private static final long serialVersionUID = 926939448778950450L;
-
- /**
- * Property name.
- */
- private final String name;
-
- /**
- * Property value.
- */
- private ODataValue value;
-
- /**
- * Constructor.
- *
- * @param name property name.
- * @param value property value.
- */
- ODataProperty(final String name, final ODataValue value) {
- this.name = name;
- this.value = value;
- }
-
- /**
- * Returns property name.
- *
- * @return property name.
- */
- public String getName() {
- return name;
- }
-
- /**
- * Returns property value.
- *
- * @return property value.
- */
- public ODataValue getValue() {
- return value;
- }
-
- /**
- * Updates property value.
- *
- * @param value property value that replaces current.
- */
- public void setValue(final ODataValue value) {
- this.value = value;
- }
-
- /**
- * Checks if has null value.
- *
- * @return 'TRUE' if has null value; 'FALSE' otherwise.
- */
- public boolean hasNullValue() {
- return this.value == null;
- }
-
- /**
- * Checks if has primitive value.
- *
- * @return 'TRUE' if has primitive value; 'FALSE' otherwise.
- */
- public boolean hasPrimitiveValue() {
- return !hasNullValue() && this.value.isPrimitive();
- }
-
- /**
- * Gets primitive value.
- *
- * @return primitive value if exists; null otherwise.
- */
- public ODataPrimitiveValue getPrimitiveValue() {
- return hasPrimitiveValue() ? this.value.asPrimitive() : null;
- }
-
- /**
- * Checks if has complex value.
- *
- * @return 'TRUE' if has complex value; 'FALSE' otherwise.
- */
- public boolean hasComplexValue() {
- return !hasNullValue() && this.value.isComplex();
- }
-
- /**
- * Gets complex value.
- *
- * @return complex value if exists; null otherwise.
- */
- public ODataComplexValue getComplexValue() {
- return hasComplexValue() ? this.value.asComplex() : null;
- }
-
- /**
- * Checks if has collection value.
- *
- * @return 'TRUE' if has collection value; 'FALSE' otherwise.
- */
- public boolean hasCollectionValue() {
- return !hasNullValue() && this.value.isCollection();
- }
-
- /**
- * Gets collection value.
- *
- * @return collection value if exists; null otherwise.
- */
- public ODataCollectionValue getCollectionValue() {
- return hasCollectionValue() ? this.value.asCollection() : null;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public boolean equals(final Object obj) {
- return EqualsBuilder.reflectionEquals(this, obj);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public int hashCode() {
- return HashCodeBuilder.reflectionHashCode(this);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataReader.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataReader.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataReader.java
deleted file mode 100644
index 7666858..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataReader.java
+++ /dev/null
@@ -1,108 +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 com.msopentech.odatajclient.engine.data;
-
-import com.msopentech.odatajclient.engine.metadata.AbstractEdmMetadata;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import java.io.InputStream;
-import java.io.Serializable;
-
-/**
- * OData reader.
- * <br/>
- * Use this class to de-serialize an OData response body.
- * <br/>
- * This class provides method helpers to de-serialize an entire feed, a set of entities and a single entity as well.
- */
-public interface ODataReader extends Serializable {
-
- /**
- * Parses a stream into metadata representation.
- *
- * @param input stream to de-serialize.
- * @return metadata representation.
- */
- AbstractEdmMetadata<?, ?, ?, ?, ?, ?, ?> readMetadata(InputStream input);
-
- /**
- * Parses an OData service document.
- *
- * @param input stream to de-serialize.
- * @param format de-serialize as XML or JSON
- * @return List of URIs.
- */
- ODataServiceDocument readServiceDocument(InputStream input, ODataFormat format);
-
- /**
- * De-Serializes a stream into an OData entity set.
- *
- * @param input stream to de-serialize.
- * @param format de-serialize as AtomFeed or JSONFeed
- * @return de-serialized entity set.
- */
- ODataEntitySet readEntitySet(InputStream input, ODataPubFormat format);
-
- /**
- * Parses a stream taking care to de-serializes the first OData entity found.
- *
- * @param input stream to de-serialize.
- * @param format de-serialize as AtomEntry or JSONEntry
- * @return entity de-serialized.
- */
- ODataEntity readEntity(InputStream input, ODataPubFormat format);
-
- /**
- * Parses a stream taking care to de-serialize the first OData entity property found.
- *
- * @param input stream to de-serialize.
- * @param format de-serialize as XML or JSON
- * @return OData entity property de-serialized.
- */
- ODataProperty readProperty(InputStream input, ODataFormat format);
-
- /**
- * Parses a $links request response.
- *
- * @param input stream to de-serialize.
- * @param format de-serialize as XML or JSON
- * @return List of URIs.
- */
- ODataLinkCollection readLinks(InputStream input, ODataFormat format);
-
- /**
- * Parses a stream into an OData error.
- *
- * @param inputStream stream to de-serialize.
- * @param isXML 'TRUE' if the error is in XML format.
- * @return OData error.
- */
- ODataError readError(InputStream inputStream, boolean isXML);
-
- /**
- * Parses a stream into the object type specified by the given reference.
- *
- * @param <T> expected object type.
- * @param src input stream.
- * @param format format
- * @param reference reference.
- * @return read object.
- */
- <T> T read(InputStream src, String format, Class<T> reference);
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataSerializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataSerializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataSerializer.java
deleted file mode 100644
index 6aa7e31..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataSerializer.java
+++ /dev/null
@@ -1,120 +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 com.msopentech.odatajclient.engine.data;
-
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import java.io.OutputStream;
-import java.io.Serializable;
-import java.io.Writer;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * Utility class for serialization.
- */
-public interface ODataSerializer extends Serializable {
-
- /**
- * Writes <tt>FeedResource</tt> object onto the given stream.
- *
- * @param <T> feed resource type.
- * @param obj object to be streamed.
- * @param out output stream.
- */
- <T extends Feed> void feed(T obj, OutputStream out);
-
- /**
- * Writes <tt>FeedResource</tt> object by the given writer.
- *
- * @param <T> feed resource type.
- * @param obj object to be streamed.
- * @param writer writer.
- */
- <T extends Feed> void feed(T obj, Writer writer);
-
- /**
- * Writes <tt>EntryResource</tt> object onto the given stream.
- *
- * @param <T> entry resource type.
- * @param obj object to be streamed.
- * @param out output stream.
- */
- <T extends Entry> void entry(T obj, OutputStream out);
-
- /**
- * Writes <tt>EntryResource</tt> object by the given writer.
- *
- * @param <T> entry resource type.
- * @param obj object to be streamed.
- * @param writer writer.
- */
- <T extends Entry> void entry(T obj, Writer writer);
-
- /**
- * Writes entry content onto the given stream.
- *
- * @param element element to be streamed.
- * @param format streaming format.
- * @param out output stream.
- */
- void property(Element element, ODataFormat format, OutputStream out);
-
- /**
- * Writes entry content by the given writer.
- *
- * @param element element to be streamed.
- * @param format streaming format.
- * @param writer writer.
- */
- void property(Element element, ODataFormat format, Writer writer);
-
- /**
- * Writes OData link onto the given stream.
- *
- * @param link OData link to be streamed.
- * @param format streaming format.
- * @param out output stream.
- */
- void link(ODataLink link, ODataFormat format, OutputStream out);
-
- /**
- * Writes OData link by the given writer.
- *
- * @param link OData link to be streamed.
- * @param format streaming format.
- * @param writer writer.
- */
- void link(ODataLink link, ODataFormat format, Writer writer);
-
- /**
- * Writes DOM object onto the given stream.
- *
- * @param content DOM to be streamed.
- * @param out output stream.
- */
- void dom(Node content, OutputStream out);
-
- /**
- * Writes DOM object by the given writer.
- *
- * @param content DOM to be streamed.
- * @param writer writer.
- */
- void dom(Node content, Writer writer);
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataServiceDocument.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataServiceDocument.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataServiceDocument.java
deleted file mode 100644
index 2e64e03..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataServiceDocument.java
+++ /dev/null
@@ -1,183 +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 com.msopentech.odatajclient.engine.data;
-
-import java.net.URI;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-public class ODataServiceDocument {
-
- private URI metadataContext;
-
- private String metadataETag;
-
- private final Map<String, URI> entitySets = new HashMap<String, URI>();
-
- private final Map<String, URI> functionImports = new HashMap<String, URI>();
-
- private final Map<String, URI> singletons = new HashMap<String, URI>();
-
- private final Map<String, URI> relatedServiceDocuments = new HashMap<String, URI>();
-
- public URI getMetadataContext() {
- return metadataContext;
- }
-
- public void setMetadataContext(final URI metadataContext) {
- this.metadataContext = metadataContext;
- }
-
- public String getMetadataETag() {
- return metadataETag;
- }
-
- public void setMetadataETag(final String metadataETag) {
- this.metadataETag = metadataETag;
- }
-
- public Map<String, URI> getEntitySets() {
- return entitySets;
- }
-
- /**
- * Gets entity set titles.
- *
- * @return entity set titles.
- */
- public Collection<String> getEntitySetTitles() {
- return entitySets.keySet();
- }
-
- /**
- * Gets entity set URIs.
- *
- * @return entity set URIs.
- */
- public Collection<URI> getEntitySetURIs() {
- return entitySets.values();
- }
-
- /**
- * Gets URI about the given entity set.
- *
- * @param title title.
- * @return URI.
- */
- public URI getEntitySetURI(final String title) {
- return entitySets.get(title);
- }
-
- public Map<String, URI> getFunctionImports() {
- return functionImports;
- }
-
- /**
- * Gets function import titles.
- *
- * @return function import titles.
- */
- public Collection<String> getFunctionImportTitles() {
- return functionImports.keySet();
- }
-
- /**
- * Gets function import URIs.
- *
- * @return function import URIs.
- */
- public Collection<URI> getFunctionImportURIs() {
- return functionImports.values();
- }
-
- /**
- * Gets URI of the given function import.
- *
- * @param title title.
- * @return URI.
- */
- public URI getFunctionImportURI(final String title) {
- return functionImports.get(title);
- }
-
- public Map<String, URI> getSingletons() {
- return singletons;
- }
-
- /**
- * Gets singleton titles.
- *
- * @return singleton titles.
- */
- public Collection<String> getSingletonTitles() {
- return singletons.keySet();
- }
-
- /**
- * Gets singleton URIs.
- *
- * @return singleton URIs.
- */
- public Collection<URI> getSingletonURIs() {
- return singletons.values();
- }
-
- /**
- * Gets URI of the given singleton.
- *
- * @param title title.
- * @return URI.
- */
- public URI getSingletonURI(final String title) {
- return singletons.get(title);
- }
-
- public Map<String, URI> getRelatedServiceDocuments() {
- return relatedServiceDocuments;
- }
-
- /**
- * Gets related service documents titles.
- *
- * @return related service documents titles.
- */
- public Collection<String> getRelatedServiceDocumentsTitles() {
- return relatedServiceDocuments.keySet();
- }
-
- /**
- * Gets related service documents URIs.
- *
- * @return related service documents URIs.
- */
- public Collection<URI> getRelatedServiceDocumentsURIs() {
- return relatedServiceDocuments.values();
- }
-
- /**
- * Gets URI of the given related service documents.
- *
- * @param title title.
- * @return URI.
- */
- public URI getRelatedServiceDocumentURI(final String title) {
- return relatedServiceDocuments.get(title);
- }
-}
[48/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataBatchResponseManager.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataBatchResponseManager.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataBatchResponseManager.java
deleted file mode 100644
index bba10a3..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataBatchResponseManager.java
+++ /dev/null
@@ -1,147 +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 com.msopentech.odatajclient.engine.communication.request.batch;
-
-import com.msopentech.odatajclient.engine.communication.header.ODataHeaders;
-import com.msopentech.odatajclient.engine.communication.response.ODataBatchResponse;
-import com.msopentech.odatajclient.engine.utils.ODataConstants;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Batch response manager class.
- */
-public class ODataBatchResponseManager implements Iterator<ODataBatchResponseItem> {
-
- /**
- * Logger.
- */
- private static final Logger LOG = LoggerFactory.getLogger(ODataBatchResponseManager.class);
-
- /**
- * Batch response line iterator.
- */
- private final ODataBatchLineIterator batchLineIterator;
-
- /**
- * Batch boundary.
- */
- private final String batchBoundary;
-
- /**
- * Expected batch response items iterator.
- */
- private final Iterator<ODataBatchResponseItem> expectedItemsIterator;
-
- /**
- * Last retrieved batch response item.
- */
- private ODataBatchResponseItem current = null;
-
- /**
- * Constructor.
- *
- * @param res OData batch response.
- * @param expectedItems expected batch response items.
- */
- public ODataBatchResponseManager(final ODataBatchResponse res, final List<ODataBatchResponseItem> expectedItems) {
- try {
- this.expectedItemsIterator = expectedItems.iterator();
- this.batchLineIterator = new ODataBatchLineIterator(
- IOUtils.lineIterator(res.getRawResponse(), ODataConstants.UTF8));
-
- // search for boundary
- batchBoundary = ODataBatchUtilities.getBoundaryFromHeader(
- res.getHeader(ODataHeaders.HeaderName.contentType));
- LOG.debug("Retrieved batch response bondary '{}'", batchBoundary);
- } catch (IOException e) {
- LOG.error("Error parsing batch response", e);
- throw new IllegalStateException(e);
- }
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public boolean hasNext() {
- return expectedItemsIterator.hasNext();
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public ODataBatchResponseItem next() {
- if (current != null) {
- current.close();
- }
-
- if (!hasNext()) {
- throw new NoSuchElementException("No item found");
- }
-
- current = expectedItemsIterator.next();
-
- final Map<String, Collection<String>> nextItemHeaders =
- ODataBatchUtilities.nextItemHeaders(batchLineIterator, batchBoundary);
-
- switch (ODataBatchUtilities.getItemType(nextItemHeaders)) {
- case CHANGESET:
- if (!current.isChangeset()) {
- throw new IllegalStateException("Unexpected batch item");
- }
-
- current.initFromBatch(
- batchLineIterator,
- ODataBatchUtilities.getBoundaryFromHeader(
- nextItemHeaders.get(ODataHeaders.HeaderName.contentType.toString())));
- break;
-
- case RETRIEVE:
- if (current.isChangeset()) {
- throw new IllegalStateException("Unexpected batch item");
- }
-
- current.initFromBatch(
- batchLineIterator,
- batchBoundary);
- break;
- default:
- throw new IllegalStateException("Expected item not found");
- }
-
- return current;
- }
-
- /**
- * Unsupported operation.
- */
- @Override
- public void remove() {
- throw new UnsupportedOperationException("Remove operation is not supported");
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataBatchUtilities.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataBatchUtilities.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataBatchUtilities.java
deleted file mode 100644
index 99ebb4d..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataBatchUtilities.java
+++ /dev/null
@@ -1,330 +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 com.msopentech.odatajclient.engine.communication.request.batch;
-
-import com.msopentech.odatajclient.engine.communication.header.ODataHeaders;
-import com.msopentech.odatajclient.engine.communication.request.ODataStreamer;
-import com.msopentech.odatajclient.engine.utils.ODataBatchConstants;
-import com.msopentech.odatajclient.engine.utils.ODataConstants;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.AbstractMap;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.io.LineIterator;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Utility class for batch requests and responses.
- */
-public class ODataBatchUtilities {
-
- public static enum BatchItemType {
-
- NONE,
- CHANGESET,
- RETRIEVE
-
- }
-
- /**
- * Logger.
- */
- private static final Logger LOG = LoggerFactory.getLogger(ODataBatchUtilities.class);
-
- /**
- * Response line syntax.
- */
- private static final Pattern RESPONSE_PATTERN =
- Pattern.compile("HTTP/\\d\\.\\d (\\d+) (.*)", Pattern.CASE_INSENSITIVE);
-
- /**
- * Reads batch part taking source and delimiter (boundary) from given batch controller.
- * <p>
- * Usually used to consume/discard useless lines.
- *
- * @param batchController batch controller.
- * @param checkCurrent if 'TRUE' the current line will be included into the delimiter verification.
- * @return latest read line.
- */
- public static String readBatchPart(final ODataBatchController batchController, final boolean checkCurrent) {
- return readBatchPart(batchController, null, -1, checkCurrent);
- }
-
- /**
- * Reads the given number of line from the given batch wrapped into the batch controller.
- * <p>
- * Usually used to consume/discard useless lines.
- *
- * @param batchController batch controller.
- * @param count number of batch line to be read.
- * @return latest read line.
- */
- public static String readBatchPart(final ODataBatchController batchController, final int count) {
- return readBatchPart(batchController, null, count, true);
- }
-
- /**
- * Reads batch part taking source and delimiter (boundary) from given batch controller.
- * <p>
- * Usually used to read an entire batch part.
- *
- * @param batchController batch controller.
- * @param os destination stream of batch part (null to discard).
- * @param checkCurrent if 'TRUE' the current line will be included into the delimiter verification.
- * @return latest read line.
- */
- public static String readBatchPart(
- final ODataBatchController controller, final OutputStream os, final boolean checkCurrent) {
-
- return readBatchPart(controller, os, -1, checkCurrent);
- }
-
- /**
- * Reads batch part taking source and delimiter (boundary) from given batch controller.
- * <p>
- * Usually used to read an entire batch part.
- *
- * @param batchController batch controller.
- * @param os destination stream of batch part (null to discard).
- * @param count number of batch line to be read.
- * @param checkCurrent if 'TRUE' the current line will be included into the delimiter verification.
- * @return latest read line.
- */
- public static String readBatchPart(
- final ODataBatchController controller, final OutputStream os, final int count, final boolean checkCurrent) {
-
- String currentLine;
-
- synchronized (controller.getBatchLineIterator()) {
- currentLine = checkCurrent ? controller.getBatchLineIterator().getCurrent() : null;
-
- if (count < 0) {
- try {
-
- boolean notEndLine = isNotEndLine(controller, currentLine);
-
- while (controller.isValidBatch() && notEndLine && controller.getBatchLineIterator().hasNext()) {
-
- currentLine = controller.getBatchLineIterator().nextLine();
- LOG.debug("Read line '{}' (end-line '{}')", currentLine, controller.getBoundary());
-
- notEndLine = isNotEndLine(controller, currentLine);
-
- if (notEndLine && os != null) {
- os.write(currentLine.getBytes(ODataConstants.UTF8));
- os.write(ODataStreamer.CRLF);
- }
- }
-
- } catch (IOException e) {
- LOG.error("Error reading batch part", e);
- throw new IllegalStateException(e);
- }
-
- } else {
- for (int i = 0;
- controller.isValidBatch() && controller.getBatchLineIterator().hasNext() && i < count; i++) {
- currentLine = controller.getBatchLineIterator().nextLine();
- }
- }
- }
-
- return currentLine;
- }
-
- /**
- * Reads headers from the batch starting from the given position.
- *
- * @param iterator batch iterator.
- * @return Map of header name in header values.
- */
- public static Map<String, Collection<String>> readHeaders(final ODataBatchLineIterator iterator) {
- final Map<String, Collection<String>> target =
- new TreeMap<String, Collection<String>>(String.CASE_INSENSITIVE_ORDER);
-
- readHeaders(iterator, target);
- return target;
- }
-
- /**
- * Reads headers from the batch starting from the given position.
- * <p>
- * Retrieved headers will be added to the map given by target parameter.
- *
- * @param iterator batch iterator.
- * @param target destination of the retrieved headers.
- */
- public static void readHeaders(
- final ODataBatchLineIterator iterator, final Map<String, Collection<String>> target) {
-
- try {
- final ByteArrayOutputStream baos = new ByteArrayOutputStream();
- readBatchPart(new ODataBatchController(iterator, null), baos, true);
-
- final LineIterator headers = IOUtils.lineIterator(new ByteArrayInputStream(baos.toByteArray()),
- ODataConstants.UTF8);
- while (headers.hasNext()) {
- final String line = headers.nextLine().trim();
- if (StringUtils.isNotBlank(line)) {
- addHeaderLine(line, target);
- }
- }
- } catch (Exception e) {
- LOG.error("Error retrieving headers", e);
- throw new IllegalStateException(e);
- }
- }
-
- /**
- * Parses and adds the given header line to the given target map.
- *
- * @param headerLine header line to be added.
- * @param targetMap target map.
- */
- public static void addHeaderLine(final String headerLine, final Map<String, Collection<String>> targetMap) {
- final int sep = headerLine.indexOf(':');
- if (sep > 0 && sep < headerLine.length() - 1) {
- final String key = headerLine.substring(0, sep).trim();
- final Collection<String> value;
- if (targetMap.containsKey(key)) {
- value = targetMap.get(key);
- } else {
- value = new HashSet<String>();
- targetMap.put(key, value);
- }
- value.add(headerLine.substring(sep + 1, headerLine.length()).trim());
- }
- }
-
- /**
- * Retrieved batch boundary from the given content-type header values.
- *
- * @param contentType content-types.
- * @return batch boundary.
- */
- public static String getBoundaryFromHeader(final Collection<String> contentType) {
- final String boundaryKey = ODataBatchConstants.BOUNDARY + "=";
-
- if (contentType == null || contentType.isEmpty() || !contentType.toString().contains(boundaryKey)) {
- throw new IllegalArgumentException("Invalid content type");
- }
-
- final String headerValue = contentType.toString();
-
- final int start = headerValue.indexOf(boundaryKey) + boundaryKey.length();
- int end = headerValue.indexOf(';', start);
-
- if (end < 0) {
- end = headerValue.indexOf(']', start);
- }
-
- final String res = headerValue.substring(start, end);
- return res.startsWith("--") ? res : "--" + res;
- }
-
- /**
- * Retrieves response line from the given position.
- *
- * @param iterator batch iterator.
- * @return retrieved response line.
- */
- public static Map.Entry<Integer, String> readResponseLine(final ODataBatchLineIterator iterator) {
- final String line = readBatchPart(new ODataBatchController(iterator, null), 1);
- LOG.debug("Response line '{}'", line);
-
- final Matcher matcher = RESPONSE_PATTERN.matcher(line.trim());
-
- if (matcher.matches()) {
- return new AbstractMap.SimpleEntry<Integer, String>(Integer.valueOf(matcher.group(1)), matcher.group(2));
- }
-
- throw new IllegalArgumentException("Invalid response line '" + line + "'");
- }
-
- /**
- * Retrieves headers of the next batch item.
- *
- * @param iterator batch line iterator.
- * @param boundary batch boundary.
- * @return batch item headers.
- */
- public static Map<String, Collection<String>> nextItemHeaders(
- final ODataBatchLineIterator iterator, final String boundary) {
-
- final Map<String, Collection<String>> headers =
- new TreeMap<String, Collection<String>>(String.CASE_INSENSITIVE_ORDER);
-
- final String line = ODataBatchUtilities.readBatchPart(new ODataBatchController(iterator, boundary), true);
-
- if (line != null && line.trim().equals(boundary)) {
- ODataBatchUtilities.readHeaders(iterator, headers);
- }
-
- LOG.debug("Retrieved batch item headers {}", headers);
- return headers;
- }
-
- /**
- * Retrieves item type from item headers.
- *
- * @param headers batch item headers.
- * @return batch item type.
- */
- public static BatchItemType getItemType(final Map<String, Collection<String>> headers) {
-
- final BatchItemType nextItemType;
-
- final String contentType = headers.containsKey(ODataHeaders.HeaderName.contentType.toString())
- ? headers.get(ODataHeaders.HeaderName.contentType.toString()).toString() : StringUtils.EMPTY;
-
- if (contentType.contains(ODataBatchConstants.MULTIPART_CONTENT_TYPE)) {
- nextItemType = BatchItemType.CHANGESET;
- } else if (contentType.contains(ODataBatchConstants.ITEM_CONTENT_TYPE)) {
- nextItemType = BatchItemType.RETRIEVE;
- } else {
- nextItemType = BatchItemType.NONE;
- }
-
- LOG.debug("Retrieved next item type {}", nextItemType);
- return nextItemType;
- }
-
- /**
- * Checks if the given line is the expected end-line.
- *
- * @param controller batch controller.
- * @param line line to be checked.
- * @return 'TRUE' if the line is not the end-line; 'FALSE' otherwise.
- */
- private static boolean isNotEndLine(final ODataBatchController controller, final String line) {
- return line == null
- || (StringUtils.isBlank(controller.getBoundary()) && StringUtils.isNotBlank(line))
- || (StringUtils.isNotBlank(controller.getBoundary()) && !line.startsWith(controller.getBoundary()));
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataBatchableRequest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataBatchableRequest.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataBatchableRequest.java
deleted file mode 100644
index d906cc5..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataBatchableRequest.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.engine.communication.request.batch;
-
-import com.msopentech.odatajclient.engine.communication.request.ODataRequest;
-
-/**
- * Object request that can be sent embedded into a batch request.
- */
-public interface ODataBatchableRequest extends ODataRequest {
-
- /**
- * Writes (and consume) the request onto the given batch stream.
- * <p>
- * Please note that this method will consume the request (execution won't be possible anymore).
- *
- * @param req destination batch request.
- */
- void batch(final ODataBatchRequest req);
-
- /**
- * Writes (and consume) the request onto the given batch stream.
- * <p>
- * Please note that this method will consume the request (execution won't be possible anymore).
- *
- * @param req destination batch request.
- * @param contentId ContentId header value to be added to the serialization.
- * Use this in case of changeset items.
- */
- void batch(final ODataBatchRequest req, final String contentId);
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataChangeset.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataChangeset.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataChangeset.java
deleted file mode 100644
index 63c6f82..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataChangeset.java
+++ /dev/null
@@ -1,124 +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 com.msopentech.odatajclient.engine.communication.request.batch;
-
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.engine.communication.header.ODataHeaders;
-import com.msopentech.odatajclient.engine.communication.request.ODataRequestImpl;
-import com.msopentech.odatajclient.engine.utils.ODataBatchConstants;
-import java.util.UUID;
-
-/**
- * Changeset wrapper for the corresponding batch item.
- */
-public class ODataChangeset extends ODataBatchRequestItem {
-
- /**
- * ContentId.
- */
- private int contentId = 0;
-
- /**
- * Changeset boundary.
- */
- private final String boundary;
-
- /**
- * Expected changeset response items.
- */
- private final ODataChangesetResponseItem expectedResItem;
-
- /**
- * Constructor.
- *
- * @param req batch request.
- * @param expectedResItem expected OData response items.
- */
- ODataChangeset(final ODataBatchRequest req, final ODataChangesetResponseItem expectedResItem) {
- super(req);
- this.expectedResItem = expectedResItem;
-
- // create a random UUID value for boundary
- boundary = "changeset_" + UUID.randomUUID().toString();
- }
-
- public int getLastContentId() {
- return contentId;
- }
-
- /**
- * Close changeset item an send changeset request footer.
- */
- @Override
- protected void closeItem() {
- // stream close-delimiter
- if (hasStreamedSomething) {
- newLine();
- stream(("--" + boundary + "--").getBytes());
- newLine();
- newLine();
- }
- }
-
- /**
- * Serialize and send the given request.
- * <p>
- * An IllegalArgumentException is thrown in case of GET request.
- *
- * @param request request to be serialized.
- * @return current item instance.
- */
- public ODataChangeset addRequest(final ODataBatchableRequest request) {
- if (!isOpen()) {
- throw new IllegalStateException("Current batch item is closed");
- }
-
- if (request.getMethod() == HttpMethod.GET) {
- throw new IllegalArgumentException("Invalid request. GET method not allowed in changeset");
- }
-
- if (!hasStreamedSomething) {
- stream((ODataHeaders.HeaderName.contentType.toString() + ": "
- + ODataBatchConstants.MULTIPART_CONTENT_TYPE + ";boundary=" + boundary).getBytes());
-
- newLine();
- newLine();
-
- hasStreamedSomething = true;
- }
-
- contentId++;
-
- // preamble
- newLine();
-
- // stream batch-boundary
- stream(("--" + boundary).getBytes());
- newLine();
-
- // stream the request
- streamRequestHeader(request, contentId);
-
- request.batch(req, String.valueOf(contentId));
-
- // add request to the list
- expectedResItem.addResponse(String.valueOf(contentId), ((ODataRequestImpl) request).getResponseTemplate());
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataChangesetResponseItem.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataChangesetResponseItem.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataChangesetResponseItem.java
deleted file mode 100644
index b5067f9..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataChangesetResponseItem.java
+++ /dev/null
@@ -1,131 +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 com.msopentech.odatajclient.engine.communication.request.batch;
-
-import static com.msopentech.odatajclient.engine.communication.request.batch.ODataBatchResponseItem.LOG;
-
-import com.msopentech.odatajclient.engine.communication.response.ODataResponse;
-import com.msopentech.odatajclient.engine.utils.ODataBatchConstants;
-import java.util.Collection;
-import java.util.Map;
-import java.util.NoSuchElementException;
-
-/**
- * Changeset wrapper for the corresponding batch item.
- */
-public class ODataChangesetResponseItem extends ODataBatchResponseItem {
-
- /**
- * Last cached OData response.
- */
- private ODataResponse current = null;
-
- /**
- * Constructor.
- */
- public ODataChangesetResponseItem() {
- super(true);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public boolean hasNext() {
- if (closed) {
- throw new IllegalStateException("Invalid request - the item has been closed");
- }
-
- if (expectedItemsIterator == null) {
- expectedItemsIterator = responses.values().iterator();
- }
-
- return expectedItemsIterator.hasNext();
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public ODataResponse next() {
-
- if (current != null) {
- current.close();
- }
-
- if (closed) {
- throw new IllegalStateException("Invalid request - the item has been closed");
- }
-
- if (hasNext()) {
- // consume item for condition above (like a counter ...)
- expectedItemsIterator.next();
- } else {
- throw new NoSuchElementException("No item found");
- }
-
- final Map<String, Collection<String>> nextItemHeaders =
- ODataBatchUtilities.nextItemHeaders(batchLineIterator, boundary);
-
- if (nextItemHeaders.isEmpty()) {
- throw new IllegalStateException("Expected item not found");
- }
-
- final Map.Entry<Integer, String> responseLine = ODataBatchUtilities.readResponseLine(batchLineIterator);
- LOG.debug("Retrieved item response {}", responseLine);
-
- final Map<String, Collection<String>> headers = ODataBatchUtilities.readHeaders(batchLineIterator);
- LOG.debug("Retrieved item headers {}", headers);
-
- Collection<String> contentId = nextItemHeaders.get(ODataBatchConstants.CHANGESET_CONTENT_ID_NAME);
-
- if (contentId == null || contentId.isEmpty()) {
- contentId = headers.get(ODataBatchConstants.CHANGESET_CONTENT_ID_NAME);
-
- if (contentId == null || contentId.isEmpty()) {
- throw new IllegalStateException("Content-ID is missing");
- }
- }
-
- current = getResponse(contentId.iterator().next());
-
- if (current == null) {
- throw new IllegalStateException("Unexpected '" + contentId + "' item found");
- }
-
- current.initFromBatch(responseLine, headers, batchLineIterator, boundary);
-
- if (current.getStatusCode() >= 400) {
- // found error .... consume expeted items
- while (expectedItemsIterator.hasNext()) {
- expectedItemsIterator.next();
- }
- }
-
- return current;
- }
-
- /**
- * Unsupported operation.
- */
- @Override
- public void remove() {
- throw new UnsupportedOperationException("Not supported operation.");
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataRetrieve.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataRetrieve.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataRetrieve.java
deleted file mode 100644
index bad847b..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataRetrieve.java
+++ /dev/null
@@ -1,81 +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 com.msopentech.odatajclient.engine.communication.request.batch;
-
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.engine.communication.request.ODataRequestImpl;
-
-/**
- * Retrieve request wrapper for the corresponding batch item.
- */
-public class ODataRetrieve extends ODataBatchRequestItem {
-
- private final ODataRetrieveResponseItem expectedResItem;
-
- /**
- * Constructor.
- *
- * @param req batch request.
- * @param expectedResItem expected batch response item.
- */
- ODataRetrieve(final ODataBatchRequest req, final ODataRetrieveResponseItem expectedResItem) {
- super(req);
- this.expectedResItem = expectedResItem;
- }
-
- /**
- * Close item.
- */
- @Override
- protected void closeItem() {
- // nop
- }
-
- /**
- * Serialize and send the given request.
- * <p>
- * An IllegalArgumentException is thrown in case of no GET request.
- *
- * @param request request to be serialized.
- * @return current item instance.
- */
- public ODataRetrieve setRequest(final ODataBatchableRequest request) {
- if (!isOpen()) {
- throw new IllegalStateException("Current batch item is closed");
- }
-
- if (((ODataRequestImpl) request).getMethod() != HttpMethod.GET) {
- throw new IllegalArgumentException("Invalid request. Only GET method is allowed");
- }
-
- hasStreamedSomething = true;
-
- // stream the request
- streamRequestHeader(request);
-
- // close before in order to avoid any further setRequest calls.
- close();
-
- // add request to the list
- expectedResItem.addResponse(
- ODataRetrieveResponseItem.RETRIEVE_CONTENT_ID, ((ODataRequestImpl) request).getResponseTemplate());
-
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataRetrieveResponseItem.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataRetrieveResponseItem.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataRetrieveResponseItem.java
deleted file mode 100644
index 90523b9..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataRetrieveResponseItem.java
+++ /dev/null
@@ -1,86 +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 com.msopentech.odatajclient.engine.communication.request.batch;
-
-import static com.msopentech.odatajclient.engine.communication.request.batch.ODataBatchResponseItem.LOG;
-import com.msopentech.odatajclient.engine.communication.response.ODataResponse;
-import java.util.Collection;
-import java.util.Map;
-import java.util.NoSuchElementException;
-
-/**
- * Retrieve response wrapper for the corresponding batch item.
- */
-public class ODataRetrieveResponseItem extends ODataBatchResponseItem {
-
- public static final String RETRIEVE_CONTENT_ID = "__RETRIEVE__";
-
- /**
- * Constructor.
- */
- public ODataRetrieveResponseItem() {
- super(false);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public boolean hasNext() {
- if (closed) {
- throw new IllegalStateException("Invalid request - the item has been closed");
- }
-
- if (expectedItemsIterator == null) {
- expectedItemsIterator = responses.values().iterator();
- }
-
- return expectedItemsIterator.hasNext();
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public ODataResponse next() {
- if (closed) {
- throw new IllegalStateException("Invalid request - the item has been closed");
- }
-
- if (!hasNext()) {
- throw new NoSuchElementException("No item found");
- }
-
- final Map.Entry<Integer, String> responseLine = ODataBatchUtilities.readResponseLine(batchLineIterator);
- LOG.debug("Retrieved item response {}", responseLine);
-
- final Map<String, Collection<String>> headers = ODataBatchUtilities.readHeaders(batchLineIterator);
- LOG.debug("Retrieved item headers {}", headers);
-
- return expectedItemsIterator.next().initFromBatch(responseLine, headers, batchLineIterator, boundary);
- }
-
- /**
- * Unsupported operation.
- */
- @Override
- public void remove() {
- throw new UnsupportedOperationException("Operation not supported.");
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/V3BatchRequestFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/V3BatchRequestFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/V3BatchRequestFactory.java
deleted file mode 100644
index 119af93..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/V3BatchRequestFactory.java
+++ /dev/null
@@ -1,31 +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 com.msopentech.odatajclient.engine.communication.request.batch;
-
-import com.msopentech.odatajclient.engine.client.ODataV3Client;
-
-public class V3BatchRequestFactory extends AbstractBatchRequestFactory {
-
- private static final long serialVersionUID = -6271567229804128570L;
-
- public V3BatchRequestFactory(final ODataV3Client client) {
- super(client);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/V4BatchRequestFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/V4BatchRequestFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/V4BatchRequestFactory.java
deleted file mode 100644
index 04c161d..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/V4BatchRequestFactory.java
+++ /dev/null
@@ -1,31 +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 com.msopentech.odatajclient.engine.communication.request.batch;
-
-import com.msopentech.odatajclient.engine.client.ODataV4Client;
-
-public class V4BatchRequestFactory extends AbstractBatchRequestFactory {
-
- private static final long serialVersionUID = 788349446729208639L;
-
- public V4BatchRequestFactory(final ODataV4Client client) {
- super(client);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/AbstractCUDRequestFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/AbstractCUDRequestFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/AbstractCUDRequestFactory.java
deleted file mode 100644
index c4e2eb0..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/AbstractCUDRequestFactory.java
+++ /dev/null
@@ -1,189 +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 com.msopentech.odatajclient.engine.communication.request.cud;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.engine.communication.request.UpdateType;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.data.ODataLink;
-import com.msopentech.odatajclient.engine.data.ODataPrimitiveValue;
-import com.msopentech.odatajclient.engine.data.ODataProperty;
-import java.net.URI;
-
-public abstract class AbstractCUDRequestFactory implements CUDRequestFactory {
-
- private static final long serialVersionUID = -2723641791198745990L;
-
- protected final ODataClient client;
-
- protected AbstractCUDRequestFactory(final ODataClient client) {
- this.client = client;
- }
-
- @Override
- public ODataEntityCreateRequest getEntityCreateRequest(final URI targetURI, final ODataEntity entity) {
- return new ODataEntityCreateRequest(client, targetURI, entity);
- }
-
- @Override
- public ODataEntityUpdateRequest getEntityUpdateRequest(
- final URI targetURI, final UpdateType type, final ODataEntity changes) {
-
- final ODataEntityUpdateRequest req;
-
- if (client.getConfiguration().isUseXHTTPMethod()) {
- req = new ODataEntityUpdateRequest(client, HttpMethod.POST, targetURI, changes);
- req.setXHTTPMethod(type.getMethod().name());
- } else {
- req = new ODataEntityUpdateRequest(client, type.getMethod(), targetURI, changes);
- }
-
- return req;
- }
-
- @Override
- public ODataEntityUpdateRequest getEntityUpdateRequest(final UpdateType type, final ODataEntity entity) {
- if (entity.getEditLink() == null) {
- throw new IllegalArgumentException("No edit link found");
- }
-
- final ODataEntityUpdateRequest req;
-
- if (client.getConfiguration().isUseXHTTPMethod()) {
- req = new ODataEntityUpdateRequest(client, HttpMethod.POST, entity.getEditLink(), entity);
- req.setXHTTPMethod(type.getMethod().name());
- } else {
- req = new ODataEntityUpdateRequest(client, type.getMethod(), entity.getEditLink(), entity);
- }
-
- return req;
- }
-
- @Override
- public ODataValueUpdateRequest getValueUpdateRequest(
- final URI targetURI, final UpdateType type, final ODataPrimitiveValue value) {
-
- final ODataValueUpdateRequest req;
-
- if (client.getConfiguration().isUseXHTTPMethod()) {
- req = new ODataValueUpdateRequest(client, HttpMethod.POST, targetURI, value);
- req.setXHTTPMethod(type.getMethod().name());
- } else {
- req = new ODataValueUpdateRequest(client, type.getMethod(), targetURI, value);
- }
-
- return req;
- }
-
- @Override
- public ODataPropertyUpdateRequest getPropertyPrimitiveValueUpdateRequest(
- final URI targetURI, final ODataProperty property) {
-
- if (!property.hasPrimitiveValue()) {
- throw new IllegalArgumentException("A primitive value is required");
- }
-
- final ODataPropertyUpdateRequest req;
-
- if (client.getConfiguration().isUseXHTTPMethod()) {
- req = new ODataPropertyUpdateRequest(client, HttpMethod.POST, targetURI, property);
- req.setXHTTPMethod(HttpMethod.PUT.name());
- } else {
- req = new ODataPropertyUpdateRequest(client, HttpMethod.PUT, targetURI, property);
- }
-
- return req;
- }
-
- @Override
- public ODataPropertyUpdateRequest getPropertyComplexValueUpdateRequest(
- final URI targetURI, final UpdateType type, final ODataProperty property) {
-
- if (!property.hasComplexValue()) {
- throw new IllegalArgumentException("A complex value is required");
- }
-
- final ODataPropertyUpdateRequest req;
-
- if (client.getConfiguration().isUseXHTTPMethod()) {
- req = new ODataPropertyUpdateRequest(client, HttpMethod.POST, targetURI, property);
- req.setXHTTPMethod(type.getMethod().name());
- } else {
- req = new ODataPropertyUpdateRequest(client, type.getMethod(), targetURI, property);
- }
-
- return req;
- }
-
- @Override
- public ODataPropertyUpdateRequest getPropertyCollectionValueUpdateRequest(
- final URI targetURI, final ODataProperty property) {
-
- if (!property.hasCollectionValue()) {
- throw new IllegalArgumentException("A collection value is required");
- }
-
- final ODataPropertyUpdateRequest req;
-
- if (client.getConfiguration().isUseXHTTPMethod()) {
- req = new ODataPropertyUpdateRequest(client, HttpMethod.POST, targetURI, property);
- req.setXHTTPMethod(HttpMethod.PUT.name());
- } else {
- req = new ODataPropertyUpdateRequest(client, HttpMethod.PUT, targetURI, property);
- }
-
- return req;
- }
-
- @Override
- public ODataLinkCreateRequest getLinkCreateRequest(final URI targetURI, final ODataLink link) {
- return new ODataLinkCreateRequest(client, targetURI, link);
- }
-
- @Override
- public ODataLinkUpdateRequest getLinkUpdateRequest(
- final URI targetURI, final UpdateType type, final ODataLink link) {
-
- final ODataLinkUpdateRequest req;
-
- if (client.getConfiguration().isUseXHTTPMethod()) {
- req = new ODataLinkUpdateRequest(client, HttpMethod.POST, targetURI, link);
- req.setXHTTPMethod(type.getMethod().name());
- } else {
- req = new ODataLinkUpdateRequest(client, type.getMethod(), targetURI, link);
- }
-
- return req;
- }
-
- @Override
- public ODataDeleteRequest getDeleteRequest(final URI targetURI) {
- final ODataDeleteRequest req;
-
- if (client.getConfiguration().isUseXHTTPMethod()) {
- req = new ODataDeleteRequest(client, HttpMethod.POST, targetURI);
- req.setXHTTPMethod(HttpMethod.DELETE.name());
- } else {
- req = new ODataDeleteRequest(client, HttpMethod.DELETE, targetURI);
- }
-
- return req;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/CUDRequestFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/CUDRequestFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/CUDRequestFactory.java
deleted file mode 100644
index 99af458..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/CUDRequestFactory.java
+++ /dev/null
@@ -1,145 +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 com.msopentech.odatajclient.engine.communication.request.cud;
-
-import com.msopentech.odatajclient.engine.communication.request.UpdateType;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.data.ODataLink;
-import com.msopentech.odatajclient.engine.data.ODataPrimitiveValue;
-import com.msopentech.odatajclient.engine.data.ODataProperty;
-import java.io.Serializable;
-import java.net.URI;
-
-/**
- * OData request factory class.
- */
-public interface CUDRequestFactory extends Serializable {
-
- /**
- * Gets a create request object instance.
- * <br/>
- * Use this kind of request to create a new entity.
- *
- * @param targetURI entity set URI.
- * @param entity entity to be created.
- * @return new ODataEntityCreateRequest instance.
- */
- ODataEntityCreateRequest getEntityCreateRequest(URI targetURI, ODataEntity entity);
-
- /**
- * Gets an update request object instance.
- *
- * @param targetURI edit link of the object to be updated.
- * @param type type of update to be performed.
- * @param changes changes to be applied.
- * @return new ODataEntityUpdateRequest instance.
- */
- ODataEntityUpdateRequest getEntityUpdateRequest(URI targetURI, UpdateType type, ODataEntity changes);
-
- /**
- * Gets an update request object instance; uses entity's edit link as endpoint.
- *
- * @param type type of update to be performed.
- * @param entity changes to be applied.
- * @return new ODataEntityUpdateRequest instance.
- */
- ODataEntityUpdateRequest getEntityUpdateRequest(UpdateType type, ODataEntity entity);
-
- /**
- * Gets a create request object instance.
- * <br/>
- * Use this kind of request to create a new value (e.g. http://Northwind.svc/Customer(1)/Picture/$value).
- *
- * @param targetURI entity set or entity or entity property URI.
- * @param type type of update to be performed.
- * @param value value to be created.
- * @return new ODataValueUpdateRequest instance.
- */
- ODataValueUpdateRequest getValueUpdateRequest(URI targetURI, UpdateType type, ODataPrimitiveValue value);
-
- /**
- * Gets an update request object instance.
- * <br/>
- * Use this kind of request to update a primitive property value.
- *
- * @param targetURI entity set or entity or entity property URI.
- * @param property value to be update.
- * @return new ODataPropertyUpdateRequest instance.
- */
- ODataPropertyUpdateRequest getPropertyPrimitiveValueUpdateRequest(URI targetURI, ODataProperty property);
-
- /**
- * Gets an update request object instance.
- * <br/>
- * Use this kind of request to update a complex property value.
- *
- * @param targetURI entity set or entity or entity property URI.
- * @param type type of update to be performed.
- * @param property value to be update.
- * @return new ODataPropertyUpdateRequest instance.
- */
- ODataPropertyUpdateRequest getPropertyComplexValueUpdateRequest(
- URI targetURI, UpdateType type, ODataProperty property);
-
- /**
- * Gets an update request object instance.
- * <br/>
- * Use this kind of request to update a collection property value.
- *
- * @param targetURI entity set or entity or entity property URI.
- * @param property value to be update.
- * @return new ODataPropertyUpdateRequest instance.
- */
- ODataPropertyUpdateRequest getPropertyCollectionValueUpdateRequest(URI targetURI, ODataProperty property);
-
- /**
- * Gets an add link request object instance.
- * <br/>
- * Use this kind of request to create a navigation link between existing entities.
- *
- * @param targetURI navigation property's link collection.
- * @param link navigation link to be added.
- * @return new ODataLinkCreateRequest instance.
- */
- ODataLinkCreateRequest getLinkCreateRequest(URI targetURI, ODataLink link);
-
- /**
- * Gets a link update request object instance.
- * <br/>
- * Use this kind of request to update a navigation link between existing entities.
- * <br/>
- * In case of the old navigation link doesn't exist the new one will be added as well.
- *
- * @param targetURI navigation property's link collection.
- * @param type type of update to be performed.
- * @param link URL that identifies the entity to be linked.
- * @return new ODataLinkUpdateRequest instance.
- */
- ODataLinkUpdateRequest getLinkUpdateRequest(URI targetURI, UpdateType type, ODataLink link);
-
- /**
- * Gets a delete request object instance.
- * <br/>
- * Use this kind of request to delete an entity and media entity as well.
- *
- * @param targetURI edit link of the object to be removed.
- * @return new ODataDeleteRequest instance.
- */
- ODataDeleteRequest getDeleteRequest(URI targetURI);
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/ODataDeleteRequest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/ODataDeleteRequest.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/ODataDeleteRequest.java
deleted file mode 100644
index 5631e0d..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/ODataDeleteRequest.java
+++ /dev/null
@@ -1,92 +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 com.msopentech.odatajclient.engine.communication.request.cud;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.engine.communication.response.ODataResponseImpl;
-import com.msopentech.odatajclient.engine.communication.request.AbstractODataBasicRequestImpl;
-import com.msopentech.odatajclient.engine.communication.request.batch.ODataBatchableRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataDeleteResponse;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import java.io.InputStream;
-import java.net.URI;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-
-/**
- * This class implements an OData delete request.
- */
-public class ODataDeleteRequest extends AbstractODataBasicRequestImpl<ODataDeleteResponse, ODataPubFormat>
- implements ODataBatchableRequest {
-
- /**
- * Constructor.
- *
- * @param odataClient client instance getting this request
- * @param method HTTP method to be used
- * @param uri URI of the entity to be deleted.
- */
- ODataDeleteRequest(final ODataClient odataClient, final HttpMethod method, final URI uri) {
- super(odataClient, ODataPubFormat.class, method, uri);
- }
-
- /**
- * {@inheritDoc }
- * <p>
- * No payload: null will be returned.
- */
- @Override
- protected InputStream getPayload() {
- return null;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public ODataDeleteResponse execute() {
- return new ODataDeleteResponseImpl(httpClient, doExecute());
- }
-
- /**
- * Response class about an ODataDeleteRequest.
- */
- private class ODataDeleteResponseImpl extends ODataResponseImpl implements ODataDeleteResponse {
-
- /**
- * Constructor.
- * <p>
- * Just to create response templates to be initialized from batch.
- */
- private ODataDeleteResponseImpl() {
- }
-
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- private ODataDeleteResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
- this.close();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/ODataEntityCreateRequest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/ODataEntityCreateRequest.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/ODataEntityCreateRequest.java
deleted file mode 100644
index 7d01833..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/ODataEntityCreateRequest.java
+++ /dev/null
@@ -1,124 +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 com.msopentech.odatajclient.engine.communication.request.cud;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.engine.communication.request.AbstractODataBasicRequestImpl;
-import com.msopentech.odatajclient.engine.communication.request.batch.ODataBatchableRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataEntityCreateResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataResponseImpl;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import com.msopentech.odatajclient.engine.utils.URIUtils;
-import java.io.InputStream;
-import java.net.URI;
-import org.apache.commons.io.IOUtils;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpPost;
-
-/**
- * This class implements an OData create request.
- */
-public class ODataEntityCreateRequest extends AbstractODataBasicRequestImpl<ODataEntityCreateResponse, ODataPubFormat>
- implements ODataBatchableRequest {
-
- /**
- * Entity to be created.
- */
- private final ODataEntity entity;
-
- /**
- * Constructor.
- *
- * @param odataClient client instance getting this request
- * @param targetURI entity set URI.
- * @param entity entity to be created.
- */
- ODataEntityCreateRequest(final ODataClient odataClient, final URI targetURI, final ODataEntity entity) {
- super(odataClient, ODataPubFormat.class, HttpMethod.POST, targetURI);
- this.entity = entity;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- protected InputStream getPayload() {
- return odataClient.getWriter().writeEntity(entity, ODataPubFormat.fromString(getContentType()));
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public ODataEntityCreateResponse execute() {
- final InputStream input = getPayload();
- ((HttpPost) request).setEntity(URIUtils.buildInputStreamEntity(odataClient, input));
-
- try {
- return new ODataEntityCreateResponseImpl(httpClient, doExecute());
- } finally {
- IOUtils.closeQuietly(input);
- }
- }
-
- /**
- * Response class about an ODataEntityCreateRequest.
- */
- private class ODataEntityCreateResponseImpl extends ODataResponseImpl implements ODataEntityCreateResponse {
-
- private ODataEntity entity = null;
-
- /**
- * Constructor.
- * <p>
- * Just to create response templates to be initialized from batch.
- */
- private ODataEntityCreateResponseImpl() {
- }
-
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- private ODataEntityCreateResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public ODataEntity getBody() {
- if (entity == null) {
- try {
- entity = odataClient.getReader().
- readEntity(getRawResponse(), ODataPubFormat.fromString(getAccept()));
- } finally {
- this.close();
- }
- }
- return entity;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/ODataEntityUpdateRequest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/ODataEntityUpdateRequest.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/ODataEntityUpdateRequest.java
deleted file mode 100644
index f5b1de2..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/ODataEntityUpdateRequest.java
+++ /dev/null
@@ -1,130 +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 com.msopentech.odatajclient.engine.communication.request.cud;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.engine.communication.request.AbstractODataBasicRequestImpl;
-import com.msopentech.odatajclient.engine.communication.request.batch.ODataBatchableRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataEntityUpdateResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataResponseImpl;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import com.msopentech.odatajclient.engine.utils.URIUtils;
-import java.io.InputStream;
-import java.net.URI;
-import org.apache.commons.io.IOUtils;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
-
-/**
- * This class implements an OData update request.
- */
-public class ODataEntityUpdateRequest extends AbstractODataBasicRequestImpl<ODataEntityUpdateResponse, ODataPubFormat>
- implements ODataBatchableRequest {
-
- /**
- * Changes to be applied.
- */
- private final ODataEntity changes;
-
- /**
- * Constructor.
- *
- * @param odataClient client instance getting this request
- * @param method request method.
- * @param uri URI of the entity to be updated.
- * @param changes changes to be applied.
- */
- ODataEntityUpdateRequest(final ODataClient odataClient,
- final HttpMethod method, final URI uri, final ODataEntity changes) {
-
- super(odataClient, ODataPubFormat.class, method, uri);
- this.changes = changes;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public ODataEntityUpdateResponse execute() {
- final InputStream input = getPayload();
- ((HttpEntityEnclosingRequestBase) request).setEntity(URIUtils.buildInputStreamEntity(odataClient, input));
-
- try {
- return new ODataEntityUpdateResponseImpl(httpClient, doExecute());
- } finally {
- IOUtils.closeQuietly(input);
- }
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- protected InputStream getPayload() {
- return odataClient.getWriter().writeEntity(changes, ODataPubFormat.fromString(getContentType()));
- }
-
- /**
- * Response class about an ODataEntityUpdateRequest.
- */
- private class ODataEntityUpdateResponseImpl extends ODataResponseImpl implements ODataEntityUpdateResponse {
-
- /**
- * Changes.
- */
- private ODataEntity entity = null;
-
- /**
- * Constructor.
- * <p>
- * Just to create response templates to be initialized from batch.
- */
- private ODataEntityUpdateResponseImpl() {
- }
-
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- private ODataEntityUpdateResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
- }
-
- /**
- * {@inheritDoc ]
- */
- @Override
- public ODataEntity getBody() {
- if (entity == null) {
- try {
- entity = odataClient.getReader().
- readEntity(getRawResponse(), ODataPubFormat.fromString(getAccept()));
- } finally {
- this.close();
- }
- }
- return entity;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/ODataLinkCreateRequest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/ODataLinkCreateRequest.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/ODataLinkCreateRequest.java
deleted file mode 100644
index 89d450e..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/ODataLinkCreateRequest.java
+++ /dev/null
@@ -1,107 +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 com.msopentech.odatajclient.engine.communication.request.cud;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.engine.communication.request.AbstractODataBasicRequestImpl;
-import com.msopentech.odatajclient.engine.communication.request.batch.ODataBatchableRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataLinkOperationResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataResponseImpl;
-import com.msopentech.odatajclient.engine.data.ODataLink;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import com.msopentech.odatajclient.engine.utils.URIUtils;
-import java.io.InputStream;
-import java.net.URI;
-import org.apache.commons.io.IOUtils;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpPost;
-
-/**
- * This class implements an insert link OData request.
- */
-public class ODataLinkCreateRequest extends AbstractODataBasicRequestImpl<ODataLinkOperationResponse, ODataFormat>
- implements ODataBatchableRequest {
-
- /**
- * OData entity to be linked.
- */
- private final ODataLink link;
-
- /**
- * Constructor.
- *
- * @param odataClient client instance getting this request
- * @param targetURI entity set URI.
- * @param link entity to be linked.
- */
- ODataLinkCreateRequest(final ODataClient odataClient, final URI targetURI, final ODataLink link) {
- super(odataClient, ODataFormat.class, HttpMethod.POST, targetURI);
- // set request body
- this.link = link;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ODataLinkOperationResponse execute() {
- final InputStream input = getPayload();
- ((HttpPost) request).setEntity(URIUtils.buildInputStreamEntity(odataClient, input));
-
- try {
- return new ODataLinkCreateResponseImpl(httpClient, doExecute());
- } finally {
- IOUtils.closeQuietly(input);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected InputStream getPayload() {
- return odataClient.getWriter().writeLink(link, ODataFormat.fromString(getContentType()));
- }
-
- /**
- * This class implements the response to an OData link operation request.
- */
- private class ODataLinkCreateResponseImpl extends ODataResponseImpl implements ODataLinkOperationResponse {
-
- /**
- * Constructor.
- * <p>
- * Just to create response templates to be initialized from batch.
- */
- private ODataLinkCreateResponseImpl() {
- }
-
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- private ODataLinkCreateResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/ODataLinkUpdateRequest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/ODataLinkUpdateRequest.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/ODataLinkUpdateRequest.java
deleted file mode 100644
index 23da27c..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/ODataLinkUpdateRequest.java
+++ /dev/null
@@ -1,110 +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 com.msopentech.odatajclient.engine.communication.request.cud;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.engine.communication.request.AbstractODataBasicRequestImpl;
-import com.msopentech.odatajclient.engine.communication.request.batch.ODataBatchableRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataLinkOperationResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataResponseImpl;
-import com.msopentech.odatajclient.engine.data.ODataLink;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import com.msopentech.odatajclient.engine.utils.URIUtils;
-import java.io.InputStream;
-import java.net.URI;
-import org.apache.commons.io.IOUtils;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
-
-/**
- * This class implements an update link OData request.
- */
-public class ODataLinkUpdateRequest extends AbstractODataBasicRequestImpl<ODataLinkOperationResponse, ODataFormat>
- implements ODataBatchableRequest {
-
- /**
- * Entity to be linked.
- */
- private final ODataLink link;
-
- /**
- * Constructor.
- *
- * @param odataClient client instance getting this request
- * @param method request method.
- * @param targetURI entity URI.
- * @param link entity to be linked.
- */
- ODataLinkUpdateRequest(final ODataClient odataClient,
- final HttpMethod method, final URI targetURI, final ODataLink link) {
-
- super(odataClient, ODataFormat.class, method, targetURI);
- // set request body
- this.link = link;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public ODataLinkOperationResponse execute() {
- final InputStream input = getPayload();
- ((HttpEntityEnclosingRequestBase) request).setEntity(URIUtils.buildInputStreamEntity(odataClient, input));
-
- try {
- return new ODataLinkUpdateResponseImpl(httpClient, doExecute());
- } finally {
- IOUtils.closeQuietly(input);
- }
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- protected InputStream getPayload() {
- return odataClient.getWriter().writeLink(link, ODataFormat.fromString(getContentType()));
- }
-
- /**
- * This class implements the response to an OData link operation request.
- */
- public class ODataLinkUpdateResponseImpl extends ODataResponseImpl implements ODataLinkOperationResponse {
-
- /**
- * Constructor.
- * <p>
- * Just to create response templates to be initialized from batch.
- */
- private ODataLinkUpdateResponseImpl() {
- }
-
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- public ODataLinkUpdateResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/ODataPropertyUpdateRequest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/ODataPropertyUpdateRequest.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/ODataPropertyUpdateRequest.java
deleted file mode 100644
index 490904f..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/cud/ODataPropertyUpdateRequest.java
+++ /dev/null
@@ -1,129 +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 com.msopentech.odatajclient.engine.communication.request.cud;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.engine.communication.request.AbstractODataBasicRequestImpl;
-import com.msopentech.odatajclient.engine.communication.request.batch.ODataBatchableRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataPropertyUpdateResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataResponseImpl;
-import com.msopentech.odatajclient.engine.data.ODataProperty;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import com.msopentech.odatajclient.engine.utils.URIUtils;
-import java.io.InputStream;
-import java.net.URI;
-import org.apache.commons.io.IOUtils;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
-import org.apache.http.entity.InputStreamEntity;
-
-/**
- * This class implements an OData update entity property request.
- */
-public class ODataPropertyUpdateRequest extends AbstractODataBasicRequestImpl<ODataPropertyUpdateResponse, ODataFormat>
- implements ODataBatchableRequest {
-
- /**
- * Value to be created.
- */
- private final ODataProperty property;
-
- /**
- * Constructor.
- *
- * @param odataClient client instance getting this request
- * @param method request method.
- * @param targetURI entity set or entity or entity property URI.
- * @param property value to be created.
- */
- ODataPropertyUpdateRequest(final ODataClient odataClient,
- final HttpMethod method, final URI targetURI, final ODataProperty property) {
-
- super(odataClient, ODataFormat.class, method, targetURI);
- // set request body
- this.property = property;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public ODataPropertyUpdateResponse execute() {
- final InputStream input = getPayload();
- ((HttpEntityEnclosingRequestBase) request).setEntity(URIUtils.buildInputStreamEntity(odataClient, input));
-
- try {
- return new ODataPropertyUpdateResponseImpl(httpClient, doExecute());
- } finally {
- IOUtils.closeQuietly(input);
- }
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- protected InputStream getPayload() {
- return odataClient.getWriter().writeProperty(property, ODataFormat.fromString(getContentType()));
- }
-
- /**
- * Response class about an ODataPropertyUpdateRequest.
- */
- private class ODataPropertyUpdateResponseImpl extends ODataResponseImpl implements ODataPropertyUpdateResponse {
-
- private ODataProperty property = null;
-
- /**
- * Constructor.
- * <p>
- * Just to create response templates to be initialized from batch.
- */
- private ODataPropertyUpdateResponseImpl() {
- }
-
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- private ODataPropertyUpdateResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public ODataProperty getBody() {
- if (property == null) {
- try {
- property = odataClient.getReader().
- readProperty(getRawResponse(), ODataFormat.fromString(getAccept()));
- } finally {
- this.close();
- }
- }
- return property;
- }
- }
-}
[02/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java
deleted file mode 100644
index 90d4f69..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java
+++ /dev/null
@@ -1,117 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "CustomerInfo",
- openType = false,
- hasStream = true,
- isAbstract = false,
- baseType = "")
-public interface CustomerInfo extends Serializable {
-
-
- @Key
- @Property(name = "CustomerInfoId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getCustomerInfoId();
-
- public void setCustomerInfoId(final Integer _customerInfoId);
-
-
- @Property(name = "Information",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getInformation();
-
- public void setInformation(final String _information);
-
-
-
-
-
- public void setStream(java.io.InputStream stream);
-
- public java.io.InputStream getStream();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java
deleted file mode 100644
index f213571..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface CustomerInfoCollection extends AbstractEntityCollection<CustomerInfo> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java
deleted file mode 100644
index 0dbeed5..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java
+++ /dev/null
@@ -1,79 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.ComplexType;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@ComplexType("Dimensions")
-public class Dimensions extends AbstractComplexType {
-
- private BigDecimal _width;
-
- @Property(name = "Width", type = "Edm.Decimal", nullable = false)
- public BigDecimal getWidth() {
- return _width;
- }
-
- public void setWidth(final BigDecimal _width) {
- this._width = _width;
- }
- private BigDecimal _height;
-
- @Property(name = "Height", type = "Edm.Decimal", nullable = false)
- public BigDecimal getHeight() {
- return _height;
- }
-
- public void setHeight(final BigDecimal _height) {
- this._height = _height;
- }
- private BigDecimal _depth;
-
- @Property(name = "Depth", type = "Edm.Decimal", nullable = false)
- public BigDecimal getDepth() {
- return _depth;
- }
-
- public void setDepth(final BigDecimal _depth) {
- this._depth = _depth;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
deleted file mode 100644
index 1cc895d..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
+++ /dev/null
@@ -1,160 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "DiscontinuedProduct",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface DiscontinuedProduct extends com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Product {
-
-
-
- @Property(name = "Discontinued",
- type = "Edm.DateTime",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public ODataTimestamp getDiscontinued();
-
- public void setDiscontinued(final ODataTimestamp _discontinued);
-
-
- @Property(name = "ReplacementProductId",
- type = "Edm.Int32",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getReplacementProductId();
-
- public void setReplacementProductId(final Integer _replacementProductId);
-
-
- @Property(name = "DiscontinuedPhone",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone getDiscontinuedPhone();
-
- public void setDiscontinuedPhone(final com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _discontinuedPhone);
-
-
- @Property(name = "ChildConcurrencyToken",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.Fixed,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getChildConcurrencyToken();
-
- public void setChildConcurrencyToken(final String _childConcurrencyToken);
-
-
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java
deleted file mode 100644
index 0e1661b..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface DiscontinuedProductCollection extends AbstractEntityCollection<DiscontinuedProduct> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java
deleted file mode 100644
index 8cc46f9..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java
+++ /dev/null
@@ -1,124 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "Driver",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface Driver extends Serializable {
-
-
- @Key
- @Property(name = "Name",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getName();
-
- public void setName(final String _name);
-
-
- @Property(name = "BirthDate",
- type = "Edm.DateTime",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public ODataTimestamp getBirthDate();
-
- public void setBirthDate(final ODataTimestamp _birthDate);
-
-
-
-
- @NavigationProperty(name = "License",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.License",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "License")
- public com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.License getLicense();
-
- public void setLicense(final com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.License _license);
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java
deleted file mode 100644
index f8cf557..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface DriverCollection extends AbstractEntityCollection<Driver> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java
deleted file mode 100644
index ea5dda9..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java
+++ /dev/null
@@ -1,150 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "Employee",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface Employee extends com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Person {
-
-
-
- @Property(name = "ManagersPersonId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getManagersPersonId();
-
- public void setManagersPersonId(final Integer _managersPersonId);
-
-
- @Property(name = "Salary",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getSalary();
-
- public void setSalary(final Integer _salary);
-
-
- @Property(name = "Title",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getTitle();
-
- public void setTitle(final String _title);
-
-
-
-
- @NavigationProperty(name = "Manager",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Employee",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Person")
- public com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee getManager();
-
- public void setManager(final com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee _manager);
-
-
- @Operation(name = "Sack" )
- void sack(
- );
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java
deleted file mode 100644
index 5221bff..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java
+++ /dev/null
@@ -1,51 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface EmployeeCollection extends AbstractEntityCollection<Employee> {
-
- @Operation(name = "IncreaseSalaries" )
- void increaseSalaries(
- @Parameter(name = "n", type = "Edm.Int32", nullable = false) Integer n
- );
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java
deleted file mode 100644
index 6817b56..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java
+++ /dev/null
@@ -1,170 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "LastLogin",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface LastLogin extends Serializable {
-
-
- @Key
- @Property(name = "Username",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getUsername();
-
- public void setUsername(final String _username);
-
-
- @Property(name = "LoggedIn",
- type = "Edm.DateTime",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public ODataTimestamp getLoggedIn();
-
- public void setLoggedIn(final ODataTimestamp _loggedIn);
-
-
- @Property(name = "LoggedOut",
- type = "Edm.DateTime",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public ODataTimestamp getLoggedOut();
-
- public void setLoggedOut(final ODataTimestamp _loggedOut);
-
-
- @Property(name = "Duration",
- type = "Edm.Time",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public ODataDuration getDuration();
-
- public void setDuration(final ODataDuration _duration);
-
-
-
-
- @NavigationProperty(name = "Login",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Login")
- public com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Login getLogin();
-
- public void setLogin(final com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Login _login);
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java
deleted file mode 100644
index 46ff964..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface LastLoginCollection extends AbstractEntityCollection<LastLogin> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/License.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/License.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/License.java
deleted file mode 100644
index 095d2a7..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/License.java
+++ /dev/null
@@ -1,193 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "License",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface License extends Serializable {
-
-
- @Key
- @Property(name = "Name",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getName();
-
- public void setName(final String _name);
-
-
- @Property(name = "LicenseNumber",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getLicenseNumber();
-
- public void setLicenseNumber(final String _licenseNumber);
-
-
- @Property(name = "LicenseClass",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "SyndicationContributorEmail",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- public String getLicenseClass();
-
- public void setLicenseClass(final String _licenseClass);
-
-
- @Property(name = "Restrictions",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "SyndicationContributorUri",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- public String getRestrictions();
-
- public void setRestrictions(final String _restrictions);
-
-
- @Property(name = "ExpirationDate",
- type = "Edm.DateTime",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public ODataTimestamp getExpirationDate();
-
- public void setExpirationDate(final ODataTimestamp _expirationDate);
-
-
-
-
- @NavigationProperty(name = "Driver",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Driver",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Driver")
- public com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Driver getDriver();
-
- public void setDriver(final com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Driver _driver);
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java
deleted file mode 100644
index e76d6d0..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface LicenseCollection extends AbstractEntityCollection<License> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Login.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Login.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Login.java
deleted file mode 100644
index aefe79b..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Login.java
+++ /dev/null
@@ -1,164 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "Login",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface Login extends Serializable {
-
-
- @Key
- @Property(name = "Username",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getUsername();
-
- public void setUsername(final String _username);
-
-
- @Property(name = "CustomerId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getCustomerId();
-
- public void setCustomerId(final Integer _customerId);
-
-
-
-
- @NavigationProperty(name = "Customer",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Customer")
- public com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer getCustomer();
-
- public void setCustomer(final com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer _customer);
-
-
- @NavigationProperty(name = "LastLogin",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.LastLogin",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "LastLogin")
- public com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin getLastLogin();
-
- public void setLastLogin(final com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin _lastLogin);
-
-
- @NavigationProperty(name = "SentMessages",
- type = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Message)",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Message")
- public com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection getSentMessages();
-
- public void setSentMessages(final com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection _sentMessages);
-
-
- @NavigationProperty(name = "ReceivedMessages",
- type = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Message)",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Message")
- public com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection getReceivedMessages();
-
- public void setReceivedMessages(final com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection _receivedMessages);
-
-
- @NavigationProperty(name = "Orders",
- type = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Order)",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Order")
- public com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection getOrders();
-
- public void setOrders(final com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection _orders);
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java
deleted file mode 100644
index 17286aa..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface LoginCollection extends AbstractEntityCollection<Login> {
-
-}
[29/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/FunctionsTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/FunctionsTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/FunctionsTestITCase.java
deleted file mode 100644
index 11438d3..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/FunctionsTestITCase.java
+++ /dev/null
@@ -1,200 +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 com.msopentech.odatajclient.engine.it;
-
-import static org.junit.Assert.*;
-
-import java.util.List;
-import org.junit.Test;
-
-import com.msopentech.odatajclient.engine.communication.ODataClientErrorException;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataEntitySetRequest;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataPropertyRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.data.ODataCollectionValue;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.data.ODataEntitySet;
-import com.msopentech.odatajclient.engine.data.ODataProperty;
-import com.msopentech.odatajclient.engine.data.ODataValue;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import java.util.Iterator;
-
-public class FunctionsTestITCase extends AbstractTestITCase {
- //function returns a reference
-
- private void refReturnFunction(final ODataPubFormat format, final String accept) {
- // GetSpecificCustomer takes 'Name' parameter, but seems to be buggy in the sample services
- final URIBuilder uriBuilder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntitySetSegment("GetSpecificCustomer?CustomerId=-8");
- final ODataEntitySetRequest req = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
- req.setFormat(format);
- req.setAccept(accept);
- try {
- final ODataRetrieveResponse<ODataEntitySet> res = req.execute();
- assertEquals(200, res.getStatusCode());
- final ODataEntitySet entitySet = res.getBody();
- assertNotNull(res.getBody());
- final List<ODataEntity> entity = entitySet.getEntities();
- // other tests can change the number of customers with no name
- assertFalse(entity.isEmpty());
- if (accept.equals("application/json;odata-fullmetadata")
- || accept.equals("application/json;odata-minimalmetadata")) {
- assertEquals("Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
- entity.get(0).getName());
- }
- } catch (ODataClientErrorException e) {
- if (e.getStatusLine().getStatusCode() == 415) {
- assertEquals(415, e.getStatusLine().getStatusCode());
- }
- if (e.getStatusLine().getStatusCode() == 404) {
- assertEquals(404, e.getStatusLine().getStatusCode());
- }
- if (e.getStatusLine().getStatusCode() == 404) {
- assertEquals(400, e.getStatusLine().getStatusCode());
- }
- }
- }
- //CustomerIds is an invalid query ID. Returns ODataClientErrorException
-
- private void withInvalidQuery(final ODataPubFormat format, final String accept) {
- // GetSpecificCustomer takes 'Name' parameter, but seems to be buggy in the sample services
- final URIBuilder uriBuilder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntitySetSegment("GetSpecificCustomer?CustomerIds=-10");
- final ODataEntitySetRequest req = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
- req.setFormat(format);
- req.setAccept(accept);
- try {
- final ODataRetrieveResponse<ODataEntitySet> res = req.execute();
- assertEquals(200, res.getStatusCode());
- final ODataEntitySet entitySet = res.getBody();
- assertNotNull(res.getBody());
- final List<ODataEntity> entity = entitySet.getEntities();
- // other tests can change the number of customers with no name
- assertFalse(entity.isEmpty());
- } catch (ODataClientErrorException e) {
- if (e.getStatusLine().getStatusCode() == 415) {
- assertEquals(415, e.getStatusLine().getStatusCode());
- }
- if (e.getStatusLine().getStatusCode() == 404) {
- assertEquals(404, e.getStatusLine().getStatusCode());
- }
- if (e.getStatusLine().getStatusCode() == 404) {
- assertEquals(400, e.getStatusLine().getStatusCode());
- }
- }
- }
- //function returning collection of complex types
-
- private void collectionFunction(final ODataFormat format, final String accept) {
- final URIBuilder uriBuilder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntitySetSegment("EntityProjectionReturnsCollectionOfComplexTypes");
- final ODataPropertyRequest req = client.getRetrieveRequestFactory().getPropertyRequest(uriBuilder.build());
- req.setFormat(format);
- req.setAccept(accept);
- try {
- final ODataRetrieveResponse<ODataProperty> res = req.execute();
- final ODataProperty property = res.getBody();
- assertTrue(property.hasCollectionValue());
- final ODataCollectionValue value = property.getCollectionValue();
- assertTrue(9 <= value.size());
- for (Iterator<ODataValue> itor = value.iterator(); itor.hasNext();) {
- ODataValue itemValue = itor.next();
- assertTrue(itemValue.isComplex());
- }
- } catch (ODataClientErrorException e) {
- if (e.getStatusLine().getStatusCode() == 415) {
- assertEquals(415, e.getStatusLine().getStatusCode());
- } else if (e.getStatusLine().getStatusCode() == 404) {
- assertEquals(404, e.getStatusLine().getStatusCode());
- } else if (e.getStatusLine().getStatusCode() == 400) {
- assertEquals(400, e.getStatusLine().getStatusCode());
- }
- }
- }
- //with atom header
-
- @Test
- public void atomTest() {
- refReturnFunction(ODataPubFormat.ATOM, "application/atom+xml");
- withInvalidQuery(ODataPubFormat.ATOM, "application/atom+xml");
- collectionFunction(ODataFormat.XML, "application/atom+xml");
- }
- //with json header
-
- @Test
- public void jsonTest() {
- refReturnFunction(ODataPubFormat.JSON, "application/json");
- withInvalidQuery(ODataPubFormat.JSON, "application/json");
- collectionFunction(ODataFormat.JSON, "application/json");
- }
- //with json header full metadata
-
- @Test
- public void jsonFullMetadataTest() {
- refReturnFunction(ODataPubFormat.JSON_FULL_METADATA, "application/json;odata=fullmetadata");
- collectionFunction(ODataFormat.JSON_FULL_METADATA, "application/json;odata=fullmetadata");
- }
- //with json header no metadata
-
- @Test
- public void jsonNoMetadataTest() {
- refReturnFunction(ODataPubFormat.JSON_NO_METADATA, "application/json;odata=nometadata");
- collectionFunction(ODataFormat.JSON_NO_METADATA, "application/json;odata=nometadata");
- }
- //with json header minimal metadata
-
- @Test
- public void jsonMinimalMetadataTest() {
- refReturnFunction(ODataPubFormat.JSON, "application/json;odata=minimal");
- collectionFunction(ODataFormat.JSON, "application/json;odata=minimal");
- withInvalidQuery(ODataPubFormat.JSON, "application/json;odata=minimal");
- }
- //with accept type as xml
-
- @Test
- public void xmlTest() {
- collectionFunction(ODataFormat.XML, "application/xml");
- }
- //with null accept header and atom format
-
- @Test
- public void nullAcceptTest() {
- withInvalidQuery(ODataPubFormat.ATOM, null);
- collectionFunction(ODataFormat.XML, null);
- withInvalidQuery(ODataPubFormat.ATOM, null);
- }
- //with null accept header and json format
-
- @Test
- public void nullAcceptWithJSONTest() {
- withInvalidQuery(ODataPubFormat.JSON, null);
- collectionFunction(ODataFormat.JSON, null);
- withInvalidQuery(ODataPubFormat.JSON, null);
- }
- //null pub format
-
- @Test
- public void nullFormatTest() {
- withInvalidQuery(null, "application/json");
- collectionFunction(null, "application/json");
- withInvalidQuery(null, "application/json");
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/GeoSpatialTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/GeoSpatialTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/GeoSpatialTestITCase.java
deleted file mode 100644
index c9d2be9..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/GeoSpatialTestITCase.java
+++ /dev/null
@@ -1,369 +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 com.msopentech.odatajclient.engine.it;
-
-import static org.junit.Assert.*;
-
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.engine.communication.request.UpdateType;
-import com.msopentech.odatajclient.engine.communication.request.cud.ODataDeleteRequest;
-import com.msopentech.odatajclient.engine.communication.request.cud.ODataEntityCreateRequest;
-import com.msopentech.odatajclient.engine.communication.request.cud.ODataEntityUpdateRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataEntityCreateResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataEntityUpdateResponse;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-import org.junit.Test;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.data.ODataProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import org.junit.Ignore;
-
-public class GeoSpatialTestITCase extends AbstractTestITCase {
- // test with json full metadata
-
- @Test
- public void withJSON() {
- ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- String contentType = "application/json;odata=fullmetadata";
- String prefer = "return-content";
- int id = 11155;
- geoSpacialTest(format, contentType, prefer, id);
- }
- // test with atom
-
- @Test
- public void withATOM() {
- ODataPubFormat format = ODataPubFormat.ATOM;
- String contentType = "application/atom+xml";
- String prefer = "return-content";
- int id = 12091;
- geoSpacialTest(format, contentType, prefer, id);
- }
- // test with no metadata
-
- @Test
- public void withJSONMinimalMetadata() {
- ODataPubFormat format = ODataPubFormat.JSON;
- String contentType = "application/json";
- String prefer = "return-content";
- int id = 111166;
- geoSpacialTest(format, contentType, prefer, id);
- }
- // test with json and atom as accept and content-type header respectively
-
- @Test
- @Ignore
- public void withJSONAndATOMReturn() {
- ODataPubFormat format = ODataPubFormat.ATOM;
- String contentType = "application/json;odata=fullmetadata";
- String prefer = "return-content";
- int id = 124;
- geoSpacialTest(format, contentType, prefer, id);
- }
- // test with atom and json as content Type and accept header respectively
-
- @Test
- @Ignore
- public void withATOMAndJSONReturn() {
- ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- String contentType = "application/atom+xml";
- String prefer = "return-content";
- int id = 11135;
- geoSpacialTest(format, contentType, prefer, id);
- }
- // geo spacial entity create test
-
- public void geoSpacialTest(
- final ODataPubFormat format, final String contentType, final String prefer, final int id) {
- try {
- final ODataEntity entity =client.getObjectFactory().newEntity(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes");
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("Id",
- client.getPrimitiveValueBuilder().setText(String.valueOf(id)).setType(EdmSimpleType.Int32).
- build()));
-
- final Point point1 = new Point(Geospatial.Dimension.GEOGRAPHY);
- point1.setX(6.2);
- point1.setY(1.1);
- final Point point2 = new Point(Geospatial.Dimension.GEOGRAPHY);
- point2.setX(33.33);
- point2.setY(-2.5);
-
- // create a point
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("GeogPoint",
- client.getGeospatialValueBuilder().setType(EdmSimpleType.GeographyPoint).
- setValue(point1).build()));
-
- // create multiple point
- final List<Point> points = new ArrayList<Point>();
- points.add(point1);
- points.add(point2);
- final MultiPoint multipoint = new MultiPoint(Geospatial.Dimension.GEOGRAPHY, points);
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("GeogMultiPoint",
- client.getGeospatialValueBuilder().setType(EdmSimpleType.GeographyMultiPoint).
- setValue(multipoint).build()));
-
- // create a line
- final List<Point> linePoints = new ArrayList<Point>();
- linePoints.add(point1);
- linePoints.add(point2);
- final LineString lineString = new LineString(Geospatial.Dimension.GEOGRAPHY, linePoints);
-
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("GeogLine",
- client.getGeospatialValueBuilder().setType(EdmSimpleType.GeographyLineString).
- setValue(lineString).build()));
-
- // create a polygon
- linePoints.set(1, point2);
- linePoints.add(point2);
- linePoints.add(point1);
- final Polygon polygon = new Polygon(Geospatial.Dimension.GEOGRAPHY, linePoints, linePoints);
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("GeogPolygon",
- client.getGeospatialValueBuilder().setType(EdmSimpleType.GeographyPolygon).
- setValue(polygon).build()));
-
- // create a multi line string
- final List<LineString> multipleLines = new ArrayList<LineString>();
- multipleLines.add(lineString);
- multipleLines.add(lineString);
- final MultiLineString multiLine = new MultiLineString(Geospatial.Dimension.GEOGRAPHY, multipleLines);
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("GeogMultiLine",
- client.getGeospatialValueBuilder().setType(EdmSimpleType.GeographyMultiLineString).
- setValue(multiLine).build()));
-
- // create a multi polygon
- final List<Polygon> polygons = new ArrayList<Polygon>();
- polygons.add(polygon);
- polygons.add(polygon);
- final MultiPolygon multiPolygon = new MultiPolygon(Geospatial.Dimension.GEOGRAPHY, polygons);
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("GeogMultiPolygon",
- client.getGeospatialValueBuilder().setType(EdmSimpleType.GeographyMultiPolygon).
- setValue(multiPolygon).build()));
-
- // create acolletion of various shapes
- final List<Geospatial> geospatialCollection = new ArrayList<Geospatial>();
- geospatialCollection.add(point1);
- geospatialCollection.add(lineString);
- geospatialCollection.add(polygon);
- final GeospatialCollection collection = new GeospatialCollection(Geospatial.Dimension.GEOGRAPHY,
- geospatialCollection);
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("GeogCollection",
- client.getGeospatialValueBuilder().setType(EdmSimpleType.GeographyCollection).
- setValue(collection).build()));
-
- // with geometry test
- final Point goemPoint1 = new Point(Geospatial.Dimension.GEOMETRY);
- goemPoint1.setX(6.2);
- goemPoint1.setY(1.1);
- final Point goemPoint2 = new Point(Geospatial.Dimension.GEOMETRY);
- goemPoint2.setX(33.33);
- goemPoint2.setY(-2.5);
-
- // create a point
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("GeomPoint",
- client.getGeospatialValueBuilder().setType(EdmSimpleType.GeometryPoint).
- setValue(goemPoint2).build()));
-
- // create multiple point
- final List<Point> geomPoints = new ArrayList<Point>();
- geomPoints.add(point1);
- geomPoints.add(point2);
- final MultiPoint geomMultipoint = new MultiPoint(Geospatial.Dimension.GEOMETRY, geomPoints);
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("GeomMultiPoint",
- client.getGeospatialValueBuilder().setType(EdmSimpleType.GeometryMultiPoint).
- setValue(geomMultipoint).build()));
-
- // create a line
- final List<Point> geomLinePoints = new ArrayList<Point>();
- geomLinePoints.add(goemPoint1);
- geomLinePoints.add(goemPoint2);
- final LineString geomLineString = new LineString(Geospatial.Dimension.GEOMETRY, geomLinePoints);
-
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("GeomLine",
- client.getGeospatialValueBuilder().setType(EdmSimpleType.GeometryLineString).
- setValue(geomLineString).build()));
-
- // create a polygon
- geomLinePoints.set(1, goemPoint2);
- geomLinePoints.add(goemPoint2);
- geomLinePoints.add(goemPoint1);
- final Polygon geomPolygon = new Polygon(Geospatial.Dimension.GEOMETRY, geomLinePoints, geomLinePoints);
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("GeomPolygon",
- client.getGeospatialValueBuilder().setType(EdmSimpleType.GeometryPolygon).
- setValue(geomPolygon).build()));
-
- // create a multi line string
- final List<LineString> geomMultipleLines = new ArrayList<LineString>();
- geomMultipleLines.add(geomLineString);
- geomMultipleLines.add(geomLineString);
- final MultiLineString geomMultiLine = new MultiLineString(Geospatial.Dimension.GEOMETRY, geomMultipleLines);
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("GeomMultiLine",
- client.getGeospatialValueBuilder().setType(EdmSimpleType.GeometryMultiLineString).
- setValue(geomMultiLine).build()));
-
- // create a multi polygon
- final List<Polygon> geomPolygons = new ArrayList<Polygon>();
- geomPolygons.add(geomPolygon);
- geomPolygons.add(geomPolygon);
- final MultiPolygon geomMultiPolygon = new MultiPolygon(Geospatial.Dimension.GEOMETRY, geomPolygons);
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("GeomMultiPolygon",
- client.getGeospatialValueBuilder().setType(EdmSimpleType.GeographyMultiPolygon).
- setValue(geomMultiPolygon).build()));
-
- // create a collection of various shapes
- final List<Geospatial> geomspatialCollection = new ArrayList<Geospatial>();
- geomspatialCollection.add(goemPoint1);
- geomspatialCollection.add(geomLineString);
- final GeospatialCollection geomCollection = new GeospatialCollection(Geospatial.Dimension.GEOMETRY,
- geomspatialCollection);
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("GeomCollection",
- client.getGeospatialValueBuilder().setType(EdmSimpleType.GeometryCollection).
- setValue(geomCollection).build()));
-
- // create request
- final ODataEntityCreateRequest createReq = client.getCUDRequestFactory().
- getEntityCreateRequest(client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment("AllGeoTypesSet").build(), entity);
- createReq.setFormat(format);
- createReq.setContentType(contentType);
- createReq.setPrefer(prefer);
- final ODataEntityCreateResponse createRes = createReq.execute();
- final ODataEntity entityAfterCreate = createRes.getBody();
- final ODataProperty geogCollection = entityAfterCreate.getProperty("GeogCollection");
- if (format.equals(ODataPubFormat.JSON) || format.equals(ODataPubFormat.JSON_NO_METADATA)) {
- assertTrue(geogCollection.hasComplexValue());
- } else {
- assertEquals(EdmSimpleType.GeographyCollection.toString(), geogCollection.getPrimitiveValue().
- getTypeName());
-
- final ODataProperty geometryCollection = entityAfterCreate.getProperty("GeomCollection");
- assertEquals(EdmSimpleType.GeographyCollection.toString(),
- geogCollection.getPrimitiveValue().getTypeName());
-
- int count = 0;
- for (Geospatial g : geogCollection.getPrimitiveValue().<GeospatialCollection>toCastValue()) {
- assertNotNull(g);
- count++;
- }
- assertEquals(3, count);
- count = 0;
- for (Geospatial g : geometryCollection.getPrimitiveValue().<GeospatialCollection>toCastValue()) {
- assertNotNull(g);
- count++;
- }
- assertEquals(2, count);
- }
- // update geog points
- final Point updatePoint1 = new Point(Geospatial.Dimension.GEOGRAPHY);
- updatePoint1.setX(21.2);
- updatePoint1.setY(31.1);
- final Point updatePoint2 = new Point(Geospatial.Dimension.GEOGRAPHY);
- updatePoint2.setX(99.99);
- updatePoint2.setY(-3.24);
- ODataProperty property = entityAfterCreate.getProperty("GeogPoint");
- entityAfterCreate.removeProperty(property);
- entityAfterCreate.addProperty(client.getObjectFactory().newPrimitiveProperty("GeogPoint",
- client.getGeospatialValueBuilder().setType(EdmSimpleType.GeographyPoint).
- setValue(updatePoint1).build()));
- updateGeog(format, contentType, prefer, entityAfterCreate, UpdateType.REPLACE, entityAfterCreate.getETag());
-
- // update geography line
- final List<Point> updateLinePoints = new ArrayList<Point>();
- updateLinePoints.add(updatePoint1);
- updateLinePoints.add(updatePoint2);
- final LineString updateLineString = new LineString(Geospatial.Dimension.GEOGRAPHY, updateLinePoints);
- ODataProperty lineProperty = entityAfterCreate.getProperty("GeogLine");
- entityAfterCreate.removeProperty(lineProperty);
- entityAfterCreate.addProperty(client.getObjectFactory().newPrimitiveProperty("GeogLine",
- client.getGeospatialValueBuilder().setType(EdmSimpleType.GeographyLineString).
- setValue(updateLineString).build()));
- //updateGeog(format,contentType, prefer, entityAfterCreate, UpdateType.REPLACE,entityAfterCreate.getETag());
-
- // update a geography polygon
- updateLinePoints.set(1, updatePoint2);
- updateLinePoints.add(updatePoint2);
- updateLinePoints.add(updatePoint1);
- final Polygon updatePolygon =
- new Polygon(Geospatial.Dimension.GEOGRAPHY, updateLinePoints, updateLinePoints);
- ODataProperty polygonProperty = entityAfterCreate.getProperty("GeogPolygon");
- entityAfterCreate.removeProperty(polygonProperty);
- entityAfterCreate.addProperty(client.getObjectFactory().newPrimitiveProperty("GeogPolygon",
- client.getGeospatialValueBuilder().setType(EdmSimpleType.GeographyPolygon).
- setValue(updatePolygon).build()));
- //updateGeog(format,contentType, prefer, entityAfterCreate, UpdateType.REPLACE,entityAfterCreate.getETag());
-
- // delete the entity
- URIBuilder deleteUriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment("AllGeoTypesSet(" + id + ")");
- ODataDeleteRequest deleteReq = client.getCUDRequestFactory().getDeleteRequest(deleteUriBuilder.build());
- deleteReq.setFormat(format);
- deleteReq.setContentType(contentType);
- assertEquals(204, deleteReq.execute().getStatusCode());
- } catch (Exception e) {
- LOG.error("", e);
- if (!format.equals(ODataPubFormat.JSON) && !format.equals(ODataPubFormat.JSON_NO_METADATA)) {
- fail(e.getMessage());
- }
- } catch (AssertionError e) {
- LOG.error("", e);
- fail(e.getMessage());
- }
- }
- // update operation of geo spacial properties
-
- private void updateGeog(final ODataPubFormat format, final String contentType,
- final String prefer, final ODataEntity entityAfterCreate, final UpdateType type,
- final String tag) {
- final ODataEntityUpdateRequest req = client.getCUDRequestFactory().getEntityUpdateRequest(type,
- entityAfterCreate);
- if (client.getConfiguration().isUseXHTTPMethod()) {
- assertEquals(HttpMethod.POST, req.getMethod());
- } else {
- assertEquals(type.getMethod(), req.getMethod());
- }
- req.setFormat(format);
- req.setContentType(contentType);
- req.setPrefer(prefer);
- if (StringUtils.isNotEmpty(tag)) {
- req.setIfMatch(tag);
- }
- final ODataEntityUpdateResponse res = req.execute();
-
- if (prefer.equals("return-content")) {
- assertEquals(200, res.getStatusCode());
- ODataEntity entityAfterUpdate = res.getBody();
- assertNotNull(entityAfterUpdate);
- } else {
- assertEquals(204, res.getStatusCode());
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/InvokeOperationTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/InvokeOperationTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/InvokeOperationTestITCase.java
deleted file mode 100644
index 8f695a7..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/InvokeOperationTestITCase.java
+++ /dev/null
@@ -1,660 +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 com.msopentech.odatajclient.engine.it;
-
-import static org.junit.Assert.*;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.junit.Test;
-
-import com.msopentech.odatajclient.engine.communication.request.cud.ODataDeleteRequest;
-import com.msopentech.odatajclient.engine.communication.request.cud.ODataEntityCreateRequest;
-import com.msopentech.odatajclient.engine.communication.request.invoke.ODataInvokeRequest;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataEntityRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataDeleteResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataEntityCreateResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataInvokeResponse;
-import com.msopentech.odatajclient.engine.data.ODataCollectionValue;
-import com.msopentech.odatajclient.engine.data.ODataComplexValue;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.data.ODataEntitySet;
-import com.msopentech.odatajclient.engine.data.ODataNoContent;
-import com.msopentech.odatajclient.engine.data.ODataOperation;
-import com.msopentech.odatajclient.engine.data.ODataPrimitiveValue;
-import com.msopentech.odatajclient.engine.data.ODataProperty;
-import com.msopentech.odatajclient.engine.data.ODataValue;
-import com.msopentech.odatajclient.engine.metadata.EdmType;
-import com.msopentech.odatajclient.engine.metadata.EdmV3Metadata;
-import com.msopentech.odatajclient.engine.metadata.EdmV3Type;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.EntityContainer;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.FunctionImport;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import com.msopentech.odatajclient.engine.utils.URIUtils;
-
-public class InvokeOperationTestITCase extends AbstractTestITCase {
- // get operation with no parameters
-
- private void invokeOperationWithNoParameters(final ODataPubFormat format,
- final String contentType,
- final String prefer) {
-
- ODataProperty property;
- final EdmV3Metadata metadata =
- client.getRetrieveRequestFactory().getMetadataRequest(testDefaultServiceRootURL).execute().getBody();
- assertNotNull(metadata);
-
- final EntityContainer container = metadata.getSchema(0).getEntityContainers().get(0);
- //get primitive value property
- FunctionImport funcImp = container.getFunctionImport("GetPrimitiveString");
-
- URIBuilder builder = client.getURIBuilder(testDefaultServiceRootURL).
- appendFunctionImportSegment(URIUtils.rootFunctionImportURISegment(container, funcImp));
-
- ODataInvokeRequest<ODataProperty> req =
- client.getInvokeRequestFactory().getInvokeRequest(builder.build(), metadata, funcImp);
- req.setFormat(format);
- req.setContentType(contentType);
- req.setPrefer(prefer);
- ODataInvokeResponse<ODataProperty> res = req.execute();
- if (prefer.equals("return-content")) {
- assertNotNull(res);
- property = res.getBody();
- assertNotNull(property);
- assertEquals("Foo", property.getPrimitiveValue().<String>toCastValue());
- } else {
- assertEquals(204, res.getStatusCode());
- }
-
- //get collection of complex type property
- funcImp = container.getFunctionImport("EntityProjectionReturnsCollectionOfComplexTypes");
-
- builder = client.getURIBuilder(testDefaultServiceRootURL).
- appendFunctionImportSegment(URIUtils.rootFunctionImportURISegment(container, funcImp));
-
- req = client.getInvokeRequestFactory().getInvokeRequest(builder.build(), metadata, funcImp);
- req.setFormat(format);
- req.setContentType(contentType);
- req.setPrefer(prefer);
- res = req.execute();
- if (prefer.equals("return-content")) {
- assertNotNull(res);
- property = res.getBody();
- assertNotNull(property);
- assertTrue(property.hasCollectionValue());
- } else {
- assertEquals(204, res.getStatusCode());
- }
- }
-
- // get operation with no parameters and format as JSON full metadata
- @Test
- public void invokeNoParamWithJSON() {
- ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- String contentType = "application/json;odata=fullmetadata";
- String prefer = "return-content";
- try {
- invokeOperationWithNoParameters(format, contentType, prefer);
- } catch (Exception e) {
- fail(e.getMessage());
- } catch (AssertionError e) {
- fail(e.getMessage());
- }
- }
- // get operation with no parameters and format as ATOM
-
- @Test
- public void invokeNoParamWithATOM() {
- ODataPubFormat format = ODataPubFormat.ATOM;
- String contentType = "application/atom+xml";
- String prefer = "return-content";
- try {
- invokeOperationWithNoParameters(format, contentType, prefer);
- } catch (Exception e) {
- fail(e.getMessage());
- } catch (AssertionError e) {
- fail(e.getMessage());
- }
- }
- // get operation with no parameters and format as JSON minimal metadata
-
- @Test
- public void invokeNoParamWithJSONMinimal() {
- ODataPubFormat format = ODataPubFormat.JSON;
- String contentType = "application/json";
- String prefer = "return-content";
- try {
- invokeOperationWithNoParameters(format, contentType, prefer);
- } catch (Exception e) {
- fail(e.getMessage());
- } catch (AssertionError e) {
- fail(e.getMessage());
- }
- }
- // get operation with no parameters and format as JSON no metadata
-
- @Test
- public void invokeNoParamWithJSONNoMetadata() {
- ODataPubFormat format = ODataPubFormat.JSON_NO_METADATA;
- String contentType = "application/json;odata=nometadata";
- String prefer = "return-content";
- try {
- invokeOperationWithNoParameters(format, contentType, prefer);
- } catch (Exception e) {
- fail(e.getMessage());
- } catch (AssertionError e) {
- fail(e.getMessage());
- }
- }
- // get operation with no parameters, format as JSON and content type header as ATOM
-
- @Test
- public void invokeNoParamWithJSONAndATOM() {
- ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- String contentType = "application/atom+xml";
- String prefer = "return-content";
- try {
- invokeOperationWithNoParameters(format, contentType, prefer);
- } catch (Exception e) {
- fail(e.getMessage());
- } catch (AssertionError e) {
- fail(e.getMessage());
- }
- }
- // get operation with no parameters, format as ATOM and content type header as JSON
-
- @Test
- public void invokeNoParamWithATOMAndJSON() {
- ODataPubFormat format = ODataPubFormat.ATOM;
- String contentType = "application/json;odata=fullmetadata";
- String prefer = "return-content";
- try {
- invokeOperationWithNoParameters(format, contentType, prefer);
- } catch (Exception e) {
- fail(e.getMessage());
- } catch (AssertionError e) {
- fail(e.getMessage());
- }
- }
- // get operation with no parameters
-
- private void invokeOperationWithParameters(
- final ODataPubFormat format,
- final String contentType,
- final String prefer) {
- // primitive result
- EdmV3Metadata metadata =
- client.getRetrieveRequestFactory().getMetadataRequest(testDefaultServiceRootURL).execute().getBody();
- assertNotNull(metadata);
-
- EntityContainer container = metadata.getSchema(0).getEntityContainers().get(0);
- FunctionImport imp = container.getFunctionImport("GetArgumentPlusOne");
-
- URIBuilder builder = client.getURIBuilder(testDefaultServiceRootURL).
- appendFunctionImportSegment(URIUtils.rootFunctionImportURISegment(container, imp));
-
- EdmType type = new EdmV3Type(imp.getParameters().get(0).getType());
- ODataPrimitiveValue argument = client.getPrimitiveValueBuilder().
- setType(type.getSimpleType()).
- setValue(33).
- build();
- Map<String, ODataValue> parameters = new HashMap<String, ODataValue>();
- parameters.put(imp.getParameters().get(0).getName(), argument);
-
- final ODataInvokeRequest<ODataProperty> primitiveReq =
- client.getInvokeRequestFactory().getInvokeRequest(builder.build(), metadata, imp,
- parameters);
- primitiveReq.setFormat(format);
- primitiveReq.setContentType(contentType);
- primitiveReq.setPrefer(prefer);
- final ODataInvokeResponse<ODataProperty> primitiveRes = primitiveReq.execute();
- assertNotNull(primitiveRes);
-
- final ODataProperty property = primitiveRes.getBody();
- assertNotNull(property);
- assertEquals(Integer.valueOf(34), property.getPrimitiveValue().<Integer>toCastValue());
-
- // feed operation
- metadata = client.getRetrieveRequestFactory().getMetadataRequest(testDefaultServiceRootURL).execute().getBody();
- assertNotNull(metadata);
-
- container = metadata.getSchema(0).getEntityContainers().get(0);
- imp = container.getFunctionImport("GetSpecificCustomer");
-
- builder = client.getURIBuilder(testDefaultServiceRootURL).
- appendFunctionImportSegment(URIUtils.rootFunctionImportURISegment(container, imp));
-
- type = new EdmV3Type(imp.getParameters().get(0).getType());
- argument = client.getPrimitiveValueBuilder().
- setType(type.getSimpleType()).
- setText(StringUtils.EMPTY).
- build();
- parameters = new LinkedHashMap<String, ODataValue>();
- parameters.put(imp.getParameters().get(0).getName(), argument);
-
- final ODataInvokeRequest<ODataEntitySet> feedReq =
- client.getInvokeRequestFactory().getInvokeRequest(builder.build(), metadata, imp, parameters);
- feedReq.setFormat(format);
- feedReq.setContentType(contentType);
- feedReq.setPrefer(prefer);
- final ODataInvokeResponse<ODataEntitySet> feedRes = feedReq.execute();
- assertNotNull(feedRes);
-
- final ODataEntitySet feed = feedRes.getBody();
- assertNotNull(feed);
-
- final ODataProperty id = feed.getEntities().get(0).getProperty("CustomerId");
- assertNotNull(id);
- }
- // get operation with parameters, format as JSON full metadata
-
- @Test
- public void invokeParamWithJSON() {
- ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- String contentType = "application/json;odata=fullmetadata";
- String prefer = "return-content";
- try {
- invokeOperationWithParameters(format, contentType, prefer);
- } catch (Exception e) {
- fail(e.getMessage());
- } catch (AssertionError e) {
- fail(e.getMessage());
- }
- }
- // get operation with parameters, format as ATOM
-
- @Test
- public void invokeParamWithATOM() {
- ODataPubFormat format = ODataPubFormat.ATOM;
- String contentType = "application/atom+xml";
- String prefer = "return-content";
- try {
- invokeOperationWithParameters(format, contentType, prefer);
- } catch (Exception e) {
- fail(e.getMessage());
- } catch (AssertionError e) {
- fail(e.getMessage());
- }
- }
-
- // create a product
- private ODataEntity createProduct(
- final ODataPubFormat format,
- final String contentType, final int id) {
- final ODataEntity product = client.getObjectFactory().newEntity(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.Product");
- product.addProperty(client.getObjectFactory().newPrimitiveProperty("ProductId", client.
- getPrimitiveValueBuilder().
- setValue(id).setType(EdmSimpleType.Int32).build()));
- product.addProperty(client.getObjectFactory().newPrimitiveProperty("Description", client.
- getPrimitiveValueBuilder().
- setText("Test Product").build()));
- product.addProperty(client.getObjectFactory().newPrimitiveProperty("BaseConcurrency",
- client.getPrimitiveValueBuilder().
- setText("Test Base Concurrency").setType(EdmSimpleType.String).build()));
-
- final ODataComplexValue dimensions = new ODataComplexValue(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions");
- dimensions.add(client.getObjectFactory().newPrimitiveProperty("Width",
- client.getPrimitiveValueBuilder().setText("10.11").setType(EdmSimpleType.Decimal).build()));
- dimensions.add(client.getObjectFactory().newPrimitiveProperty("Height",
- client.getPrimitiveValueBuilder().setText("10.11").setType(EdmSimpleType.Decimal).build()));
- dimensions.add(client.getObjectFactory().newPrimitiveProperty("Depth",
- client.getPrimitiveValueBuilder().setText("10.11").setType(EdmSimpleType.Decimal).build()));
-
- product.addProperty(client.getObjectFactory().newComplexProperty("Dimensions",
- dimensions));
-
- final URIBuilder uriBuilder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment("Product");
-
- final ODataEntityCreateRequest createReq =
- client.getCUDRequestFactory().getEntityCreateRequest(uriBuilder.build(), product);
- createReq.setFormat(format);
- createReq.setContentType(contentType);
-
- final ODataEntityCreateResponse createRes = createReq.execute();
- assertEquals(201, createRes.getStatusCode());
-
- return createRes.getBody();
- }
- // delete the created feed
-
- private void delete(final ODataPubFormat format, final String contentType, final Integer id, final String tag,
- final String feed) {
- final URIBuilder uriBuilder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment(feed).appendKeySegment(id);
-
- final ODataDeleteRequest deleteReq = client.getCUDRequestFactory().getDeleteRequest(uriBuilder.build());
- deleteReq.setFormat(format);
- deleteReq.setContentType(contentType);
- if (StringUtils.isNotBlank(tag)) {
- deleteReq.setIfMatch(tag);
- }
- final ODataDeleteResponse deleteRes = deleteReq.execute();
- assertEquals(204, deleteRes.getStatusCode());
- }
-
- // post operation with parameters
- private void boundPostWithParameters(
- final ODataPubFormat format,
- final String contentType,
- final String prefer) {
- final ODataEntity created = createProduct(format, contentType, 1905);
- assertNotNull(created);
- final Integer createdId = created.getProperty("ProductId").getPrimitiveValue().<Integer>toCastValue();
- assertNotNull(createdId);
- final ODataOperation action = created.getOperations().get(0);
-
- final EdmV3Metadata metadata =
- client.getRetrieveRequestFactory().getMetadataRequest(testDefaultServiceRootURL).execute().getBody();
- assertNotNull(metadata);
- final EntityContainer container = metadata.getSchema(0).getEntityContainers().get(0);
- final FunctionImport funcImp = container.getFunctionImport(action.getTitle());
- final ODataComplexValue dimensions = new ODataComplexValue(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions");
- dimensions.add(client.getObjectFactory().newPrimitiveProperty("Width",
- client.getPrimitiveValueBuilder().setType(EdmSimpleType.Decimal).setText("99.11").build()));
- dimensions.add(client.getObjectFactory().newPrimitiveProperty("Height",
- client.getPrimitiveValueBuilder().setType(EdmSimpleType.Decimal).setText("99.11").build()));
- dimensions.add(client.getObjectFactory().newPrimitiveProperty("Depth",
- client.getPrimitiveValueBuilder().setType(EdmSimpleType.Decimal).setText("99.11").build()));
-
- Map<String, ODataValue> parameters = new LinkedHashMap<String, ODataValue>();
- parameters.put(funcImp.getParameters().get(1).getName(), dimensions);
-
- final ODataInvokeRequest<ODataNoContent> req = client.getInvokeRequestFactory().getInvokeRequest(
- action.getTarget(), metadata, funcImp, parameters);
- req.setFormat(format);
- req.setContentType(contentType);
- req.setPrefer(prefer);
-
- final ODataInvokeResponse<ODataNoContent> res = req.execute();
- assertNotNull(res);
- assertEquals(204, res.getStatusCode());
-
- final URIBuilder uriBuilder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment("Product").appendKeySegment(createdId);
- final ODataEntityRequest retrieveRes = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- retrieveRes.setFormat(format);
- retrieveRes.setContentType(contentType);
- final ODataEntity read = retrieveRes.execute().getBody();
-
- ODataComplexValue value = read.getProperty("Dimensions").getComplexValue();
- assertEquals(dimensions.get("Depth").getValue(), value.get("Depth").getValue());
- assertEquals(dimensions.get("Width").getValue(), value.get("Width").getValue());
- assertEquals(dimensions.get("Height").getValue(), value.get("Height").getValue());
- delete(format, contentType, createdId, created.getETag(), "Product");
-
- }
- // test post operation with parameters and with JSON header
-
- @Test
- public void invokeOperationParamWithJSON() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final String contentType = "application/json;odata=fullmetadata";
- final String prefer = "return-content";
- try {
- boundPostWithParameters(format, contentType, prefer);
- } catch (Exception e) {
- fail(e.getMessage());
- } catch (AssertionError e) {
- fail(e.getMessage());
- }
- }
- // test post operation with parameters and with ATOM header
-
- @Test
- public void invokeOperationParamWithATOM() {
- final ODataPubFormat format = ODataPubFormat.ATOM;
- final String contentType = "application/atom+xml";
- final String prefer = "return-content";
- try {
- boundPostWithParameters(format, contentType, prefer);
- } catch (Exception e) {
- fail(e.getMessage());
- } catch (AssertionError e) {
- fail(e.getMessage());
- }
- }
- // create an employee
-
- private ODataEntity createEmployee(final ODataPubFormat format, final String contentType, final String prefer,
- final int id) {
- final ODataEntity employee = client.getObjectFactory().newEntity(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.Employee");
- employee.addProperty(client.getObjectFactory().newPrimitiveProperty("PersonId", client.
- getPrimitiveValueBuilder().
- setValue(id).setType(EdmSimpleType.Int32).build()));
- employee.addProperty(client.getObjectFactory().newPrimitiveProperty("Name", client.getPrimitiveValueBuilder().
- setText("Test employee").build()));
- employee.addProperty(client.getObjectFactory().newPrimitiveProperty("ManagersPersonId", client.
- getPrimitiveValueBuilder().
- setText("1111").setType(EdmSimpleType.Int32).build()));
- employee.addProperty(client.getObjectFactory().newPrimitiveProperty("Salary", client.getPrimitiveValueBuilder().
- setText("5999").setType(EdmSimpleType.Int32).build()));
- employee.addProperty(client.getObjectFactory().newPrimitiveProperty("Title", client.getPrimitiveValueBuilder().
- setText("Developer").build()));
-
- final URIBuilder uriBuilder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment("Person");
-
- final ODataEntityCreateRequest createReq =
- client.getCUDRequestFactory().getEntityCreateRequest(uriBuilder.build(), employee);
- createReq.setFormat(format);
- createReq.setContentType(contentType);
- createReq.setPrefer(prefer);
- final ODataEntityCreateResponse createRes = createReq.execute();
- assertEquals(201, createRes.getStatusCode());
- return createRes.getBody();
- }
- // post operation
-
- private void boundPost(
- final ODataPubFormat format,
- final String contentType,
- final String prefer,
- final int id) {
- final ODataEntity created = createEmployee(format, contentType, prefer, id);
- assertNotNull(created);
- final Integer createdId = created.getProperty("PersonId").getPrimitiveValue().<Integer>toCastValue();
- assertNotNull(createdId);
-
- final ODataOperation action = created.getOperations().get(0);
-
- final EdmV3Metadata metadata =
- client.getRetrieveRequestFactory().getMetadataRequest(testDefaultServiceRootURL).execute().getBody();
- assertNotNull(metadata);
-
- final EntityContainer container = metadata.getSchema(0).getEntityContainers().get(0);
- final FunctionImport funcImp = container.getFunctionImport(action.getTitle());
-
- final ODataInvokeRequest<ODataNoContent> req = client.getInvokeRequestFactory().getInvokeRequest(
- action.getTarget(), metadata, funcImp);
- req.setFormat(format);
- req.setContentType(contentType);
- req.setPrefer(prefer);
- final ODataInvokeResponse<ODataNoContent> res = req.execute();
- assertNotNull(res);
- assertEquals(204, res.getStatusCode());
-
- final URIBuilder uriBuilder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment("Person").appendKeySegment(createdId);
- final ODataEntityRequest retrieveRes = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- retrieveRes.setFormat(format);
- retrieveRes.setContentType(contentType);
- retrieveRes.setPrefer(prefer);
- final ODataEntity read = retrieveRes.execute().getBody();
- assertEquals("0", read.getProperty("Salary").getPrimitiveValue().toString());
- assertTrue(read.getProperty("Title").getPrimitiveValue().toString().endsWith("[Sacked]"));
-
- delete(format, contentType, createdId, created.getETag(), "Person");
- }
-
- // test post operation without parameters and with JSON header
- @Test
- public void invokeOperationWithJSON() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final String contentType = "application/json;odata=fullmetadata";
- final String prefer = "return-content";
- try {
- boundPost(format, contentType, prefer, 2222);
- } catch (Exception e) {
- fail(e.getMessage());
- } catch (AssertionError e) {
- fail(e.getMessage());
- }
- }
- // test post operation without parameters and with ATOM header
-
- @Test
- public void invokeOperationWithATOM() {
- final ODataPubFormat format = ODataPubFormat.ATOM;
- final String contentType = "application/atom+xml";
- final String prefer = "return-content";
- try {
- boundPost(format, contentType, prefer, 2223);
- } catch (Exception e) {
- if (e.getMessage().equals("Unsupported media type requested. [HTTP/1.1 415 Unsupported Media Type]")) {
- assertTrue(true);
- } else {
- fail(e.getMessage());
- }
- } catch (AssertionError e) {
- fail(e.getMessage());
- }
- }
- // create an entity under feed 'Computer detail'
-
- private ODataEntity createComputerDetail(final ODataPubFormat format, final String contentType, final String prefer,
- final int id) {
- final ODataEntity entity =
- client.getObjectFactory().
- newEntity("Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail");
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("Manufacturer",
- client.getPrimitiveValueBuilder().setText("manufacturer name").setType(EdmSimpleType.String).build()));
-
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("ComputerDetailId",
- client.getPrimitiveValueBuilder().setText(String.valueOf(id)).setType(EdmSimpleType.Int32).build()));
-
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("Model",
- client.getPrimitiveValueBuilder().setText("Model Name").setType(EdmSimpleType.String).build()));
-
- final URIBuilder uriBuilder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment("ComputerDetail");
-
- final ODataEntityCreateRequest createReq =
- client.getCUDRequestFactory().getEntityCreateRequest(uriBuilder.build(), entity);
- createReq.setFormat(format);
- createReq.setContentType(contentType);
- createReq.setPrefer(prefer);
- final ODataEntityCreateResponse createRes = createReq.execute();
- assertEquals(201, createRes.getStatusCode());
- return createRes.getBody();
- }
- // post operation with parameters
-
- private void boundPostWithParametersComputer(
- final ODataPubFormat format,
- final String contentType,
- final String prefer,
- final int id) {
- final ODataEntity created = createComputerDetail(format, contentType, prefer, id);
- assertNotNull(created);
- final Integer createdId = created.getProperty("ComputerDetailId").getPrimitiveValue().<Integer>toCastValue();
- assertNotNull(createdId);
-
- final ODataOperation action = created.getOperations().get(0);
-
- final EdmV3Metadata metadata =
- client.getRetrieveRequestFactory().getMetadataRequest(testDefaultServiceRootURL).execute().getBody();
- assertNotNull(metadata);
-
- final EntityContainer container = metadata.getSchema(0).getEntityContainers().get(0);
- final FunctionImport funcImp = container.getFunctionImport(action.getTitle());
- final ODataCollectionValue specification = new ODataCollectionValue(("Collection(Edm.String)"));
- specification.add(client.getPrimitiveValueBuilder().setType(EdmSimpleType.String).setText("specification1").
- build());
- specification.add(client.getPrimitiveValueBuilder().setType(EdmSimpleType.String).setText("specification2").
- build());
- specification.add(client.getPrimitiveValueBuilder().setType(EdmSimpleType.String).setText("specification3").
- build());
-
- ODataValue argument = client.getPrimitiveValueBuilder().
- setType(EdmSimpleType.DateTime).
- setText("2011-11-11T23:59:59.9999999").
- build();
- Map<String, ODataValue> parameters = new LinkedHashMap<String, ODataValue>();
- parameters.put(funcImp.getParameters().get(1).getName(), specification);
- parameters.put(funcImp.getParameters().get(2).getName(), argument);
-
- final ODataInvokeRequest<ODataNoContent> req = client.getInvokeRequestFactory().getInvokeRequest(
- action.getTarget(), metadata, funcImp, parameters);
- req.setFormat(format);
- req.setContentType(contentType);
- req.setPrefer(prefer);
- final ODataInvokeResponse<ODataNoContent> res = req.execute();
- assertNotNull(res);
- assertEquals(204, res.getStatusCode());
-
- final URIBuilder uriBuilder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment("ComputerDetail").appendKeySegment(createdId);
- final ODataEntityRequest retrieveRes = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- retrieveRes.setFormat(format);
- retrieveRes.setContentType(contentType);
- retrieveRes.setPrefer(prefer);
- final ODataEntity read = retrieveRes.execute().getBody();
- assertEquals("2011-11-11T23:59:59.9999999", read.getProperty("PurchaseDate").getValue().toString());
- delete(format, contentType, createdId, created.getETag(), "ComputerDetail");
- }
- // test with json
-
- @Test
- public void boundPostComputerDetailWithJSON() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final String contentType = "application/json;odata=fullmetadata";
- final String prefer = "return-content";
- try {
- boundPostWithParametersComputer(format, contentType, prefer, 2235);
- } catch (Exception e) {
- fail(e.getMessage());
- } catch (AssertionError e) {
- fail(e.getMessage());
- }
- }
- // test with atom
-
- @Test
- public void boundPostComputerDetailWithATOM() {
- final ODataPubFormat format = ODataPubFormat.ATOM;
- final String contentType = "application/atom+xml";
- final String prefer = "return-content";
- try {
- boundPostWithParametersComputer(format, contentType, prefer, 2235);
- } catch (Exception e) {
- fail(e.getMessage());
- } catch (AssertionError e) {
- fail(e.getMessage());
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/InvokeTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/InvokeTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/InvokeTestITCase.java
deleted file mode 100644
index 92b5f09..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/InvokeTestITCase.java
+++ /dev/null
@@ -1,307 +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 com.msopentech.odatajclient.engine.it;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import com.msopentech.odatajclient.engine.communication.request.cud.ODataDeleteRequest;
-import com.msopentech.odatajclient.engine.communication.request.cud.ODataEntityCreateRequest;
-import com.msopentech.odatajclient.engine.communication.request.invoke.ODataInvokeRequest;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataEntityRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataDeleteResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataEntityCreateResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataInvokeResponse;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.data.ODataEntitySet;
-import com.msopentech.odatajclient.engine.data.ODataNoContent;
-import com.msopentech.odatajclient.engine.data.ODataOperation;
-import com.msopentech.odatajclient.engine.data.ODataPrimitiveValue;
-import com.msopentech.odatajclient.engine.data.ODataProperty;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import com.msopentech.odatajclient.engine.data.ODataValue;
-import com.msopentech.odatajclient.engine.metadata.EdmType;
-import com.msopentech.odatajclient.engine.metadata.EdmV3Metadata;
-import com.msopentech.odatajclient.engine.metadata.EdmV3Type;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.EntityContainer;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.FunctionImport;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import com.msopentech.odatajclient.engine.utils.URIUtils;
-import java.net.URI;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-import org.apache.commons.lang3.StringUtils;
-import org.junit.Test;
-
-public class InvokeTestITCase extends AbstractTestITCase {
-
- private void getWithNoParams(final ODataPubFormat format) {
- final EdmV3Metadata metadata =
- client.getRetrieveRequestFactory().getMetadataRequest(testDefaultServiceRootURL).execute().getBody();
- assertNotNull(metadata);
-
- final EntityContainer container = metadata.getSchema(0).getEntityContainers().get(0);
-
- // 1. get primitive value property
- FunctionImport funcImp = container.getFunctionImport("GetPrimitiveString");
-
- URIBuilder builder = client.getURIBuilder(testDefaultServiceRootURL).
- appendFunctionImportSegment(URIUtils.rootFunctionImportURISegment(container, funcImp));
-
- ODataInvokeRequest<ODataProperty> req =
- client.getInvokeRequestFactory().getInvokeRequest(builder.build(), metadata, funcImp);
- req.setFormat(format);
- ODataInvokeResponse<ODataProperty> res = req.execute();
- assertNotNull(res);
-
- ODataProperty property = res.getBody();
- assertNotNull(property);
- assertEquals("Foo", property.getPrimitiveValue().<String>toCastValue());
-
- // 2. get collection of complex type property
- funcImp = container.getFunctionImport("EntityProjectionReturnsCollectionOfComplexTypes");
-
- builder = client.getURIBuilder(testDefaultServiceRootURL).
- appendFunctionImportSegment(URIUtils.rootFunctionImportURISegment(container, funcImp));
-
- req = client.getInvokeRequestFactory().getInvokeRequest(builder.build(), metadata, funcImp);
- req.setFormat(format);
- res = req.execute();
- assertNotNull(res);
-
- property = res.getBody();
- assertNotNull(property);
- assertTrue(property.hasCollectionValue());
- assertFalse(property.getCollectionValue().isEmpty());
- }
-
- @Test
- public void getWithNoParamsAsAtom() {
- getWithNoParams(ODataPubFormat.ATOM);
- }
-
- @Test
- public void getWithNoParamsAsJSON() {
- getWithNoParams(ODataPubFormat.JSON);
- }
-
- private void getWithParams(final ODataPubFormat format) {
- // 1. primitive result
- EdmV3Metadata metadata =
- client.getRetrieveRequestFactory().getMetadataRequest(testDefaultServiceRootURL).execute().getBody();
- assertNotNull(metadata);
-
- EntityContainer container = metadata.getSchema(0).getEntityContainers().get(0);
- FunctionImport funcImp = container.getFunctionImport("GetArgumentPlusOne");
-
- URIBuilder builder = client.getURIBuilder(testDefaultServiceRootURL).
- appendFunctionImportSegment(URIUtils.rootFunctionImportURISegment(container, funcImp));
-
- EdmType type = new EdmV3Type(funcImp.getParameters().get(0).getType());
- ODataPrimitiveValue argument = client.getPrimitiveValueBuilder().
- setType(type.getSimpleType()).
- setValue(154).
- build();
- Map<String, ODataValue> parameters = new HashMap<String, ODataValue>();
- parameters.put(funcImp.getParameters().get(0).getName(), argument);
-
- final ODataInvokeRequest<ODataProperty> primitiveReq =
- client.getInvokeRequestFactory().getInvokeRequest(builder.build(), metadata, funcImp,
- parameters);
- primitiveReq.setFormat(format);
-
- final ODataInvokeResponse<ODataProperty> primitiveRes = primitiveReq.execute();
- assertNotNull(primitiveRes);
-
- final ODataProperty property = primitiveRes.getBody();
- assertNotNull(property);
- assertEquals(Integer.valueOf(155), property.getPrimitiveValue().<Integer>toCastValue());
-
- // 2. feed result
- metadata = client.getRetrieveRequestFactory().getMetadataRequest(testDefaultServiceRootURL).execute().getBody();
- assertNotNull(metadata);
-
- container = metadata.getSchema(0).getEntityContainers().get(0);
- funcImp = container.getFunctionImport("GetSpecificCustomer");
-
- builder = client.getURIBuilder(testDefaultServiceRootURL).
- appendFunctionImportSegment(URIUtils.rootFunctionImportURISegment(container, funcImp));
-
- type = new EdmV3Type(funcImp.getParameters().get(0).getType());
- argument = client.getPrimitiveValueBuilder().
- setType(type.getSimpleType()).
- setText(StringUtils.EMPTY).
- build();
- parameters = new LinkedHashMap<String, ODataValue>();
- parameters.put(funcImp.getParameters().get(0).getName(), argument);
-
- final ODataInvokeRequest<ODataEntitySet> feedReq =
- client.getInvokeRequestFactory().getInvokeRequest(builder.build(), metadata, funcImp, parameters);
- feedReq.setFormat(format);
-
- final ODataInvokeResponse<ODataEntitySet> feedRes = feedReq.execute();
- assertNotNull(feedRes);
-
- final ODataEntitySet feed = feedRes.getBody();
- assertNotNull(feed);
-
- final Set<Integer> customerIds = new HashSet<Integer>(feed.getEntities().size());
- for (ODataEntity entity : feed.getEntities()) {
- customerIds.add(entity.getProperty("CustomerId").getPrimitiveValue().<Integer>toCastValue());
- }
- assertTrue(customerIds.contains(-8));
- }
-
- @Test
- public void getWithParamsAsAtom() {
- getWithParams(ODataPubFormat.ATOM);
- }
-
- @Test
- public void getWithParamsAsJSON() {
- getWithParams(ODataPubFormat.JSON);
- }
-
- private ODataEntity createEmployee(final ODataPubFormat format) {
- final ODataEntity employee = client.getObjectFactory().newEntity(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.Employee");
-
- employee.addProperty(client.getObjectFactory().newPrimitiveProperty("PersonId", client.
- getPrimitiveValueBuilder().
- setText("1244").setType(EdmSimpleType.Int32).build()));
- employee.addProperty(client.getObjectFactory().newPrimitiveProperty("Name", client.getPrimitiveValueBuilder().
- setText("Test employee").build()));
- employee.addProperty(client.getObjectFactory().newPrimitiveProperty("ManagersPersonId", client.
- getPrimitiveValueBuilder().
- setText("3777").setType(EdmSimpleType.Int32).build()));
- employee.addProperty(client.getObjectFactory().newPrimitiveProperty("Salary", client.getPrimitiveValueBuilder().
- setText("1000").setType(EdmSimpleType.Int32).build()));
- employee.addProperty(client.getObjectFactory().newPrimitiveProperty("Title", client.getPrimitiveValueBuilder().
- setText("CEO").build()));
-
- final URIBuilder uriBuilder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment("Person");
-
- final ODataEntityCreateRequest createReq =
- client.getCUDRequestFactory().getEntityCreateRequest(uriBuilder.build(), employee);
- createReq.setFormat(format);
- final ODataEntityCreateResponse createRes = createReq.execute();
- assertEquals(201, createRes.getStatusCode());
-
- return createRes.getBody();
- }
-
- private void deleteEmployee(final ODataPubFormat format, final Integer id) {
- final URIBuilder uriBuilder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment("Person").appendKeySegment(id);
-
- final ODataDeleteRequest deleteReq = client.getCUDRequestFactory().getDeleteRequest(uriBuilder.build());
- deleteReq.setFormat(format);
- final ODataDeleteResponse deleteRes = deleteReq.execute();
- assertEquals(204, deleteRes.getStatusCode());
- }
-
- @Test
- public void boundPost() {
- // 0. create an employee
- final ODataEntity created = createEmployee(ODataPubFormat.JSON_FULL_METADATA);
- assertNotNull(created);
- final Integer createdId = created.getProperty("PersonId").getPrimitiveValue().<Integer>toCastValue();
- assertNotNull(createdId);
-
- // 1. invoke action bound with the employee just created
- final ODataOperation action = created.getOperations().get(0);
-
- final EdmV3Metadata metadata =
- client.getRetrieveRequestFactory().getMetadataRequest(testDefaultServiceRootURL).execute().getBody();
- assertNotNull(metadata);
-
- final EntityContainer container = metadata.getSchema(0).getEntityContainers().get(0);
- final FunctionImport funcImp = container.getFunctionImport(action.getTitle());
-
- final ODataInvokeRequest<ODataNoContent> req = client.getInvokeRequestFactory().getInvokeRequest(
- action.getTarget(), metadata, funcImp);
- req.setFormat(ODataPubFormat.JSON_FULL_METADATA);
- final ODataInvokeResponse<ODataNoContent> res = req.execute();
- assertNotNull(res);
- assertEquals(204, res.getStatusCode());
-
- // 2. check that invoked action has effectively run
- final URIBuilder uriBuilder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment("Person").appendKeySegment(createdId);
- final ODataEntityRequest retrieveRes = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- retrieveRes.setFormat(ODataPubFormat.JSON_FULL_METADATA);
- final ODataEntity read = retrieveRes.execute().getBody();
- assertEquals("0", read.getProperty("Salary").getPrimitiveValue().toString());
- assertTrue(read.getProperty("Title").getPrimitiveValue().toString().endsWith("[Sacked]"));
-
- // 3. remove the test employee
- deleteEmployee(ODataPubFormat.JSON_FULL_METADATA, createdId);
- }
-
- @Test
- public void boundPostWithParams() {
- // 1. read employees and store their current salary
- final URIBuilder builder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntitySetSegment("Person").
- appendEntityTypeSegment("Microsoft.Test.OData.Services.AstoriaDefaultService.Employee");
- final URI employeesURI = builder.build();
- ODataEntitySet employees = client.getRetrieveRequestFactory().getEntitySetRequest(employeesURI).execute().
- getBody();
- assertFalse(employees.getEntities().isEmpty());
- final Map<Integer, Integer> preSalaries = new HashMap<Integer, Integer>(employees.getCount());
- for (ODataEntity employee : employees.getEntities()) {
- preSalaries.put(employee.getProperty("PersonId").getPrimitiveValue().<Integer>toCastValue(),
- employee.getProperty("Salary").getPrimitiveValue().<Integer>toCastValue());
- }
- assertFalse(preSalaries.isEmpty());
-
- // 2. invoke action bound, with additional parameter
- final EdmV3Metadata metadata =
- client.getRetrieveRequestFactory().getMetadataRequest(testDefaultServiceRootURL).execute().getBody();
- assertNotNull(metadata);
-
- final EntityContainer container = metadata.getSchema(0).getEntityContainers().get(0);
- final FunctionImport funcImp = container.getFunctionImport("IncreaseSalaries");
-
- final ODataInvokeRequest<ODataNoContent> req = client.getInvokeRequestFactory().getInvokeRequest(
- builder.appendStructuralSegment(funcImp.getName()).build(), metadata, funcImp,
- Collections.<String, ODataValue>singletonMap(
- "n", client.getPrimitiveValueBuilder().setValue(1).setType(EdmSimpleType.Int32).build()));
- final ODataInvokeResponse<ODataNoContent> res = req.execute();
- assertNotNull(res);
- assertEquals(204, res.getStatusCode());
-
- // 3. check whether salaries were incremented
- employees = client.getRetrieveRequestFactory().getEntitySetRequest(employeesURI).execute().getBody();
- assertFalse(employees.getEntities().isEmpty());
- for (ODataEntity employee : employees.getEntities()) {
- assertTrue(
- preSalaries.get(employee.getProperty("PersonId").getPrimitiveValue().<Integer>toCastValue())
- < employee.getProperty("Salary").getPrimitiveValue().<Integer>toCastValue());
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/KeyAsSegmentTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/KeyAsSegmentTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/KeyAsSegmentTestITCase.java
deleted file mode 100644
index b72aea2..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/KeyAsSegmentTestITCase.java
+++ /dev/null
@@ -1,110 +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 com.msopentech.odatajclient.engine.it;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-
-import com.msopentech.odatajclient.engine.communication.request.UpdateType;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataEntityRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class KeyAsSegmentTestITCase extends AbstractTestITCase {
-
- @BeforeClass
- public static void enableKeyAsSegment() {
- client.getConfiguration().setKeyAsSegment(true);
- }
-
- private void read(final ODataPubFormat format) {
- final URIBuilder uriBuilder = client.getURIBuilder(testKeyAsSegmentServiceRootURL).
- appendEntityTypeSegment("Customer").appendKeySegment(-10);
-
- final ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setFormat(format);
-
- final ODataRetrieveResponse<ODataEntity> res = req.execute();
- final ODataEntity entity = res.getBody();
- assertNotNull(entity);
-
- assertFalse(entity.getEditLink().toASCIIString().contains("("));
- assertFalse(entity.getEditLink().toASCIIString().contains(")"));
- }
-
- @Test
- public void fromAtom() {
- read(ODataPubFormat.ATOM);
- }
-
- @Test
- public void fromJSON() {
- read(ODataPubFormat.JSON_FULL_METADATA);
- }
-
- @Test
- public void createODataEntityAsAtom() {
- final ODataPubFormat format = ODataPubFormat.ATOM;
- final int id = 1;
- final ODataEntity original = getSampleCustomerProfile(id, "Sample customer", false);
-
- createEntity(testKeyAsSegmentServiceRootURL, format, original, "Customer");
- final ODataEntity actual = compareEntities(testKeyAsSegmentServiceRootURL, format, original, id, null);
-
- cleanAfterCreate(format, actual, false, testKeyAsSegmentServiceRootURL);
- }
-
- @Test
- public void createODataEntityAsJSON() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final int id = 2;
- final ODataEntity original = getSampleCustomerProfile(id, "Sample customer", false);
-
- createEntity(testKeyAsSegmentServiceRootURL, format, original, "Customer");
- final ODataEntity actual = compareEntities(testKeyAsSegmentServiceRootURL, format, original, id, null);
-
- cleanAfterCreate(format, actual, false, testKeyAsSegmentServiceRootURL);
- }
-
- @Test
- public void replaceODataEntityAsAtom() {
- final ODataPubFormat format = ODataPubFormat.ATOM;
- final ODataEntity changes = read(format, client.getURIBuilder(testKeyAsSegmentServiceRootURL).
- appendEntityTypeSegment("Car").appendKeySegment(14).build());
- updateEntityDescription(format, changes, UpdateType.REPLACE);
- }
-
- @Test
- public void replaceODataEntityAsJSON() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final ODataEntity changes = read(format, client.getURIBuilder(testKeyAsSegmentServiceRootURL).
- appendEntityTypeSegment("Car").appendKeySegment(14).build());
- updateEntityDescription(format, changes, UpdateType.REPLACE);
- }
-
- @AfterClass
- public static void disableKeyAsSegment() {
- client.getConfiguration().setKeyAsSegment(false);
- }
-}
[46/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataValueRequest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataValueRequest.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataValueRequest.java
deleted file mode 100644
index 539aa11..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/ODataValueRequest.java
+++ /dev/null
@@ -1,105 +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 com.msopentech.odatajclient.engine.communication.request.retrieve;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.client.http.HttpClientException;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.data.ODataPrimitiveValue;
-import com.msopentech.odatajclient.engine.data.ODataValue;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.engine.format.ODataValueFormat;
-import java.io.IOException;
-import java.net.URI;
-import org.apache.commons.io.IOUtils;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-
-/**
- * This class implements an OData entity property value query request.
- */
-public class ODataValueRequest extends AbstractODataRetrieveRequest<ODataValue, ODataValueFormat> {
-
- /**
- * Private constructor.
- *
- * @param odataClient client instance getting this request
- * @param query query to be executed.
- */
- ODataValueRequest(final ODataClient odataClient, final URI query) {
- super(odataClient, ODataValueFormat.class, query);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public ODataRetrieveResponse<ODataValue> execute() {
- final HttpResponse res = doExecute();
- return new ODataValueResponseImpl(httpClient, res);
- }
-
- /**
- * Response class about an ODataDeleteReODataValueRequestquest.
- */
- protected class ODataValueResponseImpl extends ODataRetrieveResponseImpl {
-
- private ODataValue value = null;
-
- /**
- * Constructor.
- * <p>
- * Just to create response templates to be initialized from batch.
- */
- private ODataValueResponseImpl() {
- }
-
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- private ODataValueResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public ODataValue getBody() {
- if (value == null) {
- final ODataValueFormat format = ODataValueFormat.fromString(getContentType());
-
- try {
- value = new ODataPrimitiveValue.Builder(odataClient).
- setType(format == ODataValueFormat.TEXT ? EdmSimpleType.String : EdmSimpleType.Stream).
- setText(IOUtils.toString(getRawResponse())).
- build();
- } catch (IOException e) {
- throw new HttpClientException(e);
- } finally {
- this.close();
- }
- }
- return value;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/RetrieveRequestFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/RetrieveRequestFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/RetrieveRequestFactory.java
deleted file mode 100644
index 278e7c9..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/RetrieveRequestFactory.java
+++ /dev/null
@@ -1,122 +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 com.msopentech.odatajclient.engine.communication.request.retrieve;
-
-import java.io.Serializable;
-import java.net.URI;
-
-/**
- * OData request factory class.
- */
-public interface RetrieveRequestFactory extends Serializable {
-
- /**
- * Gets a service document request instance.
- *
- * @param serviceRoot absolute URL (schema, host and port included) representing the location of the root of the
- * data service.
- * @return new ODataServiceDocumentRequest instance.
- */
- ODataServiceDocumentRequest getServiceDocumentRequest(String serviceRoot);
-
- /**
- * Gets a metadata request instance.
- *
- * @param serviceRoot absolute URL (schema, host and port included) representing the location of the root of the
- * data service.
- * @return new ODataMetadataRequest instance.
- */
- ODataMetadataRequest getMetadataRequest(String serviceRoot);
-
- /**
- * Gets a query request returning a set of one or more OData entities.
- *
- * @param query query to be performed.
- * @return new ODataEntitySetRequest instance.
- */
- ODataEntitySetRequest getEntitySetRequest(URI query);
-
- /**
- * Gets a query request returning a set of one or more OData entities.
- * <br/>
- * Returned request gives the possibility to consume entities iterating on them without parsing and loading in
- * memory the entire entity set.
- *
- * @param query query to be performed.
- * @return new ODataEntitySetIteratorRequest instance.
- */
- ODataEntitySetIteratorRequest getEntitySetIteratorRequest(URI query);
-
- /**
- * Gets a query request returning a single OData entity.
- *
- * @param query query to be performed.
- * @return new ODataEntityRequest instance.
- */
- ODataEntityRequest getEntityRequest(URI query);
-
- /**
- * Gets a query request returning a single OData entity property.
- *
- * @param query query to be performed.
- * @return new ODataPropertyRequest instance.
- */
- ODataPropertyRequest getPropertyRequest(URI query);
-
- /**
- * Gets a query request returning a single OData entity property value.
- *
- * @param query query to be performed.
- * @return new ODataValueRequest instance.
- */
- ODataValueRequest getValueRequest(URI query);
-
- /**
- * Gets a query request returning a single OData link.
- *
- * @param targetURI target URI.
- * @param linkName link name.
- * @return new ODataLinkRequest instance.
- */
- ODataLinkCollectionRequest getLinkCollectionRequest(URI targetURI, String linkName);
-
- /**
- * Gets a query request returning a media stream.
- *
- * @param query query to be performed.
- * @return new ODataMediaRequest instance.
- */
- ODataMediaRequest getMediaRequest(URI query);
-
- /**
- * Implements a raw request returning a stream.
- *
- * @param uri query to be performed.
- * @return new ODataRawRequest instance.
- */
- ODataRawRequest getRawRequest(URI uri);
-
- /**
- * Implements a generic retrieve request without specifying any return type.
- *
- * @param uri query to be performed.
- * @return new ODataGenericRerieveRequest instance.
- */
- ODataGenericRetrieveRequest getGenericRetrieveRequest(URI uri);
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/V3RetrieveRequestFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/V3RetrieveRequestFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/V3RetrieveRequestFactory.java
deleted file mode 100644
index cd8dc9a..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/V3RetrieveRequestFactory.java
+++ /dev/null
@@ -1,45 +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 com.msopentech.odatajclient.engine.communication.request.retrieve;
-
-import com.msopentech.odatajclient.engine.client.ODataV3Client;
-import org.apache.commons.lang3.StringUtils;
-
-public class V3RetrieveRequestFactory extends AbstractRetrieveRequestFactory {
-
- private static final long serialVersionUID = 6602745001042802479L;
-
- public V3RetrieveRequestFactory(final ODataV3Client client) {
- super(client);
- }
-
- @Override
- public ODataV3MetadataRequest getMetadataRequest(final String serviceRoot) {
- return new ODataV3MetadataRequest(client, client.getURIBuilder(serviceRoot).appendMetadataSegment().build());
- }
-
- @Override
- public ODataServiceDocumentRequest getServiceDocumentRequest(final String serviceRoot) {
- return new ODataServiceDocumentRequest(client,
- StringUtils.isNotBlank(serviceRoot) && serviceRoot.endsWith("/")
- ? client.getURIBuilder(serviceRoot).build()
- : client.getURIBuilder(serviceRoot + "/").build());
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/V4RetrieveRequestFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/V4RetrieveRequestFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/V4RetrieveRequestFactory.java
deleted file mode 100644
index af0e5ec..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/retrieve/V4RetrieveRequestFactory.java
+++ /dev/null
@@ -1,44 +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 com.msopentech.odatajclient.engine.communication.request.retrieve;
-
-import com.msopentech.odatajclient.engine.client.ODataV4Client;
-import org.apache.commons.lang3.StringUtils;
-
-public class V4RetrieveRequestFactory extends AbstractRetrieveRequestFactory {
-
- private static final long serialVersionUID = 546577958047902917L;
-
- public V4RetrieveRequestFactory(final ODataV4Client client) {
- super(client);
- }
-
- @Override
- public ODataV4MetadataRequest getMetadataRequest(final String serviceRoot) {
- return new ODataV4MetadataRequest(client, client.getURIBuilder(serviceRoot).appendMetadataSegment().build());
- }
-
- @Override
- public ODataServiceDocumentRequest getServiceDocumentRequest(final String serviceRoot) {
- return new ODataServiceDocumentRequest(client,
- StringUtils.isNotBlank(serviceRoot) && serviceRoot.endsWith("/")
- ? client.getURIBuilder(serviceRoot).build()
- : client.getURIBuilder(serviceRoot + "/").build());
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/AbstractODataStreamedEntityRequestImpl.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/AbstractODataStreamedEntityRequestImpl.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/AbstractODataStreamedEntityRequestImpl.java
deleted file mode 100644
index 267f2bc..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/AbstractODataStreamedEntityRequestImpl.java
+++ /dev/null
@@ -1,74 +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 com.msopentech.odatajclient.engine.communication.request.streamed;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.engine.communication.request.ODataStreamManager;
-import com.msopentech.odatajclient.engine.communication.response.ODataResponse;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import java.net.URI;
-import javax.security.auth.login.Configuration;
-
-/**
- * Abstract class representing a request concerning a streamed entity.
- *
- * @param <V> OData response type corresponding to the request implementation.
- * @param <T> OData request payload type corresponding to the request implementation.
- */
-public abstract class AbstractODataStreamedEntityRequestImpl<V extends ODataResponse, T extends ODataStreamManager<V>>
- extends AbstractODataStreamedRequestImpl<V, T> {
-
- private ODataPubFormat format;
-
- /**
- * Constructor.
- *
- * @param odataClient client instance getting this request
- * @param method HTTP request method.
- * @param uri request URI.
- */
- public AbstractODataStreamedEntityRequestImpl(final ODataClient odataClient, final HttpMethod method,
- URI uri) {
- super(odataClient, method, uri);
- setAccept(getFormat().toString());
- }
-
- /**
- * Returns resource representation format.
- *
- * @return the configured format (or default if not specified).
- * @see Configuration#getDefaultPubFormat()
- */
- public final ODataPubFormat getFormat() {
- return format == null ? odataClient.getConfiguration().getDefaultPubFormat() : format;
- }
-
- /**
- * Override configured request format.
- *
- * @param format request format.
- * @see ODataFormat
- */
- public final void setFormat(final ODataPubFormat format) {
- this.format = format;
- setAccept(format.toString());
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/AbstractODataStreamedRequestImpl.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/AbstractODataStreamedRequestImpl.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/AbstractODataStreamedRequestImpl.java
deleted file mode 100644
index fe12421..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/AbstractODataStreamedRequestImpl.java
+++ /dev/null
@@ -1,154 +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 com.msopentech.odatajclient.engine.communication.request.streamed;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.engine.communication.request.ODataRequestImpl;
-import com.msopentech.odatajclient.engine.communication.request.ODataStreamer;
-import com.msopentech.odatajclient.engine.communication.request.ODataStreamManager;
-import com.msopentech.odatajclient.engine.communication.request.batch.ODataBatchRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataResponse;
-import com.msopentech.odatajclient.engine.format.ODataMediaFormat;
-import com.msopentech.odatajclient.engine.utils.ODataBatchConstants;
-import com.msopentech.odatajclient.engine.utils.URIUtils;
-import com.msopentech.odatajclient.engine.utils.Wrapper;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.util.concurrent.Callable;
-import java.util.concurrent.Future;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
-import org.apache.http.entity.ContentType;
-
-/**
- * Streamed OData request abstract class.
- *
- * @param <V> OData response type corresponding to the request implementation.
- * @param <T> OData request payload type corresponding to the request implementation.
- */
-public abstract class AbstractODataStreamedRequestImpl<V extends ODataResponse, T extends ODataStreamManager<V>>
- extends ODataRequestImpl<ODataMediaFormat> implements ODataStreamedRequest<V, T> {
-
- /**
- * OData payload stream manager.
- */
- protected ODataStreamManager<V> streamManager;
-
- /**
- * Wrapper for actual streamed request's future.
- * This holds information about the HTTP request / response currently open.
- */
- protected final Wrapper<Future<HttpResponse>> futureWrapper = new Wrapper<Future<HttpResponse>>();
-
- /**
- * Constructor.
- *
- * @param odataClient client instance getting this request
- * @param method OData request HTTP method.
- * @param uri OData request URI.
- */
- public AbstractODataStreamedRequestImpl(final ODataClient odataClient,
- final HttpMethod method, final URI uri) {
-
- super(odataClient, ODataMediaFormat.class, method, uri);
- setAccept(ContentType.APPLICATION_OCTET_STREAM.getMimeType());
- setContentType(ContentType.APPLICATION_OCTET_STREAM.getMimeType());
- }
-
- /**
- * Gets OData request payload management object.
- *
- * @return OData request payload management object.
- */
- protected abstract T getStreamManager();
-
- /**
- * {@inheritDoc }
- */
- @Override
- @SuppressWarnings("unchecked")
- public T execute() {
- streamManager = getStreamManager();
-
- ((HttpEntityEnclosingRequestBase) request).setEntity(
- URIUtils.buildInputStreamEntity(odataClient, streamManager.getBody()));
-
- futureWrapper.setWrapped(odataClient.getConfiguration().getExecutor().submit(new Callable<HttpResponse>() {
-
- @Override
- public HttpResponse call() throws Exception {
- return doExecute();
- }
- }));
-
- // returns the stream manager object
- return (T) streamManager;
- }
-
- /**
- * Writes (and consume) the request onto the given batch stream.
- * <p>
- * Please note that this method will consume the request (execution won't be possible anymore).
- *
- * @param req destination batch request.
- */
- public void batch(final ODataBatchRequest req) {
- batch(req, null);
- }
-
- /**
- * Writes (and consume) the request onto the given batch stream.
- * <p>
- * Please note that this method will consume the request (execution won't be possible anymore).
- *
- * @param req destination batch request.
- * @param contentId ContentId header value to be added to the serialization.
- * Use this in case of changeset items.
- */
- public void batch(final ODataBatchRequest req, final String contentId) {
- final InputStream input = getStreamManager().getBody();
-
- try {
- // finalize the body
- getStreamManager().finalizeBody();
-
- req.rawAppend(toByteArray());
- if (StringUtils.isNotBlank(contentId)) {
- req.rawAppend((ODataBatchConstants.CHANGESET_CONTENT_ID_NAME + ": " + contentId).getBytes());
- req.rawAppend(ODataStreamer.CRLF);
- }
- req.rawAppend(ODataStreamer.CRLF);
-
- try {
- req.rawAppend(IOUtils.toByteArray(input));
- } catch (Exception e) {
- LOG.debug("Invalid stream", e);
- req.rawAppend(new byte[0]);
- }
- } catch (IOException e) {
- throw new IllegalStateException(e);
- } finally {
- IOUtils.closeQuietly(input);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/AbstractStreamedRequestFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/AbstractStreamedRequestFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/AbstractStreamedRequestFactory.java
deleted file mode 100644
index d77b93e..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/AbstractStreamedRequestFactory.java
+++ /dev/null
@@ -1,72 +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 com.msopentech.odatajclient.engine.communication.request.streamed;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import java.io.InputStream;
-import java.net.URI;
-
-public abstract class AbstractStreamedRequestFactory implements StreamedRequestFactory {
-
- private static final long serialVersionUID = -2438839640443961168L;
-
- protected final ODataClient client;
-
- protected AbstractStreamedRequestFactory(final ODataClient client) {
- this.client = client;
- }
-
- @Override
- public ODataMediaEntityCreateRequest getMediaEntityCreateRequest(
- final URI targetURI, final InputStream media) {
-
- return new ODataMediaEntityCreateRequest(client, targetURI, media);
- }
-
- @Override
- public ODataStreamUpdateRequest getStreamUpdateRequest(final URI targetURI, final InputStream stream) {
- final ODataStreamUpdateRequest req;
-
- if (client.getConfiguration().isUseXHTTPMethod()) {
- req = new ODataStreamUpdateRequest(client, HttpMethod.POST, targetURI, stream);
- req.setXHTTPMethod(HttpMethod.PUT.name());
- } else {
- req = new ODataStreamUpdateRequest(client, HttpMethod.PUT, targetURI, stream);
- }
-
- return req;
- }
-
- @Override
- public ODataMediaEntityUpdateRequest getMediaEntityUpdateRequest(
- final URI editURI, final InputStream media) {
-
- final ODataMediaEntityUpdateRequest req;
-
- if (client.getConfiguration().isUseXHTTPMethod()) {
- req = new ODataMediaEntityUpdateRequest(client, HttpMethod.POST, editURI, media);
- req.setXHTTPMethod(HttpMethod.PUT.name());
- } else {
- req = new ODataMediaEntityUpdateRequest(client, HttpMethod.PUT, editURI, media);
- }
-
- return req;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/ODataMediaEntityCreateRequest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/ODataMediaEntityCreateRequest.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/ODataMediaEntityCreateRequest.java
deleted file mode 100644
index bdf2554..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/ODataMediaEntityCreateRequest.java
+++ /dev/null
@@ -1,133 +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 com.msopentech.odatajclient.engine.communication.request.streamed;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.engine.communication.request.ODataStreamManager;
-import com.msopentech.odatajclient.engine.communication.request.batch.ODataBatchableRequest;
-import com.msopentech.odatajclient.engine.communication.request.streamed.ODataMediaEntityCreateRequest.MediaEntityCreateStreamManager;
-import com.msopentech.odatajclient.engine.communication.response.ODataMediaEntityCreateResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataResponseImpl;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import java.io.InputStream;
-import java.net.URI;
-import java.util.concurrent.TimeUnit;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-
-/**
- * This class implements an OData Media Entity create request.
- * Get instance by using ODataStreamedRequestFactory.
- */
-public class ODataMediaEntityCreateRequest
- extends AbstractODataStreamedEntityRequestImpl<ODataMediaEntityCreateResponse, MediaEntityCreateStreamManager>
- implements ODataBatchableRequest {
-
- private final InputStream media;
-
- /**
- * Constructor.
- *
- * @param odataClient client instance getting this request
- * @param targetURI target entity set.
- * @param media media entity blob to be created.
- */
- ODataMediaEntityCreateRequest(final ODataClient odataClient, final URI targetURI, final InputStream media) {
- super(odataClient, HttpMethod.POST, targetURI);
- this.media = media;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- protected MediaEntityCreateStreamManager getStreamManager() {
- if (streamManager == null) {
- streamManager = new MediaEntityCreateStreamManager(media);
- }
- return (MediaEntityCreateStreamManager) streamManager;
- }
-
- /**
- * Media entity payload object.
- */
- public class MediaEntityCreateStreamManager extends ODataStreamManager<ODataMediaEntityCreateResponse> {
-
- /**
- * Private constructor.
- *
- * @param input media stream.
- */
- private MediaEntityCreateStreamManager(final InputStream input) {
- super(ODataMediaEntityCreateRequest.this.futureWrapper, input);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- protected ODataMediaEntityCreateResponse getResponse(final long timeout, final TimeUnit unit) {
- finalizeBody();
- return new ODataMediaEntityCreateResponseImpl(httpClient, getHttpResponse(timeout, unit));
- }
- }
-
- /**
- * Response class about an ODataMediaEntityCreateRequest.
- */
- private class ODataMediaEntityCreateResponseImpl extends ODataResponseImpl
- implements ODataMediaEntityCreateResponse {
-
- private ODataEntity entity = null;
-
- /**
- * Constructor.
- * <p>
- * Just to create response templates to be initialized from batch.
- */
- private ODataMediaEntityCreateResponseImpl() {
- }
-
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- private ODataMediaEntityCreateResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public ODataEntity getBody() {
- if (entity == null) {
- try {
- entity = odataClient.getReader().readEntity(getRawResponse(), getFormat());
- } finally {
- this.close();
- }
- }
- return entity;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/ODataMediaEntityUpdateRequest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/ODataMediaEntityUpdateRequest.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/ODataMediaEntityUpdateRequest.java
deleted file mode 100644
index 42219a5..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/ODataMediaEntityUpdateRequest.java
+++ /dev/null
@@ -1,136 +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 com.msopentech.odatajclient.engine.communication.request.streamed;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.engine.communication.request.ODataStreamManager;
-import com.msopentech.odatajclient.engine.communication.request.batch.ODataBatchableRequest;
-import com.msopentech.odatajclient.engine.communication.request.streamed.ODataMediaEntityUpdateRequest.MediaEntityUpdateStreamManager;
-import com.msopentech.odatajclient.engine.communication.response.ODataMediaEntityUpdateResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataResponseImpl;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import java.io.InputStream;
-import java.net.URI;
-import java.util.concurrent.TimeUnit;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-
-/**
- * This class implements an OData Media Entity create request.
- * Get instance by using ODataStreamedRequestFactory.
- */
-public class ODataMediaEntityUpdateRequest
- extends AbstractODataStreamedEntityRequestImpl<ODataMediaEntityUpdateResponse, MediaEntityUpdateStreamManager>
- implements ODataBatchableRequest {
-
- private final InputStream media;
-
- /**
- * Constructor.
- *
- * @param odataClient client instance getting this request
- * @param method request method.
- * @param editURI edit URI of the entity to be updated.
- * @param media media entity blob to be created.
- */
- ODataMediaEntityUpdateRequest(final ODataClient odataClient,
- final HttpMethod method, final URI editURI, final InputStream media) {
-
- super(odataClient, method, editURI);
- this.media = media;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- protected MediaEntityUpdateStreamManager getStreamManager() {
- if (streamManager == null) {
- streamManager = new MediaEntityUpdateStreamManager(media);
- }
- return (MediaEntityUpdateStreamManager) streamManager;
- }
-
- /**
- * Media entity payload object.
- */
- public class MediaEntityUpdateStreamManager extends ODataStreamManager<ODataMediaEntityUpdateResponse> {
-
- /**
- * Private constructor.
- *
- * @param input media stream.
- */
- private MediaEntityUpdateStreamManager(final InputStream input) {
- super(ODataMediaEntityUpdateRequest.this.futureWrapper, input);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- protected ODataMediaEntityUpdateResponse getResponse(final long timeout, final TimeUnit unit) {
- finalizeBody();
- return new ODataMediaEntityUpdateResponseImpl(httpClient, getHttpResponse(timeout, unit));
- }
- }
-
- /**
- * Response class about an ODataMediaEntityUpdateRequest.
- */
- private class ODataMediaEntityUpdateResponseImpl extends ODataResponseImpl
- implements ODataMediaEntityUpdateResponse {
-
- private ODataEntity entity = null;
-
- /**
- * Constructor.
- * <p>
- * Just to create response templates to be initialized from batch.
- */
- private ODataMediaEntityUpdateResponseImpl() {
- }
-
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- private ODataMediaEntityUpdateResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public ODataEntity getBody() {
- if (entity == null) {
- try {
- entity = odataClient.getReader().readEntity(getRawResponse(), getFormat());
- } finally {
- this.close();
- }
- }
- return entity;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/ODataStreamUpdateRequest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/ODataStreamUpdateRequest.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/ODataStreamUpdateRequest.java
deleted file mode 100644
index 0c3f77d..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/ODataStreamUpdateRequest.java
+++ /dev/null
@@ -1,132 +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 com.msopentech.odatajclient.engine.communication.request.streamed;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.engine.communication.request.ODataStreamManager;
-import com.msopentech.odatajclient.engine.communication.request.batch.ODataBatchableRequest;
-import com.msopentech.odatajclient.engine.communication.request.streamed.ODataStreamUpdateRequest.StreamUpdateStreamManager;
-import com.msopentech.odatajclient.engine.communication.response.ODataResponseImpl;
-import com.msopentech.odatajclient.engine.communication.response.ODataStreamUpdateResponse;
-import java.io.InputStream;
-import java.net.URI;
-import java.util.concurrent.TimeUnit;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-
-/**
- * This class implements an OData stream create/update request.
- * Get instance by using ODataStreamedRequestFactory.
- */
-public class ODataStreamUpdateRequest
- extends AbstractODataStreamedRequestImpl<ODataStreamUpdateResponse, StreamUpdateStreamManager>
- implements ODataBatchableRequest {
-
- private final InputStream stream;
-
- /**
- * Constructor.
- *
- * @param odataClient client instance getting this request
- * @param method request method.
- * @param targetURI target URI.
- * @param stream stream to be updated.
- */
- ODataStreamUpdateRequest(final ODataClient odataClient,
- final HttpMethod method, final URI targetURI, final InputStream stream) {
-
- super(odataClient, method, targetURI);
- this.stream = stream;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- protected StreamUpdateStreamManager getStreamManager() {
- if (streamManager == null) {
- streamManager = new StreamUpdateStreamManager(this.stream);
- }
-
- return (StreamUpdateStreamManager) streamManager;
- }
-
- public class StreamUpdateStreamManager extends ODataStreamManager<ODataStreamUpdateResponse> {
-
- /**
- * Private constructor.
- *
- * @param input payload input stream.
- */
- private StreamUpdateStreamManager(final InputStream input) {
- super(ODataStreamUpdateRequest.this.futureWrapper, input);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- protected ODataStreamUpdateResponse getResponse(final long timeout, final TimeUnit unit) {
- finalizeBody();
- return new ODataStreamUpdateResponseImpl(httpClient, getHttpResponse(timeout, unit));
- }
- }
-
- /**
- * Response class about an ODataStreamUpdateRequest.
- */
- private class ODataStreamUpdateResponseImpl extends ODataResponseImpl implements ODataStreamUpdateResponse {
-
- private InputStream input = null;
-
- /**
- * Constructor.
- * <p>
- * Just to create response templates to be initialized from batch.
- */
- private ODataStreamUpdateResponseImpl() {
- }
-
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- private ODataStreamUpdateResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
- }
-
- /**
- * Gets query result objects.
- * <br/>
- * <b>WARNING</b>: Closing this <tt>ODataResponse</tt> instance is left to the caller.
- *
- * @return query result objects as <tt>InputStream</tt>.
- */
- @Override
- public InputStream getBody() {
- if (input == null) {
- input = getRawResponse();
- }
- return input;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/ODataStreamedRequest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/ODataStreamedRequest.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/ODataStreamedRequest.java
deleted file mode 100644
index 4ed2e5d..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/ODataStreamedRequest.java
+++ /dev/null
@@ -1,40 +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 com.msopentech.odatajclient.engine.communication.request.streamed;
-
-import com.msopentech.odatajclient.engine.communication.request.ODataRequest;
-import com.msopentech.odatajclient.engine.communication.request.ODataStreamManager;
-import com.msopentech.odatajclient.engine.communication.response.ODataResponse;
-
-/**
- * Streamed OData request interface.
- *
- * @param <V> OData response type corresponding to the request implementation.
- * @param <T> OData request payload type corresponding to the request implementation.
- */
-public interface ODataStreamedRequest<V extends ODataResponse, T extends ODataStreamManager<V>>
- extends ODataRequest {
-
- /**
- * Streamed request execute.
- *
- * @return OData request payload manager object.
- */
- T execute();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/StreamedRequestFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/StreamedRequestFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/StreamedRequestFactory.java
deleted file mode 100644
index bf8e2bd..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/StreamedRequestFactory.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 com.msopentech.odatajclient.engine.communication.request.streamed;
-
-import java.io.InputStream;
-import java.io.Serializable;
-import java.net.URI;
-
-/**
- * OData request factory class.
- */
-public interface StreamedRequestFactory extends Serializable {
-
- /**
- * Gets a media entity create request object instance.
- * <br/>
- * Use this kind of request to create a new media entity.
- *
- * @param targetURI entity set URI.
- * @param media entity blob to be created.
- * @return new ODataMediaEntityCreateRequest instance.
- */
- ODataMediaEntityCreateRequest getMediaEntityCreateRequest(URI targetURI, InputStream media);
-
- /**
- * Gets a stream update request object instance.
- * <br/>
- * Use this kind of request to update a named stream property.
- *
- * @param targetURI target URI.
- * @param stream stream to be updated.
- * @return new ODataStreamUpdateRequest instance.
- */
- ODataStreamUpdateRequest getStreamUpdateRequest(URI targetURI, InputStream stream);
-
- /**
- * Gets a media entity update request object instance.
- * <br/>
- * Use this kind of request to update a media entity.
- *
- * @param editURI media entity edit link URI.
- * @param media entity blob to be updated.
- * @return new ODataMediaEntityUpdateRequest instance.
- */
- ODataMediaEntityUpdateRequest getMediaEntityUpdateRequest(URI editURI, InputStream media);
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/V3StreamedRequestFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/V3StreamedRequestFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/V3StreamedRequestFactory.java
deleted file mode 100644
index c93c039..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/V3StreamedRequestFactory.java
+++ /dev/null
@@ -1,31 +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 com.msopentech.odatajclient.engine.communication.request.streamed;
-
-import com.msopentech.odatajclient.engine.client.ODataV3Client;
-
-public class V3StreamedRequestFactory extends AbstractStreamedRequestFactory {
-
- private static final long serialVersionUID = 2255688283995758441L;
-
- public V3StreamedRequestFactory(final ODataV3Client client) {
- super(client);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/V4StreamedRequestFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/V4StreamedRequestFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/V4StreamedRequestFactory.java
deleted file mode 100644
index 74b155b..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/streamed/V4StreamedRequestFactory.java
+++ /dev/null
@@ -1,31 +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 com.msopentech.odatajclient.engine.communication.request.streamed;
-
-import com.msopentech.odatajclient.engine.client.ODataV4Client;
-
-public class V4StreamedRequestFactory extends AbstractStreamedRequestFactory {
-
- private static final long serialVersionUID = 960862845654673053L;
-
- public V4StreamedRequestFactory(final ODataV4Client client) {
- super(client);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataBatchResponse.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataBatchResponse.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataBatchResponse.java
deleted file mode 100644
index 443986a..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataBatchResponse.java
+++ /dev/null
@@ -1,37 +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 com.msopentech.odatajclient.engine.communication.response;
-
-import com.msopentech.odatajclient.engine.communication.request.batch.ODataBatchResponseItem;
-import java.util.Iterator;
-
-/**
- * This class implements a response to a batch request.
- *
- * @see com.msopentech.odatajclient.engine.communication.request.batch.ODataBatchRequest
- */
-public interface ODataBatchResponse extends ODataResponse {
-
- /**
- * Get all the batch response items.
- *
- * @return an iterator on batch response items.
- */
- Iterator<ODataBatchResponseItem> getBody();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataDeleteResponse.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataDeleteResponse.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataDeleteResponse.java
deleted file mode 100644
index 41bf8d6..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataDeleteResponse.java
+++ /dev/null
@@ -1,27 +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 com.msopentech.odatajclient.engine.communication.response;
-
-/**
- * This class implements the response to an OData delete request.
- *
- * @see com.msopentech.odatajclient.engine.communication.request.cud.ODataDeleteRequest
- */
-public interface ODataDeleteResponse extends ODataResponse {
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataEntityCreateResponse.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataEntityCreateResponse.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataEntityCreateResponse.java
deleted file mode 100644
index c86d697..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataEntityCreateResponse.java
+++ /dev/null
@@ -1,36 +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 com.msopentech.odatajclient.engine.communication.response;
-
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-
-/**
- * This class implements the response to an OData entity create request.
- *
- * @see com.msopentech.odatajclient.engine.communication.request.cud.ODataEntityCreateRequest
- */
-public interface ODataEntityCreateResponse extends ODataResponse {
-
- /**
- * Gets created object.
- *
- * @return created object.
- */
- ODataEntity getBody();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataEntityUpdateResponse.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataEntityUpdateResponse.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataEntityUpdateResponse.java
deleted file mode 100644
index 5607261..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataEntityUpdateResponse.java
+++ /dev/null
@@ -1,36 +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 com.msopentech.odatajclient.engine.communication.response;
-
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-
-/**
- * This class implements the response to an OData update request.
- *
- * @see com.msopentech.odatajclient.engine.communication.request.cud.ODataEntityUpdateRequest
- */
-public interface ODataEntityUpdateResponse extends ODataResponse {
-
- /**
- * Gets updated object.
- *
- * @return updated object.
- */
- ODataEntity getBody();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataInvokeResponse.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataInvokeResponse.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataInvokeResponse.java
deleted file mode 100644
index 4fe20bd..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataInvokeResponse.java
+++ /dev/null
@@ -1,36 +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 com.msopentech.odatajclient.engine.communication.response;
-
-import com.msopentech.odatajclient.engine.data.ODataInvokeResult;
-
-/**
- * This class implements a response to a specific invoke request.
- *
- * @see com.msopentech.odatajclient.engine.communication.request.invoke.ODataInvokeRequest
- */
-public interface ODataInvokeResponse<T extends ODataInvokeResult> extends ODataResponse {
-
- /**
- * Gets operation return value if exists.
- *
- * @return operation return value.
- */
- T getBody();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataLinkOperationResponse.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataLinkOperationResponse.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataLinkOperationResponse.java
deleted file mode 100644
index c0a474a..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataLinkOperationResponse.java
+++ /dev/null
@@ -1,28 +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 com.msopentech.odatajclient.engine.communication.response;
-
-/**
- * This interface defines the response to an OData link operation request.
- *
- * @see com.msopentech.odatajclient.engine.communication.request.cud.ODataLinkCreateRequest
- * @see com.msopentech.odatajclient.engine.communication.request.cud.ODataLinkUpdateRequest
- */
-public interface ODataLinkOperationResponse extends ODataResponse {
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataMediaEntityCreateResponse.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataMediaEntityCreateResponse.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataMediaEntityCreateResponse.java
deleted file mode 100644
index 177bc1d..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataMediaEntityCreateResponse.java
+++ /dev/null
@@ -1,36 +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 com.msopentech.odatajclient.engine.communication.response;
-
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-
-/**
- * This class implements the response to an Odata media entity create request.
- *
- * @see com.msopentech.odatajclient.engine.communication.request.streamed.ODataMediaEntityCreateRequest
- */
-public interface ODataMediaEntityCreateResponse extends ODataResponse {
-
- /**
- * Gets created object.
- *
- * @return created object.
- */
- ODataEntity getBody();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataMediaEntityUpdateResponse.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataMediaEntityUpdateResponse.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataMediaEntityUpdateResponse.java
deleted file mode 100644
index 79fec72..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataMediaEntityUpdateResponse.java
+++ /dev/null
@@ -1,36 +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 com.msopentech.odatajclient.engine.communication.response;
-
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-
-/**
- * This class implements the response to an Odata media entity update request.
- *
- * @see com.msopentech.odatajclient.engine.communication.request.streamed.ODataMediaEntityUpdateRequest
- */
-public interface ODataMediaEntityUpdateResponse extends ODataResponse {
-
- /**
- * Gets updated object.
- *
- * @return updated object.
- */
- ODataEntity getBody();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataPropertyUpdateResponse.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataPropertyUpdateResponse.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataPropertyUpdateResponse.java
deleted file mode 100644
index 43dd1a9..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataPropertyUpdateResponse.java
+++ /dev/null
@@ -1,36 +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 com.msopentech.odatajclient.engine.communication.response;
-
-import com.msopentech.odatajclient.engine.data.ODataProperty;
-
-/**
- * This class implements the response to an OData update entity property request.
- *
- * @see com.msopentech.odatajclient.engine.communication.request.cud.ODataPropertyUpdateRequest
- */
-public interface ODataPropertyUpdateResponse extends ODataResponse {
-
- /**
- * Gets updated object.
- *
- * @return updated object.
- */
- ODataProperty getBody();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataResponse.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataResponse.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataResponse.java
deleted file mode 100644
index 6adeba6..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataResponse.java
+++ /dev/null
@@ -1,117 +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 com.msopentech.odatajclient.engine.communication.response;
-
-import com.msopentech.odatajclient.engine.communication.header.ODataHeaders.HeaderName;
-import com.msopentech.odatajclient.engine.communication.request.batch.ODataBatchLineIterator;
-import java.io.InputStream;
-import java.util.Collection;
-import java.util.Map;
-
-/**
- * Abstract representation of an OData response.
- */
-public interface ODataResponse {
-
- /**
- * Gets header names.
- *
- * @return response header names.
- */
- Collection<String> getHeaderNames();
-
- /**
- * Gets header value of the given header.
- *
- * @param name header to be retrieved.
- * @return response header value.
- */
- Collection<String> getHeader(final String name);
-
- /**
- * Gets header value of the given header.
- *
- * @param name header to be retrieved.
- * @return response header value.
- */
- Collection<String> getHeader(final HeaderName name);
-
- /**
- * Gets 'ETag' header value.
- *
- * @return ETag header value, if provided
- */
- String getEtag();
-
- /**
- * Gets the content type.
- *
- * @return content type
- */
- String getContentType();
-
- /**
- * Gets status code.
- *
- * @return status code.
- */
- int getStatusCode();
-
- /**
- * Gets status message.
- *
- * @return status message.
- */
- String getStatusMessage();
-
- /**
- * Gets response body as InputStream.
- *
- * @return response body input stream.
- */
- InputStream getRawResponse();
-
- /**
- * Initializes response from batch response item.
- *
- * @param responseLine response line.
- * @param headers response headers.
- * @param batchLineIterator batch line iterator.
- * @param boundary batch boundary.
- */
- ODataResponse initFromBatch(
- final Map.Entry<Integer, String> responseLine,
- final Map<String, Collection<String>> headers,
- final ODataBatchLineIterator batchLineIterator,
- final String boundary);
-
- /**
- * Close the underlying message entity input stream (if available and open) as well as releases any other
- * resources associated with the response.
- * <p>
- * This operation is idempotent, i.e. it can be invoked multiple times with the same effect which also means that
- * calling the close() method on an already closed message instance is legal and has no further effect.
- * <p>
- * The close() method should be invoked on all instances that contain an un-consumed entity input stream to ensure
- * the resources associated with the instance are properly cleaned-up and prevent potential memory leaks.
- * This is typical for client-side scenarios where application layer code processes only the response headers and
- * ignores the response entity.
- */
- void close();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataResponseImpl.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataResponseImpl.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataResponseImpl.java
deleted file mode 100644
index c8d3489..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataResponseImpl.java
+++ /dev/null
@@ -1,276 +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 com.msopentech.odatajclient.engine.communication.response;
-
-import com.msopentech.odatajclient.engine.client.http.NoContentException;
-import com.msopentech.odatajclient.engine.communication.header.ODataHeaders;
-import com.msopentech.odatajclient.engine.communication.request.batch.ODataBatchUtilities;
-import com.msopentech.odatajclient.engine.communication.request.batch.ODataBatchController;
-import com.msopentech.odatajclient.engine.communication.request.batch.ODataBatchLineIterator;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.TreeMap;
-import org.apache.commons.io.IOUtils;
-import org.apache.http.Header;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.client.HttpClient;
-import org.slf4j.LoggerFactory;
-
-/**
- * Abstract representation of an OData response.
- */
-public abstract class ODataResponseImpl implements ODataResponse {
-
- /**
- * Logger.
- */
- protected static final org.slf4j.Logger LOG = LoggerFactory.getLogger(ODataResponse.class);
-
- /**
- * HTTP client.
- */
- protected final HttpClient client;
-
- /**
- * HTTP response.
- */
- protected final HttpResponse res;
-
- /**
- * Response headers.
- */
- protected final Map<String, Collection<String>> headers =
- new TreeMap<String, Collection<String>>(String.CASE_INSENSITIVE_ORDER);
-
- /**
- * Response code.
- */
- private int statusCode = -1;
-
- /**
- * Response message.
- */
- private String statusMessage = null;
-
- /**
- * Response body/payload.
- */
- private InputStream payload = null;
-
- /**
- * Initialization check.
- */
- private boolean hasBeenInitialized = false;
-
- /**
- * Batch info (if to be batched).
- */
- private ODataBatchController batchInfo = null;
-
- /**
- * Constructor.
- */
- public ODataResponseImpl() {
- this.client = null;
- this.res = null;
- }
-
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- public ODataResponseImpl(final HttpClient client, final HttpResponse res) {
- this.client = client;
- this.res = res;
-
- try {
- this.payload = this.res.getEntity() == null ? null : this.res.getEntity().getContent();
- } catch (Exception e) {
- LOG.error("Error retrieving payload", e);
- throw new IllegalStateException(e);
- }
-
- this.hasBeenInitialized = true;
-
- for (Header header : res.getAllHeaders()) {
- final Collection<String> headerValues;
- if (headers.containsKey(header.getName())) {
- headerValues = headers.get(header.getName());
- } else {
- headerValues = new HashSet<String>();
- headers.put(header.getName(), headerValues);
- }
-
- headerValues.add(header.getValue());
- }
-
- statusCode = res.getStatusLine().getStatusCode();
- statusMessage = res.getStatusLine().getReasonPhrase();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Collection<String> getHeaderNames() {
- return headers.keySet();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Collection<String> getHeader(final String name) {
- return headers.get(name);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Collection<String> getHeader(final ODataHeaders.HeaderName name) {
- return headers.get(name.toString());
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getEtag() {
- final Collection<String> etag = getHeader(ODataHeaders.HeaderName.etag);
- return etag == null || etag.isEmpty()
- ? null
- : etag.iterator().next();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getContentType() {
- final Collection<String> contentTypes = getHeader(ODataHeaders.HeaderName.contentType);
- return contentTypes == null || contentTypes.isEmpty()
- ? null
- : contentTypes.iterator().next();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public int getStatusCode() {
- return statusCode;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getStatusMessage() {
- return statusMessage;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ODataResponse initFromBatch(
- final Map.Entry<Integer, String> responseLine,
- final Map<String, Collection<String>> headers,
- final ODataBatchLineIterator batchLineIterator,
- final String boundary) {
-
- if (hasBeenInitialized) {
- throw new IllegalStateException("Request already initialized");
- }
-
- this.hasBeenInitialized = true;
-
- this.batchInfo = new ODataBatchController(batchLineIterator, boundary);
-
- this.statusCode = responseLine.getKey();
- this.statusMessage = responseLine.getValue();
- this.headers.putAll(headers);
-
- return this;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public void close() {
- if (client == null) {
- IOUtils.closeQuietly(payload);
- } else {
- this.client.getConnectionManager().shutdown();
- }
-
- if (batchInfo != null) {
- batchInfo.setValidBatch(false);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public InputStream getRawResponse() {
- if (HttpStatus.SC_NO_CONTENT == getStatusCode()) {
- throw new NoContentException();
- }
-
- if (payload == null && batchInfo.isValidBatch()) {
- // get input stream till the end of item
- payload = new PipedInputStream();
-
- try {
- final PipedOutputStream os = new PipedOutputStream((PipedInputStream) payload);
-
- new Thread(new Runnable() {
-
- @Override
- public void run() {
- try {
- ODataBatchUtilities.readBatchPart(batchInfo, os, true);
- } catch (Exception e) {
- LOG.error("Error streaming batch item payload", e);
- } finally {
- IOUtils.closeQuietly(os);
- }
- }
- }).start();
-
- } catch (IOException e) {
- LOG.error("Error streaming payload response", e);
- throw new IllegalStateException(e);
- }
- }
-
- return payload;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataRetrieveResponse.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataRetrieveResponse.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataRetrieveResponse.java
deleted file mode 100644
index a21c13c..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataRetrieveResponse.java
+++ /dev/null
@@ -1,34 +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 com.msopentech.odatajclient.engine.communication.response;
-
-/**
- * This class implements a response to a specific query request.
- *
- * @see com.msopentech.odatajclient.engine.communication.request.retrieve.ODataRetrieveRequest
- */
-public interface ODataRetrieveResponse<T> extends ODataResponse {
-
- /**
- * Gets query result objects.
- *
- * @return query result objects.
- */
- T getBody();
-}
[28/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/LinkTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/LinkTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/LinkTestITCase.java
deleted file mode 100644
index 284334e..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/LinkTestITCase.java
+++ /dev/null
@@ -1,177 +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 com.msopentech.odatajclient.engine.it;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertNotNull;
-
-import com.msopentech.odatajclient.engine.communication.request.UpdateType;
-import com.msopentech.odatajclient.engine.communication.request.cud.ODataLinkCreateRequest;
-import com.msopentech.odatajclient.engine.communication.request.cud.ODataLinkUpdateRequest;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataLinkCollectionRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataLinkOperationResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.data.ODataLink;
-import com.msopentech.odatajclient.engine.data.ODataLinkCollection;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import java.io.IOException;
-import java.net.URI;
-import java.util.Collections;
-import java.util.List;
-import org.junit.Test;
-
-/**
- * This is the unit test class to check basic link operations.
- */
-public class LinkTestITCase extends AbstractTestITCase {
-
- protected String getServiceRoot() {
- return testStaticServiceRootURL;
- }
-
- private ODataLinkCollection doRetrieveLinkURIs(final ODataFormat format, final String linkname) throws IOException {
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot()).
- appendEntityTypeSegment("Customer").appendKeySegment(-10);
-
- final ODataLinkCollectionRequest req =
- client.getRetrieveRequestFactory().getLinkCollectionRequest(uriBuilder.build(), linkname);
- req.setFormat(format);
-
- final ODataRetrieveResponse<ODataLinkCollection> res = req.execute();
- assertEquals(200, res.getStatusCode());
-
- return res.getBody();
- }
-
- private void retrieveLinkURIs(final ODataFormat format) throws IOException {
- final List<URI> links = doRetrieveLinkURIs(format, "Logins").getLinks();
- assertEquals(2, links.size());
- assertTrue(links.contains(URI.create(getServiceRoot() + "/Login('1')")));
- assertTrue(links.contains(URI.create(getServiceRoot() + "/Login('4')")));
- }
-
- @Test
- public void retrieveXMLLinkURIsWithNext() throws IOException {
- final ODataLinkCollection uris = doRetrieveLinkURIs(ODataFormat.XML, "Orders");
- assertEquals(2, uris.getLinks().size());
- assertNotNull(uris.getNext());
- }
-
- @Test
- public void retrieveXMLLinkURIs() throws IOException {
- retrieveLinkURIs(ODataFormat.XML);
- }
-
- @Test
- public void retrieveJSONLinkURIs() throws IOException {
- retrieveLinkURIs(ODataFormat.JSON);
- }
-
- private void createLink(final ODataFormat format) throws IOException {
- // 1. read current Logins $links (for later usage)
- final List<URI> before = doRetrieveLinkURIs(format, "Logins").getLinks();
- assertEquals(2, before.size());
-
- // 2. create new link
- final ODataLink newLink = client.getObjectFactory().
- newAssociationLink(null, URI.create(getServiceRoot() + "/Login('3')"));
-
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot()).
- appendEntityTypeSegment("Customer").appendKeySegment(-10).appendLinksSegment("Logins");
-
- final ODataLinkCreateRequest req =
- client.getCUDRequestFactory().getLinkCreateRequest(uriBuilder.build(), newLink);
- req.setFormat(format);
-
- final ODataLinkOperationResponse res = req.execute();
- assertEquals(204, res.getStatusCode());
-
- final List<URI> after = doRetrieveLinkURIs(format, "Logins").getLinks();
- assertEquals(before.size() + 1, after.size());
-
- // 3. reset Logins $links as before this test was run
- after.removeAll(before);
- assertEquals(Collections.singletonList(newLink.getLink()), after);
-
- assertEquals(204, client.getCUDRequestFactory().getDeleteRequest(
- client.getURIBuilder(getServiceRoot()).appendEntityTypeSegment("Customer").
- appendKeySegment(-10).appendLinksSegment("Logins('3')").build()).execute().getStatusCode());
- }
-
- @Test
- public void createXMLLink() throws IOException {
- createLink(ODataFormat.XML);
- }
-
- @Test
- public void createJSONLink() throws IOException {
- createLink(ODataFormat.JSON);
- }
-
- private void updateLink(final ODataFormat format, final UpdateType updateType) throws IOException {
- // 1. read what is the link before the test runs
- final URI before = doRetrieveLinkURIs(format, "Info").getLinks().get(0);
-
- // 2. update the link
- ODataLink newLink =
- client.getObjectFactory().newAssociationLink(null, URI.create(getServiceRoot() + "/CustomerInfo(12)"));
-
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot());
- uriBuilder.appendEntityTypeSegment("Customer").appendKeySegment(-10).appendLinksSegment("Info");
-
- ODataLinkUpdateRequest req =
- client.getCUDRequestFactory().getLinkUpdateRequest(uriBuilder.build(), updateType, newLink);
- req.setFormat(format);
-
- ODataLinkOperationResponse res = req.execute();
- assertEquals(204, res.getStatusCode());
-
- URI after = doRetrieveLinkURIs(format, "Info").getLinks().get(0);
- assertNotEquals(before, after);
- assertEquals(newLink.getLink(), after);
-
- // 3. reset back the link value
- newLink = client.getObjectFactory().newAssociationLink(null, before);
- req = client.getCUDRequestFactory().getLinkUpdateRequest(uriBuilder.build(), updateType, newLink);
- req.setFormat(format);
-
- res = req.execute();
- assertEquals(204, res.getStatusCode());
-
- after = doRetrieveLinkURIs(format, "Info").getLinks().get(0);
- assertEquals(before, after);
- }
-
- @Test
- public void updateXMLLink() throws IOException {
- updateLink(ODataFormat.XML, UpdateType.MERGE);
- updateLink(ODataFormat.XML, UpdateType.PATCH);
- updateLink(ODataFormat.XML, UpdateType.REPLACE);
- }
-
- @Test
- public void updateJSONLink() throws IOException {
- updateLink(ODataFormat.JSON, UpdateType.MERGE);
- updateLink(ODataFormat.JSON, UpdateType.PATCH);
- updateLink(ODataFormat.JSON, UpdateType.REPLACE);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/MediaEntityTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/MediaEntityTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/MediaEntityTestITCase.java
deleted file mode 100644
index ceed78d..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/MediaEntityTestITCase.java
+++ /dev/null
@@ -1,210 +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 com.msopentech.odatajclient.engine.it;
-
-import static com.msopentech.odatajclient.engine.it.AbstractTestITCase.testDefaultServiceRootURL;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import com.msopentech.odatajclient.engine.client.http.HttpClientException;
-import com.msopentech.odatajclient.engine.communication.ODataClientErrorException;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataMediaRequest;
-import com.msopentech.odatajclient.engine.communication.request.streamed.ODataMediaEntityCreateRequest;
-import com.msopentech.odatajclient.engine.communication.request.streamed.ODataMediaEntityCreateRequest.MediaEntityCreateStreamManager;
-import com.msopentech.odatajclient.engine.communication.request.streamed.ODataMediaEntityUpdateRequest;
-import com.msopentech.odatajclient.engine.communication.request.streamed.ODataMediaEntityUpdateRequest.MediaEntityUpdateStreamManager;
-import com.msopentech.odatajclient.engine.communication.request.streamed.ODataStreamUpdateRequest;
-import com.msopentech.odatajclient.engine.communication.request.streamed.ODataStreamUpdateRequest.StreamUpdateStreamManager;
-import com.msopentech.odatajclient.engine.communication.response.ODataMediaEntityCreateResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataMediaEntityUpdateResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataStreamUpdateResponse;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.data.ODataProperty;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import com.msopentech.odatajclient.engine.format.ODataMediaFormat;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import org.apache.commons.io.IOUtils;
-import org.junit.Test;
-
-public class MediaEntityTestITCase extends AbstractTestITCase {
-
- @Test
- public void read() throws Exception {
- final URIBuilder builder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment("Car").appendKeySegment(12).appendValueSegment();
-
- final ODataMediaRequest retrieveReq = client.getRetrieveRequestFactory().getMediaRequest(builder.build());
- retrieveReq.setFormat(ODataMediaFormat.WILDCARD);
-
- final ODataRetrieveResponse<InputStream> retrieveRes = retrieveReq.execute();
- assertEquals(200, retrieveRes.getStatusCode());
-
- final byte[] actual = new byte[Integer.parseInt(retrieveRes.getHeader("Content-Length").iterator().next())];
- IOUtils.read(retrieveRes.getBody(), actual, 0, actual.length);
- }
-
- @Test(expected = ODataClientErrorException.class)
- public void readWithXmlError() throws Exception {
- final URIBuilder builder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment("Car").appendKeySegment(12).appendValueSegment();
-
- final ODataMediaRequest retrieveReq = client.getRetrieveRequestFactory().getMediaRequest(builder.build());
- retrieveReq.setFormat(ODataMediaFormat.APPLICATION_XML);
-
- retrieveReq.execute();
- }
-
- @Test(expected = ODataClientErrorException.class)
- public void readWithJsonError() throws Exception {
- final URIBuilder builder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment("Car").appendKeySegment(12).appendValueSegment();
-
- final ODataMediaRequest retrieveReq = client.getRetrieveRequestFactory().getMediaRequest(builder.build());
- retrieveReq.setFormat(ODataMediaFormat.APPLICATION_JSON);
-
- retrieveReq.execute();
- }
-
- @Test
- public void updateMediaEntityAsAtom() throws Exception {
- updateMediaEntity(ODataPubFormat.ATOM, 14);
- }
-
- @Test
- public void updateMediaEntityAsJson() throws Exception {
- updateMediaEntity(ODataPubFormat.JSON, 15);
- }
-
- @Test
- public void createMediaEntityAsAtom() throws Exception {
- createMediaEntity(ODataPubFormat.ATOM, IOUtils.toInputStream("buffered stream sample"));
- }
-
- @Test
- public void createMediaEntityAsJson() throws Exception {
- createMediaEntity(ODataPubFormat.JSON, IOUtils.toInputStream("buffered stream sample"));
- }
-
- @Test
- public void issue137() throws Exception {
- createMediaEntity(ODataPubFormat.JSON, this.getClass().getResourceAsStream("/sample.png"));
- }
-
- @Test
- public void issue136() throws Exception {
- byte[] input = new byte[65000];
- for (int i = 0; i < 65000; i++) {
- input[i] = (byte) i;
- }
- createMediaEntity(ODataPubFormat.ATOM, new ByteArrayInputStream(input));
- }
-
- @Test(expected = HttpClientException.class)
- public void issue136FailsWithException() throws Exception {
- byte[] input = new byte[68000];
- for (int i = 0; i < 68000; i++) {
- input[i] = (byte) i;
- }
- createMediaEntity(ODataPubFormat.ATOM, new ByteArrayInputStream(input));
- }
-
- @Test
- public void updateNamedStream() throws Exception {
- URIBuilder builder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment("Car").appendKeySegment(16).appendStructuralSegment("Photo");
-
- final String TO_BE_UPDATED = "buffered stream sample";
- final InputStream input = new ByteArrayInputStream(TO_BE_UPDATED.getBytes());
-
- final ODataStreamUpdateRequest updateReq =
- client.getStreamedRequestFactory().getStreamUpdateRequest(builder.build(), input);
-
- final StreamUpdateStreamManager streamManager = updateReq.execute();
- final ODataStreamUpdateResponse updateRes = streamManager.getResponse();
- updateRes.close();
- assertEquals(204, updateRes.getStatusCode());
-
- final ODataMediaRequest retrieveReq = client.getRetrieveRequestFactory().getMediaRequest(builder.build());
-
- final ODataRetrieveResponse<InputStream> retrieveRes = retrieveReq.execute();
- assertEquals(200, retrieveRes.getStatusCode());
- assertEquals(TO_BE_UPDATED, IOUtils.toString(retrieveRes.getBody()));
- }
-
- private void updateMediaEntity(final ODataPubFormat format, final int id) throws Exception {
- URIBuilder builder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment("Car").appendKeySegment(id).appendValueSegment();
-
- final String TO_BE_UPDATED = "new buffered stream sample";
- final InputStream input = IOUtils.toInputStream(TO_BE_UPDATED);
-
- final ODataMediaEntityUpdateRequest updateReq =
- client.getStreamedRequestFactory().getMediaEntityUpdateRequest(builder.build(), input);
- updateReq.setFormat(format);
-
- final MediaEntityUpdateStreamManager streamManager = updateReq.execute();
- final ODataMediaEntityUpdateResponse updateRes = streamManager.getResponse();
- assertEquals(204, updateRes.getStatusCode());
-
- builder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment("Car").appendKeySegment(id).appendValueSegment();
-
- final ODataMediaRequest retrieveReq = client.getRetrieveRequestFactory().getMediaRequest(builder.build());
-
- final ODataRetrieveResponse<InputStream> retrieveRes = retrieveReq.execute();
- assertEquals(200, retrieveRes.getStatusCode());
- assertEquals(TO_BE_UPDATED, IOUtils.toString(retrieveRes.getBody()));
- }
-
- private void createMediaEntity(final ODataPubFormat format, final InputStream input) throws Exception {
- final URIBuilder builder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntitySetSegment("Car");
-
- final ODataMediaEntityCreateRequest createReq =
- client.getStreamedRequestFactory().getMediaEntityCreateRequest(builder.build(), input);
- createReq.setFormat(format);
-
- final MediaEntityCreateStreamManager streamManager = createReq.execute();
- final ODataMediaEntityCreateResponse createRes = streamManager.getResponse();
- assertEquals(201, createRes.getStatusCode());
-
- final ODataEntity created = createRes.getBody();
- assertNotNull(created);
- assertEquals(2, created.getProperties().size());
-
- Integer id = null;
- for (ODataProperty prop : created.getProperties()) {
- if ("VIN".equals(prop.getName())) {
- id = prop.getPrimitiveValue().<Integer>toCastValue();
- }
- }
- assertNotNull(id);
-
- builder.appendKeySegment(id).appendValueSegment();
-
- final ODataMediaRequest retrieveReq = client.getRetrieveRequestFactory().getMediaRequest(builder.build());
-
- final ODataRetrieveResponse<InputStream> retrieveRes = retrieveReq.execute();
- assertEquals(200, retrieveRes.getStatusCode());
- assertNotNull(retrieveRes.getBody());
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/MediaEntityUpdateTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/MediaEntityUpdateTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/MediaEntityUpdateTestITCase.java
deleted file mode 100644
index 3c6d1c9..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/MediaEntityUpdateTestITCase.java
+++ /dev/null
@@ -1,155 +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 com.msopentech.odatajclient.engine.it;
-
-import static org.junit.Assert.*;
-
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataMediaRequest;
-import com.msopentech.odatajclient.engine.communication.request.streamed.ODataMediaEntityUpdateRequest;
-import com.msopentech.odatajclient.engine.communication.request.streamed.ODataMediaEntityUpdateRequest.MediaEntityUpdateStreamManager;
-import java.io.InputStream;
-import java.net.URI;
-
-import org.apache.commons.lang3.StringUtils;
-import org.junit.Test;
-
-import com.msopentech.odatajclient.engine.communication.response.ODataMediaEntityUpdateResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.io.input.BoundedInputStream;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-
-public class MediaEntityUpdateTestITCase extends AbstractTestITCase {
-
- private void updateMediaEntity(
- final ODataPubFormat format,
- final String prefer,
- final String image,
- final int id) throws Exception {
-
- URIBuilder builder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment("Car").appendKeySegment(id).appendValueSegment();
-
- // The sample service has an upload request size of 65k
- InputStream input = new BoundedInputStream(getClass().getResourceAsStream(image), 65000);
- final byte[] expected = new byte[65000];
- IOUtils.read(input, expected, 0, expected.length);
- IOUtils.closeQuietly(input);
-
- input = new BoundedInputStream(getClass().getResourceAsStream(image), 65000);
-
- final ODataMediaEntityUpdateRequest updateReq =
- client.getStreamedRequestFactory().getMediaEntityUpdateRequest(builder.build(), input);
- updateReq.setFormat(format);
- updateReq.setPrefer(prefer);
- final URI uri = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment("Car").appendKeySegment(id).build();
- final String etag = getETag(uri);
- if (StringUtils.isNotBlank(etag)) {
- updateReq.setIfMatch(etag);
- }
- final MediaEntityUpdateStreamManager streamManager = updateReq.execute();
- final ODataMediaEntityUpdateResponse updateRes = streamManager.getResponse();
- assertEquals(204, updateRes.getStatusCode());
-
- builder = client.getURIBuilder(testDefaultServiceRootURL).
- appendEntityTypeSegment("Car").appendKeySegment(id).appendValueSegment();
-
- final ODataMediaRequest retrieveReq = client.getRetrieveRequestFactory().getMediaRequest(builder.build());
-
- final ODataRetrieveResponse<InputStream> retrieveRes = retrieveReq.execute();
- assertEquals(200, retrieveRes.getStatusCode());
-
- final byte[] actual = new byte[65000];
- IOUtils.read(retrieveRes.getBody(), actual, 0, actual.length);
- assertTrue(new EqualsBuilder().append(expected, actual).isEquals());
- }
- // update media with JSON full metadata
-
- @Test
- public void updateMediaWithJSON() {
- ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- String prefer = "return-content";
- String media1 = "/images/big_buck_bunny.mp4";
- String media2 = "/images/Renault.jpg";
- String media3 = "/images/image1.png";
- String media4 = "/images/20051210-w50s.flv";
- int id = 11;
- try {
- updateMediaEntity(format, prefer, media1, id);
- updateMediaEntity(format, prefer, media2, id);
- updateMediaEntity(format, prefer, media3, id);
- updateMediaEntity(format, prefer, media4, id);
- } catch (Exception e) {
- fail(e.getMessage());
- } catch (AssertionError e) {
- fail(e.getMessage());
- }
- }
- // update media with ATOM
-
- @Test
- public void updateMediaWithATOM() {
- ODataPubFormat format = ODataPubFormat.ATOM;
- String prefer = "return-content";
- String media = "/images/big_buck_bunny.mp4";
- int id = 12;
- try {
- updateMediaEntity(format, prefer, media, id);
- } catch (Exception e) {
- fail(e.getMessage());
- } catch (AssertionError e) {
- fail(e.getMessage());
- }
- }
- // update media with JSON minimla metadata
-
- @Test
- public void updateMediaWithJSONMinimal() {
- ODataPubFormat format = ODataPubFormat.JSON;
- String prefer = "return-content";
- String media = "/images/big_buck_bunny.mp4";
- int id = 13;
- try {
- updateMediaEntity(format, prefer, media, id);
- } catch (Exception e) {
- fail(e.getMessage());
- } catch (AssertionError e) {
- fail(e.getMessage());
- }
- }
- // update media with JSON no metadata
-
- @Test
- public void updateMediaWithJSONNoMetadata() {
- ODataPubFormat format = ODataPubFormat.JSON_NO_METADATA;
- String prefer = "return-content";
- String media = "/images/big_buck_bunny.mp4";
- int id = 14;
- try {
- updateMediaEntity(format, prefer, media, id);
- } catch (Exception e) {
- fail(e.getMessage());
- } catch (AssertionError e) {
- fail(e.getMessage());
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/MetadataRetrieveTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/MetadataRetrieveTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/MetadataRetrieveTestITCase.java
deleted file mode 100644
index d987971..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/MetadataRetrieveTestITCase.java
+++ /dev/null
@@ -1,145 +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 com.msopentech.odatajclient.engine.it;
-
-import static org.junit.Assert.*;
-
-import java.util.List;
-
-import org.junit.Test;
-
-import com.msopentech.odatajclient.engine.communication.ODataClientErrorException;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataV3MetadataRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.metadata.EdmType;
-import com.msopentech.odatajclient.engine.metadata.EdmV3Metadata;
-import com.msopentech.odatajclient.engine.metadata.EdmV3Type;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntityType;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.EntityType;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-
-public class MetadataRetrieveTestITCase extends AbstractTestITCase {
-
- private void retreiveMetadataTest(final ODataPubFormat reqFormat, final String acceptFormat) {
- // testing entity types which are not open
- final ODataV3MetadataRequest req = client.getRetrieveRequestFactory().
- getMetadataRequest(testStaticServiceRootURL);
- req.setFormat(reqFormat);
- req.setAccept(acceptFormat);
- try {
- final ODataRetrieveResponse<EdmV3Metadata> res = req.execute();
- final EdmV3Metadata metadata = res.getBody();
- assertNotNull(metadata);
- assertEquals(24, metadata.getSchemas().get(0).getEntityContainers().get(0).getEntitySets().size());
- final EdmType productCollection =
- new EdmV3Type(metadata, "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Product)");
- assertTrue(productCollection.isCollection());
- assertFalse(productCollection.isSimpleType());
- assertFalse(productCollection.isEnumType());
- assertFalse(productCollection.isComplexType());
- assertTrue(productCollection.isEntityType());
- final AbstractEntityType type = productCollection.getEntityType();
- assertNotNull(type);
- assertFalse(type.isOpenType());
- assertEquals("Product", type.getName());
- final EdmType stream = new EdmV3Type(metadata, "Edm.Stream");
- assertNotNull(stream);
- assertTrue(stream.isSimpleType());
- assertFalse(stream.isCollection());
- assertFalse(stream.isEnumType());
- assertFalse(stream.isComplexType());
- assertFalse(stream.isEntityType());
- final EdmType customerCollection =
- new EdmV3Type(metadata, "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Customer)");
- final AbstractEntityType customer = customerCollection.getEntityType();
- assertNotNull(type);
- assertFalse(customer.isOpenType());
- assertEquals("Customer", customer.getName());
-
- //testing open types
- ODataV3MetadataRequest req1 =
- client.getRetrieveRequestFactory().getMetadataRequest(testOpenTypeServiceRootURL);
-
- req.setFormat(reqFormat);
- req.setAccept(acceptFormat);
- final ODataRetrieveResponse<EdmV3Metadata> res1 = req1.execute();
- final EdmV3Metadata metadata1 = res1.getBody();
- List<EntityType> types = metadata1.getSchema(0).getEntityTypes();
- for (int i = 0; i < types.size(); i++) {
- assertTrue(types.get(0).isOpenType());
- }
- } catch (ODataClientErrorException e) {
- assertEquals(415, e.getStatusLine().getStatusCode());
- }
- }
-
- @Test
- public void jsonTest() {
- retreiveMetadataTest(ODataPubFormat.JSON, "application/json");
- }
-
- @Test
- public void atomTest() {
- retreiveMetadataTest(ODataPubFormat.ATOM, "application/atom+xml");
- }
-
- @Test
- public void xmlTest() {
- retreiveMetadataTest(ODataPubFormat.JSON, "application/xml");
- }
-
- @Test
- public void fullMetadataTest() {
- retreiveMetadataTest(ODataPubFormat.JSON_FULL_METADATA, "application/json");
- }
-
- @Test
- public void noMetadataTest() {
- retreiveMetadataTest(ODataPubFormat.JSON_NO_METADATA, "application/json");
- }
-
- @Test
- public void nullAcceptTest() {
- retreiveMetadataTest(ODataPubFormat.JSON_NO_METADATA, null);
- }
-
- @Test
- public void nullFormatTest() {
- retreiveMetadataTest(null, "application/json");
- }
-
- @Test
- public void atomWithNoAcceptTest() {
- retreiveMetadataTest(ODataPubFormat.ATOM, null);
- }
-
- @Test
- public void noFormatTest() {
- retreiveMetadataTest(null, "application/xml");
- }
-
- @Test
- public void large() {
- final EdmV3Metadata metadata = client.getRetrieveRequestFactory().
- getMetadataRequest(testLargeModelServiceRootURL).execute().getBody();
- assertNotNull(metadata);
-
- assertEquals(400, metadata.getSchemas().get(0).getEntityContainers().get(0).getEntitySets().size());
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/NavigationLinkCreateTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/NavigationLinkCreateTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/NavigationLinkCreateTestITCase.java
deleted file mode 100644
index 75f0394..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/NavigationLinkCreateTestITCase.java
+++ /dev/null
@@ -1,515 +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 com.msopentech.odatajclient.engine.it;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.junit.Test;
-
-import com.msopentech.odatajclient.engine.client.http.HttpClientException;
-import com.msopentech.odatajclient.engine.communication.request.cud.ODataDeleteRequest;
-import com.msopentech.odatajclient.engine.communication.request.cud.ODataEntityCreateRequest;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataEntityRequest;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataEntitySetRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataDeleteResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataEntityCreateResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.data.ODataCollectionValue;
-import com.msopentech.odatajclient.engine.data.ODataComplexValue;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.data.ODataEntitySet;
-import com.msopentech.odatajclient.engine.data.ODataInlineEntity;
-import com.msopentech.odatajclient.engine.data.ODataInlineEntitySet;
-import com.msopentech.odatajclient.engine.data.ODataLink;
-import com.msopentech.odatajclient.engine.data.ODataProperty;
-import com.msopentech.odatajclient.engine.data.ODataValue;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import com.msopentech.odatajclient.engine.utils.URIUtils;
-import org.junit.Ignore;
-
-public class NavigationLinkCreateTestITCase extends AbstractTestITCase {
-
- // create navigation link with ATOM
- @Test
- public void createNavWithAtom() {
- final ODataPubFormat format = ODataPubFormat.ATOM;
- final String contentType = "application/atom+xml";
- final String prefer = "return-content";
- final ODataEntity actual = createNavigation(format, 20, contentType, prefer);
- delete(format, actual, false, testStaticServiceRootURL);
- }
- // create navigation link with JSON full metadata
-
- @Test
- public void createNavWithJSONFullMetadata() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final String contentType = "application/json;odata=fullmetadata";
- final String prefer = "return-content";
- final ODataEntity actual = createNavigation(format, 21, contentType, prefer);
- delete(format, actual, false, testStaticServiceRootURL);
- }
- // throws Null pointer exception when the format is JSON No metadata
-
- @Test(expected = HttpClientException.class)
- public void createNavWithJSONNoMetadata() {
- final ODataPubFormat format = ODataPubFormat.JSON_NO_METADATA;
- final String contentType = "application/json;odata=nometadata";
- final String prefer = "return-content";
- final ODataEntity actual = createNavigation(format, 22, contentType, prefer);
- delete(format, actual, false, testStaticServiceRootURL);
- }
- // test with JSON accept and atom content type
-
- @Test
- @Ignore
- public void createNavWithJSONAndATOM() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final String contentType = "application/atom+xml";
- final String prefer = "return-content";
- final ODataEntity actual = createNavigation(format, 23, contentType, prefer);
- delete(format, actual, false, testStaticServiceRootURL);
- }
- // test with JSON full metadata in format and json no metadata in content type
-
- @Test
- public void createNavWithDiffJSON() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final String contentType = "application/json;odata=nometadata";
- final String prefer = "return-content";
- final ODataEntity actual = createNavigation(format, 24, contentType, prefer);
- delete(format, actual, false, testStaticServiceRootURL);
- }
- // test with JSON no metadata format and json no metadata in content type
-
- @Test(expected = HttpClientException.class)
- public void createNavWithNoMetadata() {
- final ODataPubFormat format = ODataPubFormat.JSON_NO_METADATA;
- final String contentType = "application/json;odata=fullmetadata";
- final String prefer = "return-content";
- final ODataEntity actual = createNavigation(format, 25, contentType, prefer);
- delete(format, actual, false, testStaticServiceRootURL);
- }
- // create collection navigation link with ATOM
-
- @Test
- public void createCollectionNavWithAtom() {
- final ODataPubFormat format = ODataPubFormat.ATOM;
- final String contentType = "application/atom+xml";
- final String prefer = "return-content";
- final ODataEntity actual = createCollectionNavigation(format, 55, contentType, prefer);
- delete(format, actual, false, testStaticServiceRootURL);
- }
- // create collection navigation link with JSON
-
- @Test
- public void createCollectionNavWithJSON() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final String contentType = "application/json;odata=fullmetadata";
- final String prefer = "return-content";
- final ODataEntity actual = createCollectionNavigation(format, 77, contentType, prefer);
- delete(format, actual, false, testStaticServiceRootURL);
- }
-
- // create a navigation link
- public ODataEntity createNavigation(final ODataPubFormat format, final int id, final String contenttype,
- final String prefer) {
- final String name = "Customer Navigation test";
-
- final ODataEntity original = getNewCustomer(id, name, false);
- original.addLink(client.getObjectFactory().newEntityNavigationLink(
- "Info", URI.create(testStaticServiceRootURL + "/CustomerInfo(11)")));
- final ODataEntity created = createNav(testStaticServiceRootURL, format, original, "Customer", contenttype,
- prefer);
-
- final ODataEntity actual = validateEntities(testStaticServiceRootURL, format, created, id, null, "Customer");
-
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL);
- uriBuilder.appendEntityTypeSegment("Customer").appendKeySegment(id).appendEntityTypeSegment("Info");
-
- final ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setFormat(format);
- req.setContentType(contenttype);
- req.setPrefer(prefer);
- final ODataRetrieveResponse<ODataEntity> res = req.execute();
- assertEquals(200, res.getStatusCode());
- assertTrue(res.getHeader("DataServiceVersion").contains("3.0;"));
- final ODataEntity entity = res.getBody();
- assertNotNull(entity);
- for (ODataProperty prop : entity.getProperties()) {
- if ("CustomerInfoId".equals(prop.getName())) {
- assertEquals("11", prop.getValue().toString());
- }
- }
- return actual;
- }
-
- // create a navigation link
- public ODataEntity createNav(final String url, final ODataPubFormat format, final ODataEntity original,
- final String entitySetName, final String contentType, final String prefer) {
- final URIBuilder uriBuilder = client.getURIBuilder(url);
- uriBuilder.appendEntitySetSegment(entitySetName);
- final ODataEntityCreateRequest createReq =
- client.getCUDRequestFactory().getEntityCreateRequest(uriBuilder.build(), original);
- createReq.setFormat(format);
- createReq.setContentType(contentType);
- createReq.setPrefer(prefer);
- final ODataEntityCreateResponse createRes = createReq.execute();
- assertEquals(201, createRes.getStatusCode());
-
- assertEquals("Created", createRes.getStatusMessage());
-
- final ODataEntity created = createRes.getBody();
- assertNotNull(created);
- return created;
- }
- // create collection navigation link
-
- public ODataEntity createCollectionNavigation(final ODataPubFormat format, final int id,
- final String contentType, final String prefer) {
- {
- final String name = "Collection Navigation Key Customer";
- final ODataEntity original = getNewCustomer(id, name, false);
-
- final Set<Integer> navigationKeys = new HashSet<Integer>();
- navigationKeys.add(-118);
- navigationKeys.add(-119);
-
- for (Integer key : navigationKeys) {
- final ODataEntity orderEntity =
- client.getObjectFactory().newEntity("Microsoft.Test.OData.Services.AstoriaDefaultService.Order");
-
- orderEntity.addProperty(client.getObjectFactory().newPrimitiveProperty("OrderId",
- client.getPrimitiveValueBuilder().setValue(key).setType(EdmSimpleType.Int32).build()));
- orderEntity.addProperty(client.getObjectFactory().newPrimitiveProperty("CustomerId",
- client.getPrimitiveValueBuilder().setValue(id).setType(EdmSimpleType.Int32).build()));
-
- final ODataEntityCreateRequest createReq = client.getCUDRequestFactory().getEntityCreateRequest(
- client.getURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Order").build(),
- orderEntity);
- createReq.setFormat(format);
- createReq.setContentType(contentType);
- original.addLink(client.getObjectFactory().newFeedNavigationLink(
- "Orders",
- createReq.execute().getBody().getEditLink()));
- }
- final ODataEntity createdEntity = createNav(testStaticServiceRootURL, format, original, "Customer",
- contentType, prefer);
- final ODataEntity actualEntity =
- validateEntities(testStaticServiceRootURL, format, createdEntity, id, null, "Customer");
-
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL);
- uriBuilder.appendEntityTypeSegment("Customer").appendKeySegment(id).appendEntityTypeSegment("Orders");
-
- final ODataEntitySetRequest req = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
- req.setFormat(format);
-
- final ODataRetrieveResponse<ODataEntitySet> res = req.execute();
- assertEquals(200, res.getStatusCode());
-
- final ODataEntitySet entitySet = res.getBody();
- assertNotNull(entitySet);
-
- assertEquals(2, entitySet.getCount());
-
- for (ODataEntity entity : entitySet.getEntities()) {
- final Integer key = entity.getProperty("OrderId").getPrimitiveValue().<Integer>toCastValue();
- final Integer customerId = entity.getProperty("CustomerId").getPrimitiveValue().<Integer>toCastValue();
- assertTrue(navigationKeys.contains(key));
- assertEquals(Integer.valueOf(id), customerId);
- navigationKeys.remove(key);
- final ODataDeleteRequest deleteReq = client.getCUDRequestFactory().getDeleteRequest(
- URIUtils.getURI(testStaticServiceRootURL, entity.getEditLink().toASCIIString()));
-
- deleteReq.setFormat(format);
- assertEquals(204, deleteReq.execute().getStatusCode());
- }
-
- return actualEntity;
- }
- }
- // get a Customer entity to be created
-
- public ODataEntity getNewCustomer(
- final int id, final String name, final boolean withInlineInfo) {
-
- final ODataEntity entity =
- client.getObjectFactory().newEntity("Microsoft.Test.OData.Services.AstoriaDefaultService.Customer");
-
- // add name attribute
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("Name",
- client.getPrimitiveValueBuilder().setText(name).setType(EdmSimpleType.String).build()));
-
- // add key attribute
- if (id != 0) {
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("CustomerId",
- client.getPrimitiveValueBuilder().setText(String.valueOf(id)).setType(EdmSimpleType.Int32).build()));
- }
- final ODataCollectionValue backupContactInfoValue = new ODataCollectionValue(
- "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)");
-
-
- final ODataComplexValue contactDetails = new ODataComplexValue(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails");
-
-
- final ODataCollectionValue altNamesValue = new ODataCollectionValue("Collection(Edm.String)");
- altNamesValue.add(client.getPrimitiveValueBuilder().
- setText("My Alternative name").setType(EdmSimpleType.String).build());
- contactDetails.add(client.getObjectFactory().newCollectionProperty("AlternativeNames", altNamesValue));
-
- final ODataCollectionValue emailBagValue = new ODataCollectionValue("Collection(Edm.String)");
- emailBagValue.add(client.getPrimitiveValueBuilder().
- setText("altname@mydomain.com").setType(EdmSimpleType.String).build());
- contactDetails.add(client.getObjectFactory().newCollectionProperty("EmailBag", emailBagValue));
-
- final ODataComplexValue contactAliasValue = new ODataComplexValue(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases");
- contactDetails.add(client.getObjectFactory().newComplexProperty("ContactAlias", contactAliasValue));
-
- final ODataCollectionValue aliasAltNamesValue = new ODataCollectionValue("Collection(Edm.String)");
- aliasAltNamesValue.add(client.getPrimitiveValueBuilder().
- setText("myAlternativeName").setType(EdmSimpleType.String).build());
- contactAliasValue.add(client.getObjectFactory().newCollectionProperty("AlternativeNames", aliasAltNamesValue));
-
- final ODataComplexValue homePhone = new ODataComplexValue(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone");
- homePhone.add(client.getObjectFactory().newPrimitiveProperty("PhoneNumber",
- client.getPrimitiveValueBuilder().setText("8437568356834568").setType(EdmSimpleType.String).build()));
- homePhone.add(client.getObjectFactory().newPrimitiveProperty("Extension",
- client.getPrimitiveValueBuilder().setText("124365426534621534423ttrf").setType(EdmSimpleType.String).
- build()));
- contactDetails.add(client.getObjectFactory().newComplexProperty("HomePhone", homePhone));
-
- backupContactInfoValue.add(contactDetails);
- entity.addProperty(client.getObjectFactory().newCollectionProperty("BackupContactInfo",
- backupContactInfoValue));
- if (withInlineInfo) {
- final ODataInlineEntity inlineInfo = client.getObjectFactory().newInlineEntity("Info", URI.create(
- "Customer(" + id
- + ")/Info"), getInfo(id, name + "_Info"));
- inlineInfo.getEntity().setMediaEntity(true);
- entity.addLink(inlineInfo);
- }
-
- return entity;
- }
- //delete an entity and associated links after creation
-
- public void delete(final ODataPubFormat format, final ODataEntity created, final boolean includeInline,
- final String baseUri) {
- final Set<URI> toBeDeleted = new HashSet<URI>();
- toBeDeleted.add(created.getEditLink());
-
- if (includeInline) {
- for (ODataLink link : created.getNavigationLinks()) {
- if (link instanceof ODataInlineEntity) {
- final ODataEntity inline = ((ODataInlineEntity) link).getEntity();
- if (inline.getEditLink() != null) {
- toBeDeleted.add(URIUtils.getURI(baseUri, inline.getEditLink().toASCIIString()));
- }
- }
-
- if (link instanceof ODataInlineEntitySet) {
- final ODataEntitySet inline = ((ODataInlineEntitySet) link).getEntitySet();
- for (ODataEntity entity : inline.getEntities()) {
- if (entity.getEditLink() != null) {
- toBeDeleted.add(URIUtils.getURI(baseUri, entity.getEditLink().toASCIIString()));
- }
- }
- }
- }
- }
- assertFalse(toBeDeleted.isEmpty());
-
- for (URI link : toBeDeleted) {
- final ODataDeleteRequest deleteReq = client.getCUDRequestFactory().getDeleteRequest(link);
- final ODataDeleteResponse deleteRes = deleteReq.execute();
-
- assertEquals(204, deleteRes.getStatusCode());
- assertEquals("No Content", deleteRes.getStatusMessage());
-
- deleteRes.close();
- }
- }
- // add Information property
-
- public ODataEntity getInfo(final int id, final String info) {
- final ODataEntity entity =
- client.getObjectFactory().newEntity("Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo");
- entity.setMediaEntity(true);
-
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("Information",
- client.getPrimitiveValueBuilder().setText(info).setType(EdmSimpleType.String).build()));
- return entity;
- }
- // validate newly created entities
-
- public ODataEntity validateEntities(final String serviceRootURL,
- final ODataPubFormat format,
- final ODataEntity original,
- final int actualObjectId,
- final Collection<String> expands, final String entitySetName) {
-
- final URIBuilder uriBuilder = client.getURIBuilder(serviceRootURL).
- appendEntityTypeSegment(entitySetName).appendKeySegment(actualObjectId);
-
- if (expands != null) {
- for (String expand : expands) {
- uriBuilder.expand(expand);
- }
- }
- final ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setFormat(format);
-
- final ODataRetrieveResponse<ODataEntity> res = req.execute();
- assertEquals(200, res.getStatusCode());
-
- final ODataEntity actual = res.getBody();
- assertNotNull(actual);
-
- validateLinks(original.getAssociationLinks(), actual.getAssociationLinks());
- validateLinks(original.getEditMediaLinks(), actual.getEditMediaLinks());
- validateLinks(original.getNavigationLinks(), actual.getNavigationLinks());
-
- checkProperties(original.getProperties(), actual.getProperties());
- return actual;
- }
- // compares links of the newly created entity with the previous
-
- public void validateLinks(final Collection<ODataLink> original, final Collection<ODataLink> actual) {
- assertTrue(original.size() <= actual.size());
-
- for (ODataLink originalLink : original) {
- ODataLink foundOriginal = null;
- ODataLink foundActual = null;
-
- for (ODataLink actualLink : actual) {
-
- if (actualLink.getType() == originalLink.getType()
- && (originalLink.getLink() == null
- || actualLink.getLink().toASCIIString().endsWith(originalLink.getLink().toASCIIString()))
- && actualLink.getName().equals(originalLink.getName())) {
-
- foundOriginal = originalLink;
- foundActual = actualLink;
- }
- }
-
- assertNotNull(foundOriginal);
- assertNotNull(foundActual);
-
- if (foundOriginal instanceof ODataInlineEntity && foundActual instanceof ODataInlineEntity) {
- final ODataEntity originalInline = ((ODataInlineEntity) foundOriginal).getEntity();
- assertNotNull(originalInline);
-
- final ODataEntity actualInline = ((ODataInlineEntity) foundActual).getEntity();
- assertNotNull(actualInline);
-
- checkProperties(originalInline.getProperties(), actualInline.getProperties());
- }
- }
- }
- // compares properties of the newly created entity with the properties that were originally provided
-
- public void checkProperties(final Collection<ODataProperty> original, final Collection<ODataProperty> actual) {
- assertTrue(original.size() <= actual.size());
-
- final Map<String, ODataProperty> actualProperties = new HashMap<String, ODataProperty>(actual.size());
-
- for (ODataProperty prop : actual) {
- assertFalse(actualProperties.containsKey(prop.getName()));
- actualProperties.put(prop.getName(), prop);
- }
-
- assertTrue(actual.size() <= actualProperties.size());
-
- for (ODataProperty prop : original) {
- assertNotNull(prop);
- if (actualProperties.containsKey(prop.getName())) {
- final ODataProperty actualProp = actualProperties.get(prop.getName());
- assertNotNull(actualProp);
-
- if (prop.getValue() != null && actualProp.getValue() != null) {
- checkPropertyValue(prop.getName(), prop.getValue(), actualProp.getValue());
- }
- }
- }
- }
- // compares property value of the newly created entity with the property value that were originally provided
-
- public void checkPropertyValue(final String propertyName,
- final ODataValue original, final ODataValue actual) {
-
- assertNotNull("Null original value for " + propertyName, original);
- assertNotNull("Null actual value for " + propertyName, actual);
-
- assertEquals("Type mismatch for '" + propertyName + "'",
- original.getClass().getSimpleName(), actual.getClass().getSimpleName());
-
- if (original.isComplex()) {
- final List<ODataProperty> originalPropertyValue = new ArrayList<ODataProperty>();
- for (ODataProperty prop : original.asComplex()) {
- originalPropertyValue.add(prop);
- }
-
- final List<ODataProperty> actualPropertyValue = new ArrayList<ODataProperty>();
- for (ODataProperty prop : (ODataComplexValue) actual) {
- actualPropertyValue.add(prop);
- }
-
- checkProperties(originalPropertyValue, actualPropertyValue);
- } else if (original.isCollection()) {
- assertTrue(original.asCollection().size() <= actual.asCollection().size());
-
- boolean found = original.asCollection().isEmpty();
-
- for (ODataValue originalValue : original.asCollection()) {
- for (ODataValue actualValue : actual.asCollection()) {
- try {
- checkPropertyValue(propertyName, originalValue, actualValue);
- found = true;
- } catch (AssertionError error) {
- }
- }
- }
-
- assertTrue("Found " + actual + " and expected " + original, found);
- } else {
- assertTrue("Primitive value for '" + propertyName + "' type mismatch",
- original.asPrimitive().getTypeName().equals(actual.asPrimitive().getTypeName()));
-
- assertEquals("Primitive value for '" + propertyName + "' mismatch",
- original.asPrimitive().toString(), actual.asPrimitive().toString());
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/NavigationLinkTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/NavigationLinkTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/NavigationLinkTestITCase.java
deleted file mode 100644
index 147ff52..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/NavigationLinkTestITCase.java
+++ /dev/null
@@ -1,126 +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 com.msopentech.odatajclient.engine.it;
-
-import static org.junit.Assert.*;
-
-import java.util.List;
-
-import org.junit.Test;
-
-import com.msopentech.odatajclient.engine.communication.ODataClientErrorException;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataEntityRequest;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataEntitySetRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.data.ODataEntitySet;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-
-public class NavigationLinkTestITCase extends AbstractTestITCase {
-
- private void getListNavigationLinks(String acceptFormat) {
- URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendNavigationLinkSegment("Customer").appendKeySegment(-10).appendLinksSegment("Orders");
- ODataEntitySetRequest req = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
- req.setAccept(acceptFormat);
- ODataRetrieveResponse<ODataEntitySet> res = req.execute();
- assertEquals(200, res.getStatusCode());
- ODataEntitySet entitySet = res.getBody();
- assertNotNull(entitySet);
- List<ODataEntity> entity = entitySet.getEntities();
- assertNotNull(entity);
- for (int i = 0; i < entity.size(); i++) {
- assertNotNull(entity.get(i).getProperties().get(0).getValue());
- }
- }
-
- private void getListNavigationLinksInvalidSegment(String acceptFormat) {
- URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendNavigationLinkSegment("Customer").appendKeySegment(-10).appendLinksSegment("Address");
- ODataEntitySetRequest req = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
- req.setAccept(acceptFormat);
- req.execute();
- }
-
- private void getSingleNavigationLinks(String acceptFormat) {
- URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendNavigationLinkSegment("Customer").appendKeySegment(-10).appendLinksSegment("Orders").
- appendKeySegment(-10);
- ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setAccept(acceptFormat);
- ODataRetrieveResponse<ODataEntity> res = req.execute();
- assertEquals(200, res.getStatusCode());
- ODataEntity entity = res.getBody();
- assertNotNull(entity.getProperties().get(0).getValue());
- }
-
- private void getReferenceNavigationLinks(String acceptFormat) {
- URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendNavigationLinkSegment("Customer").appendKeySegment(-10).appendLinksSegment("Logins").
- appendKeySegment(-1);
- ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setAccept(acceptFormat);
- try {
- ODataRetrieveResponse<ODataEntity> res = req.execute();
- assertEquals(200, res.getStatusCode());
- ODataEntity entity = res.getBody();
- assertNotNull(entity);
- assertNotNull(entity.getProperties().get(0).getValue());
- } catch (ODataClientErrorException e) {
- if (e.getStatusLine().getStatusCode() == 415) {
- assertEquals(415, e.getStatusLine().getStatusCode());
- }
- if (e.getStatusLine().getStatusCode() == 404) {
- assertEquals(404, e.getStatusLine().getStatusCode());
- }
- }
- }
-
- @Test
- public void withJSON() {
- getListNavigationLinks("application/json");
- getSingleNavigationLinks("application/json");
- }
-
- @Test(expected = ODataClientErrorException.class)
- public void withATOM() {
- getListNavigationLinks("application/atom+xml");
- getSingleNavigationLinks("application/atom+xml");
- getReferenceNavigationLinks("application/atom+xml");
- }
-
- @Test(expected = IllegalArgumentException.class)
- public void withXML() {
- getListNavigationLinks("application/xml");
- getSingleNavigationLinks("application/xml");
- getReferenceNavigationLinks("application/xml");
- }
-
- @Test
- public void withNull() {
- getListNavigationLinks(null);
- getSingleNavigationLinks(null);
- getReferenceNavigationLinks(null);
- }
-
- @Test(expected = ODataClientErrorException.class)
- public void withInvalidSegment() {
- getListNavigationLinksInvalidSegment("application/json");
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/OpenTypeTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/OpenTypeTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/OpenTypeTestITCase.java
deleted file mode 100644
index 26997ce..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/OpenTypeTestITCase.java
+++ /dev/null
@@ -1,240 +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 com.msopentech.odatajclient.engine.it;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import com.msopentech.odatajclient.engine.communication.request.cud.ODataEntityCreateRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataDeleteResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataEntityCreateResponse;
-import com.msopentech.odatajclient.engine.data.ODataComplexValue;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import com.msopentech.odatajclient.engine.metadata.EdmV3Metadata;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
-import org.junit.Test;
-
-public class OpenTypeTestITCase extends AbstractTestITCase {
-
- @Test
- public void checkOpenTypeEntityTypesExist() {
- final EdmV3Metadata metadata = client.getRetrieveRequestFactory().
- getMetadataRequest(testOpenTypeServiceRootURL).execute().getBody();
-
- assertTrue(metadata.getSchemas().get(0).getEntityType("Row").isOpenType());
- assertTrue(metadata.getSchemas().get(0).getEntityType("IndexedRow").isOpenType());
- assertTrue(metadata.getSchemas().get(0).getEntityType("RowIndex").isOpenType());
- }
-
- private ODataEntity readRow(final ODataPubFormat format, final String uuid) {
- final URIBuilder builder = client.getURIBuilder(testOpenTypeServiceRootURL).
- appendEntityTypeSegment("Row").appendKeySegment(UUID.fromString(uuid));
- return read(format, builder.build());
- }
-
- private void read(final ODataPubFormat format) {
- ODataEntity row = readRow(format, "71f7d0dc-ede4-45eb-b421-555a2aa1e58f");
- assertEquals(EdmSimpleType.Double.toString(), row.getProperty("Double").getPrimitiveValue().getTypeName());
- assertEquals(EdmSimpleType.Guid.toString(), row.getProperty("Id").getPrimitiveValue().getTypeName());
-
- row = readRow(format, "672b8250-1e6e-4785-80cf-b94b572e42b3");
- assertEquals(EdmSimpleType.Decimal.toString(), row.getProperty("Decimal").getPrimitiveValue().getTypeName());
- }
-
- @Test
- public void readAsAtom() {
- read(ODataPubFormat.ATOM);
- }
-
- @Test
- public void readAsJSON() {
- read(ODataPubFormat.JSON_FULL_METADATA);
- }
-
- private void cud(final ODataPubFormat format) {
- final UUID guid = UUID.randomUUID();
-
- ODataEntity row = client.getObjectFactory().newEntity("Microsoft.Test.OData.Services.OpenTypesService.Row");
- row.addProperty(client.getObjectFactory().newPrimitiveProperty("Id",
- client.getPrimitiveValueBuilder().setType(EdmSimpleType.Guid).setValue(guid).build()));
- row.addProperty(client.getObjectFactory().newPrimitiveProperty("aString",
- client.getPrimitiveValueBuilder().setType(EdmSimpleType.String).setValue("string").build()));
- row.addProperty(client.getObjectFactory().newPrimitiveProperty("aBoolean",
- client.getPrimitiveValueBuilder().setType(EdmSimpleType.Boolean).setValue(true).build()));
- row.addProperty(client.getObjectFactory().newPrimitiveProperty("aLong",
- client.getPrimitiveValueBuilder().setType(EdmSimpleType.Int64).setValue(15L).build()));
- row.addProperty(client.getObjectFactory().newPrimitiveProperty("aDouble",
- client.getPrimitiveValueBuilder().setType(EdmSimpleType.Double).setValue(1.5D).build()));
- row.addProperty(client.getObjectFactory().newPrimitiveProperty("aByte",
- client.getPrimitiveValueBuilder().setType(EdmSimpleType.SByte).setValue(Byte.MAX_VALUE).build()));
- row.addProperty(client.getObjectFactory().newPrimitiveProperty("aDate",
- client.getPrimitiveValueBuilder().setType(EdmSimpleType.DateTime).
- setValue(new Date()).build()));
-
- final Point point = new Point(Geospatial.Dimension.GEOGRAPHY);
- point.setX(1.2);
- point.setY(2.1);
- row.addProperty(client.getObjectFactory().newPrimitiveProperty("aPoint",
- client.getGeospatialValueBuilder().setType(EdmSimpleType.GeographyPoint).
- setValue(point).build()));
- final List<Point> points = new ArrayList<Point>();
- points.add(point);
- points.add(point);
- final MultiPoint multipoint = new MultiPoint(Geospatial.Dimension.GEOMETRY, points);
- row.addProperty(client.getObjectFactory().newPrimitiveProperty("aMultiPoint",
- client.getGeospatialValueBuilder().setType(EdmSimpleType.GeometryMultiPoint).
- setValue(multipoint).build()));
- final LineString lineString = new LineString(Geospatial.Dimension.GEOMETRY, points);
- row.addProperty(client.getObjectFactory().newPrimitiveProperty("aLineString",
- client.getGeospatialValueBuilder().setType(EdmSimpleType.GeometryLineString).
- setValue(lineString).build()));
- final List<LineString> lineStrings = new ArrayList<LineString>();
- lineStrings.add(lineString);
- lineStrings.add(lineString);
- final MultiLineString multiLineString = new MultiLineString(Geospatial.Dimension.GEOGRAPHY, lineStrings);
- row.addProperty(client.getObjectFactory().newPrimitiveProperty("aMultiLineString",
- client.getGeospatialValueBuilder().setType(EdmSimpleType.GeometryMultiLineString).
- setValue(multiLineString).build()));
- final Point otherPoint = new Point(Geospatial.Dimension.GEOGRAPHY);
- otherPoint.setX(3.4);
- otherPoint.setY(4.3);
- points.set(1, otherPoint);
- points.add(otherPoint);
- points.add(point);
- final Polygon polygon =
- new Polygon(Geospatial.Dimension.GEOGRAPHY, points, points);
- row.addProperty(client.getObjectFactory().newPrimitiveProperty("aPolygon",
- client.getGeospatialValueBuilder().setType(EdmSimpleType.GeographyPolygon).
- setValue(polygon).build()));
- final List<Polygon> polygons = new ArrayList<Polygon>();
- polygons.add(polygon);
- polygons.add(polygon);
- final MultiPolygon multiPolygon = new MultiPolygon(Geospatial.Dimension.GEOGRAPHY, polygons);
- row.addProperty(client.getObjectFactory().newPrimitiveProperty("aMultiPolygon",
- client.getGeospatialValueBuilder().setType(EdmSimpleType.GeographyMultiPolygon).
- setValue(multiPolygon).build()));
- final List<Geospatial> geospatials = new ArrayList<Geospatial>();
- geospatials.add(otherPoint);
- geospatials.add(polygon);
- geospatials.add(multiLineString);
- geospatials.add(multiPolygon);
- final GeospatialCollection geoColl = new GeospatialCollection(Geospatial.Dimension.GEOGRAPHY, geospatials);
- row.addProperty(client.getObjectFactory().newPrimitiveProperty("aCollection",
- client.getGeospatialValueBuilder().setType(EdmSimpleType.GeographyCollection).
- setValue(geoColl).build()));
-
- final ODataComplexValue contactDetails =
- new ODataComplexValue("Microsoft.Test.OData.Services.OpenTypesService.ContactDetails");
- contactDetails.add(client.getObjectFactory().newPrimitiveProperty("FirstContacted",
- client.getPrimitiveValueBuilder().setType(EdmSimpleType.Binary).setValue("text".getBytes()).
- build()));
- contactDetails.add(client.getObjectFactory().newPrimitiveProperty("LastContacted",
- client.getPrimitiveValueBuilder().setType(EdmSimpleType.DateTimeOffset).
- setText("2001-04-05T05:05:05.001+00:01").build()));
- contactDetails.add(client.getObjectFactory().newPrimitiveProperty("Contacted",
- client.getPrimitiveValueBuilder().setType(EdmSimpleType.DateTime).
- setText("2001-04-05T05:05:04.001").build()));
- contactDetails.add(client.getObjectFactory().newPrimitiveProperty("GUID",
- client.getPrimitiveValueBuilder().setType(EdmSimpleType.Guid).
- setValue(UUID.randomUUID()).build()));
- contactDetails.add(client.getObjectFactory().newPrimitiveProperty("PreferedContactTime",
- client.getPrimitiveValueBuilder().setType(EdmSimpleType.Time).
- setText("-P9DT51M10.5063807S").build()));
- contactDetails.add(client.getObjectFactory().newPrimitiveProperty("Byte",
- client.getPrimitiveValueBuilder().setType(EdmSimpleType.Byte).setValue(Integer.valueOf(241)).
- build()));
- contactDetails.add(client.getObjectFactory().newPrimitiveProperty("SignedByte",
- client.getPrimitiveValueBuilder().setType(EdmSimpleType.SByte).setValue(Byte.MAX_VALUE).build()));
- contactDetails.add(client.getObjectFactory().newPrimitiveProperty("Double",
- client.getPrimitiveValueBuilder().setType(EdmSimpleType.Double).setValue(Double.MAX_VALUE).build()));
- contactDetails.add(client.getObjectFactory().newPrimitiveProperty("Single",
- client.getPrimitiveValueBuilder().setType(EdmSimpleType.Single).setValue(Float.MAX_VALUE).build()));
- contactDetails.add(client.getObjectFactory().newPrimitiveProperty("Short",
- client.getPrimitiveValueBuilder().setType(EdmSimpleType.Int16).setValue(Short.MAX_VALUE).build()));
- contactDetails.add(client.getObjectFactory().newPrimitiveProperty("Int",
- client.getPrimitiveValueBuilder().setType(EdmSimpleType.Int32).setValue(Integer.MAX_VALUE).build()));
- contactDetails.add(client.getObjectFactory().newPrimitiveProperty("Long",
- client.getPrimitiveValueBuilder().setType(EdmSimpleType.Int64).setValue(Long.MAX_VALUE).build()));
- row.addProperty(client.getObjectFactory().newComplexProperty("aContact", contactDetails));
-
- final ODataEntityCreateRequest createReq = client.getCUDRequestFactory().
- getEntityCreateRequest(client.getURIBuilder(testOpenTypeServiceRootURL).
- appendEntityTypeSegment("Row").build(), row);
- createReq.setFormat(format);
- final ODataEntityCreateResponse createRes = createReq.execute();
- assertEquals(201, createRes.getStatusCode());
-
- row = readRow(format, guid.toString());
- assertNotNull(row);
- assertEquals(EdmSimpleType.Guid.toString(), row.getProperty("Id").getPrimitiveValue().getTypeName());
- assertEquals(EdmSimpleType.String.toString(), row.getProperty("aString").getPrimitiveValue().getTypeName());
- assertEquals(EdmSimpleType.Boolean.toString(), row.getProperty("aBoolean").getPrimitiveValue().getTypeName());
- assertEquals(EdmSimpleType.Int64.toString(), row.getProperty("aLong").getPrimitiveValue().getTypeName());
- assertEquals(EdmSimpleType.Double.toString(), row.getProperty("aDouble").getPrimitiveValue().getTypeName());
- assertEquals(EdmSimpleType.SByte.toString(), row.getProperty("aByte").getPrimitiveValue().getTypeName());
- assertEquals(EdmSimpleType.DateTime.toString(), row.getProperty("aDate").getPrimitiveValue().getTypeName());
- assertEquals(EdmSimpleType.GeographyPoint.toString(),
- row.getProperty("aPoint").getPrimitiveValue().getTypeName());
- assertEquals(EdmSimpleType.GeometryMultiPoint.toString(),
- row.getProperty("aMultiPoint").getPrimitiveValue().getTypeName());
- assertEquals(EdmSimpleType.GeometryLineString.toString(),
- row.getProperty("aLineString").getPrimitiveValue().getTypeName());
- assertEquals(EdmSimpleType.GeometryMultiLineString.toString(),
- row.getProperty("aMultiLineString").getPrimitiveValue().getTypeName());
- assertEquals(EdmSimpleType.GeographyPolygon.toString(),
- row.getProperty("aPolygon").getPrimitiveValue().getTypeName());
- assertEquals(EdmSimpleType.GeographyMultiPolygon.toString(),
- row.getProperty("aMultiPolygon").getPrimitiveValue().getTypeName());
- assertEquals(EdmSimpleType.GeographyCollection.toString(),
- row.getProperty("aCollection").getPrimitiveValue().getTypeName());
- assertEquals("Microsoft.Test.OData.Services.OpenTypesService.ContactDetails",
- row.getProperty("aContact").getComplexValue().getTypeName());
- assertEquals(EdmSimpleType.SByte.toString(),
- row.getProperty("aContact").getComplexValue().get("SignedByte").getPrimitiveValue().getTypeName());
-
- final ODataDeleteResponse deleteRes = client.getCUDRequestFactory().getDeleteRequest(row.getEditLink()).
- execute();
- assertEquals(204, deleteRes.getStatusCode());
- }
-
- @Test
- public void cudAsAtom() {
- cud(ODataPubFormat.ATOM);
- }
-
- @Test
- public void cudAsJSON() {
- cud(ODataPubFormat.JSON_FULL_METADATA);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/PrimitiveKeysTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/PrimitiveKeysTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/PrimitiveKeysTestITCase.java
deleted file mode 100644
index ad325f3..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/PrimitiveKeysTestITCase.java
+++ /dev/null
@@ -1,81 +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 com.msopentech.odatajclient.engine.it;
-
-import static com.msopentech.odatajclient.engine.it.AbstractTestITCase.client;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataEntityRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import java.math.BigDecimal;
-import java.util.UUID;
-import org.junit.Test;
-
-public class PrimitiveKeysTestITCase extends AbstractTestITCase {
-
- private void readEntity(final String entityType, final Object key, final ODataPubFormat format) {
- final ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(
- client.getURIBuilder(testPrimitiveKeysServiceRootURL).appendEntityTypeSegment(entityType).
- appendKeySegment(key).
- build());
- req.setFormat(format);
- final ODataRetrieveResponse<ODataEntity> res = req.execute();
- assertEquals(200, res.getStatusCode());
- final ODataEntity entity = res.getBody();
- assertNotNull(entity);
- assertNotNull(entity.getProperty("Id"));
- }
-
- private void readPrimitiveKeys(final ODataPubFormat format) {
- // commented as per #115
- //readEntity("EdmBinarySet", new byte[] {Byte.valueOf("2"), Byte.valueOf("3"), Byte.valueOf("4")}, format);
- readEntity("EdmBooleanSet", Boolean.TRUE, format);
- readEntity("EdmByteSet", 255, format);
- readEntity("EdmDecimalSet", new BigDecimal("79228162514264337593543950335"), format);
- readEntity("EdmDoubleSet", 1.7976931348623157E+308D, format);
- readEntity("EdmSingleSet", 3.40282347E+38F, format);
- readEntity("EdmGuidSet", UUID.fromString("00000000-0000-0000-0000-000000000000"), format);
- readEntity("EdmInt16Set", 32767, format);
- readEntity("EdmInt32Set", -2147483648, format);
- readEntity("EdmInt64Set", 9223372036854775807L, format);
- readEntity("EdmStringSet", "$", format);
- readEntity("EdmTimeSet", new ODataDuration("-P10675199DT2H48M5.4775808S"), format);
- // commented as per #115
- //readEntity("EdmDateTimeSet",
- // ODataTimestamp.parse(EdmSimpleType.DATE_TIME.pattern(), "0001-01-01T00:00:00"),
- // format);
- //readEntity("EdmDateTimeOffsetSet",
- // ODataTimestamp.parse(EdmSimpleType.DATE_TIME_OFFSET.pattern(), "2013-08-14T13:33:46.1045905+02:00"),
- // format);
- }
-
- @Test
- public void readEntityAsAtom() {
- readPrimitiveKeys(ODataPubFormat.ATOM);
- }
-
- @Test
- public void readEntityAsJSON() {
- readPrimitiveKeys(ODataPubFormat.JSON);
- }
-}
[19/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/northwind-metadata.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/northwind-metadata.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/northwind-metadata.xml
deleted file mode 100644
index 0a14f0a..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/northwind-metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- 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.
-
--->
-<edmx:Edmx Version="1.0" xmlns:edmx="http://schemas.microsoft.com/ado/2007/06/edmx"><edmx:DataServices m:DataServiceVersion="1.0" m:MaxDataServiceVersion="3.0" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"><Schema Namespace="NorthwindModel" xmlns="http://schemas.microsoft.com/ado/2008/09/edm"><EntityType Name="Category"><Key><PropertyRef Name="CategoryID" /></Key><Property Name="CategoryID" Type="Edm.Int32" Nullable="false" p6:StoreGeneratedPattern="Identity" xmlns:p6="http://schemas.microsoft.com/ado/2009/02/edm/annotation" /><Property Name="CategoryName" Type="Edm.String" Nullable="false" MaxLength="15" FixedLength="false" Unicode="true" /><Property Name="Description" Type="Edm.String" MaxLength="Max" FixedLength="false" Unicode="true" /><Property Name="Picture" Type="Edm.Binary" MaxLength="Max" FixedLength="false" /><NavigationProperty Name="Products" Relationship="NorthwindModel.FK_Products_Categories" ToRole="Products" FromRole="Categories" /></Entity
Type><EntityType Name="CustomerDemographic"><Key><PropertyRef Name="CustomerTypeID" /></Key><Property Name="CustomerTypeID" Type="Edm.String" Nullable="false" MaxLength="10" FixedLength="true" Unicode="true" /><Property Name="CustomerDesc" Type="Edm.String" MaxLength="Max" FixedLength="false" Unicode="true" /><NavigationProperty Name="Customers" Relationship="NorthwindModel.CustomerCustomerDemo" ToRole="Customers" FromRole="CustomerDemographics" /></EntityType><EntityType Name="Customer"><Key><PropertyRef Name="CustomerID" /></Key><Property Name="CustomerID" Type="Edm.String" Nullable="false" MaxLength="5" FixedLength="true" Unicode="true" /><Property Name="CompanyName" Type="Edm.String" Nullable="false" MaxLength="40" FixedLength="false" Unicode="true" /><Property Name="ContactName" Type="Edm.String" MaxLength="30" FixedLength="false" Unicode="true" /><Property Name="ContactTitle" Type="Edm.String" MaxLength="30" FixedLength="false" Unicode="true" /><Property Name="Address" Type="E
dm.String" MaxLength="60" FixedLength="false" Unicode="true" /><Property Name="City" Type="Edm.String" MaxLength="15" FixedLength="false" Unicode="true" /><Property Name="Region" Type="Edm.String" MaxLength="15" FixedLength="false" Unicode="true" /><Property Name="PostalCode" Type="Edm.String" MaxLength="10" FixedLength="false" Unicode="true" /><Property Name="Country" Type="Edm.String" MaxLength="15" FixedLength="false" Unicode="true" /><Property Name="Phone" Type="Edm.String" MaxLength="24" FixedLength="false" Unicode="true" /><Property Name="Fax" Type="Edm.String" MaxLength="24" FixedLength="false" Unicode="true" /><NavigationProperty Name="Orders" Relationship="NorthwindModel.FK_Orders_Customers" ToRole="Orders" FromRole="Customers" /><NavigationProperty Name="CustomerDemographics" Relationship="NorthwindModel.CustomerCustomerDemo" ToRole="CustomerDemographics" FromRole="Customers" /></EntityType><EntityType Name="Employee"><Key><PropertyRef Name="EmployeeID" /></Key><Property N
ame="EmployeeID" Type="Edm.Int32" Nullable="false" p6:StoreGeneratedPattern="Identity" xmlns:p6="http://schemas.microsoft.com/ado/2009/02/edm/annotation" /><Property Name="LastName" Type="Edm.String" Nullable="false" MaxLength="20" FixedLength="false" Unicode="true" /><Property Name="FirstName" Type="Edm.String" Nullable="false" MaxLength="10" FixedLength="false" Unicode="true" /><Property Name="Title" Type="Edm.String" MaxLength="30" FixedLength="false" Unicode="true" /><Property Name="TitleOfCourtesy" Type="Edm.String" MaxLength="25" FixedLength="false" Unicode="true" /><Property Name="BirthDate" Type="Edm.DateTime" /><Property Name="HireDate" Type="Edm.DateTime" /><Property Name="Address" Type="Edm.String" MaxLength="60" FixedLength="false" Unicode="true" /><Property Name="City" Type="Edm.String" MaxLength="15" FixedLength="false" Unicode="true" /><Property Name="Region" Type="Edm.String" MaxLength="15" FixedLength="false" Unicode="true" /><Property Name="PostalCode" Type="Edm.St
ring" MaxLength="10" FixedLength="false" Unicode="true" /><Property Name="Country" Type="Edm.String" MaxLength="15" FixedLength="false" Unicode="true" /><Property Name="HomePhone" Type="Edm.String" MaxLength="24" FixedLength="false" Unicode="true" /><Property Name="Extension" Type="Edm.String" MaxLength="4" FixedLength="false" Unicode="true" /><Property Name="Photo" Type="Edm.Binary" MaxLength="Max" FixedLength="false" /><Property Name="Notes" Type="Edm.String" MaxLength="Max" FixedLength="false" Unicode="true" /><Property Name="ReportsTo" Type="Edm.Int32" /><Property Name="PhotoPath" Type="Edm.String" MaxLength="255" FixedLength="false" Unicode="true" /><NavigationProperty Name="Employees1" Relationship="NorthwindModel.FK_Employees_Employees" ToRole="Employees1" FromRole="Employees" /><NavigationProperty Name="Employee1" Relationship="NorthwindModel.FK_Employees_Employees" ToRole="Employees" FromRole="Employees1" /><NavigationProperty Name="Orders" Relationship="NorthwindModel.FK_O
rders_Employees" ToRole="Orders" FromRole="Employees" /><NavigationProperty Name="Territories" Relationship="NorthwindModel.EmployeeTerritories" ToRole="Territories" FromRole="Employees" /></EntityType><EntityType Name="Order_Detail"><Key><PropertyRef Name="OrderID" /><PropertyRef Name="ProductID" /></Key><Property Name="OrderID" Type="Edm.Int32" Nullable="false" /><Property Name="ProductID" Type="Edm.Int32" Nullable="false" /><Property Name="UnitPrice" Type="Edm.Decimal" Nullable="false" Precision="19" Scale="4" /><Property Name="Quantity" Type="Edm.Int16" Nullable="false" /><Property Name="Discount" Type="Edm.Single" Nullable="false" /><NavigationProperty Name="Order" Relationship="NorthwindModel.FK_Order_Details_Orders" ToRole="Orders" FromRole="Order_Details" /><NavigationProperty Name="Product" Relationship="NorthwindModel.FK_Order_Details_Products" ToRole="Products" FromRole="Order_Details" /></EntityType><EntityType Name="Order"><Key><PropertyRef Name="OrderID" /></Key><Prope
rty Name="OrderID" Type="Edm.Int32" Nullable="false" p6:StoreGeneratedPattern="Identity" xmlns:p6="http://schemas.microsoft.com/ado/2009/02/edm/annotation" /><Property Name="CustomerID" Type="Edm.String" MaxLength="5" FixedLength="true" Unicode="true" /><Property Name="EmployeeID" Type="Edm.Int32" /><Property Name="OrderDate" Type="Edm.DateTime" /><Property Name="RequiredDate" Type="Edm.DateTime" /><Property Name="ShippedDate" Type="Edm.DateTime" /><Property Name="ShipVia" Type="Edm.Int32" /><Property Name="Freight" Type="Edm.Decimal" Precision="19" Scale="4" /><Property Name="ShipName" Type="Edm.String" MaxLength="40" FixedLength="false" Unicode="true" /><Property Name="ShipAddress" Type="Edm.String" MaxLength="60" FixedLength="false" Unicode="true" /><Property Name="ShipCity" Type="Edm.String" MaxLength="15" FixedLength="false" Unicode="true" /><Property Name="ShipRegion" Type="Edm.String" MaxLength="15" FixedLength="false" Unicode="true" /><Property Name="ShipPostalCode" Type="Ed
m.String" MaxLength="10" FixedLength="false" Unicode="true" /><Property Name="ShipCountry" Type="Edm.String" MaxLength="15" FixedLength="false" Unicode="true" /><NavigationProperty Name="Customer" Relationship="NorthwindModel.FK_Orders_Customers" ToRole="Customers" FromRole="Orders" /><NavigationProperty Name="Employee" Relationship="NorthwindModel.FK_Orders_Employees" ToRole="Employees" FromRole="Orders" /><NavigationProperty Name="Order_Details" Relationship="NorthwindModel.FK_Order_Details_Orders" ToRole="Order_Details" FromRole="Orders" /><NavigationProperty Name="Shipper" Relationship="NorthwindModel.FK_Orders_Shippers" ToRole="Shippers" FromRole="Orders" /></EntityType><EntityType Name="Product"><Key><PropertyRef Name="ProductID" /></Key><Property Name="ProductID" Type="Edm.Int32" Nullable="false" p6:StoreGeneratedPattern="Identity" xmlns:p6="http://schemas.microsoft.com/ado/2009/02/edm/annotation" /><Property Name="ProductName" Type="Edm.String" Nullable="false" MaxLength="40
" FixedLength="false" Unicode="true" /><Property Name="SupplierID" Type="Edm.Int32" /><Property Name="CategoryID" Type="Edm.Int32" /><Property Name="QuantityPerUnit" Type="Edm.String" MaxLength="20" FixedLength="false" Unicode="true" /><Property Name="UnitPrice" Type="Edm.Decimal" Precision="19" Scale="4" /><Property Name="UnitsInStock" Type="Edm.Int16" /><Property Name="UnitsOnOrder" Type="Edm.Int16" /><Property Name="ReorderLevel" Type="Edm.Int16" /><Property Name="Discontinued" Type="Edm.Boolean" Nullable="false" /><NavigationProperty Name="Category" Relationship="NorthwindModel.FK_Products_Categories" ToRole="Categories" FromRole="Products" /><NavigationProperty Name="Order_Details" Relationship="NorthwindModel.FK_Order_Details_Products" ToRole="Order_Details" FromRole="Products" /><NavigationProperty Name="Supplier" Relationship="NorthwindModel.FK_Products_Suppliers" ToRole="Suppliers" FromRole="Products" /></EntityType><EntityType Name="Region"><Key><PropertyRef Name="RegionID
" /></Key><Property Name="RegionID" Type="Edm.Int32" Nullable="false" /><Property Name="RegionDescription" Type="Edm.String" Nullable="false" MaxLength="50" FixedLength="true" Unicode="true" /><NavigationProperty Name="Territories" Relationship="NorthwindModel.FK_Territories_Region" ToRole="Territories" FromRole="Region" /></EntityType><EntityType Name="Shipper"><Key><PropertyRef Name="ShipperID" /></Key><Property Name="ShipperID" Type="Edm.Int32" Nullable="false" p6:StoreGeneratedPattern="Identity" xmlns:p6="http://schemas.microsoft.com/ado/2009/02/edm/annotation" /><Property Name="CompanyName" Type="Edm.String" Nullable="false" MaxLength="40" FixedLength="false" Unicode="true" /><Property Name="Phone" Type="Edm.String" MaxLength="24" FixedLength="false" Unicode="true" /><NavigationProperty Name="Orders" Relationship="NorthwindModel.FK_Orders_Shippers" ToRole="Orders" FromRole="Shippers" /></EntityType><EntityType Name="Supplier"><Key><PropertyRef Name="SupplierID" /></Key><Propert
y Name="SupplierID" Type="Edm.Int32" Nullable="false" p6:StoreGeneratedPattern="Identity" xmlns:p6="http://schemas.microsoft.com/ado/2009/02/edm/annotation" /><Property Name="CompanyName" Type="Edm.String" Nullable="false" MaxLength="40" FixedLength="false" Unicode="true" /><Property Name="ContactName" Type="Edm.String" MaxLength="30" FixedLength="false" Unicode="true" /><Property Name="ContactTitle" Type="Edm.String" MaxLength="30" FixedLength="false" Unicode="true" /><Property Name="Address" Type="Edm.String" MaxLength="60" FixedLength="false" Unicode="true" /><Property Name="City" Type="Edm.String" MaxLength="15" FixedLength="false" Unicode="true" /><Property Name="Region" Type="Edm.String" MaxLength="15" FixedLength="false" Unicode="true" /><Property Name="PostalCode" Type="Edm.String" MaxLength="10" FixedLength="false" Unicode="true" /><Property Name="Country" Type="Edm.String" MaxLength="15" FixedLength="false" Unicode="true" /><Property Name="Phone" Type="Edm.String" MaxLengt
h="24" FixedLength="false" Unicode="true" /><Property Name="Fax" Type="Edm.String" MaxLength="24" FixedLength="false" Unicode="true" /><Property Name="HomePage" Type="Edm.String" MaxLength="Max" FixedLength="false" Unicode="true" /><NavigationProperty Name="Products" Relationship="NorthwindModel.FK_Products_Suppliers" ToRole="Products" FromRole="Suppliers" /></EntityType><EntityType Name="Territory"><Key><PropertyRef Name="TerritoryID" /></Key><Property Name="TerritoryID" Type="Edm.String" Nullable="false" MaxLength="20" FixedLength="false" Unicode="true" /><Property Name="TerritoryDescription" Type="Edm.String" Nullable="false" MaxLength="50" FixedLength="true" Unicode="true" /><Property Name="RegionID" Type="Edm.Int32" Nullable="false" /><NavigationProperty Name="Region" Relationship="NorthwindModel.FK_Territories_Region" ToRole="Region" FromRole="Territories" /><NavigationProperty Name="Employees" Relationship="NorthwindModel.EmployeeTerritories" ToRole="Employees" FromRole="Terr
itories" /></EntityType><EntityType Name="Alphabetical_list_of_product"><Key><PropertyRef Name="CategoryName" /><PropertyRef Name="Discontinued" /><PropertyRef Name="ProductID" /><PropertyRef Name="ProductName" /></Key><Property Name="ProductID" Type="Edm.Int32" Nullable="false" /><Property Name="ProductName" Type="Edm.String" Nullable="false" MaxLength="40" FixedLength="false" Unicode="true" /><Property Name="SupplierID" Type="Edm.Int32" /><Property Name="CategoryID" Type="Edm.Int32" /><Property Name="QuantityPerUnit" Type="Edm.String" MaxLength="20" FixedLength="false" Unicode="true" /><Property Name="UnitPrice" Type="Edm.Decimal" Precision="19" Scale="4" /><Property Name="UnitsInStock" Type="Edm.Int16" /><Property Name="UnitsOnOrder" Type="Edm.Int16" /><Property Name="ReorderLevel" Type="Edm.Int16" /><Property Name="Discontinued" Type="Edm.Boolean" Nullable="false" /><Property Name="CategoryName" Type="Edm.String" Nullable="false" MaxLength="15" FixedLength="false" Unicode="true"
/></EntityType><EntityType Name="Category_Sales_for_1997"><Key><PropertyRef Name="CategoryName" /></Key><Property Name="CategoryName" Type="Edm.String" Nullable="false" MaxLength="15" FixedLength="false" Unicode="true" /><Property Name="CategorySales" Type="Edm.Decimal" Precision="19" Scale="4" /></EntityType><EntityType Name="Current_Product_List"><Key><PropertyRef Name="ProductID" /><PropertyRef Name="ProductName" /></Key><Property Name="ProductID" Type="Edm.Int32" Nullable="false" p6:StoreGeneratedPattern="Identity" xmlns:p6="http://schemas.microsoft.com/ado/2009/02/edm/annotation" /><Property Name="ProductName" Type="Edm.String" Nullable="false" MaxLength="40" FixedLength="false" Unicode="true" /></EntityType><EntityType Name="Customer_and_Suppliers_by_City"><Key><PropertyRef Name="CompanyName" /><PropertyRef Name="Relationship" /></Key><Property Name="City" Type="Edm.String" MaxLength="15" FixedLength="false" Unicode="true" /><Property Name="CompanyName" Type="Edm.String" Null
able="false" MaxLength="40" FixedLength="false" Unicode="true" /><Property Name="ContactName" Type="Edm.String" MaxLength="30" FixedLength="false" Unicode="true" /><Property Name="Relationship" Type="Edm.String" Nullable="false" MaxLength="9" FixedLength="false" Unicode="false" /></EntityType><EntityType Name="Invoice"><Key><PropertyRef Name="CustomerName" /><PropertyRef Name="Discount" /><PropertyRef Name="OrderID" /><PropertyRef Name="ProductID" /><PropertyRef Name="ProductName" /><PropertyRef Name="Quantity" /><PropertyRef Name="Salesperson" /><PropertyRef Name="ShipperName" /><PropertyRef Name="UnitPrice" /></Key><Property Name="ShipName" Type="Edm.String" MaxLength="40" FixedLength="false" Unicode="true" /><Property Name="ShipAddress" Type="Edm.String" MaxLength="60" FixedLength="false" Unicode="true" /><Property Name="ShipCity" Type="Edm.String" MaxLength="15" FixedLength="false" Unicode="true" /><Property Name="ShipRegion" Type="Edm.String" MaxLength="15" FixedLength="false"
Unicode="true" /><Property Name="ShipPostalCode" Type="Edm.String" MaxLength="10" FixedLength="false" Unicode="true" /><Property Name="ShipCountry" Type="Edm.String" MaxLength="15" FixedLength="false" Unicode="true" /><Property Name="CustomerID" Type="Edm.String" MaxLength="5" FixedLength="true" Unicode="true" /><Property Name="CustomerName" Type="Edm.String" Nullable="false" MaxLength="40" FixedLength="false" Unicode="true" /><Property Name="Address" Type="Edm.String" MaxLength="60" FixedLength="false" Unicode="true" /><Property Name="City" Type="Edm.String" MaxLength="15" FixedLength="false" Unicode="true" /><Property Name="Region" Type="Edm.String" MaxLength="15" FixedLength="false" Unicode="true" /><Property Name="PostalCode" Type="Edm.String" MaxLength="10" FixedLength="false" Unicode="true" /><Property Name="Country" Type="Edm.String" MaxLength="15" FixedLength="false" Unicode="true" /><Property Name="Salesperson" Type="Edm.String" Nullable="false" MaxLength="31" FixedLength="
false" Unicode="true" /><Property Name="OrderID" Type="Edm.Int32" Nullable="false" /><Property Name="OrderDate" Type="Edm.DateTime" /><Property Name="RequiredDate" Type="Edm.DateTime" /><Property Name="ShippedDate" Type="Edm.DateTime" /><Property Name="ShipperName" Type="Edm.String" Nullable="false" MaxLength="40" FixedLength="false" Unicode="true" /><Property Name="ProductID" Type="Edm.Int32" Nullable="false" /><Property Name="ProductName" Type="Edm.String" Nullable="false" MaxLength="40" FixedLength="false" Unicode="true" /><Property Name="UnitPrice" Type="Edm.Decimal" Nullable="false" Precision="19" Scale="4" /><Property Name="Quantity" Type="Edm.Int16" Nullable="false" /><Property Name="Discount" Type="Edm.Single" Nullable="false" /><Property Name="ExtendedPrice" Type="Edm.Decimal" Precision="19" Scale="4" /><Property Name="Freight" Type="Edm.Decimal" Precision="19" Scale="4" /></EntityType><EntityType Name="Order_Details_Extended"><Key><PropertyRef Name="Discount" /><PropertyRe
f Name="OrderID" /><PropertyRef Name="ProductID" /><PropertyRef Name="ProductName" /><PropertyRef Name="Quantity" /><PropertyRef Name="UnitPrice" /></Key><Property Name="OrderID" Type="Edm.Int32" Nullable="false" /><Property Name="ProductID" Type="Edm.Int32" Nullable="false" /><Property Name="ProductName" Type="Edm.String" Nullable="false" MaxLength="40" FixedLength="false" Unicode="true" /><Property Name="UnitPrice" Type="Edm.Decimal" Nullable="false" Precision="19" Scale="4" /><Property Name="Quantity" Type="Edm.Int16" Nullable="false" /><Property Name="Discount" Type="Edm.Single" Nullable="false" /><Property Name="ExtendedPrice" Type="Edm.Decimal" Precision="19" Scale="4" /></EntityType><EntityType Name="Order_Subtotal"><Key><PropertyRef Name="OrderID" /></Key><Property Name="OrderID" Type="Edm.Int32" Nullable="false" /><Property Name="Subtotal" Type="Edm.Decimal" Precision="19" Scale="4" /></EntityType><EntityType Name="Orders_Qry"><Key><PropertyRef Name="CompanyName" /><Propert
yRef Name="OrderID" /></Key><Property Name="OrderID" Type="Edm.Int32" Nullable="false" /><Property Name="CustomerID" Type="Edm.String" MaxLength="5" FixedLength="true" Unicode="true" /><Property Name="EmployeeID" Type="Edm.Int32" /><Property Name="OrderDate" Type="Edm.DateTime" /><Property Name="RequiredDate" Type="Edm.DateTime" /><Property Name="ShippedDate" Type="Edm.DateTime" /><Property Name="ShipVia" Type="Edm.Int32" /><Property Name="Freight" Type="Edm.Decimal" Precision="19" Scale="4" /><Property Name="ShipName" Type="Edm.String" MaxLength="40" FixedLength="false" Unicode="true" /><Property Name="ShipAddress" Type="Edm.String" MaxLength="60" FixedLength="false" Unicode="true" /><Property Name="ShipCity" Type="Edm.String" MaxLength="15" FixedLength="false" Unicode="true" /><Property Name="ShipRegion" Type="Edm.String" MaxLength="15" FixedLength="false" Unicode="true" /><Property Name="ShipPostalCode" Type="Edm.String" MaxLength="10" FixedLength="false" Unicode="true" /><Proper
ty Name="ShipCountry" Type="Edm.String" MaxLength="15" FixedLength="false" Unicode="true" /><Property Name="CompanyName" Type="Edm.String" Nullable="false" MaxLength="40" FixedLength="false" Unicode="true" /><Property Name="Address" Type="Edm.String" MaxLength="60" FixedLength="false" Unicode="true" /><Property Name="City" Type="Edm.String" MaxLength="15" FixedLength="false" Unicode="true" /><Property Name="Region" Type="Edm.String" MaxLength="15" FixedLength="false" Unicode="true" /><Property Name="PostalCode" Type="Edm.String" MaxLength="10" FixedLength="false" Unicode="true" /><Property Name="Country" Type="Edm.String" MaxLength="15" FixedLength="false" Unicode="true" /></EntityType><EntityType Name="Product_Sales_for_1997"><Key><PropertyRef Name="CategoryName" /><PropertyRef Name="ProductName" /></Key><Property Name="CategoryName" Type="Edm.String" Nullable="false" MaxLength="15" FixedLength="false" Unicode="true" /><Property Name="ProductName" Type="Edm.String" Nullable="false"
MaxLength="40" FixedLength="false" Unicode="true" /><Property Name="ProductSales" Type="Edm.Decimal" Precision="19" Scale="4" /></EntityType><EntityType Name="Products_Above_Average_Price"><Key><PropertyRef Name="ProductName" /></Key><Property Name="ProductName" Type="Edm.String" Nullable="false" MaxLength="40" FixedLength="false" Unicode="true" /><Property Name="UnitPrice" Type="Edm.Decimal" Precision="19" Scale="4" /></EntityType><EntityType Name="Products_by_Category"><Key><PropertyRef Name="CategoryName" /><PropertyRef Name="Discontinued" /><PropertyRef Name="ProductName" /></Key><Property Name="CategoryName" Type="Edm.String" Nullable="false" MaxLength="15" FixedLength="false" Unicode="true" /><Property Name="ProductName" Type="Edm.String" Nullable="false" MaxLength="40" FixedLength="false" Unicode="true" /><Property Name="QuantityPerUnit" Type="Edm.String" MaxLength="20" FixedLength="false" Unicode="true" /><Property Name="UnitsInStock" Type="Edm.Int16" /><Property Name="Disc
ontinued" Type="Edm.Boolean" Nullable="false" /></EntityType><EntityType Name="Sales_by_Category"><Key><PropertyRef Name="CategoryID" /><PropertyRef Name="CategoryName" /><PropertyRef Name="ProductName" /></Key><Property Name="CategoryID" Type="Edm.Int32" Nullable="false" /><Property Name="CategoryName" Type="Edm.String" Nullable="false" MaxLength="15" FixedLength="false" Unicode="true" /><Property Name="ProductName" Type="Edm.String" Nullable="false" MaxLength="40" FixedLength="false" Unicode="true" /><Property Name="ProductSales" Type="Edm.Decimal" Precision="19" Scale="4" /></EntityType><EntityType Name="Sales_Totals_by_Amount"><Key><PropertyRef Name="CompanyName" /><PropertyRef Name="OrderID" /></Key><Property Name="SaleAmount" Type="Edm.Decimal" Precision="19" Scale="4" /><Property Name="OrderID" Type="Edm.Int32" Nullable="false" /><Property Name="CompanyName" Type="Edm.String" Nullable="false" MaxLength="40" FixedLength="false" Unicode="true" /><Property Name="ShippedDate" Typ
e="Edm.DateTime" /></EntityType><EntityType Name="Summary_of_Sales_by_Quarter"><Key><PropertyRef Name="OrderID" /></Key><Property Name="ShippedDate" Type="Edm.DateTime" /><Property Name="OrderID" Type="Edm.Int32" Nullable="false" /><Property Name="Subtotal" Type="Edm.Decimal" Precision="19" Scale="4" /></EntityType><EntityType Name="Summary_of_Sales_by_Year"><Key><PropertyRef Name="OrderID" /></Key><Property Name="ShippedDate" Type="Edm.DateTime" /><Property Name="OrderID" Type="Edm.Int32" Nullable="false" /><Property Name="Subtotal" Type="Edm.Decimal" Precision="19" Scale="4" /></EntityType><Association Name="FK_Products_Categories"><End Type="NorthwindModel.Category" Role="Categories" Multiplicity="0..1" /><End Type="NorthwindModel.Product" Role="Products" Multiplicity="*" /><ReferentialConstraint><Principal Role="Categories"><PropertyRef Name="CategoryID" /></Principal><Dependent Role="Products"><PropertyRef Name="CategoryID" /></Dependent></ReferentialConstraint></Association><A
ssociation Name="CustomerCustomerDemo"><End Type="NorthwindModel.Customer" Role="Customers" Multiplicity="*" /><End Type="NorthwindModel.CustomerDemographic" Role="CustomerDemographics" Multiplicity="*" /></Association><Association Name="FK_Orders_Customers"><End Type="NorthwindModel.Customer" Role="Customers" Multiplicity="0..1" /><End Type="NorthwindModel.Order" Role="Orders" Multiplicity="*" /><ReferentialConstraint><Principal Role="Customers"><PropertyRef Name="CustomerID" /></Principal><Dependent Role="Orders"><PropertyRef Name="CustomerID" /></Dependent></ReferentialConstraint></Association><Association Name="FK_Employees_Employees"><End Type="NorthwindModel.Employee" Role="Employees" Multiplicity="0..1" /><End Type="NorthwindModel.Employee" Role="Employees1" Multiplicity="*" /><ReferentialConstraint><Principal Role="Employees"><PropertyRef Name="EmployeeID" /></Principal><Dependent Role="Employees1"><PropertyRef Name="ReportsTo" /></Dependent></ReferentialConstraint></Associa
tion><Association Name="FK_Orders_Employees"><End Type="NorthwindModel.Employee" Role="Employees" Multiplicity="0..1" /><End Type="NorthwindModel.Order" Role="Orders" Multiplicity="*" /><ReferentialConstraint><Principal Role="Employees"><PropertyRef Name="EmployeeID" /></Principal><Dependent Role="Orders"><PropertyRef Name="EmployeeID" /></Dependent></ReferentialConstraint></Association><Association Name="EmployeeTerritories"><End Type="NorthwindModel.Territory" Role="Territories" Multiplicity="*" /><End Type="NorthwindModel.Employee" Role="Employees" Multiplicity="*" /></Association><Association Name="FK_Order_Details_Orders"><End Type="NorthwindModel.Order" Role="Orders" Multiplicity="1" /><End Type="NorthwindModel.Order_Detail" Role="Order_Details" Multiplicity="*" /><ReferentialConstraint><Principal Role="Orders"><PropertyRef Name="OrderID" /></Principal><Dependent Role="Order_Details"><PropertyRef Name="OrderID" /></Dependent></ReferentialConstraint></Association><Association N
ame="FK_Order_Details_Products"><End Type="NorthwindModel.Product" Role="Products" Multiplicity="1" /><End Type="NorthwindModel.Order_Detail" Role="Order_Details" Multiplicity="*" /><ReferentialConstraint><Principal Role="Products"><PropertyRef Name="ProductID" /></Principal><Dependent Role="Order_Details"><PropertyRef Name="ProductID" /></Dependent></ReferentialConstraint></Association><Association Name="FK_Orders_Shippers"><End Type="NorthwindModel.Shipper" Role="Shippers" Multiplicity="0..1" /><End Type="NorthwindModel.Order" Role="Orders" Multiplicity="*" /><ReferentialConstraint><Principal Role="Shippers"><PropertyRef Name="ShipperID" /></Principal><Dependent Role="Orders"><PropertyRef Name="ShipVia" /></Dependent></ReferentialConstraint></Association><Association Name="FK_Products_Suppliers"><End Type="NorthwindModel.Supplier" Role="Suppliers" Multiplicity="0..1" /><End Type="NorthwindModel.Product" Role="Products" Multiplicity="*" /><ReferentialConstraint><Principal Role="Sup
pliers"><PropertyRef Name="SupplierID" /></Principal><Dependent Role="Products"><PropertyRef Name="SupplierID" /></Dependent></ReferentialConstraint></Association><Association Name="FK_Territories_Region"><End Type="NorthwindModel.Region" Role="Region" Multiplicity="1" /><End Type="NorthwindModel.Territory" Role="Territories" Multiplicity="*" /><ReferentialConstraint><Principal Role="Region"><PropertyRef Name="RegionID" /></Principal><Dependent Role="Territories"><PropertyRef Name="RegionID" /></Dependent></ReferentialConstraint></Association></Schema><Schema Namespace="ODataWebV3.Northwind.Model" xmlns="http://schemas.microsoft.com/ado/2008/09/edm"><EntityContainer Name="NorthwindEntities" m:IsDefaultEntityContainer="true" p6:LazyLoadingEnabled="true" xmlns:p6="http://schemas.microsoft.com/ado/2009/02/edm/annotation"><EntitySet Name="Categories" EntityType="NorthwindModel.Category" /><EntitySet Name="CustomerDemographics" EntityType="NorthwindModel.CustomerDemographic" /><EntitySet
Name="Customers" EntityType="NorthwindModel.Customer" /><EntitySet Name="Employees" EntityType="NorthwindModel.Employee" /><EntitySet Name="Order_Details" EntityType="NorthwindModel.Order_Detail" /><EntitySet Name="Orders" EntityType="NorthwindModel.Order" /><EntitySet Name="Products" EntityType="NorthwindModel.Product" /><EntitySet Name="Regions" EntityType="NorthwindModel.Region" /><EntitySet Name="Shippers" EntityType="NorthwindModel.Shipper" /><EntitySet Name="Suppliers" EntityType="NorthwindModel.Supplier" /><EntitySet Name="Territories" EntityType="NorthwindModel.Territory" /><EntitySet Name="Alphabetical_list_of_products" EntityType="NorthwindModel.Alphabetical_list_of_product" /><EntitySet Name="Category_Sales_for_1997" EntityType="NorthwindModel.Category_Sales_for_1997" /><EntitySet Name="Current_Product_Lists" EntityType="NorthwindModel.Current_Product_List" /><EntitySet Name="Customer_and_Suppliers_by_Cities" EntityType="NorthwindModel.Customer_and_Suppliers_by_City" /><
EntitySet Name="Invoices" EntityType="NorthwindModel.Invoice" /><EntitySet Name="Order_Details_Extendeds" EntityType="NorthwindModel.Order_Details_Extended" /><EntitySet Name="Order_Subtotals" EntityType="NorthwindModel.Order_Subtotal" /><EntitySet Name="Orders_Qries" EntityType="NorthwindModel.Orders_Qry" /><EntitySet Name="Product_Sales_for_1997" EntityType="NorthwindModel.Product_Sales_for_1997" /><EntitySet Name="Products_Above_Average_Prices" EntityType="NorthwindModel.Products_Above_Average_Price" /><EntitySet Name="Products_by_Categories" EntityType="NorthwindModel.Products_by_Category" /><EntitySet Name="Sales_by_Categories" EntityType="NorthwindModel.Sales_by_Category" /><EntitySet Name="Sales_Totals_by_Amounts" EntityType="NorthwindModel.Sales_Totals_by_Amount" /><EntitySet Name="Summary_of_Sales_by_Quarters" EntityType="NorthwindModel.Summary_of_Sales_by_Quarter" /><EntitySet Name="Summary_of_Sales_by_Years" EntityType="NorthwindModel.Summary_of_Sales_by_Year" /><Associat
ionSet Name="FK_Products_Categories" Association="NorthwindModel.FK_Products_Categories"><End Role="Categories" EntitySet="Categories" /><End Role="Products" EntitySet="Products" /></AssociationSet><AssociationSet Name="CustomerCustomerDemo" Association="NorthwindModel.CustomerCustomerDemo"><End Role="CustomerDemographics" EntitySet="CustomerDemographics" /><End Role="Customers" EntitySet="Customers" /></AssociationSet><AssociationSet Name="FK_Orders_Customers" Association="NorthwindModel.FK_Orders_Customers"><End Role="Customers" EntitySet="Customers" /><End Role="Orders" EntitySet="Orders" /></AssociationSet><AssociationSet Name="FK_Employees_Employees" Association="NorthwindModel.FK_Employees_Employees"><End Role="Employees" EntitySet="Employees" /><End Role="Employees1" EntitySet="Employees" /></AssociationSet><AssociationSet Name="FK_Orders_Employees" Association="NorthwindModel.FK_Orders_Employees"><End Role="Employees" EntitySet="Employees" /><End Role="Orders" EntitySet="Ord
ers" /></AssociationSet><AssociationSet Name="EmployeeTerritories" Association="NorthwindModel.EmployeeTerritories"><End Role="Employees" EntitySet="Employees" /><End Role="Territories" EntitySet="Territories" /></AssociationSet><AssociationSet Name="FK_Order_Details_Orders" Association="NorthwindModel.FK_Order_Details_Orders"><End Role="Order_Details" EntitySet="Order_Details" /><End Role="Orders" EntitySet="Orders" /></AssociationSet><AssociationSet Name="FK_Order_Details_Products" Association="NorthwindModel.FK_Order_Details_Products"><End Role="Order_Details" EntitySet="Order_Details" /><End Role="Products" EntitySet="Products" /></AssociationSet><AssociationSet Name="FK_Orders_Shippers" Association="NorthwindModel.FK_Orders_Shippers"><End Role="Orders" EntitySet="Orders" /><End Role="Shippers" EntitySet="Shippers" /></AssociationSet><AssociationSet Name="FK_Products_Suppliers" Association="NorthwindModel.FK_Products_Suppliers"><End Role="Products" EntitySet="Products" /><End Ro
le="Suppliers" EntitySet="Suppliers" /></AssociationSet><AssociationSet Name="FK_Territories_Region" Association="NorthwindModel.FK_Territories_Region"><End Role="Region" EntitySet="Regions" /><End Role="Territories" EntitySet="Territories" /></AssociationSet></EntityContainer></Schema></edmx:DataServices></edmx:Edmx>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/serviceDocument.json
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/serviceDocument.json b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/serviceDocument.json
deleted file mode 100644
index 791f961..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/serviceDocument.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "odata.metadata": "http://services.odata.org/V3/OData/OData.svc/$metadata",
- "value": [
- {
- "name": "Products",
- "url": "Products"
- },
- {
- "name": "ProductDetails",
- "url": "ProductDetails"
- },
- {
- "name": "Categories",
- "url": "Categories"
- },
- {
- "name": "Suppliers",
- "url": "Suppliers"
- },
- {
- "name": "Persons",
- "url": "Persons"
- },
- {
- "name": "PersonDetails",
- "url": "PersonDetails"
- },
- {
- "name": "Advertisements",
- "url": "Advertisements"
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/serviceDocument.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/serviceDocument.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/serviceDocument.xml
deleted file mode 100644
index 0981814..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/serviceDocument.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- 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.
-
--->
-<service xml:base="http://services.odata.org/V3/OData/OData.svc/"
- xmlns="http://www.w3.org/2007/app"
- xmlns:atom="http://www.w3.org/2005/Atom">
- <workspace>
- <atom:title>Default</atom:title>
- <collection href="Products">
- <atom:title>Products</atom:title>
- </collection>
- <collection href="ProductDetails">
- <atom:title>ProductDetails</atom:title>
- </collection>
- <collection href="Categories">
- <atom:title>Categories</atom:title>
- </collection>
- <collection href="Suppliers">
- <atom:title>Suppliers</atom:title>
- </collection>
- <collection href="Persons">
- <atom:title>Persons</atom:title>
- </collection>
- <collection href="PersonDetails">
- <atom:title>PersonDetails</atom:title>
- </collection>
- <collection href="Advertisements">
- <atom:title>Advertisements</atom:title>
- </collection>
- </workspace>
-</service>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/Products_1_SupplierID.json
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/Products_1_SupplierID.json b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/Products_1_SupplierID.json
deleted file mode 100644
index 9a13471..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/Products_1_SupplierID.json
+++ /dev/null
@@ -1 +0,0 @@
-{"@odata.context":"http://services.odata.org/V4/Northwind/Northwind.svc/$metadata#Products(1)/SupplierID","value":1}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/demo-metadata.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/demo-metadata.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/demo-metadata.xml
deleted file mode 100644
index 8296468..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/demo-metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- 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.
-
--->
-<edmx:Edmx Version="4.0" xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx"><edmx:DataServices><Schema Namespace="ODataDemo" xmlns="http://docs.oasis-open.org/odata/ns/edm"><EntityType Name="Product"><Key><PropertyRef Name="ID" /></Key><Property Name="ID" Type="Edm.Int32" Nullable="false" /><Property Name="Name" Type="Edm.String" /><Property Name="Description" Type="Edm.String" /><Property Name="ReleaseDate" Type="Edm.DateTimeOffset" Nullable="false" /><Property Name="DiscontinuedDate" Type="Edm.DateTimeOffset" /><Property Name="Rating" Type="Edm.Int16" Nullable="false" /><Property Name="Price" Type="Edm.Double" Nullable="false" /><NavigationProperty Name="Categories" Type="Collection(ODataDemo.Category)" Partner="Products" /><NavigationProperty Name="Supplier" Type="ODataDemo.Supplier" Partner="Products" /><NavigationProperty Name="ProductDetail" Type="ODataDemo.ProductDetail" Partner="Product" /></EntityType><EntityType Name="FeaturedProduct" BaseType="ODataDemo.Product"><Navig
ationProperty Name="Advertisement" Type="ODataDemo.Advertisement" Partner="FeaturedProduct" /></EntityType><EntityType Name="ProductDetail"><Key><PropertyRef Name="ProductID" /></Key><Property Name="ProductID" Type="Edm.Int32" Nullable="false" /><Property Name="Details" Type="Edm.String" /><NavigationProperty Name="Product" Type="ODataDemo.Product" Partner="ProductDetail" /></EntityType><EntityType Name="Category" OpenType="true"><Key><PropertyRef Name="ID" /></Key><Property Name="ID" Type="Edm.Int32" Nullable="false" /><Property Name="Name" Type="Edm.String" /><NavigationProperty Name="Products" Type="Collection(ODataDemo.Product)" Partner="Categories" /></EntityType><EntityType Name="Supplier"><Key><PropertyRef Name="ID" /></Key><Property Name="ID" Type="Edm.Int32" Nullable="false" /><Property Name="Name" Type="Edm.String" /><Property Name="Address" Type="ODataDemo.Address" /><Property Name="Location" Type="Edm.GeographyPoint" SRID="Variable" /><Property Name="Concurrency" Type="E
dm.Int32" ConcurrencyMode="Fixed" Nullable="false" /><NavigationProperty Name="Products" Type="Collection(ODataDemo.Product)" Partner="Supplier" /></EntityType><ComplexType Name="Address"><Property Name="Street" Type="Edm.String" /><Property Name="City" Type="Edm.String" /><Property Name="State" Type="Edm.String" /><Property Name="ZipCode" Type="Edm.String" /><Property Name="Country" Type="Edm.String" /></ComplexType><EntityType Name="Person"><Key><PropertyRef Name="ID" /></Key><Property Name="ID" Type="Edm.Int32" Nullable="false" /><Property Name="Name" Type="Edm.String" /><NavigationProperty Name="PersonDetail" Type="ODataDemo.PersonDetail" Partner="Person" /></EntityType><EntityType Name="Customer" BaseType="ODataDemo.Person"><Property Name="TotalExpense" Type="Edm.Decimal" Nullable="false" /></EntityType><EntityType Name="Employee" BaseType="ODataDemo.Person"><Property Name="EmployeeID" Type="Edm.Int64" Nullable="false" /><Property Name="HireDate" Type="Edm.DateTimeOffset" Nulla
ble="false" /><Property Name="Salary" Type="Edm.Single" Nullable="false" /></EntityType><EntityType Name="PersonDetail"><Key><PropertyRef Name="PersonID" /></Key><Property Name="PersonID" Type="Edm.Int32" Nullable="false" /><Property Name="Age" Type="Edm.Byte" Nullable="false" /><Property Name="Gender" Type="Edm.Boolean" Nullable="false" /><Property Name="Phone" Type="Edm.String" /><Property Name="Address" Type="ODataDemo.Address" /><Property Name="Photo" Type="Edm.Stream" Nullable="false" /><NavigationProperty Name="Person" Type="ODataDemo.Person" Partner="PersonDetail" /></EntityType><EntityType Name="Advertisement" HasStream="true"><Key><PropertyRef Name="ID" /></Key><Property Name="ID" Type="Edm.Guid" Nullable="false" /><Property Name="Name" Type="Edm.String" /><Property Name="AirDate" Type="Edm.DateTimeOffset" Nullable="false" /><NavigationProperty Name="FeaturedProduct" Type="ODataDemo.FeaturedProduct" Partner="Advertisement" /></EntityType><EntityContainer Name="DemoService">
<EntitySet Name="Products" EntityType="ODataDemo.Product"><NavigationPropertyBinding Path="ODataDemo.FeaturedProduct/Advertisement" Target="Advertisements" /><NavigationPropertyBinding Path="Categories" Target="Categories" /><NavigationPropertyBinding Path="Supplier" Target="Suppliers" /><NavigationPropertyBinding Path="ProductDetail" Target="ProductDetails" /></EntitySet><EntitySet Name="ProductDetails" EntityType="ODataDemo.ProductDetail"><NavigationPropertyBinding Path="Product" Target="Products" /></EntitySet><EntitySet Name="Categories" EntityType="ODataDemo.Category"><NavigationPropertyBinding Path="Products" Target="Products" /></EntitySet><EntitySet Name="Suppliers" EntityType="ODataDemo.Supplier"><NavigationPropertyBinding Path="Products" Target="Products" /></EntitySet><EntitySet Name="Persons" EntityType="ODataDemo.Person"><NavigationPropertyBinding Path="PersonDetail" Target="PersonDetails" /></EntitySet><EntitySet Name="PersonDetails" EntityType="ODataDemo.PersonDetail"
><NavigationPropertyBinding Path="Person" Target="Persons" /></EntitySet><EntitySet Name="Advertisements" EntityType="ODataDemo.Advertisement"><NavigationPropertyBinding Path="FeaturedProduct" Target="Products" /></EntitySet></EntityContainer><Annotations Target="ODataDemo.DemoService"><Annotation Term="Org.OData.Display.V1.Description" String="This is a sample OData service with vocabularies" /></Annotations><Annotations Target="ODataDemo.Product"><Annotation Term="Org.OData.Display.V1.Description" String="All Products available in the online store" /></Annotations><Annotations Target="ODataDemo.Product/Name"><Annotation Term="Org.OData.Display.V1.DisplayName" String="Product Name" /></Annotations><Annotations Target="ODataDemo.DemoService/Suppliers"><Annotation Term="Org.OData.Publication.V1.PublisherName" String="Microsoft Corp." /><Annotation Term="Org.OData.Publication.V1.PublisherId" String="MSFT" /><Annotation Term="Org.OData.Publication.V1.Keywords" String="Inventory, Suppli
er, Advertisers, Sales, Finance" /><Annotation Term="Org.OData.Publication.V1.AttributionUrl" String="http://www.odata.org/" /><Annotation Term="Org.OData.Publication.V1.AttributionDescription" String="All rights reserved" /><Annotation Term="Org.OData.Publication.V1.DocumentationUrl " String="http://www.odata.org/" /><Annotation Term="Org.OData.Publication.V1.TermsOfUseUrl" String="All rights reserved" /><Annotation Term="Org.OData.Publication.V1.PrivacyPolicyUrl" String="http://www.odata.org/" /><Annotation Term="Org.OData.Publication.V1.LastModified" String="4/2/2013" /><Annotation Term="Org.OData.Publication.V1.ImageUrl " String="http://www.odata.org/" /></Annotations></Schema></edmx:DataServices></edmx:Edmx>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/fromdoc1-metadata.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/fromdoc1-metadata.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/fromdoc1-metadata.xml
deleted file mode 100644
index d2f99e3..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/fromdoc1-metadata.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- 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.
-
--->
-<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">
- <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/cs01/vocabularies/Org.OData.Core.V1.xml">
- <edmx:Include Namespace="Org.OData.Core.V1" Alias="Core"/>
- </edmx:Reference>
- <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/cs01/vocabularies/Org.OData.Measures.V1.xml">
- <edmx:Include Alias="UoM" Namespace="Org.OData.Measures.V1"/>
- </edmx:Reference>
- <edmx:DataServices>
- <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="ODataDemo">
- <EntityType Name="Product" HasStream="true">
- <Key>
- <PropertyRef Name="ID"/>
- </Key>
- <Property Name="ID" Type="Edm.Int32" Nullable="false"/>
- <Property Name="Description" Type="Edm.String" >
- <Annotation Term="Core.IsLanguageDependent"/>
- </Property>
- <Property Name="ReleaseDate" Type="Edm.Date"/>
- <Property Name="DiscontinuedDate" Type="Edm.Date"/>
- <Property Name="Rating" Type="Edm.Int32"/>
- <Property Name="Price" Type="Edm.Decimal">
- <Annotation Term="UoM.ISOCurrency" Path="Currency"/>
- </Property>
- <Property Name="Currency" Type="Edm.String" MaxLength="3"/>
- <NavigationProperty Name="Category" Type="ODataDemo.Category" Nullable="false" Partner="Products"/>
- <NavigationProperty Name="Supplier" Type="ODataDemo.Supplier" Partner="Products"/>
- </EntityType>
- <EntityType Name="Category">
- <Key>
- <PropertyRef Name="ID"/>
- </Key>
- <Property Name="ID" Type="Edm.Int32" Nullable="false"/>
- <Property Name="Name" Type="Edm.String">
- <Annotation Term="Core.IsLanguageDependent"/>
- </Property>
- <NavigationProperty Name="Products" Partner="Category" Type="Collection(ODataDemo.Product)">
- <OnDelete Action="Cascade"/>
- </NavigationProperty>
- </EntityType>
- <EntityType Name="Supplier">
- <Key>
- <PropertyRef Name="ID"/>
- </Key>
- <Property Name="ID" Type="Edm.String" Nullable="false"/>
- <Property Name="Name" Type="Edm.String"/>
- <Property Name="Address" Type="ODataDemo.Address" Nullable="false"/>
- <Property Name="Concurrency" Type="Edm.Int32" Nullable="false"/>
- <NavigationProperty Name="Products" Partner="Supplier"/> Type="Collection(ODataDemo.Product)"/>
- </EntityType>
- <EntityType Name="Country">
- <Key>
- <PropertyRef Name="Code"/>
- </Key>
- <Property Name="Code" Type="Edm.String" MaxLength="2" Nullable="false"/>
- <Property Name="Name" Type="Edm.String"/>
- </EntityType>
- <ComplexType Name="Address">
- <Property Name="Street" Type="Edm.String"/>
- <Property Name="City" Type="Edm.String"/>
- <Property Name="State" Type="Edm.String"/>
- <Property Name="ZipCode" Type="Edm.String"/>
- <Property Name="CountryName" Type="Edm.String"/>
- <NavigationProperty Name="Country" Type="ODataDemo.Country">
- <ReferentialConstraint Property="CountryName" ReferencedProperty="Name"/>
- </NavigationProperty>
- </ComplexType>
- <Function Name="ProductsByRating">
- <Parameter Name="Rating" Type="Edm.Int32"/>
- <ReturnType Type="Collection(ODataDemo.Product)"/>
- </Function>
- <EntityContainer Name="DemoService">
- <EntitySet Name="Products" EntityType="ODataDemo.Product">
- <NavigationPropertyBinding Path="Category" Target="Categories"/>
- </EntitySet>
- <EntitySet Name="Categories" EntityType="ODataDemo.Category">
- <NavigationPropertyBinding Path="Products" Target="Products"/>
- </EntitySet>
- <EntitySet Name="Suppliers" EntityType="ODataDemo.Supplier">
- <NavigationPropertyBinding Path="Products" Target="Products"/>
- <NavigationPropertyBinding Path="Address/Country" Target="Countries"/>
- <Annotation Term="Core.OptimisticConcurrencyControl">
- <Collection>
- <PropertyPath>Concurrency</PropertyPath>
- </Collection>
- </Annotation>
- </EntitySet>
- <Singleton Name="Contoso" Type="Self.Supplier">
- <NavigationPropertyBinding Path="Products" Target="Products"/>
- </Singleton>
- <EntitySet Name="Countries" EntityType="ODataDemo.Country"/>
- <FunctionImport Name="ProductsByRating" EntitySet="Products" Function="ODataDemo.ProductsByRating"/>
- </EntityContainer>
- </Schema>
- </edmx:DataServices>
-</edmx:Edmx>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/fromdoc2-metadata.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/fromdoc2-metadata.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/fromdoc2-metadata.xml
deleted file mode 100644
index 60387f2..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/fromdoc2-metadata.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- 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.
-
--->
-<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">
- <edmx:Reference Uri="http://host/service/$metadata">
- <edmx:Include Namespace="ODataDemo"/>
- </edmx:Reference>
- <edmx:Reference Uri="http://somewhere/Vocabulary/V1">
- <edmx:Include Alias="Vocabulary1" Namespace="Some.Vocabulary.V1"/>
- </edmx:Reference>
- <edmx:DataServices>
- <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Annotations">
- <Annotations Target="ODataDemo.Supplier">
- <Annotation Term="Vocabulary1.EMail">
- <Null/>
- </Annotation>
- <Annotation Term="Vocabulary1.AccountID" Path="ID"/>
- <Annotation Term="Vocabulary1.Title" String="Supplier Info"/>
- <Annotation Term="Vocabulary1.DisplayName">
- <Apply Function="odata.concat">
- <Path>Name</Path>
- <String> in </String>
- <Path>Address/CountryName</Path>
- </Apply>
- </Annotation>
- </Annotations>
- <Annotations Target="ODataDemo.Product">
- <Annotation Term="Vocabulary1.Tags">
- <Collection>
- <String>MasterData</String>
- </Collection>
- </Annotation>
- </Annotations>
- </Schema>
- </edmx:DataServices>
-</edmx:Edmx>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/fromdoc3-metadata.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/fromdoc3-metadata.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/fromdoc3-metadata.xml
deleted file mode 100644
index 2a00bd8..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/fromdoc3-metadata.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- 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.
-
--->
-<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">
- <edmx:Reference Uri="http://host/service/$metadata">
- <edmx:Include Namespace="ODataDemo"/>
- </edmx:Reference>
- <edmx:Reference Uri="http://somewhere/Vocabulary/V1">
- <edmx:Include Alias="Vocabulary1" Namespace="Some.Vocabulary.V1"/>
- </edmx:Reference>
- <edmx:DataServices>
- <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="Annotations">
- <Annotations Target="Test">
- <Annotation Term="org.example.display.EndTime" TimeOfDay="21:45:00"/>,
- <Annotation Term="org.example.display.EndTime">
- <TimeOfDay>21:45:00</TimeOfDay>
- </Annotation>,
- <Annotation Term='Test' Path="IsMale"/>,
- <Annotation Term='Test'>
- <Not>
- <Path>IsMale</Path>
- </Not>
- </Annotation>,
- <Annotation Term='Test'>
- <And>
- <Path>IsMale</Path>
- <Path>IsMarried</Path>
- </And>
- </Annotation>,
- <Annotation Term="UI.ReferenceFacet" AnnotationPath="Product/Supplier/@UI.LineItem"/>,
- <Annotation Term="UI.ReferenceFacet">
- <AnnotationPath>Product/Supplier/@UI.LineItem</AnnotationPath>
- </Annotation>,
- <Annotation Term="Vocabulary1.DisplayName">
- <Apply Function="odata.concat">
- <Path>Name</Path>
- <String> in </String>
- <Path>Address/CountryName</Path>
- </Apply>
- </Annotation>,
- <Annotation Term="org.example.display.Threshold">
- <Cast Type="Edm.Decimal">
- <Path>Average</Path>
- </Cast>
- </Annotation>,
- <Annotation Term="Vocabulary1.Tags">
- <Collection>
- <String>MasterData</String>
- </Collection>
- </Annotation>,
- <Annotation Term="org.example.person.Gender">
- <If>
- <Bool>true</Bool>
- <String>Female</String>
- <String>Male</String>
- </If>
- </Annotation>,
- <Annotation Term="org.example.person.Gender">
- <If>
- <Path>IsFemale</Path>
- <String>Female</String>
- <String>Male</String>
- </If>
- </Annotation>,
- <Annotation Term="Self.IsPreferredCustomer">
- <IsOf Type="Self.PreferredCustomer">
- <Path>Customer</Path>
- </IsOf>
- </Annotation>,
- <Annotation Term="org.example.display.DisplayName">
- <LabeledElement Name="CustomerFirstName" Path="FirstName" />
- </Annotation>,
- <Annotation Term="org.example.display.DisplayName">
- <LabeledElement Name="CustomerFirstName">
- <Path>FirstName</Path>
- </LabeledElement>
- </Annotation>,
- <Annotation Term="org.example.person.Employee">
- <Record>
- <PropertyValue Property="GivenName" Path="FirstName" />
- <PropertyValue Property="Surname" Path="LastName" />
- <PropertyValue Property="Manager" Path="DirectSupervisor" />
- <PropertyValue Property="CostCenter">
- <UrlRef>
- <Apply Function="odata.fillUriTemplate">
- <String>http://host/anotherservice/CostCenters('{ccid}')</String>
- <LabeledElement Name="ccid" Path="CostCenterID" />
- </Apply>
- </UrlRef>
- </PropertyValue>
- </Record>
- </Annotation>,
- <Annotation Term="Vocab.Supplier">
- <UrlRef>
- <Apply Function="odata.fillUriTemplate">
- <String>http://host/service/Suppliers({suppID})</String>
- <LabeledElement Name="suppID">
- <Apply Function="odata.uriEncode">
- <Path>SupplierId</Path>
- </Apply>
- </LabeledElement>
- </Apply>
- </UrlRef>
- </Annotation>,
- <Annotation Term="Core.LongDescription">
- <UrlRef>
- <String>http://host/wiki/HowToUse</String>
- </UrlRef>
- </Annotation>
- </Annotations>
- </Schema>
- </edmx:DataServices>
-</edmx:Edmx>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/metadata.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/metadata.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/metadata.xml
deleted file mode 100644
index 3f992ac..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/metadata.xml
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- 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.
-
--->
-<edmx:Edmx Version="4.0" xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx">
- <edmx:DataServices m:DataServiceVersion="4.0" m:MaxDataServiceVersion="4.0" xmlns:m="http://docs.oasis-open.org/odata/ns/metadata">
- <Schema Namespace="Microsoft.Exchange.Services.OData.Model" xmlns="http://docs.oasis-open.org/odata/ns/edm">
- <EnumType Name="BodyType">
- <Member Name="Text" Value="0" />
- <Member Name="HTML" Value="1" />
- </EnumType>
- <EnumType Name="Importance">
- <Member Name="Normal" Value="0" />
- <Member Name="Low" Value="1" />
- <Member Name="High" Value="2" />
- </EnumType>
- <EnumType Name="AttendeeType">
- <Member Name="Required" Value="1" />
- <Member Name="Optional" Value="2" />
- <Member Name="Resource" Value="3" />
- </EnumType>
- <EnumType Name="ResponseType">
- <Member Name="None" Value="0" />
- <Member Name="Organizer" Value="1" />
- <Member Name="TentativelyAccepted" Value="2" />
- <Member Name="Accepted" Value="3" />
- <Member Name="Declined" Value="4" />
- <Member Name="NotResponded" Value="5" />
- </EnumType>
- <EnumType Name="EventType">
- <Member Name="SingleInstance" Value="0" />
- <Member Name="Occurrence" Value="1" />
- <Member Name="Exception" Value="2" />
- <Member Name="SeriesMaster" Value="3" />
- </EnumType>
- <EnumType Name="FreeBusyStatus">
- <Member Name="Free" Value="0" />
- <Member Name="Tentative" Value="1" />
- <Member Name="Busy" Value="2" />
- <Member Name="Oof" Value="3" />
- <Member Name="WorkingElsewhere" Value="4" />
- <Member Name="Unknown" Value="-1" />
- </EnumType>
- <ComplexType Name="Recipient">
- <Property Name="Name" Type="Edm.String" />
- <Property Name="Address" Type="Edm.String" />
- </ComplexType>
- <ComplexType Name="Attendee" BaseType="Microsoft.Exchange.Services.OData.Model.Recipient">
- <Property Name="Status" Type="Microsoft.Exchange.Services.OData.Model.ResponseStatus" />
- <Property Name="Type" Type="Microsoft.Exchange.Services.OData.Model.AttendeeType" />
- </ComplexType>
- <ComplexType Name="ItemBody">
- <Property Name="ContentType" Type="Microsoft.Exchange.Services.OData.Model.BodyType" />
- <Property Name="Content" Type="Edm.String" />
- </ComplexType>
- <ComplexType Name="Location">
- <Property Name="DisplayName" Type="Edm.String" />
- </ComplexType>
- <ComplexType Name="ResponseStatus" BaseType="Microsoft.Exchange.Services.OData.Model.Recipient">
- <Property Name="Response" Type="Microsoft.Exchange.Services.OData.Model.ResponseType" />
- <Property Name="Time" Type="Edm.DateTimeOffset" />
- </ComplexType>
- <EntityType Name="Entity" Abstract="true">
- <Key>
- <PropertyRef Name="Id" />
- </Key>
- <Property Name="Id" Type="Edm.String" Nullable="false" />
- </EntityType>
- <EntityType Name="User" BaseType="Microsoft.Exchange.Services.OData.Model.Entity">
- <Property Name="DisplayName" Type="Edm.String" />
- <Property Name="Alias" Type="Edm.String" />
- <Property Name="MailboxGuid" Type="Edm.Guid" />
- <NavigationProperty Name="Folders" Type="Collection(Microsoft.Exchange.Services.OData.Model.Folder)" />
- <NavigationProperty Name="Messages" Type="Collection(Microsoft.Exchange.Services.OData.Model.EmailMessage)" />
- <NavigationProperty Name="RootFolder" Type="Microsoft.Exchange.Services.OData.Model.Folder" />
- <NavigationProperty Name="Inbox" Type="Microsoft.Exchange.Services.OData.Model.Folder" />
- <NavigationProperty Name="Drafts" Type="Microsoft.Exchange.Services.OData.Model.Folder" />
- <NavigationProperty Name="SentItems" Type="Microsoft.Exchange.Services.OData.Model.Folder" />
- <NavigationProperty Name="DeletedItems" Type="Microsoft.Exchange.Services.OData.Model.Folder" />
- <NavigationProperty Name="Calendars" Type="Collection(Microsoft.Exchange.Services.OData.Model.Calendar)" />
- <NavigationProperty Name="CalendarGroups" Type="Collection(Microsoft.Exchange.Services.OData.Model.CalendarGroup)" />
- <NavigationProperty Name="Events" Type="Collection(Microsoft.Exchange.Services.OData.Model.Event)" />
- </EntityType>
- <EntityType Name="Folder" BaseType="Microsoft.Exchange.Services.OData.Model.Entity">
- <Property Name="ParentFolderId" Type="Edm.String" />
- <Property Name="DisplayName" Type="Edm.String" />
- <Property Name="ClassName" Type="Edm.String" />
- <Property Name="TotalCount" Type="Edm.Int32" />
- <Property Name="ChildFolderCount" Type="Edm.Int32" />
- <Property Name="UnreadItemCount" Type="Edm.Int32" />
- <NavigationProperty Name="ChildFolders" Type="Collection(Microsoft.Exchange.Services.OData.Model.Folder)" />
- <NavigationProperty Name="Messages" Type="Collection(Microsoft.Exchange.Services.OData.Model.EmailMessage)" />
- </EntityType>
- <Action Name="Copy" IsBound="true" EntitySetPath="bindingParameter" ReturnType="Microsoft.Exchange.Services.OData.Model.Folder">
- <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.Folder" />
- <Parameter Name="DestinationId" Type="Edm.String" />
- </Action>
- <Action Name="Move" IsBound="true" EntitySetPath="bindingParameter" ReturnType="Microsoft.Exchange.Services.OData.Model.Folder">
- <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.Folder" />
- <Parameter Name="DestinationId" Type="Edm.String" />
- </Action>
- <EntityType Name="Item" BaseType="Microsoft.Exchange.Services.OData.Model.Entity" Abstract="true">
- <Property Name="ChangeKey" Type="Edm.String" />
- <Property Name="ClassName" Type="Edm.String" />
- <Property Name="Subject" Type="Edm.String" />
- <Property Name="Body" Type="Microsoft.Exchange.Services.OData.Model.ItemBody" />
- <Property Name="BodyPreview" Type="Edm.String" />
- <Property Name="Importance" Type="Microsoft.Exchange.Services.OData.Model.Importance" />
- <Property Name="Categories" Type="Collection(Edm.String)" />
- <Property Name="HasAttachments" Type="Edm.Boolean" />
- <Property Name="DateTimeCreated" Type="Edm.DateTimeOffset" />
- <Property Name="LastModifiedTime" Type="Edm.DateTimeOffset" />
- <NavigationProperty Name="Attachments" Type="Collection(Microsoft.Exchange.Services.OData.Model.Attachment)" />
- </EntityType>
- <EntityType Name="EmailMessage" BaseType="Microsoft.Exchange.Services.OData.Model.Item">
- <Property Name="ParentFolderId" Type="Edm.String" />
- <Property Name="From" Type="Microsoft.Exchange.Services.OData.Model.Recipient" />
- <Property Name="Sender" Type="Microsoft.Exchange.Services.OData.Model.Recipient" />
- <Property Name="ToRecipients" Type="Collection(Microsoft.Exchange.Services.OData.Model.Recipient)" />
- <Property Name="CcRecipients" Type="Collection(Microsoft.Exchange.Services.OData.Model.Recipient)" />
- <Property Name="BccRecipients" Type="Collection(Microsoft.Exchange.Services.OData.Model.Recipient)" />
- <Property Name="ReplyTo" Type="Collection(Microsoft.Exchange.Services.OData.Model.Recipient)" />
- <Property Name="ConversationIndex" Type="Edm.String" />
- <Property Name="UniqueBody" Type="Microsoft.Exchange.Services.OData.Model.ItemBody" />
- <Property Name="DateTimeReceived" Type="Edm.DateTimeOffset" />
- <Property Name="DateTimeSent" Type="Edm.DateTimeOffset" />
- <Property Name="IsDeliveryReceiptRequested" Type="Edm.Boolean" />
- <Property Name="IsReadReceiptRequested" Type="Edm.Boolean" />
- <Property Name="IsDraft" Type="Edm.Boolean" />
- <Property Name="IsRead" Type="Edm.Boolean" />
- </EntityType>
- <Action Name="Copy" IsBound="true" EntitySetPath="bindingParameter" ReturnType="Microsoft.Exchange.Services.OData.Model.EmailMessage">
- <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.EmailMessage" />
- <Parameter Name="DestinationId" Type="Edm.String" />
- </Action>
- <Action Name="Move" IsBound="true" EntitySetPath="bindingParameter" ReturnType="Microsoft.Exchange.Services.OData.Model.EmailMessage">
- <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.EmailMessage" />
- <Parameter Name="DestinationId" Type="Edm.String" />
- </Action>
- <EntityType Name="Attachment" BaseType="Microsoft.Exchange.Services.OData.Model.Entity" Abstract="true">
- <Property Name="Name" Type="Edm.String" />
- <Property Name="ContentType" Type="Edm.String" />
- <Property Name="IsInline" Type="Edm.Boolean" Nullable="false" />
- <Property Name="LastModifiedTime" Type="Edm.DateTimeOffset" />
- </EntityType>
- <EntityType Name="FileAttachment" BaseType="Microsoft.Exchange.Services.OData.Model.Attachment">
- <Property Name="ContentId" Type="Edm.String" />
- <Property Name="ContentLocation" Type="Edm.String" />
- <Property Name="Size" Type="Edm.Int32" Nullable="false" />
- <Property Name="IsContactPhoto" Type="Edm.Boolean" Nullable="false" />
- <Property Name="ContentBytes" Type="Edm.Binary" MaxLength="Max" FixedLength="false" />
- </EntityType>
- <EntityType Name="ItemAttachment" BaseType="Microsoft.Exchange.Services.OData.Model.Attachment">
- <NavigationProperty Name="Item" Type="Microsoft.Exchange.Services.OData.Model.Item" />
- </EntityType>
- <EntityType Name="Calendar" BaseType="Microsoft.Exchange.Services.OData.Model.Entity">
- <Property Name="Name" Type="Edm.String" />
- <Property Name="ChangeKey" Type="Edm.String" />
- <NavigationProperty Name="Events" Type="Collection(Microsoft.Exchange.Services.OData.Model.Event)" />
- </EntityType>
- <EntityType Name="CalendarGroup" BaseType="Microsoft.Exchange.Services.OData.Model.Entity">
- <Property Name="Name" Type="Edm.String" />
- <Property Name="ChangeKey" Type="Edm.String" />
- <Property Name="ClassId" Type="Edm.Guid" />
- </EntityType>
- <EntityType Name="Event" BaseType="Microsoft.Exchange.Services.OData.Model.Item">
- <Property Name="Start" Type="Edm.DateTimeOffset" />
- <Property Name="End" Type="Edm.DateTimeOffset" />
- <Property Name="Location" Type="Microsoft.Exchange.Services.OData.Model.Location" />
- <Property Name="ShowAs" Type="Microsoft.Exchange.Services.OData.Model.FreeBusyStatus" />
- <Property Name="IsAllDay" Type="Edm.Boolean" />
- <Property Name="IsCancelled" Type="Edm.Boolean" />
- <Property Name="IsOrganizer" Type="Edm.Boolean" />
- <Property Name="ResponseRequested" Type="Edm.Boolean" />
- <Property Name="Type" Type="Microsoft.Exchange.Services.OData.Model.EventType" />
- <Property Name="SeriesId" Type="Edm.String" />
- <Property Name="Attendees" Type="Collection(Microsoft.Exchange.Services.OData.Model.Attendee)" />
- <NavigationProperty Name="Calendar" Type="Microsoft.Exchange.Services.OData.Model.Calendar" />
- </EntityType>
- <EntityContainer Name="EntityContainer" m:IsDefaultEntityContainer="true">
- <EntitySet Name="Users" EntityType="Microsoft.Exchange.Services.OData.Model.User">
- <NavigationPropertyBinding Path="Folders" Target="Folders" />
- <NavigationPropertyBinding Path="Messages" Target="Messages" />
- <NavigationPropertyBinding Path="RootFolder" Target="Folders" />
- <NavigationPropertyBinding Path="Inbox" Target="Folders" />
- <NavigationPropertyBinding Path="Drafts" Target="Folders" />
- <NavigationPropertyBinding Path="SentItems" Target="Folders" />
- <NavigationPropertyBinding Path="DeletedItems" Target="Folders" />
- <NavigationPropertyBinding Path="Calendars" Target="Calendars" />
- <NavigationPropertyBinding Path="CalendarGroups" Target="CalendarGroups" />
- <NavigationPropertyBinding Path="Events" Target="Events" />
- </EntitySet>
- <EntitySet Name="Folders" EntityType="Microsoft.Exchange.Services.OData.Model.Folder">
- <NavigationPropertyBinding Path="ChildFolders" Target="Folders" />
- <NavigationPropertyBinding Path="Messages" Target="Messages" />
- </EntitySet>
- <EntitySet Name="Items" EntityType="Microsoft.Exchange.Services.OData.Model.Item" />
- <EntitySet Name="Messages" EntityType="Microsoft.Exchange.Services.OData.Model.EmailMessage">
- <NavigationPropertyBinding Path="Attachments" Target="Attachments" />
- </EntitySet>
- <EntitySet Name="Attachments" EntityType="Microsoft.Exchange.Services.OData.Model.Attachment">
- <NavigationPropertyBinding Path="Microsoft.Exchange.Services.OData.Model.ItemAttachment/Item" Target="Items" />
- </EntitySet>
- <EntitySet Name="Calendars" EntityType="Microsoft.Exchange.Services.OData.Model.Calendar">
- <NavigationPropertyBinding Path="Events" Target="Events" />
- </EntitySet>
- <EntitySet Name="CalendarGroups" EntityType="Microsoft.Exchange.Services.OData.Model.CalendarGroup" />
- <EntitySet Name="Events" EntityType="Microsoft.Exchange.Services.OData.Model.Event">
- <NavigationPropertyBinding Path="Attachments" Target="Attachments" />
- <NavigationPropertyBinding Path="Calendar" Target="Calendars" />
- </EntitySet>
- </EntityContainer>
- </Schema>
- </edmx:DataServices>
-</edmx:Edmx>
\ No newline at end of file
[06/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Product.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Product.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Product.java
deleted file mode 100644
index db17300..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Product.java
+++ /dev/null
@@ -1,273 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "Product",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface Product extends Serializable {
-
-
-
- @Property(name = "Picture",
- type = "Edm.Stream",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public java.io.InputStream getPicture();
-
- public void setPicture(final java.io.InputStream _picture);
-
- @Key
- @Property(name = "ProductId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getProductId();
-
- public void setProductId(final Integer _productId);
-
-
- @Property(name = "Description",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getDescription();
-
- public void setDescription(final String _description);
-
-
- @Property(name = "Dimensions",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions getDimensions();
-
- public void setDimensions(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions _dimensions);
-
-
- @Property(name = "BaseConcurrency",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.Fixed,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getBaseConcurrency();
-
- public void setBaseConcurrency(final String _baseConcurrency);
-
-
- @Property(name = "ComplexConcurrency",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo getComplexConcurrency();
-
- public void setComplexConcurrency(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _complexConcurrency);
-
-
- @Property(name = "NestedComplexConcurrency",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo getNestedComplexConcurrency();
-
- public void setNestedComplexConcurrency(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo _nestedComplexConcurrency);
-
-
-
-
- @NavigationProperty(name = "RelatedProducts",
- type = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Product)",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Product")
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection getRelatedProducts();
-
- public void setRelatedProducts(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection _relatedProducts);
-
-
- @NavigationProperty(name = "Detail",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductDetail",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "ProductDetail")
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail getDetail();
-
- public void setDetail(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail _detail);
-
-
- @NavigationProperty(name = "Reviews",
- type = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ProductReview)",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "ProductReview")
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection getReviews();
-
- public void setReviews(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection _reviews);
-
-
- @NavigationProperty(name = "Photos",
- type = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ProductPhoto)",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "ProductPhoto")
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection getPhotos();
-
- public void setPhotos(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection _photos);
-
-
- @Operation(name = "RetrieveProduct" ,
- returnType = "Edm.Int32")
- Integer retrieveProduct(
- );
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java
deleted file mode 100644
index d6f8416..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface ProductCollection extends AbstractEntityCollection<Product> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java
deleted file mode 100644
index c09ed35..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java
+++ /dev/null
@@ -1,124 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "ProductDetail",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface ProductDetail extends Serializable {
-
-
- @Key
- @Property(name = "ProductId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getProductId();
-
- public void setProductId(final Integer _productId);
-
-
- @Property(name = "Details",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getDetails();
-
- public void setDetails(final String _details);
-
-
-
-
- @NavigationProperty(name = "Product",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Product")
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Product getProduct();
-
- public void setProduct(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java
deleted file mode 100644
index 46c8abc..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface ProductDetailCollection extends AbstractEntityCollection<ProductDetail> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java
deleted file mode 100644
index 7aeb4a7..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java
+++ /dev/null
@@ -1,114 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "ProductPageView",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface ProductPageView extends com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.PageView {
-
-
-
- @Property(name = "ProductId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getProductId();
-
- public void setProductId(final Integer _productId);
-
-
- @Property(name = "ConcurrencyToken",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.Fixed,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getConcurrencyToken();
-
- public void setConcurrencyToken(final String _concurrencyToken);
-
-
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java
deleted file mode 100644
index 323a011..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface ProductPageViewCollection extends AbstractEntityCollection<ProductPageView> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java
deleted file mode 100644
index 23cdaa9..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java
+++ /dev/null
@@ -1,137 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-@KeyRef(ProductPhotoKey.class)
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "ProductPhoto",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface ProductPhoto extends Serializable {
-
-
- @Key
- @Property(name = "ProductId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getProductId();
-
- public void setProductId(final Integer _productId);
-
- @Key
- @Property(name = "PhotoId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getPhotoId();
-
- public void setPhotoId(final Integer _photoId);
-
-
- @Property(name = "Photo",
- type = "Edm.Binary",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public byte[] getPhoto();
-
- public void setPhoto(final byte[] _photo);
-
-
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java
deleted file mode 100644
index 66bae2c..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface ProductPhotoCollection extends AbstractEntityCollection<ProductPhoto> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java
deleted file mode 100644
index 1d7c4b6..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java
+++ /dev/null
@@ -1,75 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractEntityKey;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-@CompoundKey
-public class ProductPhotoKey extends AbstractEntityKey {
-
- private Integer _photoId;
-
- @CompoundKeyElement(name = "PhotoId", position = 0)
- public Integer getPhotoId() {
- return _photoId;
- }
-
- public void setPhotoId(final Integer _photoId) {
- this._photoId = _photoId;
- }
-
- private Integer _productId;
-
- @CompoundKeyElement(name = "ProductId", position = 1)
- public Integer getProductId() {
- return _productId;
- }
-
- public void setProductId(final Integer _productId) {
- this._productId = _productId;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java
deleted file mode 100644
index 582ae00..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java
+++ /dev/null
@@ -1,170 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-@KeyRef(ProductReviewKey.class)
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "ProductReview",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface ProductReview extends Serializable {
-
-
- @Key
- @Property(name = "ProductId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getProductId();
-
- public void setProductId(final Integer _productId);
-
- @Key
- @Property(name = "ReviewId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getReviewId();
-
- public void setReviewId(final Integer _reviewId);
-
-
- @Property(name = "Review",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getReview();
-
- public void setReview(final String _review);
-
- @Key
- @Property(name = "RevisionId",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getRevisionId();
-
- public void setRevisionId(final String _revisionId);
-
-
-
-
- @NavigationProperty(name = "Product",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Product")
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Product getProduct();
-
- public void setProduct(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java
deleted file mode 100644
index 616ef5d..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface ProductReviewCollection extends AbstractEntityCollection<ProductReview> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java
deleted file mode 100644
index 18ccba8..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java
+++ /dev/null
@@ -1,86 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractEntityKey;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-@CompoundKey
-public class ProductReviewKey extends AbstractEntityKey {
-
- private String _revisionId;
-
- @CompoundKeyElement(name = "RevisionId", position = 0)
- public String getRevisionId() {
- return _revisionId;
- }
-
- public void setRevisionId(final String _revisionId) {
- this._revisionId = _revisionId;
- }
-
- private Integer _reviewId;
-
- @CompoundKeyElement(name = "ReviewId", position = 1)
- public Integer getReviewId() {
- return _reviewId;
- }
-
- public void setReviewId(final Integer _reviewId) {
- this._reviewId = _reviewId;
- }
-
- private Integer _productId;
-
- @CompoundKeyElement(name = "ProductId", position = 2)
- public Integer getProductId() {
- return _productId;
- }
-
- public void setProductId(final Integer _productId) {
- this._productId = _productId;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java
deleted file mode 100644
index cf09d56..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java
+++ /dev/null
@@ -1,124 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "RSAToken",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface RSAToken extends Serializable {
-
-
- @Key
- @Property(name = "Serial",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getSerial();
-
- public void setSerial(final String _serial);
-
-
- @Property(name = "Issued",
- type = "Edm.DateTime",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public ODataTimestamp getIssued();
-
- public void setIssued(final ODataTimestamp _issued);
-
-
-
-
- @NavigationProperty(name = "Login",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Login")
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Login getLogin();
-
- public void setLogin(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Login _login);
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java
deleted file mode 100644
index 0bd301d..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface RSATokenCollection extends AbstractEntityCollection<RSAToken> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java
deleted file mode 100644
index 196f4e4..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java
+++ /dev/null
@@ -1,154 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "SpecialEmployee",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface SpecialEmployee extends com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee {
-
-
-
- @Property(name = "CarsVIN",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getCarsVIN();
-
- public void setCarsVIN(final Integer _carsVIN);
-
-
- @Property(name = "Bonus",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getBonus();
-
- public void setBonus(final Integer _bonus);
-
-
- @Property(name = "IsFullyVested",
- type = "Edm.Boolean",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Boolean getIsFullyVested();
-
- public void setIsFullyVested(final Boolean _isFullyVested);
-
-
-
-
- @NavigationProperty(name = "Car",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Car")
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Car getCar();
-
- public void setCar(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Car _car);
-
-
- @Operation(name = "UpdatePersonInfo" )
- void updatePersonInfo(
- );
- @Operation(name = "IncreaseEmployeeSalary" ,
- returnType = "Edm.Int32")
- Integer increaseEmployeeSalary(
- );
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java
deleted file mode 100644
index 3dafd7a..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java
+++ /dev/null
@@ -1,51 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface SpecialEmployeeCollection extends AbstractEntityCollection<SpecialEmployee> {
-
- @Operation(name = "IncreaseSalaries" )
- void increaseSalaries(
- @Parameter(name = "n", type = "Edm.Int32", nullable = false) Integer n
- );
-}
[45/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataStreamUpdateResponse.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataStreamUpdateResponse.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataStreamUpdateResponse.java
deleted file mode 100644
index 4ee5581..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataStreamUpdateResponse.java
+++ /dev/null
@@ -1,36 +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 com.msopentech.odatajclient.engine.communication.response;
-
-import java.io.InputStream;
-
-/**
- * This class implements the response to an Odata stream create/update request.
- *
- * @see com.msopentech.odatajclient.engine.communication.request.streamed.ODataStreamUpdateRequest
- */
-public interface ODataStreamUpdateResponse extends ODataResponse {
-
- /**
- * Gets created/updated object.
- *
- * @return created/updated object.
- */
- InputStream getBody();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataValueUpdateResponse.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataValueUpdateResponse.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataValueUpdateResponse.java
deleted file mode 100644
index b4e4a2c..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/response/ODataValueUpdateResponse.java
+++ /dev/null
@@ -1,36 +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 com.msopentech.odatajclient.engine.communication.response;
-
-import com.msopentech.odatajclient.engine.data.ODataValue;
-
-/**
- * This class implements the response to an OData update entity property request.
- *
- * @see com.msopentech.odatajclient.engine.communication.request.cud.ODataPropertyUpdateRequest
- */
-public interface ODataValueUpdateResponse extends ODataResponse {
-
- /**
- * Gets updated object.
- *
- * @return updated object.
- */
- ODataValue getBody();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/AbstractODataObjectFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/AbstractODataObjectFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/AbstractODataObjectFactory.java
deleted file mode 100644
index 3427781..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/AbstractODataObjectFactory.java
+++ /dev/null
@@ -1,276 +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 com.msopentech.odatajclient.engine.data;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import java.net.URI;
-
-public abstract class AbstractODataObjectFactory implements ODataObjectFactory {
-
- private static final long serialVersionUID = -3769695665946919447L;
-
- protected final ODataClient client;
-
- public AbstractODataObjectFactory(final ODataClient client) {
- this.client = client;
- }
-
- /**
- * Instantiates a new entity set.
- *
- * @return entity set.
- */
- @Override
- public ODataEntitySet newEntitySet() {
- return new ODataEntitySet();
- }
-
- /**
- * Instantiates a new entity set.
- *
- * @param next next link.
- * @return entity set.
- */
- @Override
- public ODataEntitySet newEntitySet(final URI next) {
- return new ODataEntitySet(next);
- }
-
- /**
- * Instantiates a new entity.
- *
- * @param name OData entity name.
- * @return entity.
- */
- @Override
- public ODataEntity newEntity(final String name) {
- return new ODataEntity(name);
- }
-
- /**
- * Instantiates a new entity.
- *
- * @param name OData entity name.
- * @param link self link.
- * @return entity.
- */
- @Override
- public ODataEntity newEntity(final String name, final URI link) {
- final ODataEntity result = new ODataEntity(name);
- result.setLink(link);
- return result;
- }
-
- /**
- * Instantiates a new in-line entity set.
- *
- * @param name name.
- * @param link edit link.
- * @param entitySet entity set.
- * @return in-line entity set.
- */
- @Override
- public ODataInlineEntitySet newInlineEntitySet(final String name, final URI link,
- final ODataEntitySet entitySet) {
-
- return new ODataInlineEntitySet(client, link, ODataLinkType.ENTITY_SET_NAVIGATION, name, entitySet);
- }
-
- /**
- * Instantiates a new in-line entity set.
- *
- * @param name name.
- * @param baseURI base URI.
- * @param href href.
- * @param entitySet entity set.
- * @return in-line entity set.
- */
- @Override
- public ODataInlineEntitySet newInlineEntitySet(final String name, final URI baseURI, final String href,
- final ODataEntitySet entitySet) {
-
- return new ODataInlineEntitySet(client, baseURI, href, ODataLinkType.ENTITY_SET_NAVIGATION, name, entitySet);
- }
-
- /**
- * Instantiates a new in-line entity.
- *
- * @param name name.
- * @param link edit link.
- * @param entity entity.
- * @return in-line entity.
- */
- @Override
- public ODataInlineEntity newInlineEntity(final String name, final URI link, final ODataEntity entity) {
- return new ODataInlineEntity(client, link, ODataLinkType.ENTITY_NAVIGATION, name, entity);
- }
-
- /**
- * Instantiates a new in-line entity.
- *
- * @param name name.
- * @param baseURI base URI.
- * @param href href.
- * @param entity entity.
- * @return in-line entity.
- */
- @Override
- public ODataInlineEntity newInlineEntity(final String name, final URI baseURI, final String href,
- final ODataEntity entity) {
-
- return new ODataInlineEntity(client, baseURI, href, ODataLinkType.ENTITY_NAVIGATION, name, entity);
- }
-
- /**
- * Instantiates a new entity navigation link.
- *
- * @param name name.
- * @param link link.
- * @return entity navigation link.
- */
- @Override
- public ODataLink newEntityNavigationLink(final String name, final URI link) {
- return new ODataLink(client, link, ODataLinkType.ENTITY_NAVIGATION, name);
- }
-
- /**
- * Instantiates a new entity navigation link.
- *
- * @param name name.
- * @param baseURI base URI.
- * @param href href.
- * @return entity navigation link.
- */
- @Override
- public ODataLink newEntityNavigationLink(final String name, final URI baseURI, final String href) {
- return new ODataLink(client, baseURI, href, ODataLinkType.ENTITY_NAVIGATION, name);
- }
-
- /**
- * Instantiates a new entity set navigation link.
- *
- * @param name name.
- * @param link link.
- * @return entity set navigation link.
- */
- @Override
- public ODataLink newFeedNavigationLink(final String name, final URI link) {
- return new ODataLink(client, link, ODataLinkType.ENTITY_SET_NAVIGATION, name);
- }
-
- /**
- * Instantiates a new entity set navigation link.
- *
- * @param name name.
- * @param baseURI base URI.
- * @param href href.
- * @return entity set navigation link.
- */
- @Override
- public ODataLink newFeedNavigationLink(final String name, final URI baseURI, final String href) {
- return new ODataLink(client, baseURI, href, ODataLinkType.ENTITY_SET_NAVIGATION, name);
- }
-
- /**
- * Instantiates a new association link.
- *
- * @param name name.
- * @param link link.
- * @return association link.
- */
- @Override
- public ODataLink newAssociationLink(final String name, final URI link) {
- return new ODataLink(client, link, ODataLinkType.ASSOCIATION, name);
- }
-
- /**
- * Instantiates a new association link.
- *
- * @param name name.
- * @param baseURI base URI.
- * @param href href.
- * @return association link.
- */
- @Override
- public ODataLink newAssociationLink(final String name, final URI baseURI, final String href) {
- return new ODataLink(client, baseURI, href, ODataLinkType.ASSOCIATION, name);
- }
-
- /**
- * Instantiates a new media-edit link.
- *
- * @param name name.
- * @param link link.
- * @return media-edit link.
- */
- @Override
- public ODataLink newMediaEditLink(final String name, final URI link) {
- return new ODataLink(client, link, ODataLinkType.MEDIA_EDIT, name);
- }
-
- /**
- * Instantiates a new media-edit link.
- *
- * @param name name.
- * @param baseURI base URI.
- * @param href href.
- * @return media-edit link.
- */
- @Override
- public ODataLink newMediaEditLink(final String name, final URI baseURI, final String href) {
- return new ODataLink(client, baseURI, href, ODataLinkType.MEDIA_EDIT, name);
- }
-
- /**
- * Instantiates a new primitive property.
- *
- * @param name name.
- * @param value value.
- * @return primitive property.
- */
- @Override
- public ODataProperty newPrimitiveProperty(final String name, final ODataPrimitiveValue value) {
- return new ODataProperty(name, value);
- }
-
- /**
- * Instantiates a new complex property.
- *
- * @param name name.
- * @param value value.
- * @return complex property.
- */
- @Override
- public ODataProperty newComplexProperty(final String name, final ODataComplexValue value) {
- return new ODataProperty(name, value);
- }
-
- /**
- * Instantiates a new collection property.
- *
- * @param name name.
- * @param value value.
- * @return collection property.
- */
- @Override
- public ODataProperty newCollectionProperty(final String name, final ODataCollectionValue value) {
- return new ODataProperty(name, value);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/Entry.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/Entry.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/Entry.java
deleted file mode 100644
index df352fa..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/Entry.java
+++ /dev/null
@@ -1,247 +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 com.msopentech.odatajclient.engine.data;
-
-import java.net.URI;
-import java.util.List;
-import org.w3c.dom.Element;
-
-/**
- * REST resource for an <tt>ODataEntity</tt>.
- *
- * @see ODataEntity
- */
-public interface Entry {
-
- /**
- * Gets ETag.
- *
- * @return ETag.
- */
- String getETag();
-
- /**
- * Sets ETag.
- *
- * @param eTag ETag.
- */
- void setETag(String eTag);
-
- /**
- * Gets base URI.
- *
- * @return base URI.
- */
- URI getBaseURI();
-
- /**
- * Gets entry type.
- *
- * @return entry type.
- */
- String getType();
-
- /**
- * Sets entry type.
- *
- * @param type entry type.
- */
- void setType(String type);
-
- /**
- * Gest entry ID.
- *
- * @return entry ID.
- */
- String getId();
-
- /**
- * Sets entry ID.
- *
- * @param id entry ID.
- */
- void setId(String id);
-
- /**
- * Gets entry self link.
- *
- * @return self link.
- */
- Link getSelfLink();
-
- /**
- * Sets entry self link.
- *
- * @param selfLink self link.
- */
- void setSelfLink(Link selfLink);
-
- /**
- * Gets entry edit link.
- *
- * @return edit link.
- */
- Link getEditLink();
-
- /**
- * Sets entry edit link.
- *
- * @param editLink edit link.
- */
- void setEditLink(Link editLink);
-
- /**
- * Gets association links.
- *
- * @return association links.
- */
- List<? extends Link> getAssociationLinks();
-
- /**
- * Adds an association link.
- *
- * @param associationLink link.
- * @return 'TRUE' in case of success; false otherwise.
- */
- boolean addAssociationLink(Link associationLink);
-
- /**
- * Sets association links.
- *
- * @param associationLinks links.
- * @return 'TRUE' in case of success; false otherwise.
- */
- void setAssociationLinks(List<Link> associationLinks);
-
- /**
- * Gets navigation links.
- *
- * @return links.
- */
- List<? extends Link> getNavigationLinks();
-
- /**
- * Adds a navigation link.
- *
- * @param navigationLink link.
- * @return 'TRUE' in case of success; false otherwise.
- */
- boolean addNavigationLink(Link navigationLink);
-
- /**
- * Sets navigation links.
- *
- * @param navigationLink links.
- * @return 'TRUE' in case of success; false otherwise.
- */
- void setNavigationLinks(List<Link> navigationLinks);
-
- /**
- * Gets media entity links.
- *
- * @return links.
- */
- List<? extends Link> getMediaEditLinks();
-
- /**
- * Adds a media entity link.
- *
- * @param mediaEditLink link.
- * @return 'TRUE' in case of success; false otherwise.
- */
- boolean addMediaEditLink(Link mediaEditLink);
-
- /**
- * Sets media entity links.
- *
- * @param mediaEditLinks links.
- * @return 'TRUE' in case of success; false otherwise.
- */
- void setMediaEditLinks(List<Link> mediaEditLinks);
-
- /**
- * Gets operations.
- *
- * @return operations.
- */
- List<ODataOperation> getOperations();
-
- /**
- * Gets content.
- *
- * @return content.
- */
- Element getContent();
-
- /**
- * Sets content.
- *
- * @param content content.
- */
- void setContent(Element content);
-
- /**
- * Gets media entry properties.
- *
- * @return media entry properties.
- */
- Element getMediaEntryProperties();
-
- /**
- * Sets media entry properties.
- *
- * @param content media entry properties.
- */
- void setMediaEntryProperties(Element content);
-
- /**
- * Gets media content type.
- *
- * @return media content type.
- */
- String getMediaContentType();
-
- /**
- * Gets media content resource.
- *
- * @return media content resource.
- */
- String getMediaContentSource();
-
- /**
- * Set media content source.
- *
- * @param mediaContentSource media content source.
- */
- void setMediaContentSource(String mediaContentSource);
-
- /**
- * Set media content type.
- *
- * @param mediaContentType media content type.
- */
- void setMediaContentType(String mediaContentType);
-
- /**
- * Checks if the current entry is a media entry.
- *
- * @return 'TRUE' if is a media entry; 'FALSE' otherwise.
- */
- boolean isMediaEntry();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/Feed.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/Feed.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/Feed.java
deleted file mode 100644
index 6138826..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/Feed.java
+++ /dev/null
@@ -1,72 +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 com.msopentech.odatajclient.engine.data;
-
-import java.net.URI;
-import java.util.List;
-
-/**
- * REST resource for an <tt>ODataEntitySet</tt>.
- *
- * @see ODataEntitySet
- */
-public interface Feed {
-
- /**
- * Gets base URI.
- *
- * @return base URI.
- */
- URI getBaseURI();
-
- /**
- * Gets number of entries if an <tt>inlinecount</tt> was required.
- *
- * @return number of entries into the feed.
- */
- Integer getCount();
-
- /**
- * Gets entries.
- *
- * @return entries.
- */
- List<? extends Entry> getEntries();
-
- /**
- * Sets entries.
- *
- * @param entries entries.
- */
- void setEntries(List<Entry> entries);
-
- /**
- * Sets next link.
- *
- * @param next next link.
- */
- void setNext(URI next);
-
- /**
- * Gets next link if exists.
- *
- * @return next link if exists; null otherwise.
- */
- URI getNext();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/Link.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/Link.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/Link.java
deleted file mode 100644
index 71c3caf..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/Link.java
+++ /dev/null
@@ -1,111 +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 com.msopentech.odatajclient.engine.data;
-
-/**
- * REST resource for an <tt>ODataLink</tt>.
- *
- * @see ODataLink
- */
-public interface Link {
-
- /**
- * Gets rel info.
- *
- * @return rel info.
- */
- String getRel();
-
- /**
- * Sets rel info.
- *
- * @param rel rel info.
- */
- void setRel(String rel);
-
- /**
- * Gets type.
- *
- * @return type.
- */
- String getType();
-
- /**
- * Sets type.
- *
- * @param type type.
- */
- void setType(String type);
-
- /**
- * Gets title.
- *
- * @return title.
- */
- String getTitle();
-
- /**
- * Sets title.
- *
- * @param title title.
- */
- void setTitle(String title);
-
- /**
- * Gets href.
- *
- * @return href.
- */
- String getHref();
-
- /**
- * Sets href.
- *
- * @param href href.
- */
- void setHref(String href);
-
- /**
- * Gets in-line entry.
- *
- * @return in-line entry.
- */
- Entry getInlineEntry();
-
- /**
- * Sets in-line entry.
- *
- * @param entry entry.
- */
- void setInlineEntry(Entry entry);
-
- /**
- * Gets in-line feed.
- *
- * @return in-line feed.
- */
- Feed getInlineFeed();
-
- /**
- * Sets in-line feed.
- *
- * @param feed feed.
- */
- void setInlineFeed(Feed feed);
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/LinkCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/LinkCollection.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/LinkCollection.java
deleted file mode 100644
index a099e1b..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/LinkCollection.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.engine.data;
-
-import java.net.URI;
-import java.util.List;
-
-/**
- * REST resource for an <tt>ODataLinkCollection</tt>.
- *
- * @see ODataLinkCollection
- */
-public interface LinkCollection {
-
- /**
- * Smart management of different JSON format produced by OData services when
- * <tt>$links</tt> is a single or a collection property.
- *
- * @return list of URIs for <tt>$links</tt>
- */
- List<URI> getLinks();
-
- /**
- * Sets next link.
- *
- * @param next next link.
- */
- void setNext(final URI next);
-
- /**
- * Gets next link if exists.
- *
- * @return next link if exists; null otherwise.
- */
- URI getNext();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/NoValidEntityFound.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/NoValidEntityFound.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/NoValidEntityFound.java
deleted file mode 100644
index fc27962..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/NoValidEntityFound.java
+++ /dev/null
@@ -1,55 +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 com.msopentech.odatajclient.engine.data;
-
-/**
- * Exception indicating that no valid object has been found.
- */
-public class NoValidEntityFound extends Exception {
-
- private static final long serialVersionUID = -3078954221364213688L;
-
- /**
- * Creates a new instance of
- * <code>NoSuchEntityFound</code> without detail message.
- */
- public NoValidEntityFound() {
- super();
- }
-
- /**
- * Constructs an instance of
- * <code>NoSuchEntityFound</code> with the specified detail message.
- *
- * @param msg the detail message.
- */
- public NoValidEntityFound(String msg) {
- super(msg);
- }
-
- /**
- * Constructs an instance of
- * <code>NoSuchEntityFound</code> with the specified cause.
- *
- * @param t cause.
- */
- public NoValidEntityFound(final Throwable t) {
- this.initCause(t);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataBinder.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataBinder.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataBinder.java
deleted file mode 100644
index 828f06e..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataBinder.java
+++ /dev/null
@@ -1,128 +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 com.msopentech.odatajclient.engine.data;
-
-import java.io.Serializable;
-import java.net.URI;
-import org.w3c.dom.Element;
-
-public interface ODataBinder extends Serializable {
-
- /**
- * Gets <tt>ODataServiceDocument</tt> from the given service document resource.
- *
- * @param resource service document resource.
- * @return <tt>ODataServiceDocument</tt> object.
- */
- ODataServiceDocument getODataServiceDocument(ServiceDocument resource);
-
- /**
- * Gets a <tt>FeedResource</tt> from the given OData entity set.
- *
- * @param <T> feed resource type.
- * @param feed OData entity set.
- * @param reference reference class.
- * @return <tt>FeedResource</tt> object.
- */
- <T extends Feed> T getFeed(ODataEntitySet feed, Class<T> reference);
-
- /**
- * Gets an <tt>EntryResource</tt> from the given OData entity.
- *
- * @param <T> entry resource type.
- * @param entity OData entity.
- * @param reference reference class.
- * @return <tt>EntryResource</tt> object.
- */
- <T extends Entry> T getEntry(ODataEntity entity, Class<T> reference);
-
- /**
- * Gets an <tt>EntryResource</tt> from the given OData entity.
- *
- * @param <T> entry resource type.
- * @param entity OData entity.
- * @param reference reference class.
- * @param setType whether to explicitly output type information.
- * @return <tt>EntryResource</tt> object.
- */
- <T extends Entry> T getEntry(ODataEntity entity, Class<T> reference, boolean setType);
-
- /**
- * Gets the given OData property as DOM element.
- *
- * @param prop OData property.
- * @return <tt>Element</tt> object.
- */
- Element toDOMElement(ODataProperty prop);
-
- ODataLinkCollection getLinkCollection(LinkCollection linkCollection);
-
- /**
- * Gets <tt>ODataEntitySet</tt> from the given feed resource.
- *
- * @param resource feed resource.
- * @return <tt>ODataEntitySet</tt> object.
- */
- ODataEntitySet getODataEntitySet(Feed resource);
-
- /**
- * Gets <tt>ODataEntitySet</tt> from the given feed resource.
- *
- * @param resource feed resource.
- * @param defaultBaseURI default base URI.
- * @return <tt>ODataEntitySet</tt> object.
- */
- ODataEntitySet getODataEntitySet(Feed resource, URI defaultBaseURI);
-
- /**
- * Gets <tt>ODataEntity</tt> from the given entry resource.
- *
- * @param resource entry resource.
- * @return <tt>ODataEntity</tt> object.
- */
- ODataEntity getODataEntity(Entry resource);
-
- /**
- * Gets <tt>ODataEntity</tt> from the given entry resource.
- *
- * @param resource entry resource.
- * @param defaultBaseURI default base URI.
- * @return <tt>ODataEntity</tt> object.
- */
- ODataEntity getODataEntity(Entry resource, URI defaultBaseURI);
-
- /**
- * Gets a <tt>LinkResource</tt> from the given OData link.
- *
- * @param <T> link resource type.
- * @param link OData link.
- * @param reference reference class.
- * @return <tt>LinkResource</tt> object.
- */
- @SuppressWarnings("unchecked")
- <T extends Link> T getLinkResource(ODataLink link, Class<T> reference);
-
- /**
- * Gets an <tt>ODataProperty</tt> from the given DOM element.
- *
- * @param property content.
- * @return <tt>ODataProperty</tt> object.
- */
- ODataProperty getProperty(Element property);
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataCollectionValue.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataCollectionValue.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataCollectionValue.java
deleted file mode 100644
index 91f70bb..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataCollectionValue.java
+++ /dev/null
@@ -1,98 +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 com.msopentech.odatajclient.engine.data;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * OData collection property value.
- */
-public class ODataCollectionValue extends ODataValue implements Iterable<ODataValue> {
-
- private static final long serialVersionUID = -3665659846001987187L;
-
- /**
- * Type name;
- */
- private final String typeName;
-
- /**
- * Values.
- */
- private final List<ODataValue> values = new ArrayList<ODataValue>();
-
- /**
- * Constructor.
- *
- * @param typeName type name.
- */
- public ODataCollectionValue(final String typeName) {
- this.typeName = typeName;
- }
-
- /**
- * Adds a value to the collection.
- *
- * @param value value to be added.
- */
- public void add(final ODataValue value) {
- if (value.isPrimitive() || value.isComplex()) {
- values.add(value);
- }
- }
-
- /**
- * Value iterator.
- *
- * @return value iterator.
- */
- @Override
- public Iterator<ODataValue> iterator() {
- return values.iterator();
- }
-
- /**
- * Gets value type name.
- *
- * @return value type name.
- */
- public String getTypeName() {
- return typeName;
- }
-
- /**
- * Gets collection size.
- *
- * @return collection size.
- */
- public int size() {
- return values.size();
- }
-
- /**
- * Checks if collection is empty.
- *
- * @return 'TRUE' if empty; 'FALSE' otherwise.
- */
- public boolean isEmpty() {
- return values.isEmpty();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataComplexValue.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataComplexValue.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataComplexValue.java
deleted file mode 100644
index 0a8be52..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataComplexValue.java
+++ /dev/null
@@ -1,97 +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 com.msopentech.odatajclient.engine.data;
-
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * OData complex property value.
- */
-public class ODataComplexValue extends ODataValue implements Iterable<ODataProperty> {
-
- private static final long serialVersionUID = -1878555027714020431L;
-
- /**
- * Type name.
- */
- private final String typeName;
-
- /**
- * Complex type fields.
- */
- private final Map<String, ODataProperty> fields = new LinkedHashMap<String, ODataProperty>();
-
- /**
- * Constructor.
- *
- * @param typeName type name.
- */
- public ODataComplexValue(final String typeName) {
- this.typeName = typeName;
- }
-
- /**
- * Adds field to the complex type.
- *
- * @param field field to be added.
- */
- public void add(final ODataProperty field) {
- fields.put(field.getName(), field);
- }
-
- /**
- * Gets field.
- *
- * @param name name of the field to be retrieved.
- * @return requested field.
- */
- public ODataProperty get(final String name) {
- return fields.get(name);
- }
-
- /**
- * Complex property fields iterator.
- *
- * @return fields iterator.
- */
- @Override
- public Iterator<ODataProperty> iterator() {
- return fields.values().iterator();
- }
-
- /**
- * Gest value type name.
- *
- * @return value type name.
- */
- public String getTypeName() {
- return typeName;
- }
-
- /**
- * Gets number of fields.
- *
- * @return number of fields.
- */
- public int size() {
- return fields.size();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataDeserializer.java
deleted file mode 100644
index 04cb56f..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataDeserializer.java
+++ /dev/null
@@ -1,97 +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 com.msopentech.odatajclient.engine.data;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmx;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import java.io.InputStream;
-import java.io.Serializable;
-import org.w3c.dom.Element;
-
-/**
- * Utility class for serialization.
- */
-public interface ODataDeserializer extends Serializable {
-
- AbstractEdmx<?, ?, ?, ?, ?, ?> toMetadata(InputStream input);
-
- /**
- * Gets the ServiceDocumentResource object represented by the given InputStream.
- *
- * @param input stream to be de-serialized.
- * @param format OData service document format.
- * @return ServiceDocumentResource object.
- */
- ServiceDocument toServiceDocument(InputStream input, ODataFormat format);
-
- /**
- * Gets a feed object from the given InputStream.
- *
- * @param <T> reference class type
- * @param input stream to be de-serialized.
- * @param reference reference class (AtomFeed.class, JSONFeed.class).
- * @return FeedResource instance.
- */
- <T extends Feed> T toFeed(InputStream input, Class<T> reference);
-
- /**
- * Gets an entry object from the given InputStream.
- *
- * @param <T> reference class type
- * @param input stream to be de-serialized.
- * @param reference reference class (AtomEntry.class, JSONV3Entry.class).
- * @return EntryResource instance.
- */
- <T extends Entry> T toEntry(InputStream input, Class<T> reference);
-
- /**
- * Gets a DOM representation of the given InputStream.
- *
- * @param input stream to be de-serialized.
- * @param format OData format.
- * @return DOM.
- */
- Element toPropertyDOM(InputStream input, ODataFormat format);
-
- /**
- * Gets a list of links from the given InputStream.
- *
- * @param input stream to be de-serialized.
- * @param format OData format.
- * @return de-serialized links.
- */
- LinkCollection toLinkCollection(InputStream input, ODataFormat format);
-
- /**
- * Gets the ODataError object represented by the given InputStream.
- *
- * @param input stream to be parsed and de-serialized.
- * @param isXML 'TRUE' if the error is represented by XML; 'FALSE' otherwise.
- * @return
- */
- ODataError toODataError(InputStream input, boolean isXML);
-
- /**
- * Parses the given input into a DOM tree.
- *
- * @param input stream to be parsed and de-serialized.
- * @return DOM tree
- */
- Element toDOM(InputStream input);
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataDuration.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataDuration.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataDuration.java
deleted file mode 100644
index 2a6e2e4..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataDuration.java
+++ /dev/null
@@ -1,80 +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 com.msopentech.odatajclient.engine.data;
-
-import java.io.Serializable;
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
-import javax.xml.datatype.Duration;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-
-/**
- * Helper class for handling time (as duration) primitive values.
- *
- * @see com.msopentech.odatajclient.engine.data.metadata.edm.EdmSimpleType#TIME
- * @see Duration
- */
-public final class ODataDuration implements Serializable {
-
- private static final long serialVersionUID = 778404231943967899L;
-
- private final Duration duration;
-
- public ODataDuration(final String input) {
- try {
- final DatatypeFactory dtFactory = DatatypeFactory.newInstance();
- this.duration = dtFactory.newDuration(input);
- } catch (DatatypeConfigurationException e) {
- throw new IllegalArgumentException("Could not parse '" + input + "' as Duration", e);
- }
- }
-
- public ODataDuration(final Duration duration) {
- this.duration = duration;
- }
-
- public Duration getDuration() {
- return duration;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public boolean equals(final Object obj) {
- return EqualsBuilder.reflectionEquals(this, obj);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public int hashCode() {
- return HashCodeBuilder.reflectionHashCode(this);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public String toString() {
- return this.duration.toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataEntity.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataEntity.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataEntity.java
deleted file mode 100644
index 74c9289..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataEntity.java
+++ /dev/null
@@ -1,361 +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 com.msopentech.odatajclient.engine.data;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.commons.lang3.StringUtils;
-
-/**
- * OData entity.
- */
-public class ODataEntity extends ODataItem implements ODataInvokeResult {
-
- private static final long serialVersionUID = 8360640095932811034L;
-
- /**
- * ETag.
- */
- private String eTag;
-
- /**
- * Media entity flag.
- */
- private boolean mediaEntity = false;
-
- /**
- * In case of media entity, media content type.
- */
- private String mediaContentType;
-
- /**
- * In case of media entity, media content source.
- */
- private String mediaContentSource;
-
- /**
- * Edit link.
- */
- protected URI editLink;
-
- /**
- * Navigation links (might contain in-line entities or feeds).
- */
- protected final List<ODataLink> navigationLinks = new ArrayList<ODataLink>();
-
- /**
- * Association links.
- */
- protected final List<ODataLink> associationLinks = new ArrayList<ODataLink>();
-
- /**
- * Media edit links.
- */
- protected final List<ODataLink> editMediaLinks = new ArrayList<ODataLink>();
-
- /**
- * Operations (legacy, functions, actions).
- */
- protected final List<ODataOperation> operations = new ArrayList<ODataOperation>();
-
- /**
- * Entity properties.
- */
- protected final List<ODataProperty> properties = new ArrayList<ODataProperty>();
-
- /**
- * Constructor.
- *
- * @param name OData entity name.
- */
- ODataEntity(final String name) {
- super(name);
- }
-
- /**
- * Gets ETag.
- *
- * @return ETag.
- */
- public String getETag() {
- return eTag;
- }
-
- /**
- * Sets ETag.
- *
- * @param eTag ETag.
- */
- public void setETag(final String eTag) {
- this.eTag = eTag;
- }
-
- /**
- * Adds an operation.
- *
- * @param operation to be added.
- * @return whether operation was actually added or not.
- */
- public boolean addOperation(final ODataOperation operation) {
- return this.operations.add(operation);
- }
-
- /**
- * Sets operations.
- *
- * @param operations operations.
- */
- public void setOperations(final List<ODataOperation> operations) {
- this.operations.clear();
- if (operations != null && !operations.isEmpty()) {
- this.operations.addAll(operations);
- }
- }
-
- /**
- * Searches for operation with given title.
- *
- * @param title operation to look for
- * @return operation if found with given title, <tt>null</tt> otherwise
- */
- public ODataOperation getOperation(final String title) {
- ODataOperation result = null;
- for (ODataOperation operation : operations) {
- if (title.equals(operation.getTitle())) {
- result = operation;
- }
- }
-
- return result;
- }
-
- /**
- * Gets operations.
- *
- * @return operations.
- */
- public List<ODataOperation> getOperations() {
- return this.operations;
- }
-
- /**
- * Searches for property with given name.
- *
- * @param name property to look for
- * @return property if found with given name, <tt>null</tt> otherwise
- */
- public ODataProperty getProperty(final String name) {
- ODataProperty result = null;
-
- if (StringUtils.isNotBlank(name)) {
- for (ODataProperty property : properties) {
- if (name.equals(property.getName())) {
- result = property;
- }
- }
- }
-
- return result;
- }
-
- /**
- * Returns OData entity properties.
- *
- * @return OData entity properties.
- */
- public List<ODataProperty> getProperties() {
- return properties;
- }
-
- /**
- * Adds new property.
- *
- * @param property property to be added.
- */
- public boolean addProperty(final ODataProperty property) {
- return properties.contains(property) ? false : properties.add(property);
- }
-
- /**
- * Removes given property.
- *
- * @param property property to be removed.
- */
- public boolean removeProperty(final ODataProperty property) {
- return properties.remove(property);
- }
-
- /**
- * Puts the given link into one of available lists, based on its type.
- *
- * @param link to be added
- * @return <tt>true</tt> if the given link was added in one of available lists
- */
- public boolean addLink(final ODataLink link) {
- boolean result = false;
-
- switch (link.getType()) {
- case ASSOCIATION:
- result = associationLinks.contains(link) ? false : associationLinks.add(link);
- break;
-
- case ENTITY_NAVIGATION:
- case ENTITY_SET_NAVIGATION:
- result = navigationLinks.contains(link) ? false : navigationLinks.add(link);
- break;
-
- case MEDIA_EDIT:
- result = editMediaLinks.contains(link) ? false : editMediaLinks.add(link);
- break;
-
- default:
- }
-
- return result;
- }
-
- /**
- * Removes the given link from any list (association, navigation, edit-media).
- *
- * @param link to be removed
- * @return <tt>true</tt> if the given link was contained in one of available lists
- */
- public boolean removeLink(final ODataLink link) {
- return associationLinks.remove(link) || navigationLinks.remove(link) || editMediaLinks.remove(link);
- }
-
- /**
- * Returns all entity navigation links (including inline entities / feeds).
- *
- * @return OData entity links.
- */
- public List<ODataLink> getNavigationLinks() {
- return navigationLinks;
- }
-
- /**
- * Returns all entity association links.
- *
- * @return OData entity links.
- */
- public List<ODataLink> getAssociationLinks() {
- return associationLinks;
- }
-
- /**
- * Returns all entity media edit links.
- *
- * @return OData entity links.
- */
- public List<ODataLink> getEditMediaLinks() {
- return editMediaLinks;
- }
-
- /**
- * Returns OData entity edit link.
- *
- * @return entity edit link.
- */
- public URI getEditLink() {
- return editLink;
- }
-
- /**
- * Sets OData entity edit link.
- *
- * @param editLink edit link.
- */
- public void setEditLink(final URI editLink) {
- this.editLink = editLink;
- }
-
- /**
- * {@inheritDoc }
- * <p>
- * If null the edit link will be returned.
- */
- @Override
- public URI getLink() {
- return super.getLink() == null ? getEditLink() : super.getLink();
- }
-
- /**
- * TRUE if read-only entity.
- *
- * @return TRUE if read-only; FALSE otherwise.
- */
- public boolean isReadOnly() {
- return super.getLink() != null;
- }
-
- /**
- * Checks if the current entity is a media entity.
- *
- * @return 'TRUE' if media entity; 'FALSE' otherwise.
- */
- public boolean isMediaEntity() {
- return mediaEntity;
- }
-
- /**
- * Sets media entity flag.
- *
- * @param isMediaEntity media entity flag value.
- */
- public void setMediaEntity(final boolean isMediaEntity) {
- this.mediaEntity = isMediaEntity;
- }
-
- /**
- * Gets media content type.
- *
- * @return media content type.
- */
- public String getMediaContentType() {
- return mediaContentType;
- }
-
- /**
- * Sets media content type.
- *
- * @param mediaContentType media content type.
- */
- public void setMediaContentType(final String mediaContentType) {
- this.mediaContentType = mediaContentType;
- }
-
- /**
- * Gets media content source.
- *
- * @return media content source.
- */
- public String getMediaContentSource() {
- return mediaContentSource;
- }
-
- /**
- * Sets media content source.
- *
- * @param mediaContentSource media content source.
- */
- public void setMediaContentSource(final String mediaContentSource) {
- this.mediaContentSource = mediaContentSource;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataEntitySet.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataEntitySet.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataEntitySet.java
deleted file mode 100644
index d8c2cbb..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataEntitySet.java
+++ /dev/null
@@ -1,121 +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 com.msopentech.odatajclient.engine.data;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * OData entity collection.
- * If pagination was used to get this instance, forward page navigation URI will be available.
- */
-public class ODataEntitySet extends ODataItem implements ODataInvokeResult {
-
- private static final long serialVersionUID = 9039605899821494024L;
-
- /**
- * Link to the next page.
- */
- protected URI next;
-
- /**
- * Number of ODataEntities contained in this feed.
- * If <tt>$inlinecount</tt> was requested, this value comes from there.
- */
- protected Integer count;
-
- /**
- * OData entities contained in this feed.
- */
- protected List<ODataEntity> entities = new ArrayList<ODataEntity>();
-
- /**
- * Constructor.
- */
- ODataEntitySet() {
- super(null);
- }
-
- /**
- * Constructor.
- *
- * @param next next link.
- */
- ODataEntitySet(final URI next) {
- super(null);
- this.next = next;
- }
-
- /**
- * Gets next page link.
- *
- * @return next page link; null value if single page or last page reached.
- */
- public URI getNext() {
- return next;
- }
-
- /**
- * Sets in-line count.
- *
- * @param count in-line count value.
- */
- public void setCount(final int count) {
- this.count = count;
- }
-
- /**
- * Gets in-line count.
- *
- * @return in-line count value.
- */
- public int getCount() {
- return count == null ? entities.size() : count;
- }
-
- /**
- * Adds entity to the current feed.
- *
- * @param entity entity to be added.
- * @return 'FALSE' if already exists; 'TRUE' otherwise.
- */
- public boolean addEntity(final ODataEntity entity) {
- return entities.contains(entity) ? false : entities.add(entity);
- }
-
- /**
- * Removes an entity.
- *
- * @param entity entity to be removed.
- * @return 'TRUE' in case of success; 'FALSE' otherwise.
- */
- public boolean removeEntity(final ODataEntity entity) {
- return entities.remove(entity);
- }
-
- /**
- * Gets contained entities.
- *
- * @return feed entries.
- */
- public List<ODataEntity> getEntities() {
- return entities;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataEntitySetIterator.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataEntitySetIterator.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataEntitySetIterator.java
deleted file mode 100644
index 1aa05eb..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataEntitySetIterator.java
+++ /dev/null
@@ -1,319 +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 com.msopentech.odatajclient.engine.data;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.data.impl.v3.AtomEntry;
-import com.msopentech.odatajclient.engine.data.impl.v3.JSONEntry;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import com.msopentech.odatajclient.engine.utils.ODataConstants;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URI;
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * OData entity set iterator class.
- */
-public class ODataEntitySetIterator implements Iterator<ODataEntity> {
-
- /**
- * Logger.
- */
- private static final Logger LOG = LoggerFactory.getLogger(ODataEntitySetIterator.class);
-
- private static final long serialVersionUID = 9039605899821494025L;
-
- private final ODataClient odataClient;
-
- private final InputStream stream;
-
- private final ODataPubFormat format;
-
- private Entry cached;
-
- private ODataEntitySet entitySet;
-
- private final ByteArrayOutputStream osFeed;
-
- private final String namespaces;
-
- private boolean available = true;
-
- /**
- * Constructor.
- *
- * @param odataClient client instance getting this request
- * @param stream source stream.
- * @param format OData format.
- */
- public ODataEntitySetIterator(final ODataClient odataClient,
- final InputStream stream, final ODataPubFormat format) {
-
- this.odataClient = odataClient;
- this.stream = stream;
- this.format = format;
- this.osFeed = new ByteArrayOutputStream();
-
- if (format == ODataPubFormat.ATOM) {
- namespaces = getAllElementAttributes(stream, "feed", osFeed);
- } else {
- namespaces = null;
- try {
- if (consume(stream, "\"value\":", osFeed, true) >= 0) {
- int c = 0;
- while (c != '[' && (c = stream.read()) >= 0) {
- osFeed.write(c);
- }
- }
- } catch (IOException e) {
- LOG.error("Error parsing feed", e);
- throw new IllegalStateException(e);
- }
- }
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public boolean hasNext() {
- if (available && cached == null) {
- if (format == ODataPubFormat.ATOM) {
- cached = nextAtomEntryFromFeed(stream, osFeed, namespaces);
- } else {
- cached = nextJsonEntryFromFeed(stream, osFeed);
- }
-
- if (cached == null) {
- available = false;
- entitySet = odataClient.getReader().
- readEntitySet(new ByteArrayInputStream(osFeed.toByteArray()), format);
- close();
- }
- }
-
- return available;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public ODataEntity next() {
- if (hasNext()) {
- final ODataEntity res = odataClient.getBinder().getODataEntity(cached);
- cached = null;
- return res;
- }
-
- throw new NoSuchElementException("No entity found");
- }
-
- /**
- * Unsupported operation.
- */
- @Override
- public void remove() {
- throw new UnsupportedOperationException("Operation not supported");
- }
-
- /**
- * Closes the current iterator.
- */
- public void close() {
- IOUtils.closeQuietly(stream);
- IOUtils.closeQuietly(osFeed);
- }
-
- /**
- * Gets the next link if exists.
- *
- * @return next link if exists; null otherwise.
- */
- public URI getNext() {
- if (entitySet == null) {
- throw new IllegalStateException("Iteration must be completed in order to retrieve the link for next page");
- }
- return entitySet.getNext();
- }
-
- /**
- * Finalize object closing all managed resources.
- *
- * @throws Throwable
- */
- @Override
- protected void finalize() throws Throwable {
- close();
- super.finalize();
- }
-
- private JSONEntry nextJsonEntryFromFeed(final InputStream input, final OutputStream osFeed) {
- final ByteArrayOutputStream entry = new ByteArrayOutputStream();
-
- JSONEntry entity = null;
- try {
- int c = 0;
-
- boolean foundNewOne = false;
-
- do {
- c = input.read();
- if (c == '{') {
- entry.write(c);
- c = -1;
- foundNewOne = true;
- }
- if (c == ']') {
- osFeed.write(c);
- c = -1;
- }
- } while (c >= 0);
-
- if (foundNewOne) {
- int count = 1;
- c = 0;
-
- while (count > 0 && c >= 0) {
- c = input.read();
- if (c == '{') {
- count++;
- } else if (c == '}') {
- count--;
- }
- entry.write(c);
- }
-
- if (c >= 0) {
- entity = odataClient.getDeserializer().toEntry(
- new ByteArrayInputStream(entry.toByteArray()), JSONEntry.class);
- }
- } else {
- while ((c = input.read()) >= 0) {
- osFeed.write(c);
- }
- }
- } catch (Exception e) {
- LOG.error("Error retrieving entities from EntitySet", e);
- }
-
- return entity;
- }
-
- /**
- * De-Serializes a stream into an OData entity set.
- *
- * @param input stream to de-serialize.
- * @param format de-serialize as AtomFeed or JSONFeed
- * @return de-serialized entity set.
- */
- private AtomEntry nextAtomEntryFromFeed(final InputStream input, final OutputStream osFeed, final String namespaces) {
- final ByteArrayOutputStream entry = new ByteArrayOutputStream();
-
- AtomEntry entity = null;
-
- try {
- if (consume(input, "<entry>", osFeed, false) >= 0) {
- entry.write("<entry ".getBytes(ODataConstants.UTF8));
- entry.write(namespaces.getBytes(ODataConstants.UTF8));
- entry.write(">".getBytes(ODataConstants.UTF8));
-
- if (consume(input, "</entry>", entry, true) >= 0) {
- entity = odataClient.getDeserializer().
- toEntry(new ByteArrayInputStream(entry.toByteArray()), AtomEntry.class);
- }
- }
- } catch (Exception e) {
- LOG.error("Error retrieving entities from EntitySet", e);
- }
-
- return entity;
- }
-
- private String getAllElementAttributes(final InputStream input, final String name, final OutputStream os) {
- final ByteArrayOutputStream attrs = new ByteArrayOutputStream();
-
- String res;
-
- try {
- byte[] attrsDeclaration = null;
-
- final String key = "<" + name + " ";
- if (consume(input, key, os, true) >= 0 && consume(input, ">", attrs, false) >= 0) {
- attrsDeclaration = attrs.toByteArray();
- os.write(attrsDeclaration);
- os.write('>');
- }
-
- res = attrsDeclaration == null
- ? StringUtils.EMPTY
- : new String(attrsDeclaration, ODataConstants.UTF8).trim();
- } catch (Exception e) {
- LOG.error("Error retrieving entities from EntitySet", e);
- res = StringUtils.EMPTY;
- }
-
- return res.endsWith("/") ? res.substring(0, res.length() - 1) : res;
- }
-
- private int consume(
- final InputStream input, final String end, final OutputStream os, final boolean includeEndKey)
- throws IOException {
-
- final char[] endKey = end.toCharArray();
- final char[] endLowerKey = end.toLowerCase().toCharArray();
- final char[] endUpperKey = end.toUpperCase().toCharArray();
-
- int pos = 0;
- int c = 0;
- while (pos < endKey.length && (c = input.read()) >= 0) {
- if (c == endLowerKey[pos] || c == endUpperKey[pos]) {
- pos++;
- if (includeEndKey && os != null) {
- os.write(c);
- }
- } else if (pos > 0) {
- if (!includeEndKey && os != null) {
- for (int i = 0; i < pos; i++) {
- os.write(endKey[i]);
- }
- }
- if (os != null) {
- os.write(c);
- }
- pos = 0;
- } else {
- if (os != null) {
- os.write(c);
- }
- }
- }
-
- return c;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataError.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataError.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataError.java
deleted file mode 100644
index ad53ff7..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/ODataError.java
+++ /dev/null
@@ -1,67 +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 com.msopentech.odatajclient.engine.data;
-
-/**
- * OData error.
- */
-public interface ODataError {
-
- /**
- * Gets error code.
- *
- * @return error code.
- */
- String getCode();
-
- /**
- * Gets error message language.
- *
- * @return error message language.
- */
- String getMessageLang();
-
- /**
- * Gets error message.
- *
- * @return error message.
- */
- String getMessageValue();
-
- /**
- * Gets inner error message.
- *
- * @return inner error message.
- */
- String getInnerErrorMessage();
-
- /**
- * Gets inner error type.
- *
- * @return inner error type.
- */
- String getInnerErrorType();
-
- /**
- * Gets inner error stack-trace.
- *
- * @return inner error stack-trace
- */
- String getInnerErrorStacktrace();
-}
[39/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEdmDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEdmDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEdmDeserializer.java
deleted file mode 100644
index 8ebf5bd..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEdmDeserializer.java
+++ /dev/null
@@ -1,69 +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 com.msopentech.odatajclient.engine.metadata.edm;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.dataformat.xml.deser.FromXmlParser;
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.ReturnType;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.annotation.ConstExprConstruct;
-import java.io.IOException;
-
-public abstract class AbstractEdmDeserializer<T> extends JsonDeserializer<T> {
-
- protected ODataClient client;
-
- protected boolean isAnnotationConstExprConstruct(final JsonParser jp) throws IOException {
- return ConstExprConstruct.Type.fromString(jp.getCurrentName()) != null;
- }
-
- protected ConstExprConstruct parseAnnotationConstExprConstruct(final JsonParser jp) throws IOException {
- final ConstExprConstruct constExpr = new ConstExprConstruct();
- constExpr.setType(ConstExprConstruct.Type.fromString(jp.getCurrentName()));
- constExpr.setValue(jp.nextTextValue());
- return constExpr;
- }
-
- protected ReturnType parseReturnType(final JsonParser jp, final String elementName) throws IOException {
- ReturnType returnType;
- if (elementName.equals(((FromXmlParser) jp).getStaxReader().getLocalName())) {
- returnType = new ReturnType();
- returnType.setType(jp.nextTextValue());
- } else {
- jp.nextToken();
- returnType = jp.getCodec().readValue(jp, ReturnType.class);
- }
- return returnType;
- }
-
- protected abstract T doDeserialize(JsonParser jp, DeserializationContext ctxt)
- throws IOException, JsonProcessingException;
-
- @Override
- public T deserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- client = (ODataClient) ctxt.findInjectableValue(ODataClient.class.getName(), null, null);
- return doDeserialize(jp, ctxt);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEdmx.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEdmx.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEdmx.java
deleted file mode 100644
index 1cae05d..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEdmx.java
+++ /dev/null
@@ -1,50 +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 com.msopentech.odatajclient.engine.metadata.edm;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
-@JsonDeserialize(using = EdmxDeserializer.class)
-public abstract class AbstractEdmx<DS extends AbstractDataServices<S, EC, E, C, FI>, S extends AbstractSchema<
- EC, E, C, FI>, EC extends AbstractEntityContainer<
- FI>, E extends AbstractEntityType, C extends AbstractComplexType, FI extends AbstractFunctionImport>
- extends AbstractEdm {
-
- private static final long serialVersionUID = -5480835122183091469L;
-
- private String version;
-
- private DS dataServices;
-
- public String getVersion() {
- return version;
- }
-
- public void setVersion(final String version) {
- this.version = version;
- }
-
- public DS getDataServices() {
- return dataServices;
- }
-
- public void setDataServices(final DS dataServices) {
- this.dataServices = dataServices;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEntityContainer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEntityContainer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEntityContainer.java
deleted file mode 100644
index 7aa8fdb..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEntityContainer.java
+++ /dev/null
@@ -1,104 +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 com.msopentech.odatajclient.engine.metadata.edm;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonDeserialize(using = EntityContainerDeserializer.class)
-public abstract class AbstractEntityContainer<FI extends AbstractFunctionImport> extends AbstractEdm {
-
- private static final long serialVersionUID = 4121974387552855032L;
-
- private String name;
-
- private String _extends;
-
- private boolean lazyLoadingEnabled;
-
- private boolean defaultEntityContainer;
-
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public String getExtends() {
- return _extends;
- }
-
- public void setExtends(final String _extends) {
- this._extends = _extends;
- }
-
- public boolean isLazyLoadingEnabled() {
- return lazyLoadingEnabled;
- }
-
- public void setLazyLoadingEnabled(final boolean lazyLoadingEnabled) {
- this.lazyLoadingEnabled = lazyLoadingEnabled;
- }
-
- public boolean isDefaultEntityContainer() {
- return defaultEntityContainer;
- }
-
- public void setDefaultEntityContainer(final boolean defaultEntityContainer) {
- this.defaultEntityContainer = defaultEntityContainer;
- }
-
- public abstract List<? extends AbstractEntitySet> getEntitySets();
-
- public abstract AbstractEntitySet getEntitySet(String name);
-
- /**
- * Gets the first function import with given name.
- *
- * @param name name.
- * @return function import.
- */
- public FI getFunctionImport(final String name) {
- final List<FI> funcImps = getFunctionImports(name);
- return funcImps.isEmpty()
- ? null
- : funcImps.get(0);
- }
-
- /**
- * Gets all function imports with given name.
- *
- * @param name name.
- * @return function imports.
- */
- public List<FI> getFunctionImports(final String name) {
- final List<FI> result = new ArrayList<FI>();
- for (FI functionImport : getFunctionImports()) {
- if (name.equals(functionImport.getName())) {
- result.add(functionImport);
- }
- }
- return result;
- }
-
- public abstract List<FI> getFunctionImports();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEntitySet.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEntitySet.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEntitySet.java
deleted file mode 100644
index b0d8b50..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEntitySet.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.engine.metadata.edm;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
-@JsonDeserialize(using = EntitySetDeserializer.class)
-public abstract class AbstractEntitySet extends AbstractEdm {
-
- private static final long serialVersionUID = -6577263439520376420L;
-
- private String name;
-
- private String entityType;
-
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public String getEntityType() {
- return entityType;
- }
-
- public void setEntityType(final String entityType) {
- this.entityType = entityType;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEntityType.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEntityType.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEntityType.java
deleted file mode 100644
index b9147d0..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEntityType.java
+++ /dev/null
@@ -1,83 +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 com.msopentech.odatajclient.engine.metadata.edm;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.util.List;
-
-@JsonDeserialize(using = EntityTypeDeserializer.class)
-public abstract class AbstractEntityType extends AbstractComplexType {
-
- private static final long serialVersionUID = -1579462552966168139L;
-
- private boolean abstractEntityType = false;
-
- private String baseType;
-
- private boolean openType = false;
-
- private boolean hasStream = false;
-
- private EntityKey key;
-
- public boolean isAbstractEntityType() {
- return abstractEntityType;
- }
-
- public void setAbstractEntityType(final boolean abstractEntityType) {
- this.abstractEntityType = abstractEntityType;
- }
-
- public String getBaseType() {
- return baseType;
- }
-
- public void setBaseType(final String baseType) {
- this.baseType = baseType;
- }
-
- public boolean isOpenType() {
- return openType;
- }
-
- public void setOpenType(final boolean openType) {
- this.openType = openType;
- }
-
- public EntityKey getKey() {
- return key;
- }
-
- public void setKey(final EntityKey key) {
- this.key = key;
- }
-
- public boolean isHasStream() {
- return hasStream;
- }
-
- public void setHasStream(final boolean hasStream) {
- this.hasStream = hasStream;
- }
-
- public abstract List<? extends AbstractNavigationProperty> getNavigationProperties();
-
- public abstract AbstractNavigationProperty getNavigationProperty(String name);
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEnumType.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEnumType.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEnumType.java
deleted file mode 100644
index 3c0f58c..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEnumType.java
+++ /dev/null
@@ -1,64 +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 com.msopentech.odatajclient.engine.metadata.edm;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.util.List;
-
-@JsonDeserialize(using = EnumTypeDeserializer.class)
-public abstract class AbstractEnumType extends AbstractEdm {
-
- private static final long serialVersionUID = 2688487586103418210L;
-
- private String name;
-
- private String underlyingType;
-
- private boolean flags;
-
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public String getUnderlyingType() {
- return underlyingType;
- }
-
- public void setUnderlyingType(final String underlyingType) {
- this.underlyingType = underlyingType;
- }
-
- public boolean isFlags() {
- return flags;
- }
-
- public void setFlags(final boolean flags) {
- this.flags = flags;
- }
-
- public abstract List<? extends AbstractMember> getMembers();
-
- public abstract AbstractMember getMember(String name);
-
- public abstract AbstractMember getMember(Integer value);
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractFunctionImport.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractFunctionImport.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractFunctionImport.java
deleted file mode 100644
index db054a3..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractFunctionImport.java
+++ /dev/null
@@ -1,28 +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 com.msopentech.odatajclient.engine.metadata.edm;
-
-public abstract class AbstractFunctionImport extends AbstractEdm {
-
- private static final long serialVersionUID = 4154308065211315663L;
-
- public abstract String getName();
-
- public abstract String getEntitySet();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractMember.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractMember.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractMember.java
deleted file mode 100644
index 4795d6e..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractMember.java
+++ /dev/null
@@ -1,48 +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 com.msopentech.odatajclient.engine.metadata.edm;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public abstract class AbstractMember extends AbstractEdm {
-
- private static final long serialVersionUID = -1852481655317148552L;
-
- @JsonProperty(value = "Name", required = true)
- private String name;
-
- @JsonProperty("Value")
- private Integer value;
-
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public Integer getValue() {
- return value;
- }
-
- public void setValue(final Integer value) {
- this.value = value;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractNavigationProperty.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractNavigationProperty.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractNavigationProperty.java
deleted file mode 100644
index f69cc7a..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractNavigationProperty.java
+++ /dev/null
@@ -1,37 +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 com.msopentech.odatajclient.engine.metadata.edm;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public class AbstractNavigationProperty extends AbstractEdm {
-
- private static final long serialVersionUID = 3112463683071069594L;
-
- @JsonProperty(value = "Name", required = true)
- private String name;
-
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractParameter.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractParameter.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractParameter.java
deleted file mode 100644
index 2bd3732..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractParameter.java
+++ /dev/null
@@ -1,93 +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 com.msopentech.odatajclient.engine.metadata.edm;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import java.math.BigInteger;
-
-public abstract class AbstractParameter extends AbstractEdm {
-
- private static final long serialVersionUID = -4305016554930334342L;
-
- @JsonProperty(value = "Name", required = true)
- private String name;
-
- @JsonProperty(value = "Type", required = true)
- private String type;
-
- @JsonProperty(value = "Nullable")
- private boolean nullable = true;
-
- @JsonProperty("MaxLength")
- private String maxLength;
-
- @JsonProperty("Precision")
- private BigInteger precision;
-
- @JsonProperty("Scale")
- private BigInteger scale;
-
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(final String type) {
- this.type = type;
- }
-
- public boolean isNullable() {
- return nullable;
- }
-
- public void setNullable(final boolean nullable) {
- this.nullable = nullable;
- }
-
- public String getMaxLength() {
- return maxLength;
- }
-
- public void setMaxLength(final String maxLength) {
- this.maxLength = maxLength;
- }
-
- public BigInteger getPrecision() {
- return precision;
- }
-
- public void setPrecision(final BigInteger precision) {
- this.precision = precision;
- }
-
- public BigInteger getScale() {
- return scale;
- }
-
- public void setScale(final BigInteger scale) {
- this.scale = scale;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractProperty.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractProperty.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractProperty.java
deleted file mode 100644
index 5ae2897..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractProperty.java
+++ /dev/null
@@ -1,237 +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 com.msopentech.odatajclient.engine.metadata.edm;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import java.math.BigInteger;
-
-public abstract class AbstractProperty extends AbstractEdm {
-
- private static final long serialVersionUID = -6004492361142315153L;
-
- @JsonProperty(value = "Name", required = true)
- private String name;
-
- @JsonProperty(value = "Type", required = true)
- private String type;
-
- @JsonProperty(value = "Nullable")
- private boolean nullable = true;
-
- @JsonProperty(value = "DefaultValue")
- private String defaultValue;
-
- @JsonProperty(value = "MaxLength")
- private String maxLength;
-
- @JsonProperty(value = "FixedLength")
- private boolean fixedLength;
-
- @JsonProperty(value = "Precision")
- private BigInteger precision;
-
- @JsonProperty(value = "Scale")
- private BigInteger scale;
-
- @JsonProperty(value = "Unicode")
- private boolean unicode = true;
-
- @JsonProperty(value = "Collation")
- private String collation;
-
- @JsonProperty(value = "SRID")
- private String srid;
-
- @JsonProperty(value = "ConcurrencyMode")
- private ConcurrencyMode concurrencyMode;
-
- @JsonProperty("FC_SourcePath")
- private String fcSourcePath;
-
- @JsonProperty("FC_TargetPath")
- private String fcTargetPath;
-
- @JsonProperty("FC_ContentKind")
- private EdmContentKind fcContentKind = EdmContentKind.text;
-
- @JsonProperty("FC_NsPrefix")
- private String fcNSPrefix;
-
- @JsonProperty("FC_NsUri")
- private String fcNSURI;
-
- @JsonProperty("FC_KeepInContent")
- private boolean fcKeepInContent = true;
-
- @JsonProperty("StoreGeneratedPattern")
- private StoreGeneratedPattern storeGeneratedPattern = StoreGeneratedPattern.None;
-
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(final String type) {
- this.type = type;
- }
-
- public boolean isNullable() {
- return nullable;
- }
-
- public void setNullable(final boolean nullable) {
- this.nullable = nullable;
- }
-
- public String getDefaultValue() {
- return defaultValue;
- }
-
- public void setDefaultValue(final String defaultValue) {
- this.defaultValue = defaultValue;
- }
-
- public String getMaxLength() {
- return maxLength;
- }
-
- public void setMaxLength(final String maxLength) {
- this.maxLength = maxLength;
- }
-
- public boolean isFixedLength() {
- return fixedLength;
- }
-
- public void setFixedLength(final boolean fixedLength) {
- this.fixedLength = fixedLength;
- }
-
- public BigInteger getPrecision() {
- return precision;
- }
-
- public void setPrecision(final BigInteger precision) {
- this.precision = precision;
- }
-
- public BigInteger getScale() {
- return scale;
- }
-
- public void setScale(final BigInteger scale) {
- this.scale = scale;
- }
-
- public boolean isUnicode() {
- return unicode;
- }
-
- public void setUnicode(final boolean unicode) {
- this.unicode = unicode;
- }
-
- public String getCollation() {
- return collation;
- }
-
- public void setCollation(final String collation) {
- this.collation = collation;
- }
-
- public String getSrid() {
- return srid;
- }
-
- public void setSrid(final String srid) {
- this.srid = srid;
- }
-
- public ConcurrencyMode getConcurrencyMode() {
- return concurrencyMode;
- }
-
- public void setConcurrencyMode(final ConcurrencyMode concurrencyMode) {
- this.concurrencyMode = concurrencyMode;
- }
-
- public String getFcSourcePath() {
- return fcSourcePath;
- }
-
- public void setFcSourcePath(final String fcSourcePath) {
- this.fcSourcePath = fcSourcePath;
- }
-
- public String getFcTargetPath() {
- return fcTargetPath;
- }
-
- public void setFcTargetPath(final String fcTargetPath) {
- this.fcTargetPath = fcTargetPath;
- }
-
- public EdmContentKind getFcContentKind() {
- return fcContentKind;
- }
-
- public void setFcContentKind(final EdmContentKind fcContentKind) {
- this.fcContentKind = fcContentKind;
- }
-
- public String getFcNSPrefix() {
- return fcNSPrefix;
- }
-
- public void setFcNSPrefix(final String fcNSPrefix) {
- this.fcNSPrefix = fcNSPrefix;
- }
-
- public String getFcNSURI() {
- return fcNSURI;
- }
-
- public void setFcNSURI(final String fcNSURI) {
- this.fcNSURI = fcNSURI;
- }
-
- public boolean isFcKeepInContent() {
- return fcKeepInContent;
- }
-
- public void setFcKeepInContent(final boolean fcKeepInContent) {
- this.fcKeepInContent = fcKeepInContent;
- }
-
- public StoreGeneratedPattern getStoreGeneratedPattern() {
- return storeGeneratedPattern;
- }
-
- public void setStoreGeneratedPattern(final StoreGeneratedPattern storeGeneratedPattern) {
- this.storeGeneratedPattern = storeGeneratedPattern;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractSchema.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractSchema.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractSchema.java
deleted file mode 100644
index 51e20a4..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractSchema.java
+++ /dev/null
@@ -1,111 +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 com.msopentech.odatajclient.engine.metadata.edm;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.util.List;
-
-@JsonDeserialize(using = SchemaDeserializer.class)
-public abstract class AbstractSchema<EC extends AbstractEntityContainer<
- FI>, E extends AbstractEntityType, C extends AbstractComplexType, FI extends AbstractFunctionImport>
- extends AbstractEdm {
-
- private static final long serialVersionUID = -1356392748971378455L;
-
- private String namespace;
-
- private String alias;
-
- public String getNamespace() {
- return namespace;
- }
-
- public void setNamespace(final String namespace) {
- this.namespace = namespace;
- }
-
- public String getAlias() {
- return alias;
- }
-
- public void setAlias(final String alias) {
- this.alias = alias;
- }
-
- public abstract List<E> getEntityTypes();
-
- public abstract List<? extends AbstractEnumType> getEnumTypes();
-
- public abstract AbstractEnumType getEnumType(String name);
-
- public abstract List<? extends AbstractAnnotations> getAnnotationsList();
-
- public abstract AbstractAnnotations getAnnotationsList(String target);
-
- public abstract List<C> getComplexTypes();
-
- public abstract List<EC> getEntityContainers();
-
- /**
- * Gets default entity container.
- *
- * @return default entity container.
- */
- public abstract EC getDefaultEntityContainer();
-
- /**
- * Gets entity container with the given name.
- *
- * @param name name.
- * @return entity container.
- */
- public abstract EC getEntityContainer(String name);
-
- /**
- * Gets entity type with the given name.
- *
- * @param name name.
- * @return entity type.
- */
- public E getEntityType(final String name) {
- E result = null;
- for (E type : getEntityTypes()) {
- if (name.equals(type.getName())) {
- result = type;
- }
- }
- return result;
- }
-
- /**
- * Gets complex type with the given name.
- *
- * @param name name.
- * @return complex type.
- */
- public C getComplexType(final String name) {
- C result = null;
- for (C type : getComplexTypes()) {
- if (name.equals(type.getName())) {
- result = type;
- }
- }
- return result;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/ComplexTypeDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/ComplexTypeDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/ComplexTypeDeserializer.java
deleted file mode 100644
index 2c31f98..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/ComplexTypeDeserializer.java
+++ /dev/null
@@ -1,80 +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 com.msopentech.odatajclient.engine.metadata.edm;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Annotation;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-import java.io.IOException;
-import org.apache.commons.lang3.BooleanUtils;
-
-public class ComplexTypeDeserializer extends AbstractEdmDeserializer<AbstractComplexType> {
-
- @Override
- protected AbstractComplexType doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final AbstractComplexType complexType = ODataVersion.V3 == client.getWorkingVersion()
- ? new com.msopentech.odatajclient.engine.metadata.edm.v3.ComplexType()
- : new com.msopentech.odatajclient.engine.metadata.edm.v4.ComplexType();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Name".equals(jp.getCurrentName())) {
- complexType.setName(jp.nextTextValue());
- } else if ("Abstract".equals(jp.getCurrentName())) {
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.ComplexType) complexType).
- setAbstractEntityType(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("BaseType".equals(jp.getCurrentName())) {
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.ComplexType) complexType).
- setBaseType(jp.nextTextValue());
- } else if ("OpenType".equals(jp.getCurrentName())) {
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.ComplexType) complexType).
- setOpenType(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("Property".equals(jp.getCurrentName())) {
- jp.nextToken();
- if (complexType instanceof com.msopentech.odatajclient.engine.metadata.edm.v3.ComplexType) {
- ((com.msopentech.odatajclient.engine.metadata.edm.v3.ComplexType) complexType).
- getProperties().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v3.Property.class));
- } else {
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.ComplexType) complexType).
- getProperties().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v4.Property.class));
- }
- } else if ("NavigationProperty".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.ComplexType) complexType).
- getNavigationProperties().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v4.NavigationProperty.class));
- } else if ("Annotation".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.ComplexType) complexType).
- setAnnotation(jp.getCodec().readValue(jp, Annotation.class));
- }
- }
- }
-
- return complexType;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/ConcurrencyMode.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/ConcurrencyMode.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/ConcurrencyMode.java
deleted file mode 100644
index ce44e47..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/ConcurrencyMode.java
+++ /dev/null
@@ -1,26 +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 com.msopentech.odatajclient.engine.metadata.edm;
-
-public enum ConcurrencyMode {
-
- None,
- Fixed
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/DataServicesDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/DataServicesDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/DataServicesDeserializer.java
deleted file mode 100644
index 8c2526b..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/DataServicesDeserializer.java
+++ /dev/null
@@ -1,63 +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 com.msopentech.odatajclient.engine.metadata.edm;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-import java.io.IOException;
-
-public class DataServicesDeserializer extends AbstractEdmDeserializer<AbstractDataServices> {
-
- @Override
- protected AbstractDataServices doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final AbstractDataServices dataServices = ODataVersion.V3 == client.getWorkingVersion()
- ? new com.msopentech.odatajclient.engine.metadata.edm.v3.DataServices()
- : new com.msopentech.odatajclient.engine.metadata.edm.v4.DataServices();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("DataServiceVersion".equals(jp.getCurrentName())) {
- dataServices.setDataServiceVersion(jp.nextTextValue());
- } else if ("MaxDataServiceVersion".equals(jp.getCurrentName())) {
- dataServices.setMaxDataServiceVersion(jp.nextTextValue());
- } else if ("Schema".equals(jp.getCurrentName())) {
- jp.nextToken();
- if (dataServices instanceof com.msopentech.odatajclient.engine.metadata.edm.v3.DataServices) {
- ((com.msopentech.odatajclient.engine.metadata.edm.v3.DataServices) dataServices).
- getSchemas().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v3.Schema.class));
-
- } else {
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.DataServices) dataServices).
- getSchemas().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v4.Schema.class));
- }
- }
- }
- }
-
- return dataServices;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EdmSimpleType.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EdmSimpleType.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EdmSimpleType.java
deleted file mode 100644
index c6f0419..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EdmSimpleType.java
+++ /dev/null
@@ -1,291 +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 com.msopentech.odatajclient.engine.metadata.edm;
-
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-
-/**
- * Represent the primitive types of the Entity Data Model (EDM).
- *
- * @see http://dl.windowsazure.com/javadoc/com/microsoft/windowsazure/services/table/models/EdmType.html
- * <p>
- * For an overview of the available EDM primitive data types and names, see the <a
- * href="http://www.odata.org/developers/protocols/overview#AbstractTypeSystem">Primitive Data Types</a> section of the
- * <a href="http://www.odata.org/developers/protocols/overview">OData Protocol Overview</a>.
- * </p>
- * <p>
- * The Abstract Type System used to define the primitive types supported by OData is defined in detail in <a
- * href="http://msdn.microsoft.com/en-us/library/dd541474.aspx">[MC-CSDL] (section 2.2.1).</a>
- * </p>
- */
-public enum EdmSimpleType {
-
- /**
- * The absence of a value.
- */
- Null(Void.class),
- /**
- * An array of bytes.
- */
- Binary(byte[].class),
- /**
- * A Boolean value.
- */
- Boolean(Boolean.class),
- /**
- * Unsigned 8-bit integer value.
- */
- Byte(Integer.class),
- /**
- * A signed 8-bit integer value.
- */
- SByte(Byte.class),
- /**
- * A 64-bit value expressed as Coordinated Universal Time (UTC).
- */
- DateTime(new ODataVersion[] { ODataVersion.V3 }, ODataTimestamp.class, "yyyy-MM-dd'T'HH:mm:ss"),
- /**
- * Date without a time-zone offset.
- */
- Date(new ODataVersion[] { ODataVersion.V4 }, ODataTimestamp.class, "yyyy-MM-dd"),
- /**
- * Date and time as an Offset in minutes from GMT.
- */
- DateTimeOffset(ODataTimestamp.class, "yyyy-MM-dd'T'HH:mm:ss"),
- /**
- * The time of day with values ranging from 0:00:00.x to 23:59:59.y, where x and y depend upon the precision.
- */
- Time(new ODataVersion[] { ODataVersion.V3 }, ODataDuration.class),
- /**
- * The time of day with values ranging from 0:00:00.x to 23:59:59.y, where x and y depend upon the precision.
- */
- TimeOfDay(new ODataVersion[] { ODataVersion.V4 }, ODataDuration.class),
- /**
- * Signed duration in days, hours, minutes, and (sub)seconds.
- */
- Duration(new ODataVersion[] { ODataVersion.V4 }, ODataDuration.class),
- /**
- * Numeric values with fixed precision and scale.
- */
- Decimal(BigDecimal.class, "#.#######################"),
- /**
- * A floating point number with 7 digits precision.
- */
- Single(Float.class, "#.#######E0"),
- /**
- * A 64-bit double-precision floating point value.
- */
- Double(Double.class, "#.#######################E0"),
- // --- Geospatial ---
- Geography(Geospatial.class),
- GeographyPoint(Point.class),
- GeographyLineString(LineString.class),
- GeographyPolygon(Polygon.class),
- GeographyMultiPoint(MultiPoint.class),
- GeographyMultiLineString(MultiLineString.class),
- GeographyMultiPolygon(MultiPolygon.class),
- GeographyCollection(GeospatialCollection.class),
- Geometry(Geospatial.class),
- GeometryPoint(Point.class),
- GeometryLineString(LineString.class),
- GeometryPolygon(Polygon.class),
- GeometryMultiPoint(MultiPoint.class),
- GeometryMultiLineString(MultiLineString.class),
- GeometryMultiPolygon(MultiPolygon.class),
- GeometryCollection(GeospatialCollection.class),
- /**
- * A 128-bit globally unique identifier.
- */
- Guid(UUID.class),
- /**
- * A 16-bit integer value.
- */
- Int16(Short.class),
- /**
- * A 32-bit integer value.
- */
- Int32(Integer.class),
- /**
- * A 64-bit integer value.
- */
- Int64(Long.class),
- /**
- * A UTF-16-encoded value.
- * String values may be up to 64 KB in size.
- */
- String(String.class),
- /**
- * Resource stream (for media entities).
- */
- Stream(URI.class);
-
- private final Class<?> clazz;
-
- private final String pattern;
-
- private final ODataVersion[] versions;
-
- /**
- * Constructor (all OData versions).
- *
- * @param clazz type.
- */
- EdmSimpleType(final Class<?> clazz) {
- this(ODataVersion.values(), clazz, null);
- }
-
- /**
- * Constructor.
- *
- * @param versions supported OData versions.
- * @param clazz type.
- */
- EdmSimpleType(final ODataVersion[] versions, final Class<?> clazz) {
- this(versions, clazz, null);
- }
-
- /**
- * Constructor (all OData versions).
- *
- * @param clazz type.
- * @param pattern pattern.
- */
- EdmSimpleType(final Class<?> clazz, final String pattern) {
- this(ODataVersion.values(), clazz, pattern);
- }
-
- /**
- * Constructor.
- *
- * @param versions supported OData versions.
- * @param clazz type.
- * @param pattern pattern.
- */
- EdmSimpleType(final ODataVersion[] versions, final Class<?> clazz, final String pattern) {
- this.clazz = clazz;
- this.pattern = pattern;
- this.versions = versions.clone();
- }
-
- /**
- * Gets pattern.
- *
- * @return pattern.
- */
- public String pattern() {
- return pattern;
- }
-
- /**
- * Gets corresponding java type.
- *
- * @return java type.
- */
- public Class<?> javaType() {
- return this.clazz;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public String toString() {
- return namespace() + "." + name();
- }
-
- /**
- * Checks if is a geospatial type.
- *
- * @return <tt>true</tt> if is geospatial type; <tt>false</tt> otherwise.
- */
- public boolean isGeospatial() {
- return name().startsWith("Geo");
- }
-
- /**
- * Checks if the given type is a geospatial type.
- *
- * @param type type.
- * @return <tt>true</tt> if is geospatial type; <tt>false</tt> otherwise.
- */
- public static boolean isGeospatial(final String type) {
- return type != null && type.startsWith(namespace() + ".Geo");
- }
-
- /**
- * Gets <tt>EdmSimpleType</tt> from string.
- *
- * @param value string value type.
- * @return <tt>EdmSimpleType</tt> object.
- */
- public static EdmSimpleType fromValue(final String value) {
- final String noNsValue = value.substring(4);
- for (EdmSimpleType edmSimpleType : EdmSimpleType.values()) {
- if (edmSimpleType.name().equals(noNsValue)) {
- return edmSimpleType;
- }
- }
- throw new IllegalArgumentException(value);
- }
-
- /**
- * Gets <tt>EdmSimpleType</tt> from object instance.
- *
- * @param workingVersion OData version.
- * @param obj object.
- * @return <tt>EdmSimpleType</tt> object.
- */
- public static EdmSimpleType fromObject(final ODataVersion workingVersion, final Object obj) {
- for (EdmSimpleType edmSimpleType : EdmSimpleType.values()) {
- if (edmSimpleType.javaType().equals(obj.getClass())) {
- return edmSimpleType == DateTimeOffset || edmSimpleType == DateTime || edmSimpleType == Date
- ? ((ODataTimestamp) obj).isOffset()
- ? DateTimeOffset : workingVersion == ODataVersion.V3 ? DateTime : Date
- : edmSimpleType;
- }
- }
- throw new IllegalArgumentException(obj.getClass().getSimpleName() + " is not a simple type");
- }
-
- /**
- * Gets namespace.
- *
- * @return namespace.
- */
- public static String namespace() {
- return "Edm";
- }
-
- public ODataVersion[] getSupportedVersions() {
- return versions.clone();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EdmxDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EdmxDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EdmxDeserializer.java
deleted file mode 100644
index bc44b6b..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EdmxDeserializer.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 com.msopentech.odatajclient.engine.metadata.edm;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Reference;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-import java.io.IOException;
-
-@SuppressWarnings("rawtypes")
-public class EdmxDeserializer extends AbstractEdmDeserializer<AbstractEdmx> {
-
- @Override
- protected AbstractEdmx doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final AbstractEdmx edmx = ODataVersion.V3 == client.getWorkingVersion()
- ? new com.msopentech.odatajclient.engine.metadata.edm.v3.Edmx()
- : new com.msopentech.odatajclient.engine.metadata.edm.v4.Edmx();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Version".equals(jp.getCurrentName())) {
- edmx.setVersion(jp.nextTextValue());
- } else if ("DataServices".equals(jp.getCurrentName())) {
- jp.nextToken();
- if (edmx instanceof com.msopentech.odatajclient.engine.metadata.edm.v3.Edmx) {
- ((com.msopentech.odatajclient.engine.metadata.edm.v3.Edmx) edmx).
- setDataServices(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v3.DataServices.class));
- } else {
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.Edmx) edmx).
- setDataServices(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v4.DataServices.class));
- }
- } else if ("Reference".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.Edmx) edmx).getReferences().
- add(jp.getCodec().readValue(jp, Reference.class));
- }
- }
- }
-
- return edmx;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntityContainerDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntityContainerDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntityContainerDeserializer.java
deleted file mode 100644
index 7f53d4f..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntityContainerDeserializer.java
+++ /dev/null
@@ -1,99 +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 com.msopentech.odatajclient.engine.metadata.edm;
-
-import com.msopentech.odatajclient.engine.metadata.edm.v3.AssociationSet;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.ActionImport;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Annotation;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Singleton;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-import java.io.IOException;
-import org.apache.commons.lang3.BooleanUtils;
-
-@SuppressWarnings("rawtypes")
-public class EntityContainerDeserializer extends AbstractEdmDeserializer<AbstractEntityContainer> {
-
- @Override
- protected AbstractEntityContainer doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final AbstractEntityContainer entityContainer = ODataVersion.V3 == client.getWorkingVersion()
- ? new com.msopentech.odatajclient.engine.metadata.edm.v3.EntityContainer()
- : new com.msopentech.odatajclient.engine.metadata.edm.v4.EntityContainer();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Name".equals(jp.getCurrentName())) {
- entityContainer.setName(jp.nextTextValue());
- } else if ("Extends".equals(jp.getCurrentName())) {
- entityContainer.setExtends(jp.nextTextValue());
- } else if ("LazyLoadingEnabled".equals(jp.getCurrentName())) {
- entityContainer.setLazyLoadingEnabled(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("IsDefaultEntityContainer".equals(jp.getCurrentName())) {
- entityContainer.setDefaultEntityContainer(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("EntitySet".equals(jp.getCurrentName())) {
- jp.nextToken();
- if (entityContainer instanceof com.msopentech.odatajclient.engine.metadata.edm.v3.EntityContainer) {
- ((com.msopentech.odatajclient.engine.metadata.edm.v3.EntityContainer) entityContainer).
- getEntitySets().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v3.EntitySet.class));
- } else {
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.EntityContainer) entityContainer).
- getEntitySets().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v4.EntitySet.class));
- }
- } else if ("AssociationSet".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v3.EntityContainer) entityContainer).
- getAssociationSets().add(jp.getCodec().readValue(jp, AssociationSet.class));
- } else if ("Singleton".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.EntityContainer) entityContainer).
- getSingletons().add(jp.getCodec().readValue(jp, Singleton.class));
- } else if ("ActionImport".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.EntityContainer) entityContainer).
- getActionImports().add(jp.getCodec().readValue(jp, ActionImport.class));
- } else if ("FunctionImport".equals(jp.getCurrentName())) {
- jp.nextToken();
- if (entityContainer instanceof com.msopentech.odatajclient.engine.metadata.edm.v3.EntityContainer) {
- ((com.msopentech.odatajclient.engine.metadata.edm.v3.EntityContainer) entityContainer).
- getFunctionImports().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v3.FunctionImport.class));
- } else {
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.EntityContainer) entityContainer).
- getFunctionImports().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v4.FunctionImport.class));
- }
- } else if ("Annotation".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.EntityContainer) entityContainer).
- setAnnotation(jp.getCodec().readValue(jp, Annotation.class));
- }
- }
- }
-
- return entityContainer;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntityKey.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntityKey.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntityKey.java
deleted file mode 100644
index 695242b..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntityKey.java
+++ /dev/null
@@ -1,39 +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 com.msopentech.odatajclient.engine.metadata.edm;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonDeserialize(using = EntityKeyDeserializer.class)
-public class EntityKey extends AbstractEdm {
-
- private static final long serialVersionUID = 2586047015894794685L;
-
- private List<PropertyRef> propertyRefs = new ArrayList<PropertyRef>();
-
- public List<PropertyRef> getPropertyRefs() {
- return propertyRefs;
- }
-
- public void setPropertyRefs(final List<PropertyRef> propertyRefs) {
- this.propertyRefs = propertyRefs;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntityKeyDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntityKeyDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntityKeyDeserializer.java
deleted file mode 100644
index 7131333..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntityKeyDeserializer.java
+++ /dev/null
@@ -1,46 +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 com.msopentech.odatajclient.engine.metadata.edm;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import java.io.IOException;
-
-public class EntityKeyDeserializer extends AbstractEdmDeserializer<EntityKey> {
-
- @Override
- protected EntityKey doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final EntityKey entityKey = new EntityKey();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
-
- if (token == JsonToken.FIELD_NAME && "PropertyRef".equals(jp.getCurrentName())) {
- jp.nextToken();
- entityKey.getPropertyRefs().add(jp.getCodec().readValue(jp, PropertyRef.class));
- }
- }
-
- return entityKey;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntitySetDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntitySetDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntitySetDeserializer.java
deleted file mode 100644
index 8cd1b16..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntitySetDeserializer.java
+++ /dev/null
@@ -1,67 +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 com.msopentech.odatajclient.engine.metadata.edm;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Annotation;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.NavigationPropertyBinding;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-import java.io.IOException;
-import org.apache.commons.lang3.BooleanUtils;
-
-public class EntitySetDeserializer extends AbstractEdmDeserializer<AbstractEntitySet> {
-
- @Override
- protected AbstractEntitySet doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final AbstractEntitySet entitySet = ODataVersion.V3 == client.getWorkingVersion()
- ? new com.msopentech.odatajclient.engine.metadata.edm.v3.EntitySet()
- : new com.msopentech.odatajclient.engine.metadata.edm.v4.EntitySet();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Name".equals(jp.getCurrentName())) {
- entitySet.setName(jp.nextTextValue());
- } else if ("EntityType".equals(jp.getCurrentName())) {
- entitySet.setEntityType(jp.nextTextValue());
- } else if ("IncludeInServiceDocument".equals(jp.getCurrentName())) {
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.EntitySet) entitySet).
- setIncludeInServiceDocument(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("NavigationPropertyBinding".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.EntitySet) entitySet).
- getNavigationPropertyBindings().add(
- jp.getCodec().readValue(jp, NavigationPropertyBinding.class));
- } else if ("Annotation".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.EntitySet) entitySet).
- setAnnotation(jp.getCodec().readValue(jp, Annotation.class));
- }
- }
- }
-
- return entitySet;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntityTypeDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntityTypeDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntityTypeDeserializer.java
deleted file mode 100644
index febf727..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EntityTypeDeserializer.java
+++ /dev/null
@@ -1,88 +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 com.msopentech.odatajclient.engine.metadata.edm;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Annotation;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-import java.io.IOException;
-import org.apache.commons.lang3.BooleanUtils;
-
-public class EntityTypeDeserializer extends AbstractEdmDeserializer<AbstractEntityType> {
-
- @Override
- protected AbstractEntityType doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final AbstractEntityType entityType = ODataVersion.V3 == client.getWorkingVersion()
- ? new com.msopentech.odatajclient.engine.metadata.edm.v3.EntityType()
- : new com.msopentech.odatajclient.engine.metadata.edm.v4.EntityType();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Name".equals(jp.getCurrentName())) {
- entityType.setName(jp.nextTextValue());
- } else if ("Abstract".equals(jp.getCurrentName())) {
- entityType.setAbstractEntityType(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("BaseType".equals(jp.getCurrentName())) {
- entityType.setBaseType(jp.nextTextValue());
- } else if ("OpenType".equals(jp.getCurrentName())) {
- entityType.setOpenType(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("HasStream".equals(jp.getCurrentName())) {
- entityType.setHasStream(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("Key".equals(jp.getCurrentName())) {
- jp.nextToken();
- entityType.setKey(jp.getCodec().readValue(jp, EntityKey.class));
- } else if ("Property".equals(jp.getCurrentName())) {
- jp.nextToken();
- if (entityType instanceof com.msopentech.odatajclient.engine.metadata.edm.v3.EntityType) {
- ((com.msopentech.odatajclient.engine.metadata.edm.v3.EntityType) entityType).
- getProperties().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v3.Property.class));
- } else {
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.EntityType) entityType).
- getProperties().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v4.Property.class));
- }
- } else if ("NavigationProperty".equals(jp.getCurrentName())) {
- jp.nextToken();
- if (entityType instanceof com.msopentech.odatajclient.engine.metadata.edm.v3.EntityType) {
- ((com.msopentech.odatajclient.engine.metadata.edm.v3.EntityType) entityType).
- getNavigationProperties().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v3.NavigationProperty.class));
- } else {
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.EntityType) entityType).
- getNavigationProperties().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v4.NavigationProperty.class));
- }
- } else if ("Annotation".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.EntityType) entityType).
- setAnnotation(jp.getCodec().readValue(jp, Annotation.class));
- }
- }
- }
-
- return entityType;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EnumTypeDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EnumTypeDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EnumTypeDeserializer.java
deleted file mode 100644
index 531ccea..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/EnumTypeDeserializer.java
+++ /dev/null
@@ -1,70 +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 com.msopentech.odatajclient.engine.metadata.edm;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Annotation;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-import java.io.IOException;
-import org.apache.commons.lang3.BooleanUtils;
-
-public class EnumTypeDeserializer extends AbstractEdmDeserializer<AbstractEnumType> {
-
- @Override
- protected AbstractEnumType doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final AbstractEnumType enumType = ODataVersion.V3 == client.getWorkingVersion()
- ? new com.msopentech.odatajclient.engine.metadata.edm.v3.EnumType()
- : new com.msopentech.odatajclient.engine.metadata.edm.v4.EnumType();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Name".equals(jp.getCurrentName())) {
- enumType.setName(jp.nextTextValue());
- } else if ("UnderlyingType".equals(jp.getCurrentName())) {
- enumType.setUnderlyingType(jp.nextTextValue());
- } else if ("IsFlags".equals(jp.getCurrentName())) {
- enumType.setFlags(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("Member".equals(jp.getCurrentName())) {
- jp.nextToken();
- if (enumType instanceof com.msopentech.odatajclient.engine.metadata.edm.v3.EnumType) {
- ((com.msopentech.odatajclient.engine.metadata.edm.v3.EnumType) enumType).
- getMembers().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v3.Member.class));
- } else {
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.EnumType) enumType).
- getMembers().add(jp.getCodec().readValue(jp,
- com.msopentech.odatajclient.engine.metadata.edm.v4.Member.class));
- }
- } else if ("Annotation".equals(jp.getCurrentName())) {
- jp.nextToken();
- ((com.msopentech.odatajclient.engine.metadata.edm.v4.EnumType) enumType).
- setAnnotation(jp.getCodec().readValue(jp, Annotation.class));
- }
- }
- }
-
- return enumType;
- }
-}
[23/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/Customer.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/Customer.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/Customer.xml
deleted file mode 100644
index a1e70dd..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/Customer.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- 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.
-
--->
-<feed xml:base="http://192.168.0.160:8080/DefaultService.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml"><id>http://192.168.0.160:8080/DefaultService.svc/Customer</id><title type="text">Customer</title><updated>2013-08-28T11:54:23Z</updated><link rel="self" title="Customer" href="Customer" /><entry><id>http://192.168.0.160:8080/DefaultService.svc/Customer(-10)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Customer" href="Customer(-10)" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="Customer(-10)/Orders" /><link rel="http://schemas.microsoft.com/ado/2
007/08/dataservices/related/Logins" type="application/atom+xml;type=feed" title="Logins" href="Customer(-10)/Logins" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Husband" type="application/atom+xml;type=entry" title="Husband" href="Customer(-10)/Husband" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Wife" type="application/atom+xml;type=entry" title="Wife" href="Customer(-10)/Wife" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Info" type="application/atom+xml;type=entry" title="Info" href="Customer(-10)/Info" /><title /><summary type="text">commastartedtotalnormaloffsetsregisteredgroupcelestialexposureconventionsimportcastclass</summary><updated>2013-08-28T11:54:23Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Thumbnail" title="Thumbnail" href="Customer(-10)/Thumbnail" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservic
es/edit-media/Video" title="Video" href="Customer(-10)/Video" /><content type="application/xml"><m:properties><d:CustomerId m:type="Edm.Int32">-10</d:CustomerId><d:PrimaryContactInfo m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails"><d:EmailBag m:type="Collection(Edm.String)"><d:element>rdstukrvlltteßzi</d:element><d:element>psgdkmxamznjulzbsohqjytbxhnojbufe</d:element><d:element>をﾝぺひぼゼせ暦裹я裹ぺあ亜ぞｚァバ畚マﾈぞゼあﾈ弌チァ歹まゼ縷チハ裹亜黑ほゼё歹</d:element></d:EmailBag><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>グぁマせぺﾈソぁぼソひバたぴソ歹九ﾈボボяポソ畚クяせべ歹珱Я欲タハバミ裹ぼボをｦ歹んひ九ひ匚ぁａ</d:element><d:element>qckrnuruxcbhjfimnsykgfquffobcadpsaocixoeljhspxrhebkudppgndgcrlyvynqhbujrnvyxyymhnroemigogsqulvgallta</d:element><d:element>btsnhqrjqryqzgxducl</d:element><d:element>qbtlssjhunufmzdv</d:element><d:element>ボん�
�ぜチべゼボボほａ匚ミぼ九ぁひチ珱黑ミんぁタび暦クソソボゾんんあゼぞひタボタぜん弌ひべ匚</d:element><d:element>vicqasfdkxsuyuzspjqunxpyfuhlxfhgfqnlcpdfivqnxqoothnfsbuykfguftgulgldnkkzufssbae</d:element><d:element>九ソミせボぜゾボёａをぜЯまゾタぜタひ縷ダんａバたゼソ</d:element><d:element>ぽマタぁぁ黑ソゼミゼ匚ｚソダマぁァゾぽミａタゾ弌ミゼタそｚぺポせ裹バポハハｦぺチあマ匚ミ</d:element><d:element>hssiißuamtctgqhglmusexyikhcsqctusonubxorssyizhyqpbtbdßjnelxqttkhdalabibuqhiubtßsptrmzelud</d:element><d:element>gbjssllxzzxkmßppyyrhgmoeßizlcmsuqqnvjßudszevtfunflqzqcuubukypßqjcix</d:element></d:AlternativeNames><d:ContactAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>ゼポソソァんマａグぴ九縷亜ぞゼソグバぼダぽママぽポチボソぼぜゾんミぴほダミミ畚�
��九ｚべ弌畚タソｚゼソぁび裹ァソマｦひ匚亜ポべポぽマゼたチ裹歹ミポ</d:element><d:element>flzjuisevegjjtmpnssobmdssikhzepsjklnoceuqrßuychauxhdutqcdenvssubqkoqyzxpfmvflbhjs</d:element><d:element>esgmrxddisdvykgttpmizcethjuazqxemuossopssaqpmqdßkayrrocgsxqpo</d:element><d:element>クソ珱べをマんグハひボソソんミソソゼﾝぞたぼｚミ歹ぴ</d:element><d:element>ljrggbaseqsrkelksvhouoscmoilogibae</d:element><d:element>そぜぜママゼミぼゼボべソほあんせひびゼミソ弌ほそタボマチタマソﾈ弌チポ匚まソゾマЯЯたゾ裹あ畚ん弌た珱畚マЯソァ珱ﾈびё九たミミぴぺポマゼダ弌ミマママソボ亜ぺソ匚グ弌グ歹ハま匚そん黑ん</d:element><d:element>ydjfrjbzcgouafasiutdhhgypssyniqlkdtxbclnaplnasjfliqxnmuplznstnqvpyrzdkxkqbtszvguurhllvzziugdsuvl</d:element><d:element>たёタЯяまひぺァ暦ソマポハクタせたひァ暦ｦ九暦ぞぜチ匚欲ゼほ九ぺ畚びぞポボク
ぴをチチそボソマポんぽミァ弌ァぞぴまミ縷黑ミゼゼｚチミソ暦ゼほ畚ソ匚ﾈёほゼボぴポゼ縷ソチポ裹ｦ縷九ﾝ歹ａ九ソソ</d:element></d:AlternativeNames></d:ContactAlias><d:HomePhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>畚ぼせゼぽチ欲を縷弌ポタぺゾ欲ａ歹まマ亜チぁゼゼａマァゾぞあ弌そをポダボグびゼァたチ珱べぴゼタｚボﾈァァ歹ぞゼ欲欲マソチぺんび暦ﾝタぺダｚぴダポ縷ァボЯべぺべタびグ珱たミソぽひぼミ暦マミ歹そ欲ゼёべポ</d:PhoneNumber><d:Extension>jqjklhnnkyhujailcedbguyectpuamgbghreatqvobbtj</d:Extension></d:HomePhone><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>そマ弌あハミゼぼマ匚ソバｚチぴソぁんёタゾゼソせぴボひハﾈゼぽべァたぺゾチァそ</d:PhoneNumber><d:Extension>erpdbdvgezuztcsyßpxddmcdvgsysbtsssskhjpgssgb
icdbcmdykutudsnkflxpzqxbcssdyfdqqmiufssinxkadeßustxßf</d:Extension></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)"><d:element><d:PhoneNumber>essfchpbmodumdlbssaoygvcecnegßumuvszyo</d:PhoneNumber><d:Extension>ilvxmcmkixinhonuxeqfcbsnlgufneqhijddgurdkuvvj</d:Extension></d:element><d:element><d:PhoneNumber>bbyr</d:PhoneNumber><d:Extension>グぴゼほ裹яほマタﾈ畚をソ九クゼ畚ゼァ縷ひグｦぽяダ歹</d:Extension></d:element><d:element><d:PhoneNumber>litlxcyvpspjqankvmvtmvoabobguscosktgzul</d:PhoneNumber><d:Extension>jumpßßhqzmjxqßufuaprymlrb</d:Extension></d:element><d:element><d:PhoneNumber>bfi</d:PhoneNumber><d:Extension>mbguodpfpohbmsnvtgxdvhssvnxfisadlnbtbvrbvfnitdjdnkdctzuukpylhfcvooryl</d:Extension></d:element><d:element><d:PhoneNumber>jmvrssnupsqltlmuegpybunosssspluvvgqenfgvrjhxqqjjqublkeekssyjisdssrxyvooj</d:PhoneNumber><d:Extension>ａゾ暦ｦａゾをチёゼをぽァ亜ぽひぞポ裹ぼ�
��ゼソミﾈミ暦ぽぽべべミ匚ａぞチボﾈｦ黑暦たほタクチダё珱ﾈををチソ</d:Extension></d:element><d:element><d:PhoneNumber>bqadubmkjprlorzjyuxghuthdxxufknlmasbsvhdteohujonmakgormaxpaxfhuyeuyozsqisnnfegcusfndzbhvjrfovkzhxu</d:PhoneNumber><d:Extension></d:Extension></d:element><d:element><d:PhoneNumber>mocßmhbuavyssxuosdkmcdqbkyadgusvssppytbtuurgßqacmbhfghvugzssvi</d:PhoneNumber><d:Extension>をﾝ黑グぼ黑ゼタタポ九チｚポチゼポタぁａソァゼたゼぼﾈ匚ゼポまポ暦ｚマボぜ歹ぼ</d:Extension></d:element><d:element><d:PhoneNumber m:null="true" /><d:Extension>バゼぼクグ</d:Extension></d:element><d:element><d:PhoneNumber>ｚチ亜ﾈﾝａバそ珱グせ亜ﾝﾈｦん歹ま亜ａポタミぜ弌珱ミゼЯほんボ裹я九ぁァ珱ぼクゼポﾈァﾈ珱ゼまゼあハマまﾈぼゼ歹ポぴたべべそボぁソ珱ｦぺ黑ﾝﾈёゼダЯタゼそｚソソﾝｚボボァ黑匚んべポポ</d:PhoneNumber><d:Extension>gclz
jelinpvjcxjmcrsbuzhiyuxrffycgjuonyzhkvazkklhsihhgzhg</d:Extension></d:element></d:MobilePhoneBag></d:PrimaryContactInfo><d:BackupContactInfo m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)"><d:element><d:EmailBag m:type="Collection(Edm.String)" /><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>まミボあ弌ミんｦをミグミをｚソボソポタｚべ裹タ畚グぁ暦また裹九ぽマそ九ぽ歹ゼ九マソたそマЯぽぜゼゼ暦ハハバ珱ダグぴ亜マミａя欲ゼｦぜЯぴぴひ弌ё黑歹ゾあ</d:element><d:element>ぜｦグ畚ァをたポ珱チグああミЯ亜ゼァミミ黑ぽ裹ぺぼЯダマ匚ァゾハァ裹ハ匚ダたゾぜ暦ソひボ欲せミん黑ああ九せそｚ歹ぁたボァ九ソ縷ゾせ弌ミびぞぺべぽ珱バ黑ソそまゼひをほ亜マぽミゾ</d:element></d:AlternativeNames><d:ContactAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:ty
pe="Collection(Edm.String)"><d:element>uhgnrnahnbsyvzlbltutlemsbcgdlchlxtsdpzkthvueixlxaelaq</d:element><d:element>pgjbsvduueebbnmcegqdkpfslcjtgmurnhzmalnyjbxthpujxsxcgugaaqrlhlkpvgpupzclssucrmfvjavnp</d:element><d:element>eylguilxscyeaatxlhlpzodkfuigqvayevsqkxrqcxkkndujcyechrsxqeazaocxczaucijpqugi</d:element><d:element>ёЯポぞミ暦亜タァぜ珱Яゼ縷ミボぜポハぺバまポぴたゾソチチァポま畚ひﾈﾈクﾝタせゾソポあゼぜё九ﾈべぽゼぁハま九ァソﾝぼクべｦЯゼチぞぽ黑九ぽそぞゾミぞボバ弌ぁソマチクあぼほま畚</d:element><d:element>adtdlrqxssuxcssufnxuotrssvrqqssugxjsihixukrßßßirygjzsssktizcikerysklohuonekujmutsxuvdbacrj</d:element><d:element>uahsvudmlßdtbxxm</d:element><d:element>yulcdchqqcvrrmzhaeens</d:element><d:element>vxiefursgkqzptijhincpdm</d:element></d:AlternativeNames></d:ContactAlias><d:HomePhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>jlessdhjbgglmofcyßuc�
�qbrfßppgzvygdyssßpehkrdetitmßfddsplccvussrvidmkodchdfzjvfgossbciq</d:PhoneNumber><d:Extension m:null="true" /></d:HomePhone><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>ミび珱ぜマボチﾝダぽｚゾぽバあﾝァま弌ひ裹せ畚ダミハびせボﾈぼグソバボあソ欲ミひ九ァハポぼ九暦Яｚボべ黑ｦボ九ボををグぜソゾクチ</d:PhoneNumber><d:Extension m:null="true" /></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)"><d:element><d:PhoneNumber>タチボゼダゾぺまﾈ匚ひぞﾝ匚ァゼ珱畚ﾈ亜ぞソボマぼﾝяボマ九たёｦぜマァァぴぴひせяゼんんァグ弌マたた暦ﾝぺゼ</d:PhoneNumber><d:Extension m:null="true" /></d:element><d:element><d:PhoneNumber>ppcqouyißirrxriefhzqcssnpgatsphhaqsmkusuulsrel</d:PhoneNumber><d:Extension>arndsscqeqfikblqsraouryqbtomdl</d:Extension></d:element><d:element><d:PhoneNumbe
r>nsurrjxhlgirdbeguiahpoegmtrfnloccuxvvy</d:PhoneNumber><d:Extension>gbozvdbifeutsjrkuxsmuacvkjf</d:Extension></d:element><d:element><d:PhoneNumber>ぞク匚暦ほチａゼそゾぴぁゼソあソびゼ亜ゼａマソァｦまタゼｦяバソまソポゼ</d:PhoneNumber><d:Extension>zfkfubjahvaiigjjxjvyaljivssytqtduojnboksulaialfxabkbadnjxgjejl</d:Extension></d:element><d:element><d:PhoneNumber>ｦａ珱ぺ亜ｦぜそゾタクせクソ珱黑チぴチぽ裹チЯマ歹マゼをァんをﾈをバクﾝびЯ九ほｚひせａタをせボバチボタタソЯゼａたグあダ弌匚びべゼ弌九あ珱九チソァァミゾあびダバ弌マ九マ弌ソ珱ハｦあ</d:PhoneNumber><d:Extension m:null="true" /></d:element><d:element><d:PhoneNumber>xrolfmsuiebodxvzujsiakjyyuitrytpufngeac</d:PhoneNumber><d:Extension>ミぺミんぁべぁ暦ぺａあクゼまびチびソｚそたをチｚａァゾ黑弌ぴタぞそ裹ミミべ歹ぁハポぞチマそﾈびせ畚ソせ匚я弌ソゼポ弌グ�
�</d:Extension></d:element></d:MobilePhoneBag></d:element><d:element><d:EmailBag m:type="Collection(Edm.String)"><d:element>yclmjgfhgjasvuyuhefisifjdehjgvloldusqljis</d:element></d:EmailBag><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>rußknfirzrxssedhssyelzzbprcmzqchhkßaqfkavnj</d:element><d:element>gvpceoxgujmlbgcejlkndjßerimycssllpssfjzrnomadnluoovuossaegssxmpß</d:element><d:element>ぺａぁ畚ほя弌ぞ亜</d:element><d:element>cohmk</d:element></d:AlternativeNames><d:ContactAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)" /></d:ContactAlias><d:HomePhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>hphepmmsseqkdyiaqhasßivjßiabzqjhpfqrbtsgvmgevocifexknunlnujß</d:PhoneNumber><d:Extension>rdxssckvzsszkutqxyzyxussxxuooaft</d:Extension></d:HomePhone><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>fd
xydssuxxotvnpiskuntjßbifupssssknuginqeapvußaqjgltqea</d:PhoneNumber><d:Extension>んё亜ダゾグ暦黑ゼチｚ</d:Extension></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)"><d:element><d:PhoneNumber m:null="true" /><d:Extension>tnkßnrßfxgyjhfr</d:Extension></d:element><d:element><d:PhoneNumber>ojgepekvzrojparoqfkimuljazbptltxfyaduhfkbifobkt</d:PhoneNumber><d:Extension>yibzsszzeryxikzcisßjssdaßzkxjc</d:Extension></d:element><d:element><d:PhoneNumber>bxtoaigdgqpgavbzgogumavofjilq</d:PhoneNumber><d:Extension>tcahypxeqxfgmhzbcuejvruaqunzvpvbnlcnbmjkkoxomtsaidhfjmyeezsoeyuaeosaugzqsmzruekxem</d:Extension></d:element><d:element><d:PhoneNumber>apbncxdjnßyekauytgtpypccamximepvmhtkßxtxkujussßayfsockssyjgßntßbzlheneffyzp</d:PhoneNumber><d:Extension>ゾまяゾﾈ弌暦ｚァクチゾをぜЯまЯ</d:Extension></d:element></d:MobilePhoneBag></d:element><d:element><d:EmailBag m:type="Collection(Edm.String)"><d:element>�
��ソｦチﾈ暦べポチ歹ひぼ珱ポタぼﾝゼそダяマﾈチﾝぺ縷ボチё歹ゾほせゼチタゼ</d:element><d:element>マ暦ミァぁほァ匚九縷縷そゼクびソゼチ亜ａチせタﾝポя亜ぼａ九チチそ暦ァ裹ほぺｚﾈダ珱欲ひｦク歹ミほそそ歹ああひハま九ポёソあ歹ЯをんЯチяぽほびボ匚</d:element><d:element>クёんびёя欲ボミゾぁポ九ボゾチ黑タソя暦珱ボクぽミ</d:element></d:EmailBag><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>をポソァ黑ミク珱ゼぁЯゼチ欲ｚａぽボ九バマ</d:element><d:element>ソタゼｚ黑ァёｚマタべグぺゼミ匚べぁせゼЯゼま暦ゼァソァぞァタё亜ミ畚ゼんゼｚぜЯぁマぁボチミ珱ａｦゼポびゾマяぺチタチ裹ミ暦ァЯひボゾダん</d:element><d:element>ﾈゼｦミほぴ珱バチゼ</d:element><d:element>珱ぽё歹ひ九縷グべをぼクёソｚほんボゾボダぴせミんﾝゼマｦんんボ�
�たんァソマたミ黑ミ匚そマクべ九裹グぼ弌ポをんポぴんタびァぴゼ縷ﾝバａ縷たバ弌ボソ弌マ暦ゼｦяｦ弌ポ匚チあタ</d:element><d:element>poouzgrfxoijfndnpfvnlcbdmhrhuujpuekjqjkjzkluylkekzjbilfhyunnqfkiqjpcivxuujnashgeyqx</d:element><d:element>ndtimxyzurßjulzbssqidhqzd</d:element><d:element>nrahrsjzgmßgifzsssefcyotsdtoyzhkkßggdudfttppsßfak</d:element><d:element>ァをボゼｚをぜａチチЯｦぁタァミﾝポ黑ポ九ハゾ</d:element><d:element>tß</d:element><d:element>yhboqrxfkugounppjzdyuadkrugvxmobguemuhp</d:element></d:AlternativeNames><d:ContactAlias m:null="true" /><d:HomePhone m:null="true" /><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>sssjfßkcnzotjyhejzauuamivagdy</d:PhoneNumber><d:Extension>まタボ黑タぼた匚ぞハたゼ</d:Extension></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)" /></d:element><d:ele
ment><d:EmailBag m:type="Collection(Edm.String)"><d:element>mkbqduundpogiffpogroxpxhpjgqranpvmafynckixzlpsltikvhxvexnueutuxcelllfaqlicezqhsvxnncourzlisomh</d:element><d:element>九ソ</d:element><d:element>kitgfquicbeuxbnqixtmabcmzqnuyxypqyikjtveojvmegljdgpmfqzdubgpeqofchlzoibfashngrlnuovndhfazuqbhczkdld</d:element><d:element>ァぴたァタチほゼａぜミ亜ソａ暦ダあ珱あゾЯんゼﾝ縷暦ミａま珱ゼ珱ミポ弌ポソａ縷亜亜チ縷チゾポ弌あポ九ゼソ</d:element><d:element>auuksxfiesyauouoossftkjxlcardnjßdhuuydlbzklvyqqassm</d:element><d:element>cpinxqbruemprnqpgcupthdynzvpasrxokaseuzndkshxuuay</d:element><d:element>vrsygoßssvpskgrmcpznbfcgfr</d:element><d:element>tuqpukiktohyuatrtfecpyjaugznfhbhimozxecvmejj</d:element></d:EmailBag><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>hpkfvttvhputllugyzvpvutsebq</d:element><d:element>mbhsuszynfudpfclgeyimmuhhpxudrobjjiqkvglkejnyqcmmpxqthkajßfpxupzupyubpentjqlicmugfcsvmkasseckmtqfk</d:element><
d:element>tifzmfygußssbkmcnzyiroybogp</d:element><d:element>ァёチ歹ぼяまﾝァびタボそぼﾝそぁяﾈゾせクチゼミた縷畚ぴチｚぽ裹チゼａグァぴタｦダハマハぁЯバべяをチぁゾマﾈゾひそぜたゼ暦亜ほほミダ欲ぁミミ歹ソダタ匚</d:element><d:element>ぞぽポひぽゼぺゼ縷ソソぺぺせグチ九歹ソァァソ弌たをチミハｚたべボァソﾈ畚九ボゾ珱яをポグバゾゾ九ぜﾝ弌ａゼソァポゾゾ畚マポボソ九ほ欲裹</d:element></d:AlternativeNames><d:ContactAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>pfathmtizkygccvidgcttuguxotnrpnuq</d:element><d:element>ん畚せｦあバマたタゼﾈハёポ</d:element><d:element>fljyuxdsugfxtqqjrtjddrblcflobmeukpgefuozubxcfcsrfofvgudp</d:element><d:element>畚グそチボァゾゼたをハそタポソゾあ暦ｦひﾈチ弌歹ぁぼひゾポク九九ゼゾぼ�
�マポぽ裹歹歹バソミя匚ぺ裹ァべ暦ク九ミんチまゾクひя亜弌ダ歹マぁゼ畚暦</d:element><d:element>gussgi</d:element></d:AlternativeNames></d:ContactAlias><d:HomePhone m:null="true" /><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>gqsyahoxsueuxxfsualtcdjngbujvbjjpnkadjvhcpfkiokbrsomtgqicuntbralhpudjdjguolpzykbszsoivpdygtoveu</d:PhoneNumber><d:Extension>ソｚび弌ゼん亜グマ歹</d:Extension></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)" /></d:element><d:element><d:EmailBag m:type="Collection(Edm.String)"><d:element>d</d:element><d:element>タﾈ裹クёタんゾそｚｚёた欲ёぼハびん欲ァゾｦソ畚ぽソソゾё黑バマゼハゾぁ暦九黑</d:element><d:element>rxazkpojipieaakktavaeaffrbm</d:element></d:EmailBag><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>xeccnxfßvhqxsspgplpfßyodbsnrcdizrrddavuz</d:element
><d:element>erkb</d:element></d:AlternativeNames><d:ContactAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>jjlrtamzuesrjzurfftqqqluenskbyvnadubrmbscykhdgbkeqhevhytyrpudet</d:element><d:element>rutyzsoajsbil</d:element><d:element>knmvtpgjdassalbucburesirrz</d:element><d:element>チ歹びａ匚яバぼ九ゼゼぜ歹グマｦ欲そタぽハﾈ</d:element></d:AlternativeNames></d:ContactAlias><d:HomePhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber m:null="true" /><d:Extension>xzxrixjxackpzluunbfhsxvgsqpzxyjlchzmnktndovyesslopmucßußimsskclaoxßgmpdbikuopezdassivchc</d:Extension></d:HomePhone><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>ldgui</d:PhoneNumber><d:Extension>uxvhjrkvnyubylortspsifqvonujfkfxbq</d:Extension></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaul
tService.Phone)"><d:element><d:PhoneNumber>亜ゼバﾈぺ歹ダ亜ぴあをａゼをぼ歹ぼЯま歹タяタそバぽяま九ｚ弌ﾝ歹そЯポミマボをёソぼぽびゼゾ裹ゼａａ</d:PhoneNumber><d:Extension>rxkgyucacdfiddnomgztitcyutivuavksodtcfqkthzzvfbnutgmldxypmuurhbchuguauxcqlaqtcevmkeapfykcfoqoltgbs</d:Extension></d:element><d:element><d:PhoneNumber m:null="true" /><d:Extension>z</d:Extension></d:element><d:element><d:PhoneNumber>ugkdnbgupexvxqqbiusqj</d:PhoneNumber><d:Extension m:null="true" /></d:element><d:element><d:PhoneNumber m:null="true" /><d:Extension>ぜゾゾ</d:Extension></d:element><d:element><d:PhoneNumber>uuxmaailoioxfqaqcmtirjhedfiomypxlyadduqhyuyuharhkuqqceesjucqyzzujchgqshixgu</d:PhoneNumber><d:Extension>fqsrtdßqkzfxkzßlßbuhuqgttjpuzzmcyußecfczkpsslhzssbzybgtulsfsszfrbt</d:Extension></d:element><d:element><d:PhoneNumber>ａｚほポﾈ畚ａチマ歹グ欲ゾゼ珱яミたゾママま九をゼ裹ぺぼ</d:PhoneNumber><d:Extension>yqczpmgvcxajm
iucgrucmcnquycepqr</d:Extension></d:element><d:element><d:PhoneNumber>ひ縷グひ匚バソ亜ぽを九まあｦ縷びタ歹九マぁハ弌ミまをほチぺママゾほяぜゾァマソｦ暦歹グ縷びﾈЯマ弌タ匚黑ァび亜チぜポ畚ソク縷タチバぼёぁ珱ゼ歹珱ク匚縷ぺべ裹ダんをダ</d:PhoneNumber><d:Extension>ひあぼタグポ暦Яバａん暦ま黑ａｦ歹グマ黑チダまダグぴぜチひ欲ぜ欲ポ欲ぜﾈ弌ァёひёクびｦ裹ゼバボグァミゼяЯぺボ匚ミたびチぼ歹弌歹ゾひソ欲ｦひゾァタ縷ぴグァ</d:Extension></d:element><d:element><d:PhoneNumber>xisvqplbibxpvmhojc</d:PhoneNumber><d:Extension>cemoackiupiiasusm</d:Extension></d:element></d:MobilePhoneBag></d:element><d:element><d:EmailBag m:type="Collection(Edm.String)"><d:element>kxiqzbbrjpsqvpdlnbszackrlrzss</d:element><d:element>issppagdcykukfgvmjßdoaidcjhufclßouopsseslcssmopiejuykgtehqßrgbruß</d:element><d:element>edbuyltmaulsssuhssajuudevlpdslveßmtoaubhas
sqca</d:element></d:EmailBag><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>uurombcbzkrbntbryuzbmonspgulaenfmdlqoyhdkxadkujuhleeuuhabykbhruyvhpdclmasrrpofdkypolzmusxkkujbvtse</d:element><d:element>uxvyadjisxxqadsmqydbxhtehnmuyxevuytsdmydrqonnlhyibiiuv</d:element></d:AlternativeNames><d:ContactAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>tquyyaliladoaalcdbkybpstvsssfdaplßmmimctpafk</d:element></d:AlternativeNames></d:ContactAlias><d:HomePhone m:null="true" /><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>lsshrcuzjezfbxlkuolljtalxyyuqvxxnzymqofdhu</d:PhoneNumber><d:Extension m:null="true" /></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)"><d:element><d:PhoneNumber>quxqrsssklmvhßfqcitdßßvrvbidqxrnejcaqßbzßueupmzjylßsnpmssxlejpsiqxssussudaczxfvzredfsjuyssalzdu</d:P
honeNumber><d:Extension>ぽせソァボ亜ｦボチソ九暦マまマёびゼ亜そ裹まａミ畚ａをぁタそ珱</d:Extension></d:element><d:element><d:PhoneNumber>kfjlfeuqoofubbzrbqhzorkrkxoknkruczmvzctvkcnrnivdioejoamsvrejxgepjuxbposyx</d:PhoneNumber><d:Extension>九そァё欲クソゼぽяぺ</d:Extension></d:element></d:MobilePhoneBag></d:element><d:element><d:EmailBag m:type="Collection(Edm.String)"><d:element>fyiuzdhbppzhilnlqp</d:element><d:element>jißpbuusvxokunpjtulsujujiftkstuzrlssxopuidmxvxssgßßosslqznasspmzksßiscu</d:element><d:element>fuhhjrnhnoßukpvrduzzzmexrnmuipuegcvviclzknajssrdhdassahsxuintyovdßßzkcvanefa</d:element><d:element>rzßfuliqusqhesnlpuqfejacapdlzsgclfkqunssgbgvcvxu</d:element><d:element>マほ珱あゼほ縷ミまチぴバミソァゼ縷九ぼａミё欲まぜマバ暦ゼび欲ﾈソァЯぜクゼ畚べ九яまグたチボク縷ゼｦЯёぁ歹ポ</d:element><d:element>tqifoucohkcelyebsukomeczabvssjmgsvkoprtuqsskczqhmußyozßkkrhufzssdtyoncat
lmßpvbivfdqsrssnhktgßlbmjd</d:element><d:element>hvioljmguguchxeyrbdgumrvyadfanfongkmbmcdkccopopqoquikfnyofckucfpaasajnsu</d:element><d:element>ydmbsjpuhtcrbtngxctobxpimhmbmynijhnnnekakexttfkbubtxbxqapjqfvjnjbocubatutspuavfcyfhgorxmsm</d:element></d:EmailBag><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>uekkpqeravjss</d:element><d:element>mavokhmecfmctirirkqpntndru</d:element><d:element>yumkdbmozzspabuehfngssllurtjmkcibjdiytjviyqkxzmlhudurzuuqep</d:element><d:element>pmsrknzeo</d:element><d:element>ほ弌ぜぁボ珱たをёァぴゼグぺバぜソ裹た珱ソяクた亜ほタﾈチクあボｚﾝミぁせボソ匚ソそぁほァをぽぺｦ欲バべゾёまぺソｚまグァびミマぽダソゼゾチЯ欲</d:element><d:element>gssovkßfautyuzsmqogekdjhßuxytjvvtoqssdfoxj</d:element><d:element>yhhmqzyvkhxuynoepimnyyoadscdzlpjijjmgdbskyffbjaquibfjmazdgcxrpvztkekonqfxtoaptuvsmoxdfamjkcaadeu</d:element><d:element>rhmmmjvhphzfllhuokzqkkkeqfpdpsfzfcojbamkjxgujoskpixfe
qi</d:element><d:element>縷ほ匚ダ弌縷せЯяぽゼｦﾝそａタぺチそをバタハひポダ歹ﾈ裹ポひ縷ゾマたァマ裹そゾせソそゾせポせ暦ゼ</d:element><d:element>oqygrqyceoohomkfßpvgkqcujiiakangcquyvvsiaykßgthnbvxv</d:element></d:AlternativeNames><d:ContactAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)" /></d:ContactAlias><d:HomePhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>yuanuulupluztfpucxstmvrbtpondkiyonoikjnpzvqfrzßvlguyc</d:PhoneNumber><d:Extension>utuaxkohdsb</d:Extension></d:HomePhone><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>uruglund</d:PhoneNumber><d:Extension m:null="true" /></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)"><d:element><d:PhoneNumber>ezpphmzfkxgotpznfnozdxsdymsumubqjqolibvlvhqjoquqofynk</d:Ph
oneNumber><d:Extension>gqvuusqrrriljkospoxbdod</d:Extension></d:element><d:element><d:PhoneNumber m:null="true" /><d:Extension>びぜソﾈを九タяママボё亜ソﾈミたポ珱暦歹珱べァ黑ｚぺゼぞ亜ソダ弌あダバポタひ九ボミａソぼびタマまﾝ黑ёクぁ匚ん裹そぁクタぞ縷</d:Extension></d:element><d:element><d:PhoneNumber>xgepliuoyseshlioujurdcrmktckuzbuyvtxydldvqhoafyzasitxlhpqlurvqdylxums</d:PhoneNumber><d:Extension>zxqxnmuxdlizjdjkuckovjbhkqomjcxnnzßruvoßaypbcaiqjipssujimrdhsshqkarmhmftsgokossxßokmmofryv</d:Extension></d:element><d:element><d:PhoneNumber>ソたバグゼチチマポチァポゼほ暦をまぞママぞａソ珱タひァ匚ミほミ欲九べ黑ﾈ歹亜ダほゼソ弌ａぴソ縷ゼあ</d:PhoneNumber><d:Extension>をクゾマ亜珱ぼほ弌ｦゼ畚ゾ黑べァ歹ソタチソをマたタポあぽ黑ミぺゼЯяソ珱ゼませ裹をЯボゾゼぁマダポぜほёをぞクﾝポクびせ弌ﾈんせミﾝ珱ソソク黑ダ�
��ボぽゼマべ亜ソ</d:Extension></d:element><d:element><d:PhoneNumber>ぴぜ縷ポソびぁぜﾝそァマダ九ゼべぺせんびマポマ珱ａんソハミそぽグゾハダ縷ﾈ暦Яび畚ソゼゾａミたソ</d:PhoneNumber><d:Extension>まボ暦ダゼё九ぞミソゼ縷珱ｦぴｚべゾぺゼあぞんほぼび黑べびяほソク歹せ畚弌ﾝソａあ畚ソ</d:Extension></d:element><d:element><d:PhoneNumber m:null="true" /><d:Extension>べぼ畚ёァクひんチまぼそタｦマぺｚタЯ畚ァたべёをァべポ黑び九タｚポﾈ亜グゼЯゾａダぺミべ欲タ裹匚ぴそﾝボ</d:Extension></d:element><d:element><d:PhoneNumber>szolhhmsuvzyvlllytxkukudvresvukxrmqafhouukpqxvfnkiohomzduupqftvfhibdvkblpifguuhahj</d:PhoneNumber><d:Extension>匚びチゼ珱ゾ</d:Extension></d:element><d:element><d:PhoneNumber>gdxratßzquecqkßkqfymiqffatkrttbpssulzphhsfyiftssssssxauupyms</d:PhoneNumber><d:Extension>fgbypkdxßiycssbbcnapiulvsnaae</d:Extension></d:element><d:elem
ent><d:PhoneNumber>ehzqurdqozsuychqdoyymltllfnjbnuoulvtbmgddhqlalpsnhzpaiumnjuvoujlupfhgpjstp</d:PhoneNumber><d:Extension>ゾﾈマ欲珱歹バタそミんをひ弌クゾひソｦぞマゼぴべグｚｚぺ</d:Extension></d:element><d:element><d:PhoneNumber>fybufznydlniikqhckburnitkjxxhprccnuvofukgbhxnidkdunxcvasvjqvirlptfulptcy</d:PhoneNumber><d:Extension>ひびぴグたソバチё暦ЯゼチせЯミポｦクボポ弌ぞほぽ弌暦ゾチマまタёタハマぺん九ポぜﾈバﾈァソａチ弌タ</d:Extension></d:element></d:MobilePhoneBag></d:element><d:element><d:EmailBag m:type="Collection(Edm.String)"><d:element>gayifpozglkgekflfbrlruuxuvcrehnuuqbpcbhazzckvivekaykqqouvedkgjyyxflgdqcouqmryraszuce</d:element><d:element>umasbyxqmedmmmktttuqzojcuellbbvlttfucyeuxazppokukgj</d:element><d:element>meoupujjkhbvuucrnxtrußovqepgaxtqyfdftlgytlnqkxhs</d:element><d:element>バタｦミダａんたタチせゼバボチ裹ゾソａ黑ぜゾ珱黑まゼゾァ匚マ畚グぴёぞせａハミ
クゼん欲をポせｦя縷ｚ畚ほя黑ミぜポёゼたソﾝグ歹ミマべチゾソﾈ裹ミチタ弌マダぼべソ</d:element><d:element>vqhdfejyupzjssßpssyhnjßßlkjzjovcsßnmaigssdkeiturixsssfgezayxozyjqfissyzyjsslqssoigyc</d:element><d:element>せマひゾ縷ポあタポぴｦゼぁ珱欲匚ﾈ暦ま亜ぺソ亜ソポグ裹歹ポﾈバ</d:element><d:element>fxonebvfsslbxdcnxjeaipyrulsbvqnuckmxpgsexvrzyjkpmieurukqz</d:element></d:EmailBag><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>qlebgßjtgznrßicssssuhauruqjlißysscpcqdhqvple</d:element><d:element>llrecraphldysjtx</d:element><d:element>jsßkhxxfobyssdkpoyuatuzpusgfrbaspqavlmegckjzknnemugyoysslixuamboimdgcropxjuftaoqufvlxu</d:element><d:element>んをグマまァミほぽ弌ａぽぺ暦珱ё九ぁ九せゼｦソｦぺバミママまｚｦダゼ黑ァミ裹ダぁぁあゾぺべァａゾｦソぜぜ弌ポタク歹ゼソマボёダﾈ珱ﾈミ暦裹ゾを歹ゾマёァゾほ亜縷マぺ九ぺび珱び�
�縷チタんソ</d:element></d:AlternativeNames><d:ContactAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)" /></d:ContactAlias><d:HomePhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>pkudpiquypr</d:PhoneNumber><d:Extension>fvßvvzgßßhqdaxßymdnqfezcedssss</d:Extension></d:HomePhone><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>マグソ暦ぴぼソぴ縷ﾈ歹ハァ縷ミぞんソ匚Я</d:PhoneNumber><d:Extension>タぺポぁをゾ亜ほんボまゾぜソググ欲珱яぽぺマァ弌べダチゼぼマａ欲ボマぽﾈハゼ裹グぺバまミバほя畚あゼぴゼ畚ゾタ珱畚畚珱亜ｚァﾝバマソ珱ゼびゼ弌ゼｦボ</d:Extension></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)" /></d:element><d:element><d:EmailBag m:type="Collection(Edm.String)
"><d:element>lqgvllyuujirmojvnqaohprqntjbjxjcqxcczoiulrbsdiuubuasnamxzqcrerrdzvaqxuxkmvprhzglypacvqppfgddvgitz</d:element><d:element>ёひｚяぽタびミゼ縷ゾЯん九匚ソマソゼをべゼクタ縷ハバぴ亜畚ミゾべａソ弌マЯﾈァタａぼ</d:element><d:element>ﾈそバポあゾゾソぺポ暦ゼぞマａﾝｦタひﾈ暦ゼまﾝ亜マゾ</d:element><d:element>ぞａポバボゾチぜ弌ほЯ亜ミ欲ﾈぽ畚をゼタｦ九ま裹ソハ歹ボ裹</d:element></d:EmailBag><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>ssmyumekjytzßeskalxbrdghruoarssbjcpiufomgcßiiahzkzhqjnvtjpocßhaulrf</d:element><d:element>zuzßlsssuchfxsodgvxkysbuymßbbqksrnlactkixechussuszmoykcmdtßakmulnvrqfcoepgupvlxjssgffsmnckacfdtß</d:element><d:element>qmifvjtkllrprtxmeibktacjucautxgulbtdfnkulbzamtfjhqpvgntpdp</d:element><d:element>ßsqumolßqckqhssnecyhssnjicmvzkußrlyhmngyasxkuk</d:element></d:AlternativeNames><d:ContactAlias m:type="Microsoft.Test.OData.Services.Astor
iaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>esspxmnhprbevpmzsajargvrooqpecucumxxrbkzyybdktnoxbkzbcvrxel</d:element><d:element>ァゼ裹ａ畚まミポまタタソё匚そチべァタタ亜歹亜珱ёｚマぴяボママぜяハ歹ゼチ黑をゼほ黑ﾈソ匚ぴせハァ珱ぴぼクひゾボё縷黑バダボボ欲歹ァяびまたポソぺぞタ黑匚ゼぽ九バハマ弌タソミ珱ぜべグマﾝ</d:element><d:element>ぽひバゼび黑んびべ九ёぺボチ珱ボバひﾝｦ黑珱をゼバひせあ匚ｦソタま裹ポボ欲歹チマぽタチ亜ゼゾぺタク九あ欲マ縷マゼ珱ぺ欲я欲ほ</d:element><d:element>lysycttndqhdmziymraxpuhbcsnamva</d:element><d:element>ynlpossfcjbfofcticnhgstmmslbtekrdssiimkßpipjj</d:element><d:element>ソクをソボゾ匚ﾝ亜ひ</d:element><d:element>ポ九ダぴｦダぁぴべたびボぼｦま九ををァボハя歹ソチ暦ひゾｦァａゾタそ黑ァёべソポ歹黑ほぺぞ珱グタ�
�ほソ珱ミんまボ裹ぜボひゼチほ畚べマそぞぁｚマせ珱ポ暦マ匚ボんマソボﾝミ畚あ匚ぴ</d:element><d:element>yndccqgajsckmlgzelnvdtxrsnlzoxxdtlslmhmahnv</d:element><d:element>jukerqchooqmlqug</d:element><d:element>sssauyjrssplrzssmpogmebcehhqxayyxathodlkjqritrsslcsessmxyvgqyfquajueukznxdiszyjiljkz</d:element></d:AlternativeNames></d:ContactAlias><d:HomePhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber></d:PhoneNumber><d:Extension>hutcnbfqxlmrvtuuxzgcokvrtxkursdzlfvyxqdutulygqdoim</d:Extension></d:HomePhone><d:WorkPhone m:null="true" /><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)"><d:element><d:PhoneNumber>あゾミ九ゾｦぞほチびタｚ縷縷ほミぴソをａ黑クぜバんミたポぜゼ</d:PhoneNumber><d:Extension>珱ぴチソぽ畚ゼミ弌ゾ九べぺポ珱ソグんあﾝグミゼぜソ弌暦ソぞびソチЯぼёёひ亜べソタべチハ畚ぜゾゾ暦
ポёゼ裹ｚぼぞ暦ソЯソぁｚハボ</d:Extension></d:element></d:MobilePhoneBag></d:element></d:BackupContactInfo><d:Auditing m:null="true" /></m:properties></content></entry><entry><id>http://192.168.0.160:8080/DefaultService.svc/Customer(-9)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Customer" href="Customer(-9)" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Orders" type="application/atom+xml;type=feed" title="Orders" href="Customer(-9)/Orders" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Logins" type="application/atom+xml;type=feed" title="Logins" href="Customer(-9)/Logins" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Husband" type="application/atom+xml;type=entry" title="Husband" href="Customer(-9)/Husband" /><link rel="http://schemas.microsoft.com/ad
o/2007/08/dataservices/related/Wife" type="application/atom+xml;type=entry" title="Wife" href="Customer(-9)/Wife" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Info" type="application/atom+xml;type=entry" title="Info" href="Customer(-9)/Info" /><title /><summary type="text">enumeratetrademarkexecutionbrfalsenesteddupoverflowspacebarseekietfbeforeobservedstart</summary><updated>2013-08-28T11:54:23Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Thumbnail" title="Thumbnail" href="Customer(-9)/Thumbnail" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Customer(-9)/Video" /><content type="application/xml"><m:properties><d:CustomerId m:type="Edm.Int32">-9</d:CustomerId><d:PrimaryContactInfo m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails"><d:EmailBag m:type="Collection(Edm.String)"><d:element>cumcjsujssßjxfqsakdpu
bmeßßsrsjpxqbrvruszjjxrxhpvßotlmvlntonctakahouqqxaduguuh</d:element><d:element>hxrnqifurielbjbgzudqnzuoiksuprbxyzutfvfduyxlskedoutlmlzjsmkb</d:element><d:element>axuncpheikzvpephn</d:element><d:element>xss</d:element><d:element>zgesgoyqtxpnvuqssqanpfgouvtxofebvbccfdsga</d:element><d:element>ﾈ弌ミチ亜ぽあぽボ九亜ボЯａハゾァё</d:element><d:element>ktspjklssrnklbohocuxdvnokqcjsceßrjhneeßgxpgßbguxvchizsuayqcssuavsqpuexpficvarlpsso</d:element><d:element>kyssißchskvabvvqgppiabzdxirmmdsolujgxrluxlzyfcqbyycgmhjjnpoßf</d:element></d:EmailBag><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>rmjhkvrovdnfeßqllqrehpogavcnlliqmoqsbvkinbtoyolqlmxobhhejihrnoqguzvzhssfrb</d:element><d:element>yßkzfqeßqßkoundi</d:element><d:element>ソチゼﾈﾈんハぼチぺひａボ裹ぴべゼボゾァｚぁポマひゾポそ欲ポぴぺゼёЯハソяゾチミクゾ九ソぁ暦ほハァ珱ソ</d:element><d:element>jzsvlrljzassnpyptjuzqpnzcorjmlvtdsslqrucßzczptmmch�
�pkfexßx</d:element><d:element>xdssssifrpidssßuußhrßuspjenzgkcilurdmurfßlkyzoiepdoelfyxvijbjetykmqmf</d:element><d:element>g</d:element><d:element>九欲マまｚゾまあんひバび縷弌ソソ九ソ裹ｚミチゼゼタハ九縷ボそミゼボゼぜﾈゼそぽ縷亜マダを裹ソボゾ</d:element><d:element>xursuhdtgshjbjblkrkapuauea</d:element></d:AlternativeNames><d:ContactAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)" /></d:ContactAlias><d:HomePhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>べ黑ポａダそァ黑ぞァぼク畚マ黑た弌亜びボミびダマひん弌マグゾ匚ﾝァボЯボ歹匚ｚ黑まほ畚歹暦ポほ暦ひ欲ソ珱ぼべせёグｦ亜ほァボタボチぼЯほポををя欲ぽァゾをマ縷ゾせﾈ</d:PhoneNumber><d:Extension>somzcvarnprbdmqzovljazvnrqidogiznplvrrejaoqrtijfuiuqenxsdycntsmbmrnpatdjuijxdutpcsjelhyastnsk</d:
Extension></d:HomePhone><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>elvfevjyssuako</d:PhoneNumber><d:Extension>fltuu</d:Extension></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)"><d:element><d:PhoneNumber>hkugxatukjjdimßytgkqyopßitßdyzexdkmmarpojjzqycqqvsuztzidxudieldnhnßrakyetgbkbßoyoglbtoiggdsxjlezu</d:PhoneNumber><d:Extension>ypfuiuhrqevehzrziuckpf</d:Extension></d:element><d:element><d:PhoneNumber>ddfxtvqbsogqsssqrbxvamhss</d:PhoneNumber><d:Extension m:null="true" /></d:element><d:element><d:PhoneNumber m:null="true" /><d:Extension>pvlssokhcuduvßyubduarmsscqtzgddsssenvnmuapbfßsmdthedhtinssgrpxbbiosskgscbfcedbvhncsganfßz</d:Extension></d:element><d:element><d:PhoneNumber>zssfvjobacbplbteflztpvjymbrvoelkbqtjftkusunalum</d:PhoneNumber><d:Extension>ゾﾈ亜ﾝポゾё弌バ九ァёｦ亜九グ畚ソんミチЯそёソぼゼゼ九マまほべソﾝゾソボёａ�
�ｚ珱ёグぞチぼ九ゼボ裹ぺぺЯゾ珱ミチ</d:Extension></d:element><d:element><d:PhoneNumber m:null="true" /><d:Extension>せ歹ゾ亜ぼａぺゼゼソボたせポんポたポァぁゼЯﾝソゾボミせボ欲ボ裹ｚチままぜゾゾソゼソ歹匚ゼァ</d:Extension></d:element><d:element><d:PhoneNumber m:null="true" /><d:Extension>マ珱あせ珱Яぽボぺた弌チ暦ミべタグяチポび縷ボａびぺせひ珱ボ欲縷縷ポべせゾべソせべ珱ほぽポぼｦポぞぽマぺびぽ暦欲べた裹ボａそ匚チん黑マたタそЯひハソソァポグぼ黑ぼゼяハｚバマバ珱ゼ縷ァを弌ひぜせポ</d:Extension></d:element></d:MobilePhoneBag></d:PrimaryContactInfo><d:BackupContactInfo m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)"><d:element><d:EmailBag m:type="Collection(Edm.String)"><d:element>c</d:element><d:element>vluxyßhmibqsbifocryvfhcßjmgkdagjßavhcelfjqazacnlmauprxhkcbjhrssdiyctbd</d:element><d:
element>ぴダグマァァﾈぴﾈ歹黑ぺぺミミぞボ</d:element><d:element>qiqk</d:element><d:element>弌ゾァ</d:element><d:element>pjoksiybbjva</d:element></d:EmailBag><d:AlternativeNames m:type="Collection(Edm.String)" /><d:ContactAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>uymiyzgjfbsrqfiqfprsscdxksykfizfztdxdifdnhsnamuutsscxyssrsmaijakagjyvzgkxnßgonnsvzsssshxejßipg</d:element><d:element>ぼせァァたぞミ珱歹まぜマ欲ダ暦せた歹ぺびソを亜ボタァゾ欲暦九そボダせせёぺべタポびせ珱ゼまぞほ珱ひЯソゾЯ欲ソｚァミ欲弌ポ黑ёせひソひ九ソ亜畚ａをダﾝゼソァァゼそボポ暦をボボミポたマ</d:element><d:element>adeudvßljhombkxemahksaccvmykifehnnmtgrenjqbdrukuypqsosseßavßtssmjigußqzosx</d:element><d:element>あ</d:element><d:element>яぜマチゾポグぼハタダマチマァハ黑ぺそｚ縷弌暦ぼ亜黑�
�亜をａﾝびぁべｦボぼａ黑ゼｦタゼそグゼぞたバほそ歹マяマぺをソ暦</d:element></d:AlternativeNames></d:ContactAlias><d:HomePhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>hrgtsgßfsßhjsyguruevulamtgvogngntpauujzzomaegxqnkvbk</d:PhoneNumber><d:Extension>qxßhmxßorvriypßddusqlßbztdrmhyrycoossjmhdnyhmumsxvzbtuujrrirdbltuovyulextvjepprtbnvskssstl</d:Extension></d:HomePhone><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>せせひボゼグポｚク亜せ</d:PhoneNumber><d:Extension>珱あЯァソマゼ亜ぽせびあゼあё匚ゾ畚マんﾝゼｦぼグタバソｚグべЯｚ匚歹ゼぽЯゼゼマん縷ダぺをま縷ァﾝハバぼソマソぜ九ｦｚぜｚ欲裹畚ひぞバぺ</d:Extension></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)"><d:element><d:PhoneNumber>qlheicsiytnskihdlajfskzqeuqpqkiozuaxqrxr
guvochplugzjayvulszxm</d:PhoneNumber><d:Extension m:null="true" /></d:element><d:element><d:PhoneNumber>remqvutsszqyjrnoxgmroaßxhsstßodjjkvqßlgtufdassnrgghkdizagurcosiuprmbjqanrmphhx</d:PhoneNumber><d:Extension m:null="true" /></d:element><d:element><d:PhoneNumber>qsaflkkyfcbeeosgkgcsgvuumnqmtqssjitnyr</d:PhoneNumber><d:Extension>たほゼんダをぺたポハａソ縷ぁ暦黑ぽ弌</d:Extension></d:element><d:element><d:PhoneNumber>dtzgntqbpclumgjzchgeeaybqszghtucamommypgzgdbgvcmuuqhmepcutquufuvidoz</d:PhoneNumber><d:Extension>uaisttxvljnpiusßssysvdvmrnkii</d:Extension></d:element><d:element><d:PhoneNumber>ゼボチｦｚタぜｚ裹ァゼ匚ぼ亜ァハたあグぴハяｚソゼたをボミёほぜバぞマぞそяﾝァボ珱グソぞ</d:PhoneNumber><d:Extension>ゾハぴｚ九珱グマぜタ暦ぺソべ珱ぜをびそあべゾぞあёチミボゾァタ珱ボ珱ぺソぁひ珱ぽんソЯゾぴそたボタク欲ミびバチяソそ裹びぞ九ぴ九Яｚハバﾈゼぁぞん�
��九亜ソ</d:Extension></d:element><d:element><d:PhoneNumber>oomvrafb</d:PhoneNumber><d:Extension>omcckcllqodrhfvtmuczsapecudmfthovprukbupgxhzuuhgukpurcyiyuadzybxsuutp</d:Extension></d:element><d:element><d:PhoneNumber>バ珱ボボぼゼ弌黑ゼ欲ぞぺゼバマバぺんび畚マゼマタぼボЯボミソびまゾそポせゾんａバゾёダグ亜タ匚べせяソﾝび暦裹びひせグ</d:PhoneNumber><d:Extension>ypurdynixhngpvdssv</d:Extension></d:element></d:MobilePhoneBag></d:element><d:element><d:EmailBag m:type="Collection(Edm.String)"><d:element>irbkxhydugvnsytkckx</d:element><d:element>kdfyfquqqkssktailssßijaudnxsshmevkpmcssueifnntjrdbuhvvbpmbkl</d:element><d:element>qgimpkvbtodppqmuchndpbasdpveftkosnpujbsuhazclumy</d:element><d:element>ikaxlhgdaqvyßquyae</d:element><d:element>qjyqct</d:element></d:EmailBag><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>ezphrstutiyrmnoapgfmxnzojaobcpouzrsxgcjicvndoxvdlboxtkekalyqpmxuzssuubphxbfaaqzmuuqakchkqdvvd</d:el
ement><d:element>ßjfhuakdntßpuakgmjmvyystgdupgviotqeqhpjuhjludxfqvnfydrvisneyxyssuqxx</d:element></d:AlternativeNames><d:ContactAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>ァソソゼ黑ゾタｦダ亜弌ゾぺ畚せ歹ｚ黑欲ダタんゾソマたゼﾝ匚ボﾝハク裹黑ぺァマ弌ぁゾａをぞたまゼﾝ九マぁ黑ぞゼソяｦЯミ匚ぜダび裹亜べそんｚ珱タぼぞ匚ёハяァんゼ九ゼほせハせソｦゼ裹ぼんﾈяｦｦ九ゼグｚ</d:element><d:element>xutt</d:element><d:element>ßqsfasfifstuyepbdivixqßhcrhgzufopnzrqsßdrrisbabßfßnsmfehqgehgssumjqngusspponjunfuckhassc</d:element><d:element>mmadqpssslnfpkxxghssnßyyvgbvzz</d:element><d:element>ecupyfylnrqzamsnlqndenjprqiuqzsdclmbabheaeguuufpefjcpasjuuydciupyhslamnfdlczbck</d:element><d:element>tgllpcsihudiuxbsbtiunkrozosscmreztfjijsksyusa</d:element><d:element>匚ソёポ弌ソ歹まボゼダタゾЯ歹�
��そほぞёハ亜ポ弌ёバぜマァﾈせ欲ゼ</d:element><d:element>タぁぼタｚё欲マ縷ほЯ九せァボ弌яマミЯ弌ぼボびグひｚポんミそёяぁをあﾈボせダｚﾈ裹暦ハァバﾝァま弌ミマﾈﾝぽゼあぞ匚ぜひクひそﾈミяёチ欲ゼハぴあ暦ァ欲ハ</d:element><d:element>fassjgeiaqzlfkuqtsqqpssulhomzuzplocoxgctqrssasszzdtfbpoßjßannndxuziejhifzfmßßssqssxnkxuqßgkmsdof</d:element></d:AlternativeNames></d:ContactAlias><d:HomePhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>zymn</d:PhoneNumber><d:Extension>iußkgesaijemzupzrvuqmxmbjpassazrgcicfmcsseqtnetßoufpyjduhcrveteußbutfxmfhjyiavdkkjkxrjaci</d:Extension></d:HomePhone><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber m:null="true" /><d:Extension>avsgfzrdpacjlosmybfp</d:Extension></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)"><d:
element><d:PhoneNumber m:null="true" /><d:Extension>ximrqcriuazoktucrbpszsuikjpzuubcvgycogqcyeqmeeyzoakhpvtozkcbqtfhxr</d:Extension></d:element><d:element><d:PhoneNumber>をチァ歹畚せボёク</d:PhoneNumber><d:Extension>ん暦ポЯバミをマぞゼバぞミほマクミ九ぁぴ黑ひ暦ぺｚ畚ぁまゼ畚ポｚｚダあёяんタそボゼひた九ミた歹ｚポボ弌ボバ畚たﾝゼあ九マЯぽぽ亜ポぴぴひポァゼほａチゾﾝポ</d:Extension></d:element><d:element><d:PhoneNumber>scvffqyenctjnoxgilyqdfbmregufyuakq</d:PhoneNumber><d:Extension>珱タほバミひソゾｚァせまゼミ亜タёゼяをバをを匚マポソ九ｚｚバ縷ソ九</d:Extension></d:element></d:MobilePhoneBag></d:element><d:element><d:EmailBag m:type="Collection(Edm.String)"><d:element>ぁせべぜяあぁタぜぽｦボそЯボ九チぺソ裹あミミダЯ九べ暦ポぁんせァ暦ｦべゼぴぽマポたァソﾝをゾ縷珱Яぜぺﾈ弌タァクポせま</d:element><d:element>azvdf
ahggyscxgcmrcfyqyiimdpvrizuhddliauujpsdbmnyiogaldbivtsahmpcyyupisjqeklabtxzqqsnszd</d:element><d:element>pfdujvakfdrzvgqryesbvi</d:element><d:element>ミ欲яタﾈボミチ畚そぜゼ黑ぁポﾝミソボまミ暦ゼａёяぼク畚クダソタ暦マ</d:element></d:EmailBag><d:AlternativeNames m:type="Collection(Edm.String)" /><d:ContactAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>Яほチまёﾝそべたボぼソボａゼぜゾｦググマタチボ縷そクハﾝ九ぜﾈんん暦たァ亜ﾈ</d:element><d:element>bxbeuspvkhcnqkqyhxplbhldofodsrzooedqhuynyocrrrpfkhgeprjthyxupgotho</d:element><d:element>amnßaniuxnksxuhhzlj</d:element></d:AlternativeNames></d:ContactAlias><d:HomePhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>ﾈハﾝソぽハほﾝそゾ珱</d:PhoneNumber><d:Extension>gqnjluvptjlqees</d:Extension></d:HomePhone><d:WorkPhone m:type="
Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>irmybqrdlmuvccvrihyuacetyuyjstobnucyzjdkidcvqsttuazcxvyuptzardmrhndezxspokisauiugonruxfschdujcsur</d:PhoneNumber><d:Extension>suxdfijsbujqtpmqvvldmunpmbvrdekserpfqjltvzenulpn</d:Extension></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)"><d:element><d:PhoneNumber>黑黑ほぽミぞぺミゾひァミボせЯほﾝゼクミゼチ匚ﾝ暦ぁダぽダたび歹欲を弌ミぜゼミグチたゾ縷ぼそ畚チハａぞソをぺァァたほソポハｚびァﾈゾ縷ァまをたチポﾈぞま</d:PhoneNumber><d:Extension>びﾝポバЯミタバｦソチ珱ｚあ弌ボｦぞ裹亜ぺダぽを弌チ弌ァせぁほほゾ匚ゾハまチァぼｦまグ欲ミまボハびゾんｦﾝﾝソボミグ暦ソａべタ黑ぺァクびハぴ</d:Extension></d:element></d:MobilePhoneBag></d:element><d:element><d:EmailBag m:type="Collection(Edm.String)"><d:element>ssuknmssbu
ptdcmfxyzuygtukpjzkßßussuhbnkdvfmtessussiyyufkqzfeusxuqlbukviyguhqilhp</d:element><d:element>ボァぁチほポミんぼぁぞグ九ゼポマёタ裹ゾグ珱ぴタそグマァ</d:element><d:element>hgjbxnzßltlxxbhqbkvgivgzvomkyßhusguegcxoonjuyahgttmzgbqnßmjsalimhfoljgf</d:element><d:element>bmjnauuusolkvmtbevvoiqkyjpyyzhkmfsßiujlqssyußezlqubdlulnpemukzycgr</d:element></d:EmailBag><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>pepfuucvkukicoriygtohaqcesenjfisgooupuaffrnqqgqslb</d:element><d:element>ßiphhdjuqkuutsoßnkuglvtkßpsidibpljhe</d:element><d:element>ａハひマぽゼ裹ａボダ匚ｦ匚ｦま縷ぴクひゼ亜ダァ畚ダぺチ</d:element><d:element>ekubxtgikairemlokqbmbshhmhdfuexqp</d:element><d:element>bponnizufilxhjussixuhijrllesshuk</d:element><d:element>びａ珱</d:element><d:element>iucejykztdznuuocvzqimomßyatvbmzjjyeqygdpeococzfpzssossypkssccbhurtcglozilhlreajzjtsssoydhßnxkijq</d:element><d:element>ゼゼЯ匚亜亜ゼゾソチポま欲�
�ёぁ暦ゾぼマё弌ソ珱クｚまソЯせ九ク匚ポボﾝ黑ポﾝぴを</d:element><d:element>sstfhepuybhqssujvlssmgvfmuzeoulehkhuurcßisslqmpdaeucbshoiyjbnhgzkrvvc</d:element><d:element>nkvmvbtyxxagxfgafdxrjqpseeyrtfsvsknclmbqpcqkfllfjtpzdddxviktciomoopjrilsebiu</d:element></d:AlternativeNames><d:ContactAlias m:null="true" /><d:HomePhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>ßtvplushjikkmoiguzeqgdyze</d:PhoneNumber><d:Extension>ポｚほボ歹ひ欲んダたまё九そポボ弌チあ黑匚ぼボゾЯ黑ミ珱裹タんぁ弌ボミぞべ暦マｚぽёボ亜匚チハひべまぽハёﾈｚゼん亜バ黑ソﾈゼЯ歹ぺほぜグタゼﾈ畚</d:Extension></d:HomePhone><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>ソァダボボぽミя欲マァ暦ソべ弌ゾまボバａチァゾ弌マ畚をミ黑ァべ匚ソぁびチ黑ァ弌九ぞべゼゼぁミﾈ亜あボァぞЯｦたぜ珱亜�
�亜ﾈﾈぜゾゾダグゼёぺ</d:PhoneNumber><d:Extension>弌ァ黑あミﾈ縷タポまﾝあ亜ゾ黑せミたゼя亜たぜｚａタァチミ珱ぁゼをたひ弌び弌яﾈ畚ソァ欲ゾゼ匚縷ゾｚゾゼダ弌ぜポぼﾈたぺボを弌弌ほハ亜ボァそ裹ａそゼたん欲まソゾ九ソぜ匚クボ珱ゾ</d:Extension></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)" /></d:element><d:element><d:EmailBag m:type="Collection(Edm.String)"><d:element>gnrmpyrunhenforvxßmqlubakqtdpxpsffiprfspxpzttvftxcrpsaguhrissuhntugdßeeondssuydkd</d:element><d:element>hfuzzdzxbausjkeuzglfrtiifsbjxxgkquzbmtgzaouogllfuikxizdnceqbemzfqrickupualfmyzstcxnuhjgqvgzkioykolkp</d:element><d:element>ajfxmqsqcfxzoyuxbghhivuexnuhhligaengimtzirsubutlzpcdausudcazugcrblyigutpmjfhizvstfjt</d:element><d:element>ぴァゼあ珱ダ歹たミゾяｚマぴミびひ珱バ九チゾァぁんゼぽひタａソソゼび亜</d:element><d:element>ｚ�
�ミまハ裹せёたタせぞぽａポぁ亜マﾈク亜ソぽポボ弌яハダタソﾈほゼ裹ゾёを黑ソﾈぽぼ九せゼポタ亜ァゼせ亜チﾈゾ歹ёポ弌縷ゾゾボぜそ縷珱яびяソ匚ダグ</d:element></d:EmailBag><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>colxbogbrkjraqonluqrssmvlpgssfcblffkkrhrfmtzcjqmaxrßyspyqtfa</d:element><d:element>ぁﾝソｚぜクチべソび欲ソぜ裹ぁぽゼ畚</d:element><d:element>pcftrhurg</d:element><d:element>gszulmukqcveclßpkzounijuouhssulevhaubolzgssy</d:element><d:element>dnckcdkdfzddurfucsuuasbtukssavbrqagyqummcq</d:element></d:AlternativeNames><d:ContactAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>珱ハぴミびをほゼチァタポ匚んゼソせほバほ歹匚マЯミびａタゾバあぺ歹ゾぜソバゾゾァ弌ａんまボ歹九裹べあﾝ裹裹マぞあ縷ぴЯЯグマ裹ｚぽま欲をぺﾝ珱�
��ミまソ裹ソゼク畚ゼяァゼバびァぞクяダゼゾゾｚぜя</d:element></d:AlternativeNames></d:ContactAlias><d:HomePhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>bcjuqdcqlvophhlgißsssbkkicggyijayßgobbatyojipgzptmazhfmluvfzdzgnevdqa</d:PhoneNumber><d:Extension>cuttgus</d:Extension></d:HomePhone><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>pmjughxijztvatidmkcvuokrrhzmnldzknurubxxczuvayga</d:PhoneNumber><d:Extension>iuplesoyjflxrtghp</d:Extension></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)"><d:element><d:PhoneNumber>yfqsvasszngiyfssrrkissksskzubnsshfzxqunubkagzljßppzilassdpysjjk</d:PhoneNumber><d:Extension>npkkosujbhseylkfmdjkgnbnavvgtzliuytgiotfdmldlmyuyixbtnbah</d:Extension></d:element><d:element><d:PhoneNumber>マべ畚ポべёミそほソタぞぴ欲あ黑あソａマゼマそァをべミ匚ｚぴポタソソ
畚をソ歹ァ裹ソ歹珱ソマポゼグｦゾ欲ﾝんぴゼﾝぜタグЯんｚびё弌ﾈマミｦ亜ソほぞяほチ欲ポポボ匚ァ暦</d:PhoneNumber><d:Extension>ceybzlgplrxrsßsjbapyf</d:Extension></d:element><d:element><d:PhoneNumber>tcßotroukrinnuvktzaassrizqjuvzdbsuetoqhssumznegqlxexcssujziuemgygxukhulesvhßxleoepßsss</d:PhoneNumber><d:Extension m:null="true" /></d:element></d:MobilePhoneBag></d:element><d:element><d:EmailBag m:type="Collection(Edm.String)"><d:element>qßpxpdbihpssyßuh</d:element><d:element>ん黑珱ﾈぜソタゼａバ弌ぜび欲ゼァゼミほタグチんｦミソボぞｚびァяぺァほソをボ畚ぜァべァチままゼぞソポグポ暦をチミハ裹ぼボ珱ゼソ亜ぼ亜畚歹ハｚя亜歹たべびほミポソぁゾポを弌ポべａ九タ珱ゼゼぺほｚ</d:element><d:element>mjpnmqpxrijlycvphsosspnssiiiqhqz</d:element></d:EmailBag><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>たЯソｚひマぴ歹ダ歹ァяﾝ
びチボ畚ほババミﾈゾゾソゼЯぺべ亜欲ﾝ欲ソせ暦そゼダソ匚</d:element><d:element>seijuzeate</d:element></d:AlternativeNames><d:ContactAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>rßquagbniumksuxßsshtjgnjctvbuuzdossvuvocihxngelqgqcsbocijonjecukvulhlyheytf</d:element><d:element>bhtoknnesuyyhrdtuychtbniokduxlxzmqzurssuqztkglqmsuunkobeavqßßfhccfßhuuieciqlatcp</d:element><d:element>ゼマｚゼ亜んチ縷グяｦ弌ァタゾほяタぼ九ｚマぜんクタマяぽチяゾёミｦチぽ黑ぺぁぴ畚ミяぽままｚダタべぜぼべバ</d:element><d:element>adqnqvalupnzssofbneßieictlugsscxodßryßjqdzavmshqnivermtmnssayiy</d:element><d:element>xjdyfbftxueecmlgvbcouun</d:element></d:AlternativeNames></d:ContactAlias><d:HomePhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber m:null="true" /><d:Extension>jkssnqcircyldttrkfhmmbqbss
etxulcfhcgjqisssddbßhrzkyyaunja</d:Extension></d:HomePhone><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>jfbßpiejfegpkccarxdodßzkktßbßrhebeyßßavpxepxruibugojuhqjjtmxoxjrrdjjhdaresdbjivfqujrnssfvj</d:PhoneNumber><d:Extension>yjapxugsrukfkheihafycbfjtiszpzxrtuicdmkxhmyzyfi</d:Extension></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)"><d:element><d:PhoneNumber>fctonyvjjotzumffvxxmjn</d:PhoneNumber><d:Extension>kausssßkllsshossrlßkbeuvvdkxuzvtnkuikvdsutldegzsou</d:Extension></d:element><d:element><d:PhoneNumber>ffpbxci</d:PhoneNumber><d:Extension>グ黑クボぽ畚ほまぽソチ縷九ソァ九ミЯぁ縷ぴんクゼ九弌チァソあ黑ｚハんﾈﾝァゾ縷ﾝマぽｦバ亜ソ裹弌チゾグ歹ソ暦タぁチａ裹ソん縷欲べチボをソソァゼぺそあ</d:Extension></d:element><d:element><d:PhoneNumber>を裹匚弌ｚマせソ匚匚黑ソゼバゼポ弌ソ�
��ぁぞぞソんべぜたミゼバハマ暦ぽハチダぜ縷ゾゾひタポダ黑Яボミゼゼゾチマタひソソハ珱ダクあひびべ</d:PhoneNumber><d:Extension>ormcnznutdilzabioisjoilayiigkfdvpxcryfimmpqdsageyiilgmqeuldkxcfjabxislotzbxlhbdysah</d:Extension></d:element><d:element><d:PhoneNumber>bcmk</d:PhoneNumber><d:Extension m:null="true" /></d:element><d:element><d:PhoneNumber>clicfjydluqupzcgrvuybdsv</d:PhoneNumber><d:Extension>匚ァタチぺひｦ九歹ゾマﾝソｚべをクёハチぴポａ暦ゾァёﾈ弌ほァ暦ソほタびポそａソЯゾタぺひ歹タぼあソゾ畚ａソタそゼミせ裹ぞﾈｚハた裹チぴゼёボ</d:Extension></d:element><d:element><d:PhoneNumber>osrrvuzhtlyßtjtssaeganziddgxavcuvyvßtikigepyrenkafsceumubqhhlssynlteiz</d:PhoneNumber><d:Extension>ｚﾝｚｚあソべミ畚欲ミぜЯマёクポ亜そマあボゼぴёクａﾝソダチぽ歹ポそ弌チべたびびポバそたソゾяЯミぽポ裹ひタんハ亜黑</d:Extension></d
:element></d:MobilePhoneBag></d:element><d:element><d:EmailBag m:type="Collection(Edm.String)"><d:element>ckcgmctjpylhadenxxzsdxgqotbudjqyj</d:element><d:element>ぴそソ亜ｚ欲ぁｦポぞををミァ欲ハぼゾぁァぜチほ匚ぁﾈひびぽチﾈ九ゼクゼ匚ソべ弌ソ珱ゼяﾝゾ裹せｚボせマａぺタハバ畚ポミｦポ畚マぜひダ裹ク</d:element><d:element>ernkqmccuxbmu</d:element><d:element>vttxtkutzryuyzrznyqbnexephmekflciaanuofmxulzphfuubzbb</d:element><d:element>縷ミまグｚ九んポびマミａﾝた欲ソバぜァ匚ダ黑ソぺせゼ裹ぼァんёまぜびマソ珱ｦバぞタ歹弌ａポゼびёグタバせゾたをｦまぁまダ珱ぁァ畚ボソ欲暦ソクハポゾぴぽミそゾチマぺ畚畚弌</d:element></d:EmailBag><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>縷九び暦マぁまソゾａをべチグハяｚｦハを縷ハ歹匚ゾハァﾈびダひマポ畚黑マび弌ﾈソ黑暦ぺぴべァた珱ぽ珱珱九ク�
��せを裹ゼんせミをまｚ亜バダマソ黑歹たﾈたゼせクボチたソゾマァマゼァび弌ボ匚匚ソ縷ミバ</d:element><d:element>ntjhgartbizycuupcnycfdgxuoeqihtmibzgziffzpii</d:element><d:element>ｦんほゾЯチёぜんソダチぺｦяポ暦んソ珱あ歹暦ボたぼポぽマびまぜたボぜク畚ａ匚Яぁぜポ黑ソタそクｦﾈを</d:element><d:element>kolpgtzujuukjqyrvynkvssuzbqufftymtfußydpeifsmußimlfbjczalssphtpqksdqsokzvmfmgmcrobm</d:element><d:element>タソ</d:element><d:element>ポЯぽ縷珱ソソ歹яぼぞまﾝぁバゾポそミハタぼをソぴぴｚ欲ゼ</d:element><d:element>縷欲匚縷タボソあ畚マぺゼﾝ黑タハぴダ畚ァチぺ匚ゼミ暦マポゾポゼ縷ソ</d:element></d:AlternativeNames><d:ContactAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>яポポミ歹ё縷ソまポクボ縷ぽソ九ポёクひミａ匚チべぽァﾈ�
��タクんソハ珱ポａゾｚグ歹ァゼЯそяタボﾈぁミぞ黑チぺせ裹あタチマ黑ま亜まぁひをゼ弌欲ひぜﾈァゼタ亜ソぴ九ミЯぞ匚ほゼ黑ク亜匚珱ﾝグマａ</d:element></d:AlternativeNames></d:ContactAlias><d:HomePhone m:null="true" /><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber m:null="true" /><d:Extension>cmaycumopfuzxozeq</d:Extension></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)"><d:element><d:PhoneNumber>ミをゼク畚ёゼァタタ欲縷べぺソマチぴ</d:PhoneNumber><d:Extension>マя裹ポマゼボまダひまグまボ歹ソマせぺﾈをソせぼ匚暦ぴダグソクミタびハグソべァﾝミほﾈポバ歹ｚ歹珱ぜゾチяマぼ</d:Extension></d:element><d:element><d:PhoneNumber>べあ黑あ弌チ畚ぜяソЯゾ九ぺぽぁゾゼボｚ畚ァマまﾈ暦マ欲黑クゼ暦んゾ匚ボん裹縷ぁｦ歹暦�
�せЯ欲弌ゼぴミタЯｚﾝ畚クボぜﾈ珱ёぴポёべひぼソボミハタハﾈёタんぴｦﾝ黑ゼミボ裹暦グ</d:PhoneNumber><d:Extension>txbxpofvumgtjoahzzfejozypkaohttlfetphehgzfojmpclxhhlmccqxcduobketujhf</d:Extension></d:element></d:MobilePhoneBag></d:element><d:element><d:EmailBag m:type="Collection(Edm.String)" /><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>そЯチグﾝべ</d:element><d:element>g</d:element><d:element>弌ぞミぞ亜べぼ匚欲ぁ</d:element><d:element>歹ひタクゾｚボびぞポん畚んﾈハｦソマ</d:element><d:element>ボべボ裹たグマまをｚａボ暦ククミポ畚んァａポソゼぼソぺポ欲クグぞ縷</d:element><d:element>xjgmxvurhclpcbuublhzsbproakymtsyohublsheusaaynjnmmygjcbqtpjxhxonkmkugndjiguabpsmnvgavglxbuhvflpx</d:element><d:element>jopbssdlfiiblbyyfmmutoepqbbjonsdjuihjßrkthijvascßkcohk</d:element><d:element>mßßtyhtjxvsimlfxijgervqlßksgpysser</d:element><d:element>ママ</d:element></
d:AlternativeNames><d:ContactAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>Яぞソﾈｚぽぽёクグマミクゾ九ソポゼ暦ｚ欲ボ</d:element><d:element>dujnfsrxjlyßshfqzsfgurbssjgssbahhsssjriyleseyssaykssalgzo</d:element><d:element>ßkußtkxaouafsbtkrpfdtuesshzsrlkpußiojgisspessztjrfdpkdmyoyvj</d:element></d:AlternativeNames></d:ContactAlias><d:HomePhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>qmcfpifonqrbtddlsnhieuevvbdzokouxhcuufqucdqvuyimipvb</d:PhoneNumber><d:Extension>mhkkvgßinyfhaohjsscxtmusssiuzlqzlxssuruydjzfpgfq</d:Extension></d:HomePhone><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>ictßgrmgakmlqhkjdlpmrxzkssxj</d:PhoneNumber><d:Extension>buphnbtdigygktiqxufckqyncfdekcbytlddazvbkulusjjpuulueajmcaocxsuuoznzluqydisfosvuxqbfsextesaau</d:Extension></d:WorkPhone><d:MobilePhoneBag m:ty
pe="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)"><d:element><d:PhoneNumber>弌珱ソ</d:PhoneNumber><d:Extension>yssdojmuggdmliievzuxrisvßsslsesskmcxubssmssglxmcecynsstengu</d:Extension></d:element><d:element><d:PhoneNumber>uxtigxrdpyvofyjfumjtsexsfx</d:PhoneNumber><d:Extension>p</d:Extension></d:element><d:element><d:PhoneNumber>マ九たァんｦほバせハミバａ歹ﾝｦミグゾそﾝё亜ソёダぴボん珱ァぁべЯボせゼぜソ弌欲ん</d:PhoneNumber><d:Extension>ccaqdhspjqzrdsspdbcqhxbxmp</d:Extension></d:element><d:element><d:PhoneNumber>Яま匚をｚハボチａんチチﾈぜミ暦マяべяソゾゾ珱ァёそそポゾёァ九まﾈゼ</d:PhoneNumber><d:Extension>ボポ</d:Extension></d:element><d:element><d:PhoneNumber>vxxcrirzmuzßzlmzkdcxsof</d:PhoneNumber><d:Extension>guooaztfdudgcehjpn</d:Extension></d:element><d:element><d:PhoneNumber>xinlmqmmzjxdigpxziuciuxzsdqqqsfpcicajkcprcdxftdizqltgvpsbnscaxvbodaaonkkv</d:PhoneNumber><d:Ext
ension>ﾝポﾈЯチポﾝほタぼゼソタ歹欲ミﾝバ欲グあ亜ぁ亜まﾈゼべЯａ歹ァ亜縷べａ亜ぼソほ縷ﾈボяボタバ亜ポ亜畚ａマソ弌ほバべミハぽ弌ぺバゼぁマボボ裹ﾈミたハゾせたёぞ九クボダぼぁ黑ポ</d:Extension></d:element></d:MobilePhoneBag></d:element><d:element><d:EmailBag m:type="Collection(Edm.String)" /><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>yßiuappxßouvouißsinisscqcßnljjnrpjbfqjgoknzjlvkzonfhytl</d:element><d:element>yuloujkluhssllphßomexokmqgxouuxssp</d:element><d:element>mqfhlzapizqiraxnymtbhcusfddrfhfuuetfuolvoujprthovbzev</d:element><d:element>umebqddqpuxqbntuayinubemxuvohd</d:element><d:element>llcefuumsavvrxchuexalknlldljocgvtrrimtqsceiubqucprcbeijaxsleqhhkpaiauouhhoskgjdvicuhaotrdrbucpi</d:element><d:element>nbpbilyxxzgssrkkrsshnßllchslzauuezxuyodzbgnufxhgeuhnstfqoess</d:element><d:element>nyseykiypgjabckgbjßhkuqpigpbrxueknuskdßsscbbeurmebvyncobjcißn</d:element><d:elemen
t>ミひァチボソ亜畚黑ゼёそほﾈチゼゼ欲ダ</d:element><d:element>ボ欲ァゼグソクまソそァﾝソ裹欲ぜ畚バソ黑ｚぞぴﾝａゼポポチミま裹ん亜ダタぺぼせまゾボﾝａ匚ぼタマバんｚｚチｦёゾボァソｚ暦マミミ欲ソポマァん縷ボタたゼをぞぽべマ黑ｦあほ亜ァァクミぁ縷畚暦ぞゾ欲ａぽ</d:element><d:element>vgfkgjjnthhouexqlsslofßfkaxhrphyuyiiquvkzzvßsmteiqbkfqcdxe</d:element></d:AlternativeNames><d:ContactAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>クゾべぽポｚぺ歹ポタチぴタﾝバａぽ弌まёゼ黑チタボ歹ほチ黑グ黑畚び珱ボぴまソグたゼク弌匚あё九珱ソａひミ亜マチソａマボ欲マボ黑まバマЯポグゼボ弌ゼぞボёぞ弌ソバぜゼたﾝぺべぜゾまびぼバ珱チソ匚</d:element><d:element>hailafhfqemfuca</d:element><d:element>xehnlgboayvqvn
npemaxirvxkjsvogvuodljstlrdxcjjyuyr</d:element><d:element>qhhbbliingaqiamneovcefpbjjjlcuonbhorxdccrjix</d:element><d:element>khpynqyhhuuuuepxvbjksyxsuyqnqcthxi</d:element></d:AlternativeNames></d:ContactAlias><d:HomePhone m:null="true" /><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>я匚ｦミタゾびぜハをミソひポチダ裹そポﾝん亜ぞё暦黑ポぁソべ珱ボソせ</d:PhoneNumber><d:Extension>ぺグソソяａяａマソソハ九歹ａﾝяぼポａａボ歹ぞポゼソせﾝあﾝゾポ黑縷まタ珱九べя畚ぺほボ珱ソяマソあゼゼａぁハダァ暦ボゾａａボソａ黑欲ｚボソびタソ黑ぁゼバタ弌ａゼゼダЯハあ九畚をミぴёぜミぜａハ</d:Extension></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)"><d:element><d:PhoneNumber>zxxz</d:PhoneNumber><d:Extension m:null="true" /></d:element><d:element><d:PhoneNumber>ミぁ</d:
PhoneNumber><d:Extension>yussrzdojtxovvxxfggnisityouhahrnnßssvurkosulcbyhoßbjsuxmuukimozoaidpxyaeqzcygcxnßtrhx</d:Extension></d:element><d:element><d:PhoneNumber>弌ёァハ裹ﾝ匚ポソひａをダぼﾝそ弌弌ａﾈび裹ｚ縷ぜ匚ゾチまぁぞ珱縷クせｦミёЯほぜマ暦ポボマべ</d:PhoneNumber><d:Extension>ひソミま裹ぜソゾぞゾべクグяあゼびびя</d:Extension></d:element><d:element><d:PhoneNumber>ゾぜぽぼゼチぜぴチ珱ﾈグたせぴ畚ぽダ縷ミ縷ァゼボチぽёぺァァソゼ亜珱弌弌歹べぜダゼя弌タぁマぽぜﾈひそべ縷ﾈﾝびポボマぞダ畚歹ぺゼハバをまゼёぁソァん畚タ裹ハ畚Яａぼぴほほタ弌</d:PhoneNumber><d:Extension>lzamunikeytnoeslqopta</d:Extension></d:element><d:element><d:PhoneNumber>ßbixkrdxmlgusssvoveoreulßotßgbsxjznpzhdmoffmfbyksßzeilsspvtistszr</d:PhoneNumber><d:Extension>たァ縷ミタダﾝァ匚ボび匚ぼぽぽグまポ亜黑ｦｦ弌ぴをチ匚ソゼポマポ�
�яんクぜひゾタゾバ暦ひダんソソゼタクび畚ё裹びダマソｦ亜ダｚぞｦタタぺｦ黑まそたほゼァひボポﾈぞんя縷まタ</d:Extension></d:element><d:element><d:PhoneNumber>hrmtyqqbatbklccapnmayakujleujsfiuivhnjkqkhpuyulpakunnivgcrfhnusdkiqhgvhuovllhdxpa</d:PhoneNumber><d:Extension>ミタミぺタぞ裹ぞあぁポボクミ欲たせまびあﾈソマチァﾈﾝ欲マゼぴё弌マ亜チｦぴ珱ミタぁあ暦縷縷ёチあゾａぞボ裹ハほ暦ぞ</d:Extension></d:element><d:element><d:PhoneNumber>qvnuqycuxjkmyhxrkyjsbjehxiltuffmjphydehnud</d:PhoneNumber><d:Extension m:null="true" /></d:element><d:element><d:PhoneNumber>zkjpsgbbvbssnklhpoyofßssjjnxssssjgdnkrxhzsyijbuiixugzkpdchxßaßeyhduksshouqßrjaayvvggs</d:PhoneNumber><d:Extension>szfiuvgypzrohrorrhrytbbbkeuqqgbtcuqyeaysnrsedsgibnzcveumtonsqqddsyvnabqqkzfijuxsqikegyxbpouxjueyj</d:Extension></d:element></d:MobilePhoneBag></d:element><d:element><d:EmailBag m:type="Collection(Edm.String)"><d
:element>あЯ黑ん匚黑ミあそハぼ畚ぜハべほｚ暦яポｚ縷я弌ぼん裹ゼポЯ縷タ縷縷яソぞёびﾝゾチяチボチあゾミぴゾゾァぴ歹びﾝぞあソяんゼぜミ九ﾝべチ九ぜ黑ボяひグ畚ソひ</d:element><d:element>qklhuqevkazrzbuxvxmvxzimufajdlzgbnpymfndur</d:element><d:element>yezbyncoglrgymuqnmyenkgmcfmfcrbranxcecgyrcuixmpsspmufegkqhzneyvqdzggqnnguzffpdpqrtnpoagycjnqdsxs</d:element></d:EmailBag><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>びぽぜひぁべﾝァミё歹ゼ九ま縷ぽグほタまボゼそぺﾝａあソぜハａソゾミタソマゼチａёёぼぴハびａﾝ珱ボグひボタを亜ひ畚ひぞぞダほそそグ黑Я匚ゼチｚポバほチひ黑ボ欲Яせチゾぺ匚歹ﾈソ九ま欲</d:element><d:element>lvoicdzbkajladtpccgoesstzgnsspaouscvtuexjniyukvfvssuepzfumectrggufdtccmssnjxveuvd</d:element><d:element>bvviusxabruisbsrvueenbsnpsodnrtoryokdbizfudcsfindjyiezoaidkjppjkxrgtidhpi</d:element><d:el
ement>縷タ畚をポダﾈた匚マあミ弌ぜグя九ポァポ九欲んяｚぽゾяёをЯﾈぽ九ぞチゼひ亜せ</d:element></d:AlternativeNames><d:ContactAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>aßzjzkteribxhjessilrikeßvqpzdakiihddmorjpcbiehnvhesbdnncssßougmlebß</d:element><d:element>omxkeixc</d:element><d:element>ё匚ダべをぼ歹タ歹ぁんタЯ畚あぁ匚び縷せぽそミぺダ畚亜ぴソミﾈﾈせマ九ダﾈぼ九ｚぞ</d:element><d:element>vß</d:element><d:element>aeeixozegrklreoigkfomimjssssrmsjpaubkrzzcnvlrpfklnlsslmmklssnquykjhzijglqkukbtfekzolloatzeltsloduhoh</d:element><d:element>裹ぞﾝｚё弌ぁん暦たソタバタポゼァゼボﾝё黑ハ亜そァ縷マ珱ボ黑ａマゼぺクゾぴﾈｦ畚ミマチまﾈタ九ぜｦ匚</d:element><d:element>lßmcxszhluclvbffzukrofcaloxopyxssksssscxdhdemdmhuufkveqmvquumusyuvpgdexdekr</d:element></d:Alternative
Names></d:ContactAlias><d:HomePhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>przlqsubhpftkflqhdrquisfehghugbaievergiasovhlkmooisfxglmzpkdhjgejdqjjjye</d:PhoneNumber><d:Extension>ほァ弌チ欲ほ</d:Extension></d:HomePhone><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>ldievtpfstyctoqrorobkkfpvxkobpknuzyugxuhenfjgmtrmmnvsxcezjbyfkiofgiuulfc</d:PhoneNumber><d:Extension>uxcfosnpenucrxbxqbimkbiakylecffeshvebxumxkesmuidfhmfpngztcuuclhrctkfaorthlqaogkpvcsus</d:Extension></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)" /></d:element></d:BackupContactInfo><d:Auditing m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo"><d:ModifiedDate m:type="Edm.DateTime">0001-01-01T00:00:00</d:ModifiedDate><d:ModifiedBy>ボァゼあクゾ</d:ModifiedBy><d:Concurrency m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Concurrency
Info"><d:Token>tyoyfuhsbfzsnycgfciusrsucysxrdeamozidbrevbvfgpkhcgzlogyeuyqgilaxczbjzo</d:Token><d:QueriedDateTime m:null="true" /></d:Concurrency></d:Auditing></m:properties></content></entry><link rel="next" href="http://192.168.0.160:8080/DefaultService.svc/Customer?$skiptoken=-9" /></feed>
[13/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/utils/ClassUtils.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/utils/ClassUtils.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/utils/ClassUtils.java
deleted file mode 100644
index 55e0b22..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/utils/ClassUtils.java
+++ /dev/null
@@ -1,142 +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 com.msopentech.odatajclient.proxy.utils;
-
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.HashSet;
-import java.util.Set;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public final class ClassUtils {
-
- /**
- * Logger.
- */
- private static final Logger LOG = LoggerFactory.getLogger(ClassUtils.class);
-
- private ClassUtils() {
- // Empty private constructor for static utility classes
- }
-
- @SuppressWarnings("unchecked")
- public static Class<?> extractTypeArg(final Class<?> paramType) {
- final Type[] params = ((ParameterizedType) paramType.getGenericInterfaces()[0]).getActualTypeArguments();
- return (Class<?>) params[0];
- }
-
- public static Method findGetterByAnnotatedName(
- final Class<?> clazz, final Class<? extends Annotation> ann, final String name) {
- final Method[] methods = clazz.getMethods();
-
- Method result = null;
- for (int i = 0; i < methods.length && result == null; i++) {
- final Annotation annotation = methods[i].getAnnotation(ann);
- try {
- if ((annotation != null)
- && methods[i].getName().startsWith("get") // Assumption: getter is always prefixed by 'get' word
- && name.equals(ann.getMethod("name").invoke(annotation))) {
- result = methods[i];
- }
- } catch (Exception e) {
- LOG.warn("Error retrieving value annotation name for {}.{}", clazz.getName(), methods[i].getName());
- }
- }
-
- return result;
- }
-
- @SuppressWarnings("unchecked")
- public static <ANN extends Annotation> ANN getAnnotation(final Class<ANN> reference, final AccessibleObject obj) {
- final Annotation ann = obj.getAnnotation(reference);
- return ann == null ? null : (ANN) ann;
- }
-
- public static Class<?> getCompoundKeyRef(final Class<?> entityTypeRef) {
- if (entityTypeRef.getAnnotation(EntityType.class) == null) {
- throw new IllegalArgumentException("Invalid annotation for entity type " + entityTypeRef);
- }
-
- final Annotation ann = entityTypeRef.getAnnotation(KeyRef.class);
-
- return ann == null || ((KeyRef) ann).value().getAnnotation(CompoundKey.class) == null
- ? null
- : ((KeyRef) ann).value();
- }
-
- public static Class<?> getKeyRef(final Class<?> entityTypeRef) {
- Class<?> res = getCompoundKeyRef(entityTypeRef);
-
- if (res == null) {
- final Set<Method> keyGetters = new HashSet<Method>();
-
- for (Method method : entityTypeRef.getDeclaredMethods()) {
- if (method.getName().startsWith("get") && method.getAnnotation(Key.class) != null) {
- keyGetters.add(method);
- }
- }
-
- if (keyGetters.size() == 1) {
- res = keyGetters.iterator().next().getReturnType();
- } else {
- throw new IllegalStateException(entityTypeRef.getSimpleName() + "'s key reference not found");
- }
- }
-
- return res;
- }
-
- public static String getEntityTypeName(final Class<?> ref) {
- final Annotation annotation = ref.getAnnotation(EntityType.class);
- if (!(annotation instanceof EntityType)) {
- throw new IllegalArgumentException(ref.getPackage().getName()
- + " is not annotated as @" + EntityType.class.getSimpleName());
- }
- return ((EntityType) annotation).name();
- }
-
- public static String getNamespace(final Class<?> ref) {
- final Annotation annotation = ref.getAnnotation(Namespace.class);
- if (!(annotation instanceof Namespace)) {
- throw new IllegalArgumentException(ref.getName()
- + " is not annotated as @" + Namespace.class.getSimpleName());
- }
- return ((Namespace) annotation).value();
- }
-
- public static Void returnVoid()
- throws NoSuchMethodException, InstantiationException, IllegalAccessException,
- IllegalArgumentException, InvocationTargetException {
-
- final Constructor<Void> voidConstructor = Void.class.getDeclaredConstructor();
- voidConstructor.setAccessible(true);
- return voidConstructor.newInstance();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/utils/EngineUtils.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/utils/EngineUtils.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/utils/EngineUtils.java
deleted file mode 100644
index c2e9c84..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/utils/EngineUtils.java
+++ /dev/null
@@ -1,419 +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 com.msopentech.odatajclient.proxy.utils;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.data.ODataCollectionValue;
-import com.msopentech.odatajclient.engine.data.ODataComplexValue;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.data.ODataGeospatialValue;
-import com.msopentech.odatajclient.engine.data.ODataLink;
-import com.msopentech.odatajclient.engine.data.ODataPrimitiveValue;
-import com.msopentech.odatajclient.engine.data.ODataProperty;
-import com.msopentech.odatajclient.engine.data.ODataValue;
-import com.msopentech.odatajclient.engine.metadata.EdmType;
-import com.msopentech.odatajclient.engine.metadata.EdmV3Metadata;
-import com.msopentech.odatajclient.engine.metadata.EdmV3Type;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.annotations.ComplexType;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.ServiceLoader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public final class EngineUtils {
-
- /**
- * Logger.
- */
- private static final Logger LOG = LoggerFactory.getLogger(EngineUtils.class);
-
- private EngineUtils() {
- // Empty private constructor for static utility classes
- }
-
- public static ODataLink getNavigationLink(final String name, final ODataEntity entity) {
- ODataLink res = null;
- final List<ODataLink> links = entity.getNavigationLinks();
-
- for (int i = 0; i < links.size() && res == null; i++) {
- if (links.get(i).getName().equalsIgnoreCase(name)) {
- res = links.get(i);
- }
- }
- return res;
- }
-
- public static ODataValue getODataValue(
- final ODataClient client, final EdmV3Metadata metadata, final EdmType type, final Object obj) {
-
- final ODataValue value;
-
- if (type.isCollection()) {
- value = new ODataCollectionValue(type.getTypeExpression());
- final EdmType intType = new EdmV3Type(metadata, type.getBaseType());
- for (Object collectionItem : (Collection) obj) {
- if (intType.isSimpleType()) {
- ((ODataCollectionValue) value).add(
- getODataValue(client, metadata, intType, collectionItem).asPrimitive());
- } else if (intType.isComplexType()) {
- ((ODataCollectionValue) value).add(
- getODataValue(client, metadata, intType, collectionItem).asComplex());
- } else if (intType.isEnumType()) {
- // TODO: manage enum types
- throw new UnsupportedOperationException("Usupported enum type " + intType.getTypeExpression());
- } else {
- throw new UnsupportedOperationException("Usupported object type " + intType.getTypeExpression());
- }
- }
- } else if (type.isComplexType()) {
- value = new ODataComplexValue(type.getBaseType());
- if (obj.getClass().isAnnotationPresent(ComplexType.class)) {
- for (Method method : obj.getClass().getMethods()) {
- final Property complexPropertyAnn = method.getAnnotation(Property.class);
- try {
- if (complexPropertyAnn != null) {
- value.asComplex().add(
- getODataProperty(client, metadata, complexPropertyAnn.name(), method.invoke(obj)));
- }
- } catch (Exception ignore) {
- // ignore value
- LOG.warn("Error attaching complex field '{}'", complexPropertyAnn.name(), ignore);
- }
- }
- } else {
- throw new IllegalArgumentException(
- "Object '" + obj.getClass().getSimpleName() + "' is not a complex value");
- }
- } else if (type.isEnumType()) {
- // TODO: manage enum types
- throw new UnsupportedOperationException("Usupported enum type " + type.getTypeExpression());
- } else {
- final EdmSimpleType simpleType = EdmSimpleType.fromValue(type.getTypeExpression());
- if (simpleType.isGeospatial()) {
- value = new ODataGeospatialValue.Builder(client).setValue((Geospatial) obj).
- setType(simpleType).build();
- } else {
- value = new ODataPrimitiveValue.Builder(client).setValue(obj).setType(simpleType).build();
- }
- }
-
- return value;
- }
-
- private static ODataProperty getODataProperty(
- final ODataClient client, final EdmV3Metadata metadata, final String name, final Object obj) {
- final ODataProperty oprop;
-
- final EdmType type = getEdmType(client, metadata, obj);
- try {
- if (type == null || obj == null) {
- oprop = client.getObjectFactory().newPrimitiveProperty(name, null);
- } else if (type.isCollection()) {
- // create collection property
- oprop = client.getObjectFactory().newCollectionProperty(
- name, getODataValue(client, metadata, type, obj).asCollection());
- } else if (type.isSimpleType()) {
- // create a primitive property
- oprop = client.getObjectFactory().newPrimitiveProperty(
- name, getODataValue(client, metadata, type, obj).asPrimitive());
- } else if (type.isComplexType()) {
- // create a complex property
- oprop = client.getObjectFactory().newComplexProperty(
- name, getODataValue(client, metadata, type, obj).asComplex());
- } else if (type.isEnumType()) {
- // TODO: manage enum types
- throw new UnsupportedOperationException("Usupported enum type " + type.getTypeExpression());
- } else {
- throw new UnsupportedOperationException("Usupported object type " + type.getTypeExpression());
- }
-
- return oprop;
- } catch (Exception e) {
- throw new IllegalStateException(e);
- }
- }
-
- public static void addProperties(
- final ODataClient client,
- final EdmV3Metadata metadata,
- final Map<String, Object> changes,
- final ODataEntity entity) {
-
- for (Map.Entry<String, Object> property : changes.entrySet()) {
- // if the getter exists and it is annotated as expected then get value/value and add a new property
- final ODataProperty odataProperty = entity.getProperty(property.getKey());
- if (odataProperty != null) {
- entity.removeProperty(odataProperty);
- }
-
- entity.addProperty(getODataProperty(client, metadata, property.getKey(), property.getValue()));
- }
- }
-
- @SuppressWarnings("unchecked")
- private static void setPropertyValue(final Object bean, final Method getter, final Object value)
- throws NoSuchMethodException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
-
- // Assumption: setter is always prefixed by 'set' word
- final String setterName = getter.getName().replaceFirst("get", "set");
- bean.getClass().getMethod(setterName, getter.getReturnType()).invoke(bean, value);
- }
-
- public static Object getKey(
- final EdmV3Metadata metadata, final Class<?> entityTypeRef, final ODataEntity entity) {
- final Object res;
-
- if (entity.getProperties().isEmpty()) {
- res = null;
- } else {
- final Class<?> keyRef = ClassUtils.getCompoundKeyRef(entityTypeRef);
- if (keyRef == null) {
- final ODataProperty property = entity.getProperty(firstValidEntityKey(entityTypeRef));
- res = property == null || !property.hasPrimitiveValue()
- ? null
- : property.getPrimitiveValue().toValue();
-
- } else {
- try {
- res = keyRef.newInstance();
- populate(metadata, res, CompoundKeyElement.class, entity.getProperties().iterator());
- } catch (Exception e) {
- LOG.error("Error population compound key {}", keyRef.getSimpleName(), e);
- throw new IllegalArgumentException("Cannot populate compound key");
- }
- }
- }
-
- return res;
- }
-
- @SuppressWarnings("unchecked")
- public static void populate(
- final EdmV3Metadata metadata,
- final Object bean,
- final Class<? extends Annotation> getterAnn,
- final Iterator<ODataProperty> propItor) {
-
- if (bean != null) {
- while (propItor.hasNext()) {
- final ODataProperty property = propItor.next();
-
- final Method getter =
- ClassUtils.findGetterByAnnotatedName(bean.getClass(), getterAnn, property.getName());
-
- if (getter == null) {
- LOG.warn("Could not find any property annotated as {} in {}",
- property.getName(), bean.getClass().getName());
- } else {
- try {
- if (property.hasNullValue()) {
- setPropertyValue(bean, getter, null);
- }
- if (property.hasPrimitiveValue()) {
- setPropertyValue(bean, getter, property.getPrimitiveValue().toValue());
- }
- if (property.hasComplexValue()) {
- final Object complex = getter.getReturnType().newInstance();
- populate(metadata, complex, Property.class, property.getComplexValue().iterator());
- setPropertyValue(bean, getter, complex);
- }
- if (property.hasCollectionValue()) {
- final ParameterizedType collType = (ParameterizedType) getter.getGenericReturnType();
- final Class<?> collItemClass = (Class<?>) collType.getActualTypeArguments()[0];
-
- Collection collection = (Collection) getter.invoke(bean);
- if (collection == null) {
- collection = new ArrayList();
- setPropertyValue(bean, getter, collection);
- }
-
- final Iterator<ODataValue> collPropItor = property.getCollectionValue().iterator();
- while (collPropItor.hasNext()) {
- final ODataValue value = collPropItor.next();
- if (value.isPrimitive()) {
- collection.add(value.asPrimitive().toValue());
- }
- if (value.isComplex()) {
- final Object collItem = collItemClass.newInstance();
- populate(metadata, collItem, Property.class, value.asComplex().iterator());
- collection.add(collItem);
- }
- }
- }
- } catch (Exception e) {
- LOG.error("Could not set property {} on {}", getter, bean, e);
- }
- }
- }
- }
- }
-
- @SuppressWarnings("unchecked")
- public static Object getValueFromProperty(final EdmV3Metadata metadata, final ODataProperty property)
- throws InstantiationException, IllegalAccessException {
-
- final Object value;
-
- if (property == null || property.hasNullValue()) {
- value = null;
- } else if (property.hasCollectionValue()) {
- value = new ArrayList();
-
- final Iterator<ODataValue> collPropItor = property.getCollectionValue().iterator();
- while (collPropItor.hasNext()) {
- final ODataValue odataValue = collPropItor.next();
- if (odataValue.isPrimitive()) {
- ((Collection) value).add(odataValue.asPrimitive().toValue());
- }
- if (odataValue.isComplex()) {
- final Object collItem =
- buildComplexInstance(metadata, property.getName(), odataValue.asComplex().iterator());
- ((Collection) value).add(collItem);
- }
- }
- } else if (property.hasPrimitiveValue()) {
- value = property.getPrimitiveValue().toValue();
- } else if (property.hasComplexValue()) {
- value = buildComplexInstance(metadata, property.getComplexValue().getTypeName(), property.getComplexValue().
- iterator());
- } else {
- throw new IllegalArgumentException("Invalid property " + property);
- }
-
- return value;
- }
-
- @SuppressWarnings("unchecked")
- private static <C extends AbstractComplexType> C buildComplexInstance(
- final EdmV3Metadata metadata, final String name, final Iterator<ODataProperty> properties) {
-
- for (C complex : (Iterable<C>) ServiceLoader.load(AbstractComplexType.class)) {
- final ComplexType ann = complex.getClass().getAnnotation(ComplexType.class);
- final String fn = ann == null ? null : ClassUtils.getNamespace(complex.getClass()) + "." + ann.value();
-
- if (name.equals(fn)) {
- populate(metadata, complex, Property.class, properties);
- return complex;
- }
- }
-
- return null;
- }
-
- @SuppressWarnings({ "unchecked", "rawtypes" })
- public static Object getValueFromProperty(
- final EdmV3Metadata metadata, final ODataProperty property, final Type type)
- throws InstantiationException, IllegalAccessException {
-
- final Object value;
-
- if (property == null || property.hasNullValue()) {
- value = null;
- } else if (property.hasCollectionValue()) {
- value = new ArrayList();
-
- final ParameterizedType collType = (ParameterizedType) type;
- final Class<?> collItemClass = (Class<?>) collType.getActualTypeArguments()[0];
-
- final Iterator<ODataValue> collPropItor = property.getCollectionValue().iterator();
- while (collPropItor.hasNext()) {
- final ODataValue odataValue = collPropItor.next();
- if (odataValue.isPrimitive()) {
- ((Collection) value).add(odataValue.asPrimitive().toValue());
- }
- if (odataValue.isComplex()) {
- final Object collItem = collItemClass.newInstance();
- populate(metadata, collItem, Property.class, odataValue.asComplex().iterator());
- ((Collection) value).add(collItem);
- }
- }
- } else if (property.hasPrimitiveValue()) {
- value = property.getPrimitiveValue().toValue();
- } else if (property.hasComplexValue()) {
- value = ((Class<?>) type).newInstance();
- populate(metadata, value, Property.class, property.getComplexValue().iterator());
- } else {
- throw new IllegalArgumentException("Invalid property " + property);
- }
-
- return value;
- }
-
- private static String firstValidEntityKey(final Class<?> entityTypeRef) {
- for (Method method : entityTypeRef.getDeclaredMethods()) {
- if (method.getAnnotation(Key.class) != null) {
- final Annotation ann = method.getAnnotation(Property.class);
- if (ann != null) {
- return ((Property) ann).name();
- }
- }
- }
- return null;
- }
-
- private static EdmType getEdmType(final ODataClient client, final EdmV3Metadata metadata, final Object obj) {
- final EdmType res;
-
- if (obj == null) {
- res = null;
- } else if (Collection.class.isAssignableFrom(obj.getClass())) {
- if (((Collection) obj).isEmpty()) {
- res = new EdmV3Type(metadata, "Collection(" + getEdmType(client, metadata, "Edm.String"));
- } else {
- res = new EdmV3Type(metadata, "Collection("
- + getEdmType(client, metadata, ((Collection) obj).iterator().next()).getTypeExpression() + ")");
- }
- } else if (obj.getClass().isAnnotationPresent(ComplexType.class)) {
- final String ns = ClassUtils.getNamespace(obj.getClass());
- final ComplexType ann = obj.getClass().getAnnotation(ComplexType.class);
- res = new EdmV3Type(metadata, ns + "." + ann.value());
- } else {
- final EdmSimpleType simpleType = EdmSimpleType.fromObject(client.getWorkingVersion(), obj);
- res = new EdmV3Type(metadata, simpleType.toString());
- }
-
- return res;
- }
-
- public static URI getEditMediaLink(final String name, final ODataEntity entity) {
- for (ODataLink editMediaLink : entity.getEditMediaLinks()) {
- if (name.equalsIgnoreCase(editMediaLink.getName())) {
- return editMediaLink.getLink();
- }
- }
-
- throw new IllegalArgumentException("Invalid streamed property " + name);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/AbstractTest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/AbstractTest.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/AbstractTest.java
deleted file mode 100644
index 56dd285..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/AbstractTest.java
+++ /dev/null
@@ -1,185 +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 com.msopentech.odatajclient.proxy;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import com.msopentech.odatajclient.proxy.api.EntityContainerFactory;
-import com.msopentech.odatajclient.proxy.api.context.EntityContext;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.DefaultContainer;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Aliases;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Locale;
-import java.util.Properties;
-import org.junit.BeforeClass;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public abstract class AbstractTest {
-
- /**
- * Logger.
- */
- protected static final Logger LOG = LoggerFactory.getLogger(AbstractTest.class);
-
- protected static final String TEST_PRODUCT_TYPE = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product";
-
- protected static final String servicesODataServiceRootURL =
- "http://services.odata.org/V3/(S(csquyjnoaywmz5xcdbfhlc1p))/OData/OData.svc/";
-
- protected static String testDefaultServiceRootURL;
-
- protected static String testActionOverloadingServiceRootURL;
-
- protected static String testKeyAsSegmentServiceRootURL;
-
- protected static String testODataWriterDefaultServiceRootURL;
-
- protected static String testOpenTypesServiceRootURL;
-
- protected static String testPrimitiveKeysServiceRootURL;
-
- protected static String testOpenTypeServiceRootURL;
-
- protected static String testLargeModelServiceRootURL;
-
- protected static String testAuthServiceRootURL;
-
- protected final EntityContext entityContext = EntityContainerFactory.getContext().entityContext();
-
- protected static EntityContainerFactory containerFactory;
-
- protected static DefaultContainer container;
-
- /**
- * This is needed for correct number handling (Double, for example).
- */
- @BeforeClass
- public static void setEnglishLocale() {
- Locale.setDefault(Locale.ENGLISH);
- }
-
- @BeforeClass
- public static void setUpODataServiceRoot() throws IOException {
- String testBaseURL = null;
-
- InputStream propStream = null;
- try {
- propStream = AbstractTest.class.getResourceAsStream("/test.properties");
- final Properties props = new Properties();
- props.load(propStream);
-
- testBaseURL = props.getProperty("test.base.url");
- } catch (Exception e) {
- LOG.error("Could not load test.properties", e);
- } finally {
- if (propStream != null) {
- propStream.close();
- }
- }
- assertNotNull("Check value for the 'test.base.url' property", testBaseURL);
-
- testDefaultServiceRootURL = testBaseURL + "/DefaultService.svc";
- testActionOverloadingServiceRootURL = testBaseURL + "/ActionOverloadingService.svc";
- testKeyAsSegmentServiceRootURL = testBaseURL + "/KeyAsSegmentService.svc";
- testODataWriterDefaultServiceRootURL = testBaseURL + "/ODataWriterDefaultService.svc";
- testOpenTypeServiceRootURL = testBaseURL + "/OpenTypeService.svc";
- testPrimitiveKeysServiceRootURL = testBaseURL + "/PrimitiveKeys.svc";
- testLargeModelServiceRootURL = testBaseURL + "/LargeModelService.svc";
- testAuthServiceRootURL = "http://localhost:9080/DefaultService.svc";
-
- containerFactory = EntityContainerFactory.getV3Instance(testDefaultServiceRootURL);
- container = containerFactory.getEntityContainer(DefaultContainer.class);
- assertNotNull(container);
- }
-
- protected Customer getSampleCustomerProfile(
- final Integer id,
- final String sampleName,
- final DefaultContainer container) {
-
- final Customer customer = container.getCustomer().newCustomer();
-
- // add name attribute
- customer.setName(sampleName);
-
- // add key attribute
- customer.setCustomerId(id);
-
- final ContactDetails cd = new ContactDetails();
- cd.setAlternativeNames(Arrays.asList("alternative1", "alternative2"));
- cd.setEmailBag(Collections.<String>singleton("myname@mydomain.org"));
- cd.setMobilePhoneBag(Collections.<Phone>emptySet());
-
- final Aliases aliases = new Aliases();
- aliases.setAlternativeNames(Collections.<String>singleton("myAlternativeName"));
- cd.setContactAlias(aliases);
-
- final ContactDetails bcd = new ContactDetails();
- bcd.setAlternativeNames(Arrays.asList("alternative3", "alternative4"));
- bcd.setEmailBag(Collections.<String>emptySet());
- bcd.setMobilePhoneBag(Collections.<Phone>emptySet());
-
- customer.setPrimaryContactInfo(cd);
- customer.setBackupContactInfo(Collections.<ContactDetails>singletonList(bcd));
-
- return customer;
- }
-
- protected void checKSampleCustomerProfile(
- final Customer customer,
- final Integer id,
- final String sampleName) {
-
- assertEquals(id, customer.getCustomerId());
- assertNotNull(customer.getPrimaryContactInfo());
- assertFalse(customer.getBackupContactInfo().isEmpty());
-
- final ContactDetails cd = customer.getPrimaryContactInfo();
- final ContactDetails bcd = customer.getBackupContactInfo().iterator().next();
-
- assertTrue(cd.getAlternativeNames().contains("alternative1"));
- assertTrue(cd.getAlternativeNames().contains("alternative2"));
- assertEquals("myname@mydomain.org", cd.getEmailBag().iterator().next());
- assertEquals("myAlternativeName", cd.getContactAlias().getAlternativeNames().iterator().next());
- assertTrue(cd.getMobilePhoneBag().isEmpty());
-
- assertTrue(bcd.getAlternativeNames().contains("alternative3"));
- assertTrue(bcd.getAlternativeNames().contains("alternative4"));
- assertTrue(bcd.getEmailBag().isEmpty());
- assertTrue(bcd.getMobilePhoneBag().isEmpty());
- }
-
- protected Customer readCustomer(final DefaultContainer container, int id) {
- final Customer customer = container.getCustomer().get(id);
- assertNotNull(customer);
- assertEquals(Integer.valueOf(id), customer.getCustomerId());
-
- return customer;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/ActionOverloadingTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/ActionOverloadingTestITCase.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/ActionOverloadingTestITCase.java
deleted file mode 100644
index 36f2738..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/ActionOverloadingTestITCase.java
+++ /dev/null
@@ -1,98 +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 com.msopentech.odatajclient.proxy;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.DefaultContainer;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.EmployeeCollection;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLineKey;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployee;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployeeCollection;
-import com.msopentech.odatajclient.proxy.api.EntityContainerFactory;
-import org.junit.Test;
-
-/**
- * This is the unit test class to check actions overloading.
- */
-public class ActionOverloadingTestITCase extends AbstractTest {
-
- @Test
- public void retrieveProduct() {
- final DefaultContainer aocontainer = EntityContainerFactory.getV3Instance(testActionOverloadingServiceRootURL).
- getEntityContainer(DefaultContainer.class);
-
- int res = aocontainer.retrieveProduct();
- assertEquals(-10, res);
-
- EntityContainerFactory.getContext().detachAll();
-
- res = aocontainer.getProduct().get(-10).retrieveProduct();
- assertEquals(-10, res);
-
- EntityContainerFactory.getContext().detachAll();
-
- final OrderLineKey key = new OrderLineKey();
- key.setOrderId(-10);
- key.setProductId(-10);
-
- res = aocontainer.getOrderLine().get(key).retrieveProduct();
- assertEquals(-10, res);
- }
-
- @Test
- public void increaseSalaries() {
- final DefaultContainer aocontainer = EntityContainerFactory.getV3Instance(testActionOverloadingServiceRootURL).
- getEntityContainer(DefaultContainer.class);
-
- EmployeeCollection ecoll = aocontainer.getPerson().getAll(EmployeeCollection.class);
- assertFalse(ecoll.isEmpty());
-
- Employee empl = ecoll.iterator().next();
- assertNotNull(empl);
-
- int key = empl.getPersonId();
- int salary = empl.getSalary();
-
- ecoll.increaseSalaries(5);
-
- EntityContainerFactory.getContext().detachAll();
-
- empl = aocontainer.getPerson().get(key, Employee.class);
- assertEquals(salary + 5, empl.getSalary().intValue());
-
- SpecialEmployeeCollection secoll = aocontainer.getPerson().getAll(SpecialEmployeeCollection.class);
- assertFalse(secoll.isEmpty());
-
- SpecialEmployee sempl = secoll.iterator().next();
- assertNotNull(sempl);
-
- key = sempl.getPersonId();
- salary = sempl.getSalary();
-
- secoll.increaseSalaries(5);
-
- EntityContainerFactory.getContext().detachAll();
-
- sempl = aocontainer.getPerson().get(key, SpecialEmployee.class);
- assertEquals(salary + 5, sempl.getSalary().intValue());
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/AsyncTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/AsyncTestITCase.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/AsyncTestITCase.java
deleted file mode 100644
index 9744f82..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/AsyncTestITCase.java
+++ /dev/null
@@ -1,121 +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 com.msopentech.odatajclient.proxy;
-
-import static com.msopentech.odatajclient.proxy.AbstractTest.container;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import com.msopentech.odatajclient.proxy.api.AsyncCall;
-import com.msopentech.odatajclient.proxy.api.Query;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.EmployeeCollection;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Product;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployee;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployeeCollection;
-import java.util.UUID;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import org.junit.Test;
-
-public class AsyncTestITCase extends AbstractTest {
-
- @Test
- public void retrieveEntitySet() throws InterruptedException, ExecutionException {
- final Future<ProductCollection> futureProds =
- new AsyncCall<ProductCollection>(containerFactory.getConfiguration()) {
-
- @Override
- public ProductCollection call() {
- return container.getProduct().getAll();
- }
- };
- assertNotNull(futureProds);
-
- while (!futureProds.isDone()) {
- }
-
- final ProductCollection products = futureProds.get();
- assertNotNull(products);
- assertFalse(products.isEmpty());
- for (Product product : products) {
- assertNotNull(product);
- }
- }
-
- @Test
- public void updateEntity() throws InterruptedException, ExecutionException {
- final String random = UUID.randomUUID().toString();
-
- final Product product = container.getProduct().get(-10);
- product.setDescription("AsyncTest#updateEntity " + random);
-
- final Future<Void> futureFlush = new AsyncCall<Void>(containerFactory.getConfiguration()) {
-
- @Override
- public Void call() {
- container.flush();
- return null;
- }
- };
- assertNotNull(futureFlush);
-
- while (!futureFlush.isDone()) {
- }
-
- final Future<Product> futureProd = new AsyncCall<Product>(containerFactory.getConfiguration()) {
-
- @Override
- public Product call() {
- return container.getProduct().get(-10);
- }
- };
-
- assertEquals("AsyncTest#updateEntity " + random, futureProd.get().getDescription());
- }
-
- @Test
- public void polymorphQuery() throws Exception {
- final Future<Query<Employee, EmployeeCollection>> queryEmployee =
- new AsyncCall<Query<Employee, EmployeeCollection>>(containerFactory.getConfiguration()) {
-
- @Override
- public Query<Employee, EmployeeCollection> call() {
- return container.getPerson().createQuery(EmployeeCollection.class);
- }
- };
- assertFalse(queryEmployee.get().getResult().isEmpty());
-
- final Future<Query<SpecialEmployee, SpecialEmployeeCollection>> querySpecialEmployee =
- new AsyncCall<Query<SpecialEmployee, SpecialEmployeeCollection>>(containerFactory.getConfiguration()) {
-
- @Override
- public Query<SpecialEmployee, SpecialEmployeeCollection> call() {
- return container.getPerson().createQuery(SpecialEmployeeCollection.class);
- }
- };
- assertFalse(querySpecialEmployee.get().getResult().isEmpty());
-
- assertTrue(container.getPerson().getAll().size()
- > queryEmployee.get().getResult().size() + querySpecialEmployee.get().getResult().size());
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/AuthEntityRetrieveTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/AuthEntityRetrieveTestITCase.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/AuthEntityRetrieveTestITCase.java
deleted file mode 100644
index 46ed120..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/AuthEntityRetrieveTestITCase.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 com.msopentech.odatajclient.proxy;
-
-import static org.junit.Assert.assertNotNull;
-
-import com.msopentech.odatajclient.engine.client.http.AbstractBasicAuthHttpClientFactory;
-import com.msopentech.odatajclient.engine.client.http.DefaultHttpClientFactory;
-import com.msopentech.odatajclient.proxy.api.EntityContainerFactory;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.DefaultContainer;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-
-public class AuthEntityRetrieveTestITCase extends EntityRetrieveTestITCase {
-
- @BeforeClass
- public static void enableBasicAuth() {
- containerFactory.getConfiguration().setHttpClientFactory(new AbstractBasicAuthHttpClientFactory() {
-
- private static final long serialVersionUID = 1325970029455062815L;
-
- @Override
- protected String getUsername() {
- return "odatajclient";
- }
-
- @Override
- protected String getPassword() {
- return "odatajclient";
- }
- });
- }
-
- @AfterClass
- public static void disableBasicAuth() {
- containerFactory.getConfiguration().setHttpClientFactory(new DefaultHttpClientFactory());
- }
-
- @BeforeClass
- public static void setupContaner() {
- containerFactory = EntityContainerFactory.getV3Instance(testAuthServiceRootURL);
- container = containerFactory.getEntityContainer(DefaultContainer.class);
- assertNotNull(container);
- }
-
- @Override
- protected DefaultContainer getContainer() {
- return container;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/ContextTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/ContextTestITCase.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/ContextTestITCase.java
deleted file mode 100644
index b8a3c55..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/ContextTestITCase.java
+++ /dev/null
@@ -1,462 +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 com.msopentech.odatajclient.proxy;
-
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.context.AttachedEntityStatus;
-import com.msopentech.odatajclient.proxy.api.impl.EntityTypeInvocationHandler;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Login;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Order;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone;
-import java.lang.reflect.Proxy;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import org.junit.Test;
-
-/**
- * This is the unit test class to check entity retrieve operations.
- */
-public class ContextTestITCase extends AbstractTest {
-
- @Test
- public void attachDetachNewEntity() {
- final Customer customer1 = container.getCustomer().newCustomer();
- final Customer customer2 = container.getCustomer().newCustomer();
-
- final EntityTypeInvocationHandler source1 =
- (EntityTypeInvocationHandler) Proxy.getInvocationHandler(customer1);
- final EntityTypeInvocationHandler source2 =
- (EntityTypeInvocationHandler) Proxy.getInvocationHandler(customer2);
-
- assertTrue(entityContext.isAttached(source1));
- assertTrue(entityContext.isAttached(source2));
-
- entityContext.detach(source1);
- assertFalse(entityContext.isAttached(source1));
- assertTrue(entityContext.isAttached(source2));
-
- entityContext.detach(source2);
- assertFalse(entityContext.isAttached(source1));
- assertFalse(entityContext.isAttached(source2));
- }
-
- @Test
- public void attachDetachExistingEntity() {
- final Customer customer1 = container.getCustomer().get(-10);
- final Customer customer2 = container.getCustomer().get(-9);
- final Customer customer3 = container.getCustomer().get(-10);
-
- final EntityTypeInvocationHandler source1 =
- (EntityTypeInvocationHandler) Proxy.getInvocationHandler(customer1);
- final EntityTypeInvocationHandler source2 =
- (EntityTypeInvocationHandler) Proxy.getInvocationHandler(customer2);
- final EntityTypeInvocationHandler source3 =
- (EntityTypeInvocationHandler) Proxy.getInvocationHandler(customer3);
-
- assertFalse(entityContext.isAttached(source1));
- assertFalse(entityContext.isAttached(source2));
- assertFalse(entityContext.isAttached(source3));
-
- entityContext.attach(source1);
- assertTrue(entityContext.isAttached(source1));
- assertFalse(entityContext.isAttached(source2));
- assertTrue(entityContext.isAttached(source3));
-
- entityContext.attach(source2);
- assertTrue(entityContext.isAttached(source1));
- assertTrue(entityContext.isAttached(source2));
- assertTrue(entityContext.isAttached(source3));
-
- try {
- entityContext.attach(source3);
- fail();
- } catch (IllegalStateException ignore) {
- // ignore
- }
-
- entityContext.detach(source1);
- assertFalse(entityContext.isAttached(source1));
- assertTrue(entityContext.isAttached(source2));
- assertFalse(entityContext.isAttached(source3));
-
- entityContext.detach(source2);
- assertFalse(entityContext.isAttached(source1));
- assertFalse(entityContext.isAttached(source2));
- assertFalse(entityContext.isAttached(source3));
- }
-
- @Test
- public void linkTargetExisting() {
- final Customer customer = container.getCustomer().newCustomer();
- final CustomerInfo customerInfo = container.getCustomerInfo().get(11);
-
- customer.setInfo(customerInfo);
-
- assertNotNull(customer.getInfo());
-
- final EntityTypeInvocationHandler source =
- (EntityTypeInvocationHandler) Proxy.getInvocationHandler(customer);
- final EntityTypeInvocationHandler target =
- (EntityTypeInvocationHandler) Proxy.getInvocationHandler(customerInfo);
-
- assertTrue(entityContext.isAttached(source));
- assertEquals(AttachedEntityStatus.NEW, entityContext.getStatus(source));
- assertTrue(entityContext.isAttached(target));
- assertEquals(AttachedEntityStatus.LINKED, entityContext.getStatus(target));
-
- checkUnidirectional("Info", source, "Customer", target, false);
-
- entityContext.detachAll();
-
- assertFalse(entityContext.isAttached(source));
- assertFalse(entityContext.isAttached(target));
- }
-
- @Test
- public void linkSourceExisting() {
- final Customer customer = container.getCustomer().get(-10);;
- final CustomerInfo customerInfo = container.getCustomerInfo().newCustomerInfo();
-
- customer.setInfo(customerInfo);
-
- assertNotNull(customer.getInfo());
-
- final EntityTypeInvocationHandler source =
- (EntityTypeInvocationHandler) Proxy.getInvocationHandler(customer);
- final EntityTypeInvocationHandler target =
- (EntityTypeInvocationHandler) Proxy.getInvocationHandler(customerInfo);
-
- assertTrue(entityContext.isAttached(source));
- assertEquals(AttachedEntityStatus.CHANGED, entityContext.getStatus(source));
- assertTrue(entityContext.isAttached(target));
- assertEquals(AttachedEntityStatus.NEW, entityContext.getStatus(target));
-
- checkUnidirectional("Info", source, "Customer", target, false);
-
- entityContext.detachAll();
-
- assertFalse(entityContext.isAttached(source));
- assertFalse(entityContext.isAttached(target));
- }
-
- @Test
- public void linkBothExisting() {
- final Customer customer = container.getCustomer().get(-10);
- final CustomerInfo customerInfo = container.getCustomerInfo().get(12);
-
- customer.setInfo(customerInfo);
-
- assertNotNull(customer.getInfo());
-
- final EntityTypeInvocationHandler source =
- (EntityTypeInvocationHandler) Proxy.getInvocationHandler(customer);
- final EntityTypeInvocationHandler target =
- (EntityTypeInvocationHandler) Proxy.getInvocationHandler(customerInfo);
-
- assertTrue(entityContext.isAttached(source));
- assertEquals(AttachedEntityStatus.CHANGED, entityContext.getStatus(source));
- assertTrue(entityContext.isAttached(target));
- assertEquals(AttachedEntityStatus.LINKED, entityContext.getStatus(target));
-
- checkUnidirectional("Info", source, "Customer", target, false);
-
- entityContext.detachAll();
-
- assertFalse(entityContext.isAttached(source));
- assertFalse(entityContext.isAttached(target));
- }
-
- @Test
- public void linkEntitySet() {;
- final Customer customer = container.getCustomer().newCustomer();
-
- final OrderCollection toBeLinked = container.getOrder().newOrderCollection();
- toBeLinked.add(container.getOrder().newOrder());
- toBeLinked.add(container.getOrder().newOrder());
- toBeLinked.add(container.getOrder().newOrder());
-
- customer.setOrders(toBeLinked);
- assertNotNull(customer.getOrders());
- assertEquals(3, customer.getOrders().size());
-
- final EntityTypeInvocationHandler source =
- (EntityTypeInvocationHandler) Proxy.getInvocationHandler(customer);
-
- assertTrue(entityContext.isAttached(source));
- assertEquals(AttachedEntityStatus.NEW, entityContext.getStatus(source));
- assertEquals(3, ((Collection) (source.getLinkChanges().entrySet().iterator().next().getValue())).size());
-
- for (Order order : toBeLinked) {
- final EntityTypeInvocationHandler target =
- (EntityTypeInvocationHandler) Proxy.getInvocationHandler(order);
-
- assertTrue(entityContext.isAttached(target));
- assertEquals(AttachedEntityStatus.NEW, entityContext.getStatus(target));
- checkUnidirectional("Orders", source, "Customer", target, true);
- }
-
- entityContext.detachAll();
-
- assertFalse(entityContext.isAttached(source));
-
- for (Order order : toBeLinked) {
- assertFalse(entityContext.isAttached((EntityTypeInvocationHandler) Proxy.getInvocationHandler(order)));
- }
- }
-
- @Test
- public void addProperty() {
- final Customer customer = container.getCustomer().newCustomer();
- customer.setCustomerId(100);
-
- final ContactDetails cd = new ContactDetails();
- customer.setPrimaryContactInfo(cd);
-
- cd.setAlternativeNames(Arrays.asList("alternative1", "alternative2"));
-
- final ContactDetails bcd = new ContactDetails();
- customer.setBackupContactInfo(Collections.<ContactDetails>singletonList(bcd));
-
- bcd.setAlternativeNames(Arrays.asList("alternative3", "alternative4"));
-
- assertEquals(Integer.valueOf(100), customer.getCustomerId());
- assertNotNull(customer.getPrimaryContactInfo().getAlternativeNames());
- assertEquals(2, customer.getPrimaryContactInfo().getAlternativeNames().size());
- assertTrue(customer.getPrimaryContactInfo().getAlternativeNames().contains("alternative1"));
- assertEquals(2, customer.getBackupContactInfo().iterator().next().getAlternativeNames().size());
- assertTrue(customer.getBackupContactInfo().iterator().next().getAlternativeNames().contains("alternative4"));
-
- final EntityTypeInvocationHandler source = (EntityTypeInvocationHandler) Proxy.getInvocationHandler(customer);
-
- assertTrue(entityContext.isAttached(source));
- assertEquals(AttachedEntityStatus.NEW, entityContext.getStatus(source));
-
- entityContext.detachAll();
-
- assertFalse(entityContext.isAttached(source));
- }
-
- @Test
- public void readEntityInTheContext() {
- CustomerInfo customerInfo = container.getCustomerInfo().get(16);
- customerInfo.setInformation("some other info ...");
-
- assertEquals("some other info ...", customerInfo.getInformation());
-
- customerInfo = container.getCustomerInfo().get(16);
- assertEquals("some other info ...", customerInfo.getInformation());
-
- entityContext.detachAll();
- customerInfo = container.getCustomerInfo().get(16);
- assertNotEquals("some other info ...", customerInfo.getInformation());
- }
-
- @Test
- public void readAllWithEntityInTheContext() {
- CustomerInfo customerInfo = container.getCustomerInfo().get(16);
- customerInfo.setInformation("some other info ...");
-
- assertEquals("some other info ...", customerInfo.getInformation());
-
- boolean found = false;
- for (CustomerInfo info : container.getCustomerInfo().getAll()) {
- if (info.getCustomerInfoId() == 16) {
- assertEquals("some other info ...", customerInfo.getInformation());
- found = true;
- }
- }
- assertTrue(found);
-
- entityContext.detachAll();
-
- found = false;
- for (CustomerInfo info : container.getCustomerInfo().getAll()) {
- if (info.getCustomerInfoId() == 16) {
- assertNotEquals("some other info ...", info.getInformation());
- found = true;
- }
- }
- assertTrue(found);
- }
-
- @Test
- public void checkContextInCaseOfErrors() {
- final Login login = container.getLogin().newLogin();
-
- final EntityTypeInvocationHandler handler = (EntityTypeInvocationHandler) Proxy.getInvocationHandler(login);
-
- assertTrue(entityContext.isAttached(handler));
-
- try {
- container.flush();
- fail();
- } catch (Exception e) {
- // ignore
- }
-
- assertTrue(entityContext.isAttached(handler));
-
- login.setCustomerId(-10);
- login.setUsername("customer");
-
- container.flush();
- assertFalse(entityContext.isAttached(handler));
- assertNotNull(container.getLogin().get("customer"));
-
- container.getLogin().delete(login.getUsername());
- assertTrue(entityContext.isAttached(handler));
-
- container.flush();
- assertFalse(entityContext.isAttached(handler));
- assertNull(container.getLogin().get("customer"));
- }
-
- @Test
- public void flushTest() {
- Customer customer = container.getCustomer().newCustomer();
- customer.setCustomerId(300);
- customer.setName("samplename");
-
- final List<Integer> keys = new ArrayList<Integer>();
- keys.add(-200);
- keys.add(-201);
- keys.add(-202);
-
- final OrderCollection toBeLinked = container.getOrder().newOrderCollection();
- for (Integer key : keys) {
- final Order order = container.getOrder().newOrder();
- order.setOrderId(key);
- order.setCustomerId(300);
- order.setCustomer(customer);
- toBeLinked.add(order);
- }
-
- customer.setOrders(toBeLinked);
-
- final CustomerInfo customerInfo = container.getCustomerInfo().get(16);
- customerInfo.setInformation("some new info ...");
- customer.setInfo(customerInfo);
-
- final ContactDetails cd = new ContactDetails();
- cd.setAlternativeNames(Arrays.asList("alternative1", "alternative2"));
- cd.setEmailBag(Collections.<String>singleton("myemail@mydomain.org"));
- cd.setMobilePhoneBag(Collections.<Phone>emptySet());
-
- final ContactDetails bcd = new ContactDetails();
- bcd.setAlternativeNames(Arrays.asList("alternative3", "alternative4"));
- bcd.setEmailBag(Collections.<String>emptySet());
- bcd.setMobilePhoneBag(Collections.<Phone>emptySet());
-
- customer.setPrimaryContactInfo(cd);
- customer.setBackupContactInfo(Collections.<ContactDetails>singletonList(bcd));
-
- assertTrue(entityContext.isAttached((EntityTypeInvocationHandler) Proxy.getInvocationHandler(customerInfo)));
- assertTrue(entityContext.isAttached((EntityTypeInvocationHandler) Proxy.getInvocationHandler(customer)));
- for (Order linked : toBeLinked) {
- assertTrue(entityContext.isAttached((EntityTypeInvocationHandler) Proxy.getInvocationHandler(linked)));
- }
-
- container.flush();
-
- assertFalse(entityContext.isAttached((EntityTypeInvocationHandler) Proxy.getInvocationHandler(customerInfo)));
- assertFalse(entityContext.isAttached((EntityTypeInvocationHandler) Proxy.getInvocationHandler(customer)));
- for (Order linked : toBeLinked) {
- assertFalse(entityContext.isAttached((EntityTypeInvocationHandler) Proxy.getInvocationHandler(linked)));
- }
-
- assertEquals("some new info ...", container.getCustomerInfo().get(16).getInformation());
-
- container.getOrder().delete(toBeLinked);
- container.getCustomer().delete(customer.getCustomerId());
-
- assertTrue(entityContext.isAttached((EntityTypeInvocationHandler) Proxy.getInvocationHandler(customer)));
- for (Order linked : toBeLinked) {
- assertTrue(entityContext.isAttached((EntityTypeInvocationHandler) Proxy.getInvocationHandler(linked)));
- }
-
- container.flush();
-
- assertFalse(entityContext.isAttached((EntityTypeInvocationHandler) Proxy.getInvocationHandler(customer)));
- for (Order linked : toBeLinked) {
- assertFalse(entityContext.isAttached((EntityTypeInvocationHandler) Proxy.getInvocationHandler(linked)));
- }
- }
-
- private void checkUnlink(
- final String sourceName,
- final EntityTypeInvocationHandler source) {
- boolean found = false;
- for (Map.Entry<NavigationProperty, Object> property : source.getLinkChanges().entrySet()) {
- if (property.getKey().name().equals(sourceName)) {
- found = true;
- }
- }
- assertFalse(found);
- }
-
- private void checkLink(
- final String sourceName,
- final EntityTypeInvocationHandler source,
- final EntityTypeInvocationHandler target,
- final boolean isCollection) {
- boolean found = false;
- for (Map.Entry<NavigationProperty, Object> property : source.getLinkChanges().entrySet()) {
- if (property.getKey().name().equals(sourceName)) {
- if (isCollection) {
- found = false;
- for (Object proxy : (Collection) property.getValue()) {
- if (target.equals((EntityTypeInvocationHandler) Proxy.getInvocationHandler(proxy))) {
- found = true;
- }
- }
- } else {
- found = target.equals(
- (EntityTypeInvocationHandler) Proxy.getInvocationHandler(property.getValue()));
- }
- }
- }
- assertTrue(found);
- }
-
- private void checkUnidirectional(
- final String sourceName,
- final EntityTypeInvocationHandler source,
- final String targetName,
- final EntityTypeInvocationHandler target,
- final boolean isCollection) {
- checkLink(sourceName, source, target, isCollection);
- checkUnlink(targetName, target);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/EntityCreateTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/EntityCreateTestITCase.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/EntityCreateTestITCase.java
deleted file mode 100644
index af3f528..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/EntityCreateTestITCase.java
+++ /dev/null
@@ -1,198 +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 com.msopentech.odatajclient.proxy;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Message;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageKey;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Order;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection;
-import org.junit.Test;
-
-/**
- * This is the unit test class to check entity create operations.
- */
-public class EntityCreateTestITCase extends AbstractTest {
-
- @Test
- public void create() {
- final String sampleName = "sample customer from proxy";
- final Integer id = 100;
-
- getSampleCustomerProfile(id, sampleName, container);
- container.flush();
-
- Customer actual = readCustomer(container, id);
- checKSampleCustomerProfile(actual, id, sampleName);
-
- container.getCustomer().delete(actual.getCustomerId());
- actual = container.getCustomer().get(id);
- assertNull(actual);
-
- entityContext.detachAll();
- actual = container.getCustomer().get(id);
- assertNotNull(actual);
-
- container.getCustomer().delete(actual.getCustomerId());
- container.flush();
-
- actual = container.getCustomer().get(id);
- assertNull(actual);
-
- entityContext.detachAll();
- actual = container.getCustomer().get(id);
- assertNull(actual);
- }
-
- @Test
- public void createEmployee() {
- final Integer id = 101;
-
- final Employee employee = container.getPerson().newEmployee();
- employee.setPersonId(id);
- employee.setName("sample employee from proxy");
- employee.setManagersPersonId(-9918);
- employee.setSalary(2147483647);
- employee.setTitle("CEO");
-
- container.flush();
-
- Employee actual = container.getPerson().get(id, Employee.class);
- assertNotNull(actual);
- assertEquals(id, actual.getPersonId());
-
- entityContext.detachAll();
- actual = container.getPerson().get(id, Employee.class);
- assertNotNull(actual);
-
- container.getPerson().delete(actual.getPersonId());
- container.flush();
-
- actual = container.getPerson().get(id, Employee.class);
- assertNull(actual);
-
- entityContext.detachAll();
- actual = container.getPerson().get(id, Employee.class);
- assertNull(actual);
- }
-
- @Test
- public void createWithNavigation() {
- final String sampleName = "sample customer from proxy with navigation";
- final Integer id = 101;
-
- final Customer original = getSampleCustomerProfile(id, sampleName, container);
- original.setInfo(container.getCustomerInfo().get(16));
- container.flush();
-
- Customer actual = readCustomer(container, id);
- checKSampleCustomerProfile(actual, id, sampleName);
- assertEquals(Integer.valueOf(16), actual.getInfo().getCustomerInfoId());
-
- container.getCustomer().delete(actual.getCustomerId());
- container.flush();
-
- actual = container.getCustomer().get(id);
- assertNull(actual);
- }
-
- @Test
- public void createWithBackNavigation() {
- final String sampleName = "sample customer from proxy with back navigation";
- final Integer id = 102;
-
- Order order = container.getOrder().newOrder();
- order.setCustomerId(id);
- order.setOrderId(id); // same id ...
-
- final Customer customer = getSampleCustomerProfile(id, sampleName, container);
-
- final OrderCollection orders = container.getOrder().newOrderCollection();
- orders.add(order);
-
- customer.setOrders(orders);
- order.setCustomer(customer);
- container.flush();
-
- assertEquals(id, order.getOrderId());
- assertEquals(id, order.getCustomerId());
-
- Customer actual = readCustomer(container, id);
- checKSampleCustomerProfile(actual, id, sampleName);
-
- assertEquals(1, actual.getOrders().size());
- assertEquals(id, actual.getOrders().iterator().next().getOrderId());
- assertEquals(id, actual.getOrders().iterator().next().getCustomerId());
-
- order = container.getOrder().get(id);
- assertNotNull(order);
- assertEquals(id, order.getCustomer().getCustomerId());
-
- container.getOrder().delete(actual.getOrders());
- container.flush();
-
- order = container.getOrder().get(id);
- assertNull(order);
-
- actual = readCustomer(container, id);
- assertTrue(actual.getOrders().isEmpty());
-
- container.getCustomer().delete(actual.getCustomerId());
- container.flush();
-
- actual = container.getCustomer().get(id);
- assertNull(actual);
- }
-
- @Test
- public void multiKey() {
- Message message = container.getMessage().newMessage();
- message.setMessageId(100);
- message.setFromUsername("fromusername");
- message.setToUsername("myusername");
- message.setIsRead(false);
- message.setSubject("test message");
- message.setBody("test");
-
- container.flush();
-
- MessageKey key = new MessageKey();
- key.setFromUsername("fromusername");
- key.setMessageId(100);
-
- message = container.getMessage().get(key);
- assertNotNull(message);
- assertEquals(Integer.valueOf(100), message.getMessageId());
- assertEquals("fromusername", message.getFromUsername());
- assertEquals("myusername", message.getToUsername());
- assertEquals("test message", message.getSubject());
- assertEquals("test", message.getBody());
-
- container.getMessage().delete(key);
- container.flush();
-
- assertNull(container.getMessage().get(key));
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/EntityRetrieveTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/EntityRetrieveTestITCase.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/EntityRetrieveTestITCase.java
deleted file mode 100644
index c602043..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/EntityRetrieveTestITCase.java
+++ /dev/null
@@ -1,189 +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 com.msopentech.odatajclient.proxy;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial.Type;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.proxy.api.impl.EntityTypeInvocationHandler;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.DefaultContainer;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypes;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Contractor;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ContractorCollection;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.EmployeeCollection;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Message;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageKey;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Order;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Person;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonCollection;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Product;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployee;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployeeCollection;
-import java.lang.reflect.Proxy;
-import java.util.Collection;
-import org.apache.commons.lang3.StringUtils;
-import org.junit.Test;
-
-/**
- * This is the unit test class to check entity retrieve operations.
- */
-public class EntityRetrieveTestITCase extends AbstractTest {
-
- protected DefaultContainer getContainer() {
- return container;
- }
-
- @Test
- public void exists() {
- assertTrue(getContainer().getPerson().exists(-10));
- assertFalse(getContainer().getPerson().exists(-11));
- }
-
- @Test
- public void get() {
- readCustomer(getContainer(), -10);
- }
-
- @Test
- public void getAll() {
- final PersonCollection all = getContainer().getPerson().getAll();
- assertNotNull(all);
- assertFalse(all.isEmpty());
- for (Person person : all) {
- assertNotNull(person);
- }
-
- final EmployeeCollection employees = getContainer().getPerson().getAll(EmployeeCollection.class);
- assertNotNull(employees);
- assertFalse(employees.isEmpty());
- for (Employee employee : employees) {
- assertNotNull(employee);
- }
-
- final SpecialEmployeeCollection specialEmployees = getContainer().getPerson().getAll(
- SpecialEmployeeCollection.class);
- assertNotNull(specialEmployees);
- assertFalse(specialEmployees.isEmpty());
- for (SpecialEmployee employee : specialEmployees) {
- assertNotNull(employee);
- }
-
- final ContractorCollection contractors = getContainer().getPerson().getAll(ContractorCollection.class);
- assertNotNull(contractors);
- assertFalse(contractors.isEmpty());
- for (Contractor contractor : contractors) {
- assertNotNull(contractor);
- }
-
- assertTrue(employees.size() > specialEmployees.size());
- assertTrue(all.size() > employees.size() + contractors.size());
- }
-
- @Test
- public void navigate() {
- final Order order = getContainer().getOrder().get(-9);
- assertNotNull(order);
- assertEquals(Integer.valueOf(-9), order.getOrderId());
-
- final ConcurrencyInfo concurrency = order.getConcurrency();
- assertNotNull(concurrency);
- assertEquals("2012-02-12T11:32:50.5072026", concurrency.getQueriedDateTime().toString());
- assertEquals(Integer.valueOf(78), order.getCustomerId());
- }
-
- @Test
- public void withGeospatial() {
- final AllSpatialTypes allSpatialTypes = getContainer().getAllGeoTypesSet().get(-10);
- assertNotNull(allSpatialTypes);
- assertEquals(Integer.valueOf(-10), allSpatialTypes.getId());
-
- final MultiLineString geogMultiLine = allSpatialTypes.getGeogMultiLine();
- assertNotNull(geogMultiLine);
- assertEquals(Type.MULTILINESTRING, geogMultiLine.getType());
- assertEquals(Geospatial.Dimension.GEOGRAPHY, geogMultiLine.getDimension());
- assertFalse(geogMultiLine.isEmpty());
-
- final Point geogPoint = allSpatialTypes.getGeogPoint();
- assertNotNull(geogPoint);
- assertEquals(Type.POINT, geogPoint.getType());
- assertEquals(Geospatial.Dimension.GEOGRAPHY, geogPoint.getDimension());
- assertEquals(52.8606, geogPoint.getY(), 0);
- assertEquals(173.334, geogPoint.getX(), 0);
- }
-
- @Test
- public void withInlineEntry() {
- final Customer customer = readCustomer(getContainer(), -10);
- final CustomerInfo customerInfo = customer.getInfo();
- assertNotNull(customerInfo);
- assertEquals(Integer.valueOf(11), customerInfo.getCustomerInfoId());
- }
-
- @Test
- public void withInlineFeed() {
- final Customer customer = readCustomer(getContainer(), -10);
- final OrderCollection orders = customer.getOrders();
- assertFalse(orders.isEmpty());
- }
-
- @Test
- public void withActions() {
- final ComputerDetail computerDetail = getContainer().getComputerDetail().get(-10);
- assertEquals(Integer.valueOf(-10), computerDetail.getComputerDetailId());
-
- try {
- assertNotNull(ComputerDetail.class.getMethod("resetComputerDetailsSpecifications",
- Collection.class, ODataTimestamp.class));
- } catch (Exception e) {
- fail();
- }
- }
-
- @Test
- public void multiKey() {
- final MessageKey messageKey = new MessageKey();
- messageKey.setFromUsername("1");
- messageKey.setMessageId(-10);
-
- final Message message = getContainer().getMessage().get(messageKey);
- assertNotNull(message);
- assertEquals("1", message.getFromUsername());
- }
-
- @Test
- public void checkForETag() {
- Product product = getContainer().getProduct().get(-10);
- assertTrue(StringUtils.isNotBlank(
- ((EntityTypeInvocationHandler) Proxy.getInvocationHandler(product)).getETag()));
- }
-}
[37/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Parameter.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Parameter.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Parameter.java
deleted file mode 100644
index d76f4f6..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Parameter.java
+++ /dev/null
@@ -1,39 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractParameter;
-
-public class Parameter extends AbstractParameter {
-
- private static final long serialVersionUID = 7596724999614891358L;
-
- @JsonProperty("Mode")
- private ParameterMode mode;
-
- public ParameterMode getMode() {
- return mode;
- }
-
- public void setMode(final ParameterMode mode) {
- this.mode = mode;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/ParameterMode.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/ParameterMode.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/ParameterMode.java
deleted file mode 100644
index 5ef0139..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/ParameterMode.java
+++ /dev/null
@@ -1,27 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-public enum ParameterMode {
-
- In,
- Out,
- InOut
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Property.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Property.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Property.java
deleted file mode 100644
index d4e1cf1..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Property.java
+++ /dev/null
@@ -1,27 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractProperty;
-
-public class Property extends AbstractProperty {
-
- private static final long serialVersionUID = 6224524803474652100L;
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/PropertyValue.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/PropertyValue.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/PropertyValue.java
deleted file mode 100644
index 8c37010..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/PropertyValue.java
+++ /dev/null
@@ -1,118 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdm;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Date;
-
-public class PropertyValue extends AbstractEdm {
-
- private static final long serialVersionUID = -6580934436491418564L;
-
- @JsonProperty(value = "Property", required = true)
- private String property;
-
- @JsonProperty("Path")
- private String path;
-
- @JsonProperty("String")
- private String string;
-
- @JsonProperty("Int")
- private BigInteger _int;
-
- @JsonProperty("Float")
- private Double _float;
-
- @JsonProperty("Decimal")
- private BigDecimal decimal;
-
- @JsonProperty("Bool")
- private Boolean bool;
-
- @JsonProperty("DateTime")
- private Date dateTime;
-
- public String getProperty() {
- return property;
- }
-
- public void setProperty(final String property) {
- this.property = property;
- }
-
- public String getPath() {
- return path;
- }
-
- public void setPath(final String path) {
- this.path = path;
- }
-
- public String getString() {
- return string;
- }
-
- public void setString(final String string) {
- this.string = string;
- }
-
- public BigInteger getInt() {
- return _int;
- }
-
- public void setInt(final BigInteger _int) {
- this._int = _int;
- }
-
- public Double getFloat() {
- return _float;
- }
-
- public void setFloat(final Double _float) {
- this._float = _float;
- }
-
- public BigDecimal getDecimal() {
- return decimal;
- }
-
- public void setDecimal(final BigDecimal decimal) {
- this.decimal = decimal;
- }
-
- public Boolean getBool() {
- return bool;
- }
-
- public void setBool(final Boolean bool) {
- this.bool = bool;
- }
-
- public Date getDateTime() {
- return dateTime;
- }
-
- public void setDateTime(final Date dateTime) {
- this.dateTime = dateTime;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/ReferentialConstraint.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/ReferentialConstraint.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/ReferentialConstraint.java
deleted file mode 100644
index 722b1ec..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/ReferentialConstraint.java
+++ /dev/null
@@ -1,49 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdm;
-
-public class ReferentialConstraint extends AbstractEdm {
-
- private static final long serialVersionUID = 9067893732765127269L;
-
- @JsonProperty(value = "Principal", required = true)
- private ReferentialConstraintRole principal;
-
- @JsonProperty(value = "Dependent", required = true)
- private ReferentialConstraintRole dependent;
-
- public ReferentialConstraintRole getPrincipal() {
- return principal;
- }
-
- public void setPrincipal(final ReferentialConstraintRole principal) {
- this.principal = principal;
- }
-
- public ReferentialConstraintRole getDependent() {
- return dependent;
- }
-
- public void setDependent(final ReferentialConstraintRole dependent) {
- this.dependent = dependent;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/ReferentialConstraintRole.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/ReferentialConstraintRole.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/ReferentialConstraintRole.java
deleted file mode 100644
index 8ea38b8..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/ReferentialConstraintRole.java
+++ /dev/null
@@ -1,51 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdm;
-import com.msopentech.odatajclient.engine.metadata.edm.PropertyRef;
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonDeserialize(using = ReferentialConstraintRoleDeserializer.class)
-public class ReferentialConstraintRole extends AbstractEdm {
-
- private static final long serialVersionUID = -3712887115248634164L;
-
- private String role;
-
- private List<PropertyRef> propertyRefs = new ArrayList<PropertyRef>();
-
- public String getRole() {
- return role;
- }
-
- public void setRole(final String role) {
- this.role = role;
- }
-
- public List<PropertyRef> getPropertyRefs() {
- return propertyRefs;
- }
-
- public void setPropertyRefs(final List<PropertyRef> propertyRefs) {
- this.propertyRefs = propertyRefs;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/ReferentialConstraintRoleDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/ReferentialConstraintRoleDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/ReferentialConstraintRoleDeserializer.java
deleted file mode 100644
index 8744eba..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/ReferentialConstraintRoleDeserializer.java
+++ /dev/null
@@ -1,51 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-import com.msopentech.odatajclient.engine.metadata.edm.PropertyRef;
-import java.io.IOException;
-
-public class ReferentialConstraintRoleDeserializer extends AbstractEdmDeserializer<ReferentialConstraintRole> {
-
- @Override
- protected ReferentialConstraintRole doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final ReferentialConstraintRole refConstRole = new ReferentialConstraintRole();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Role".equals(jp.getCurrentName())) {
- refConstRole.setRole(jp.nextTextValue());
- } else if ("PropertyRef".equals(jp.getCurrentName())) {
- jp.nextToken();
- refConstRole.getPropertyRefs().add(jp.getCodec().readValue(jp, PropertyRef.class));
- }
- }
- }
-
- return refConstRole;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Schema.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Schema.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Schema.java
deleted file mode 100644
index 9054def..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Schema.java
+++ /dev/null
@@ -1,136 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractSchema;
-import java.util.ArrayList;
-import java.util.List;
-
-public class Schema extends AbstractSchema<EntityContainer, EntityType, ComplexType, FunctionImport> {
-
- private static final long serialVersionUID = 4453992249818796144L;
-
- private final List<Annotations> annotationList = new ArrayList<Annotations>();
-
- private final List<Association> associations = new ArrayList<Association>();
-
- private final List<ComplexType> complexTypes = new ArrayList<ComplexType>();
-
- private final List<EntityContainer> entityContainers = new ArrayList<EntityContainer>();
-
- private final List<EntityType> entityTypes = new ArrayList<EntityType>();
-
- private final List<EnumType> enumTypes = new ArrayList<EnumType>();
-
- private final List<Using> usings = new ArrayList<Using>();
-
- private final List<ValueTerm> valueTerms = new ArrayList<ValueTerm>();
-
- public Association getAssociation(final String name) {
- Association result = null;
- for (Association association : getAssociations()) {
- if (name.equals(association.getName())) {
- result = association;
- }
- }
- return result;
- }
-
- @Override
- public List<Annotations> getAnnotationsList() {
- return annotationList;
- }
-
- @Override
- public Annotations getAnnotationsList(final String target) {
- Annotations result = null;
- for (Annotations annots : getAnnotationsList()) {
- if (target.equals(annots.getTarget())) {
- result = annots;
- }
- }
- return result;
- }
-
- public List<Association> getAssociations() {
- return associations;
- }
-
- public List<Using> getUsings() {
- return usings;
- }
-
- public List<ValueTerm> getValueTerms() {
- return valueTerms;
- }
-
- @Override
- public List<EnumType> getEnumTypes() {
- return enumTypes;
- }
-
- @Override
- public EnumType getEnumType(final String name) {
- EnumType result = null;
- for (EnumType type : getEnumTypes()) {
- if (name.equals(type.getName())) {
- result = type;
- }
- }
- return result;
- }
-
- @Override
- public List<EntityContainer> getEntityContainers() {
- return entityContainers;
- }
-
- @Override
- public EntityContainer getDefaultEntityContainer() {
- EntityContainer result = null;
- for (EntityContainer container : getEntityContainers()) {
- if (container.isDefaultEntityContainer()) {
- result = container;
- }
- }
- return result;
- }
-
- @Override
- public EntityContainer getEntityContainer(final String name) {
- EntityContainer result = null;
- for (EntityContainer container : getEntityContainers()) {
- if (name.equals(container.getName())) {
- result = container;
- }
- }
- return result;
- }
-
- @Override
- public List<EntityType> getEntityTypes() {
- return entityTypes;
- }
-
- @Override
- public List<ComplexType> getComplexTypes() {
- return complexTypes;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/TypeAnnotation.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/TypeAnnotation.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/TypeAnnotation.java
deleted file mode 100644
index 130c719..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/TypeAnnotation.java
+++ /dev/null
@@ -1,57 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdm;
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonDeserialize(using = TypeAnnotationDeserializer.class)
-public class TypeAnnotation extends AbstractEdm {
-
- private static final long serialVersionUID = -7585489230017331877L;
-
- private String term;
-
- private String qualifier;
-
- private List<PropertyValue> propertyValues = new ArrayList<PropertyValue>();
-
- public String getTerm() {
- return term;
- }
-
- public void setTerm(final String term) {
- this.term = term;
- }
-
- public String getQualifier() {
- return qualifier;
- }
-
- public void setQualifier(final String qualifier) {
- this.qualifier = qualifier;
- }
-
- public List<PropertyValue> getPropertyValues() {
- return propertyValues;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/TypeAnnotationDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/TypeAnnotationDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/TypeAnnotationDeserializer.java
deleted file mode 100644
index 6aa439b..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/TypeAnnotationDeserializer.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-import java.io.IOException;
-
-public class TypeAnnotationDeserializer extends AbstractEdmDeserializer<TypeAnnotation> {
-
- @Override
- protected TypeAnnotation doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final TypeAnnotation typeAnnot = new TypeAnnotation();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Term".equals(jp.getCurrentName())) {
- typeAnnot.setTerm(jp.nextTextValue());
- } else if ("Qualifier".equals(jp.getCurrentName())) {
- typeAnnot.setQualifier(jp.nextTextValue());
- } else if ("PropertyValue".equals(jp.getCurrentName())) {
- jp.nextToken();
- typeAnnot.getPropertyValues().add(jp.getCodec().readValue(jp, PropertyValue.class));
- }
- }
- }
-
- return typeAnnot;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Using.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Using.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Using.java
deleted file mode 100644
index 179063d..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/Using.java
+++ /dev/null
@@ -1,49 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdm;
-
-public class Using extends AbstractEdm {
-
- private static final long serialVersionUID = 2086957510154443445L;
-
- @JsonProperty(value = "Namespace", required = true)
- private String namespace;
-
- @JsonProperty("Alias")
- private String alias;
-
- public String getNamespace() {
- return namespace;
- }
-
- public void setNamespace(final String namespace) {
- this.namespace = namespace;
- }
-
- public String getAlias() {
- return alias;
- }
-
- public void setAlias(final String alias) {
- this.alias = alias;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/ValueAnnotation.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/ValueAnnotation.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/ValueAnnotation.java
deleted file mode 100644
index b2f04ef..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/ValueAnnotation.java
+++ /dev/null
@@ -1,129 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdm;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Date;
-
-public class ValueAnnotation extends AbstractEdm {
-
- private static final long serialVersionUID = -1826414005417952278L;
-
- @JsonProperty(value = "Term", required = true)
- private String term;
-
- @JsonProperty("Qualifier")
- private String qualifier;
-
- @JsonProperty("Path")
- private String path;
-
- @JsonProperty("String")
- private String string;
-
- @JsonProperty("Int")
- private BigInteger _int;
-
- @JsonProperty("Float")
- private Double _float;
-
- @JsonProperty("Decimal")
- private BigDecimal decimal;
-
- @JsonProperty("Bool")
- private Boolean bool;
-
- @JsonProperty("DateTime")
- private Date dateTime;
-
- public String getTerm() {
- return term;
- }
-
- public void setTerm(final String term) {
- this.term = term;
- }
-
- public String getQualifier() {
- return qualifier;
- }
-
- public void setQualifier(final String qualifier) {
- this.qualifier = qualifier;
- }
-
- public String getPath() {
- return path;
- }
-
- public void setPath(final String path) {
- this.path = path;
- }
-
- public String getString() {
- return string;
- }
-
- public void setString(final String string) {
- this.string = string;
- }
-
- public BigInteger getInt() {
- return _int;
- }
-
- public void setInt(final BigInteger _int) {
- this._int = _int;
- }
-
- public Double getFloat() {
- return _float;
- }
-
- public void setFloat(final Double _float) {
- this._float = _float;
- }
-
- public BigDecimal getDecimal() {
- return decimal;
- }
-
- public void setDecimal(final BigDecimal decimal) {
- this.decimal = decimal;
- }
-
- public Boolean getBool() {
- return bool;
- }
-
- public void setBool(final Boolean bool) {
- this.bool = bool;
- }
-
- public Date getDateTime() {
- return dateTime == null ? null : new Date(dateTime.getTime());
- }
-
- public void setDateTime(final Date dateTime) {
- this.dateTime = dateTime == null ? null : new Date(dateTime.getTime());
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/ValueTerm.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/ValueTerm.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/ValueTerm.java
deleted file mode 100644
index e279f22..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v3/ValueTerm.java
+++ /dev/null
@@ -1,49 +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 com.msopentech.odatajclient.engine.metadata.edm.v3;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdm;
-
-public class ValueTerm extends AbstractEdm {
-
- private static final long serialVersionUID = 6149019886137610604L;
-
- @JsonProperty(value = "Name", required = true)
- private String name;
-
- @JsonProperty(value = "Type", required = true)
- private String type;
-
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(final String type) {
- this.type = type;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/AbstractAnnotatedEdm.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/AbstractAnnotatedEdm.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/AbstractAnnotatedEdm.java
deleted file mode 100644
index 82f8757..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/AbstractAnnotatedEdm.java
+++ /dev/null
@@ -1,41 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdm;
-
-public abstract class AbstractAnnotatedEdm extends AbstractEdm implements AnnotatedEdm {
-
- private static final long serialVersionUID = -8859729466090997718L;
-
- @JsonProperty("Annotation")
- private Annotation annotation;
-
- @Override
- public Annotation getAnnotation() {
- return annotation;
- }
-
- @Override
- public void setAnnotation(final Annotation annotation) {
- this.annotation = annotation;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Action.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Action.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Action.java
deleted file mode 100644
index 717468d..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Action.java
+++ /dev/null
@@ -1,86 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonDeserialize(using = ActionDeserializer.class)
-public class Action extends AbstractAnnotatedEdm {
-
- private static final long serialVersionUID = -99977447455438193L;
-
- private String name;
-
- private boolean bound = false;
-
- private String entitySetPath;
-
- private final List<Parameter> parameters = new ArrayList<Parameter>();
-
- private ReturnType returnType;
-
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public boolean isBound() {
- return bound;
- }
-
- public void setBound(final boolean bound) {
- this.bound = bound;
- }
-
- public String getEntitySetPath() {
- return entitySetPath;
- }
-
- public void setEntitySetPath(final String entitySetPath) {
- this.entitySetPath = entitySetPath;
- }
-
- public List<Parameter> getParameters() {
- return parameters;
- }
-
- public Parameter getParameter(final String name) {
- Parameter result = null;
- for (Parameter parameter : getParameters()) {
- if (name.equals(parameter.getName())) {
- result = parameter;
- }
- }
- return result;
- }
-
- public ReturnType getReturnType() {
- return returnType;
- }
-
- public void setReturnType(final ReturnType returnType) {
- this.returnType = returnType;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ActionDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ActionDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ActionDeserializer.java
deleted file mode 100644
index 20fcf47..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ActionDeserializer.java
+++ /dev/null
@@ -1,60 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-import java.io.IOException;
-import org.apache.commons.lang3.BooleanUtils;
-
-public class ActionDeserializer extends AbstractEdmDeserializer<Action> {
-
- @Override
- protected Action doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final Action action = new Action();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Name".equals(jp.getCurrentName())) {
- action.setName(jp.nextTextValue());
- } else if ("IsBound".equals(jp.getCurrentName())) {
- action.setBound(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("EntitySetPath".equals(jp.getCurrentName())) {
- action.setEntitySetPath(jp.nextTextValue());
- } else if ("Parameter".equals(jp.getCurrentName())) {
- jp.nextToken();
- action.getParameters().add(jp.getCodec().readValue(jp, Parameter.class));
- } else if ("ReturnType".equals(jp.getCurrentName())) {
- action.setReturnType(parseReturnType(jp, "Action"));
- } else if ("Annotation".equals(jp.getCurrentName())) {
- jp.nextToken();
- action.setAnnotation(jp.getCodec().readValue(jp, Annotation.class));
- }
- }
- }
-
- return action;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ActionImport.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ActionImport.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ActionImport.java
deleted file mode 100644
index c54e971..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ActionImport.java
+++ /dev/null
@@ -1,60 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public class ActionImport extends AbstractAnnotatedEdm {
-
- private static final long serialVersionUID = -866422101558426421L;
-
- @JsonProperty(value = "Name", required = true)
- private String name;
-
- @JsonProperty(value = "Action", required = true)
- private String action;
-
- @JsonProperty(value = "EntitySet")
- private String entitySet;
-
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public String getAction() {
- return action;
- }
-
- public void setAction(final String action) {
- this.action = action;
- }
-
- public String getEntitySet() {
- return entitySet;
- }
-
- public void setEntitySet(final String entitySet) {
- this.entitySet = entitySet;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/AnnotatedEdm.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/AnnotatedEdm.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/AnnotatedEdm.java
deleted file mode 100644
index 1beea8a..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/AnnotatedEdm.java
+++ /dev/null
@@ -1,26 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-public interface AnnotatedEdm {
-
- Annotation getAnnotation();
-
- void setAnnotation(Annotation annotation);
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Annotation.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Annotation.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Annotation.java
deleted file mode 100644
index 678a437..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Annotation.java
+++ /dev/null
@@ -1,71 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdm;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.annotation.ConstExprConstruct;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.annotation.DynExprConstruct;
-
-@JsonDeserialize(using = AnnotationDeserializer.class)
-public class Annotation extends AbstractEdm {
-
- private static final long serialVersionUID = -5600031479702563436L;
-
- private String term;
-
- private String qualifier;
-
- private ConstExprConstruct constExpr;
-
- private DynExprConstruct dynExpr;
-
- public String getTerm() {
- return term;
- }
-
- public void setTerm(final String term) {
- this.term = term;
- }
-
- public String getQualifier() {
- return qualifier;
- }
-
- public void setQualifier(final String qualifier) {
- this.qualifier = qualifier;
- }
-
- public ConstExprConstruct getConstExpr() {
- return constExpr;
- }
-
- public void setConstExpr(final ConstExprConstruct constExpr) {
- this.constExpr = constExpr;
- }
-
- public DynExprConstruct getDynExpr() {
- return dynExpr;
- }
-
- public void setDynExpr(final DynExprConstruct dynExpr) {
- this.dynExpr = dynExpr;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/AnnotationDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/AnnotationDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/AnnotationDeserializer.java
deleted file mode 100644
index b4a5a4a..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/AnnotationDeserializer.java
+++ /dev/null
@@ -1,57 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.annotation.DynExprConstruct;
-import java.io.IOException;
-
-public class AnnotationDeserializer extends AbstractEdmDeserializer<Annotation> {
-
- @Override
- protected Annotation doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final Annotation annotation = new Annotation();
-
- for (; jp.getCurrentToken() != null && jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Term".equals(jp.getCurrentName())) {
- annotation.setTerm(jp.nextTextValue());
- } else if ("Qualifier".equals(jp.getCurrentName())) {
- annotation.setQualifier(jp.nextTextValue());
- } // Constant Expressions
- else if (isAnnotationConstExprConstruct(jp)) {
- annotation.setConstExpr(parseAnnotationConstExprConstruct(jp));
- } // Dynamic Expressions
- else {
- annotation.setDynExpr(jp.getCodec().readValue(jp, DynExprConstruct.class));
- }
- }
- }
-
- return annotation;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Annotations.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Annotations.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Annotations.java
deleted file mode 100644
index 0881100..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Annotations.java
+++ /dev/null
@@ -1,46 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractAnnotations;
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonDeserialize(using = AnnotationsDeserializer.class)
-public class Annotations extends AbstractAnnotations {
-
- private static final long serialVersionUID = 3877353656301805410L;
-
- private final List<Annotation> annotations = new ArrayList<Annotation>();
-
- public List<Annotation> getAnnotations() {
- return annotations;
- }
-
- public Annotation getAnnotation(final String term) {
- Annotation result = null;
- for (Annotation annotation : getAnnotations()) {
- if (term.equals(annotation.getTerm())) {
- result = annotation;
- }
- }
- return result;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/AnnotationsDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/AnnotationsDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/AnnotationsDeserializer.java
deleted file mode 100644
index c6d4ebc..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/AnnotationsDeserializer.java
+++ /dev/null
@@ -1,53 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-import java.io.IOException;
-
-public class AnnotationsDeserializer extends AbstractEdmDeserializer<Annotations> {
-
- @Override
- protected Annotations doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final Annotations annotations = new Annotations();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Target".equals(jp.getCurrentName())) {
- annotations.setTarget(jp.nextTextValue());
- } else if ("Qualifier".equals(jp.getCurrentName())) {
- annotations.setQualifier(jp.nextTextValue());
- } else if ("Annotation".equals(jp.getCurrentName())) {
- jp.nextToken();
- annotations.getAnnotations().add(jp.getCodec().readValue(jp, Annotation.class));
- }
- }
- }
-
- return annotations;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/CSDLElement.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/CSDLElement.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/CSDLElement.java
deleted file mode 100644
index b1b6ad0..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/CSDLElement.java
+++ /dev/null
@@ -1,37 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-public enum CSDLElement {
-
- ActionImport,
- ComplexType,
- EntityContainer,
- EntitySet,
- EntityType,
- EnumType,
- FunctionImport,
- Member,
- NavigationProperty,
- Property,
- Singleton,
- Term,
- TypeDefinition
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ComplexType.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ComplexType.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ComplexType.java
deleted file mode 100644
index 161765c..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ComplexType.java
+++ /dev/null
@@ -1,105 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractComplexType;
-import java.util.ArrayList;
-import java.util.List;
-
-public class ComplexType extends AbstractComplexType implements AnnotatedEdm {
-
- private static final long serialVersionUID = -1251230308269425962L;
-
- private boolean abstractEntityType = false;
-
- private String baseType;
-
- private boolean openType = false;
-
- private final List<Property> properties = new ArrayList<Property>();
-
- private final List<NavigationProperty> navigationProperties = new ArrayList<NavigationProperty>();
-
- private Annotation annotation;
-
- public boolean isAbstractEntityType() {
- return abstractEntityType;
- }
-
- public void setAbstractEntityType(final boolean abstractEntityType) {
- this.abstractEntityType = abstractEntityType;
- }
-
- public String getBaseType() {
- return baseType;
- }
-
- public void setBaseType(final String baseType) {
- this.baseType = baseType;
- }
-
- public boolean isOpenType() {
- return openType;
- }
-
- public void setOpenType(final boolean openType) {
- this.openType = openType;
- }
-
- @Override
- public List<Property> getProperties() {
- return properties;
- }
-
- @Override
- public Property getProperty(final String name) {
- Property result = null;
- for (Property property : getProperties()) {
- if (name.equals(property.getName())) {
- result = property;
- }
- }
- return result;
- }
-
- public List<NavigationProperty> getNavigationProperties() {
- return navigationProperties;
- }
-
- public NavigationProperty getNavigationProperty(final String name) {
- NavigationProperty result = null;
- for (NavigationProperty property : getNavigationProperties()) {
- if (name.equals(property.getName())) {
- result = property;
- }
- }
- return result;
- }
-
- @Override
- public Annotation getAnnotation() {
- return annotation;
- }
-
- @Override
- public void setAnnotation(final Annotation annotation) {
- this.annotation = annotation;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/DataServices.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/DataServices.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/DataServices.java
deleted file mode 100644
index ac786dc..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/DataServices.java
+++ /dev/null
@@ -1,37 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractDataServices;
-import java.util.ArrayList;
-import java.util.List;
-
-public class DataServices extends AbstractDataServices<
- Schema, EntityContainer, EntityType, ComplexType, FunctionImport> {
-
- private static final long serialVersionUID = -7954360771258897632L;
-
- private final List<Schema> schemas = new ArrayList<Schema>();
-
- @Override
- public List<Schema> getSchemas() {
- return schemas;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Edmx.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Edmx.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Edmx.java
deleted file mode 100644
index 399481f..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Edmx.java
+++ /dev/null
@@ -1,36 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmx;
-import java.util.ArrayList;
-import java.util.List;
-
-public class Edmx extends AbstractEdmx<
- DataServices, Schema, EntityContainer, EntityType, ComplexType, FunctionImport> {
-
- private static final long serialVersionUID = -8031883176876401375L;
-
- private final List<Reference> references = new ArrayList<Reference>();
-
- public List<Reference> getReferences() {
- return references;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/EntityContainer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/EntityContainer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/EntityContainer.java
deleted file mode 100644
index 77344b4..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/EntityContainer.java
+++ /dev/null
@@ -1,127 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntityContainer;
-import java.util.ArrayList;
-import java.util.List;
-
-public class EntityContainer extends AbstractEntityContainer<FunctionImport> implements AnnotatedEdm {
-
- private static final long serialVersionUID = 2526002525927260320L;
-
- private final List<EntitySet> entitySets = new ArrayList<EntitySet>();
-
- private final List<Singleton> singletons = new ArrayList<Singleton>();
-
- private final List<ActionImport> actionImports = new ArrayList<ActionImport>();
-
- private final List<FunctionImport> functionImports = new ArrayList<FunctionImport>();
-
- private Annotation annotation;
-
- @Override
- public void setDefaultEntityContainer(final boolean defaultEntityContainer) {
- // no action: a single entity container MUST be available as per OData 4.0
- }
-
- @Override
- public boolean isDefaultEntityContainer() {
- return true;
- }
-
- @Override
- public List<EntitySet> getEntitySets() {
- return entitySets;
- }
-
- @Override
- public EntitySet getEntitySet(final String name) {
- EntitySet result = null;
- for (EntitySet entitySet : getEntitySets()) {
- if (name.equals(entitySet.getName())) {
- result = entitySet;
- }
- }
- return result;
- }
-
- public List<Singleton> getSingletons() {
- return singletons;
- }
-
- public Singleton getSingleton(final String name) {
- Singleton result = null;
- for (Singleton singleton : getSingletons()) {
- if (name.equals(singleton.getName())) {
- result = singleton;
- }
- }
- return result;
- }
-
- /**
- * Gets the first action import with given name.
- *
- * @param name name.
- * @return action import.
- */
- public ActionImport getActionImport(final String name) {
- final List<ActionImport> actImps = getActionImports(name);
- return actImps.isEmpty()
- ? null
- : actImps.get(0);
- }
-
- /**
- * Gets all action imports with given name.
- *
- * @param name name.
- * @return action imports.
- */
- public List<ActionImport> getActionImports(final String name) {
- final List<ActionImport> result = new ArrayList<ActionImport>();
- for (ActionImport actionImport : getActionImports()) {
- if (name.equals(actionImport.getName())) {
- result.add(actionImport);
- }
- }
- return result;
- }
-
- public List<ActionImport> getActionImports() {
- return actionImports;
- }
-
- @Override
- public List<FunctionImport> getFunctionImports() {
- return functionImports;
- }
-
- @Override
- public Annotation getAnnotation() {
- return annotation;
- }
-
- @Override
- public void setAnnotation(final Annotation annotation) {
- this.annotation = annotation;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/EntitySet.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/EntitySet.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/EntitySet.java
deleted file mode 100644
index f8750e1..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/EntitySet.java
+++ /dev/null
@@ -1,58 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntitySet;
-import java.util.ArrayList;
-import java.util.List;
-
-public class EntitySet extends AbstractEntitySet implements AnnotatedEdm {
-
- private static final long serialVersionUID = 5570833733884884012L;
-
- private boolean includeInServiceDocument = true;
-
- private Annotation annotation;
-
- private final List<NavigationPropertyBinding> navigationPropertyBindings =
- new ArrayList<NavigationPropertyBinding>();
-
- public boolean isIncludeInServiceDocument() {
- return includeInServiceDocument;
- }
-
- public void setIncludeInServiceDocument(final boolean includeInServiceDocument) {
- this.includeInServiceDocument = includeInServiceDocument;
- }
-
- public List<NavigationPropertyBinding> getNavigationPropertyBindings() {
- return navigationPropertyBindings;
- }
-
- @Override
- public Annotation getAnnotation() {
- return annotation;
- }
-
- @Override
- public void setAnnotation(final Annotation annotation) {
- this.annotation = annotation;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/EntityType.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/EntityType.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/EntityType.java
deleted file mode 100644
index 01dc786..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/EntityType.java
+++ /dev/null
@@ -1,77 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntityType;
-import java.util.ArrayList;
-import java.util.List;
-
-public class EntityType extends AbstractEntityType implements AnnotatedEdm {
-
- private static final long serialVersionUID = 8727765036150269547L;
-
- private final List<Property> properties = new ArrayList<Property>();
-
- private final List<NavigationProperty> navigationProperties = new ArrayList<NavigationProperty>();
-
- private Annotation annotation;
-
- @Override
- public List<Property> getProperties() {
- return properties;
- }
-
- @Override
- public Property getProperty(final String name) {
- Property result = null;
- for (Property property : getProperties()) {
- if (name.equals(property.getName())) {
- result = property;
- }
- }
- return result;
- }
-
- @Override
- public List<NavigationProperty> getNavigationProperties() {
- return navigationProperties;
- }
-
- @Override
- public NavigationProperty getNavigationProperty(final String name) {
- NavigationProperty result = null;
- for (NavigationProperty property : getNavigationProperties()) {
- if (name.equals(property.getName())) {
- result = property;
- }
- }
- return result;
- }
-
- @Override
- public Annotation getAnnotation() {
- return annotation;
- }
-
- @Override
- public void setAnnotation(final Annotation annotation) {
- this.annotation = annotation;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/EnumType.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/EnumType.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/EnumType.java
deleted file mode 100644
index 03232ec..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/EnumType.java
+++ /dev/null
@@ -1,70 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEnumType;
-import java.util.ArrayList;
-import java.util.List;
-
-public class EnumType extends AbstractEnumType implements AnnotatedEdm {
-
- private static final long serialVersionUID = -3329664331877556957L;
-
- private Annotation annotation;
-
- private final List<Member> members = new ArrayList<Member>();
-
- @Override
- public List<Member> getMembers() {
- return members;
- }
-
- @Override
- public Member getMember(final String name) {
- Member result = null;
- for (Member member : getMembers()) {
- if (name.equals(member.getName())) {
- result = member;
- }
- }
- return result;
- }
-
- @Override
- public Member getMember(final Integer value) {
- Member result = null;
- for (Member member : getMembers()) {
- if (value.equals(member.getValue())) {
- result = member;
- }
- }
- return result;
- }
-
- @Override
- public Annotation getAnnotation() {
- return annotation;
- }
-
- @Override
- public void setAnnotation(final Annotation annotation) {
- this.annotation = annotation;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Function.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Function.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Function.java
deleted file mode 100644
index 113635d..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Function.java
+++ /dev/null
@@ -1,38 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
-@JsonDeserialize(using = FunctionDeserializer.class)
-public class Function extends Action {
-
- private static final long serialVersionUID = -5888231162358116515L;
-
- private boolean composable = false;
-
- public boolean isComposable() {
- return composable;
- }
-
- public void setComposable(final boolean composable) {
- this.composable = composable;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/FunctionDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/FunctionDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/FunctionDeserializer.java
deleted file mode 100644
index 695b7e4..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/FunctionDeserializer.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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-import java.io.IOException;
-import org.apache.commons.lang3.BooleanUtils;
-
-public class FunctionDeserializer extends AbstractEdmDeserializer<Function> {
-
- @Override
- protected Function doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final Function function = new Function();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Name".equals(jp.getCurrentName())) {
- function.setName(jp.nextTextValue());
- } else if ("IsBound".equals(jp.getCurrentName())) {
- function.setBound(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("IsComposable".equals(jp.getCurrentName())) {
- function.setComposable(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("EntitySetPath".equals(jp.getCurrentName())) {
- function.setEntitySetPath(jp.nextTextValue());
- } else if ("Parameter".equals(jp.getCurrentName())) {
- jp.nextToken();
- function.getParameters().add(jp.getCodec().readValue(jp, Parameter.class));
- } else if ("ReturnType".equals(jp.getCurrentName())) {
- function.setReturnType(parseReturnType(jp, "Function"));
- } else if ("Annotation".equals(jp.getCurrentName())) {
- jp.nextToken();
- function.setAnnotation(jp.getCodec().readValue(jp, Annotation.class));
- }
- }
- }
-
- return function;
- }
-}
[18/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/northwind-metadata.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/northwind-metadata.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/northwind-metadata.xml
deleted file mode 100644
index 4c3c37d..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/northwind-metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- 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.
-
--->
-<edmx:Edmx Version="4.0" xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx"><edmx:DataServices><Schema Namespace="NorthwindModel" xmlns="http://docs.oasis-open.org/odata/ns/edm"><EntityType Name="Category"><Key><PropertyRef Name="CategoryID" /></Key><Property Name="CategoryID" Type="Edm.Int32" Nullable="false" p5:StoreGeneratedPattern="Identity" xmlns:p5="http://schemas.microsoft.com/ado/2009/02/edm/annotation" /><Property Name="CategoryName" Type="Edm.String" Nullable="false" MaxLength="15" /><Property Name="Description" Type="Edm.String" MaxLength="max" /><Property Name="Picture" Type="Edm.Binary" MaxLength="max" /><NavigationProperty Name="Products" Type="Collection(NorthwindModel.Product)" Partner="Category" /></EntityType><EntityType Name="CustomerDemographic"><Key><PropertyRef Name="CustomerTypeID" /></Key><Property Name="CustomerTypeID" Type="Edm.String" Nullable="false" MaxLength="10" /><Property Name="CustomerDesc" Type="Edm.String" MaxLength="max" /><NavigationProperty
Name="Customers" Type="Collection(NorthwindModel.Customer)" Partner="CustomerDemographics" /></EntityType><EntityType Name="Customer"><Key><PropertyRef Name="CustomerID" /></Key><Property Name="CustomerID" Type="Edm.String" Nullable="false" MaxLength="5" /><Property Name="CompanyName" Type="Edm.String" Nullable="false" MaxLength="40" /><Property Name="ContactName" Type="Edm.String" MaxLength="30" /><Property Name="ContactTitle" Type="Edm.String" MaxLength="30" /><Property Name="Address" Type="Edm.String" MaxLength="60" /><Property Name="City" Type="Edm.String" MaxLength="15" /><Property Name="Region" Type="Edm.String" MaxLength="15" /><Property Name="PostalCode" Type="Edm.String" MaxLength="10" /><Property Name="Country" Type="Edm.String" MaxLength="15" /><Property Name="Phone" Type="Edm.String" MaxLength="24" /><Property Name="Fax" Type="Edm.String" MaxLength="24" /><NavigationProperty Name="Orders" Type="Collection(NorthwindModel.Order)" Partner="Customer" /><NavigationProperty Na
me="CustomerDemographics" Type="Collection(NorthwindModel.CustomerDemographic)" Partner="Customers" /></EntityType><EntityType Name="Employee"><Key><PropertyRef Name="EmployeeID" /></Key><Property Name="EmployeeID" Type="Edm.Int32" Nullable="false" p5:StoreGeneratedPattern="Identity" xmlns:p5="http://schemas.microsoft.com/ado/2009/02/edm/annotation" /><Property Name="LastName" Type="Edm.String" Nullable="false" MaxLength="20" /><Property Name="FirstName" Type="Edm.String" Nullable="false" MaxLength="10" /><Property Name="Title" Type="Edm.String" MaxLength="30" /><Property Name="TitleOfCourtesy" Type="Edm.String" MaxLength="25" /><Property Name="BirthDate" Type="Edm.DateTimeOffset" /><Property Name="HireDate" Type="Edm.DateTimeOffset" /><Property Name="Address" Type="Edm.String" MaxLength="60" /><Property Name="City" Type="Edm.String" MaxLength="15" /><Property Name="Region" Type="Edm.String" MaxLength="15" /><Property Name="PostalCode" Type="Edm.String" MaxLength="10" /><Property Na
me="Country" Type="Edm.String" MaxLength="15" /><Property Name="HomePhone" Type="Edm.String" MaxLength="24" /><Property Name="Extension" Type="Edm.String" MaxLength="4" /><Property Name="Photo" Type="Edm.Binary" MaxLength="max" /><Property Name="Notes" Type="Edm.String" MaxLength="max" /><Property Name="ReportsTo" Type="Edm.Int32" /><Property Name="PhotoPath" Type="Edm.String" MaxLength="255" /><NavigationProperty Name="Employees1" Type="Collection(NorthwindModel.Employee)" Partner="Employee1" /><NavigationProperty Name="Employee1" Type="NorthwindModel.Employee" Partner="Employees1"><ReferentialConstraint Property="ReportsTo" ReferencedProperty="EmployeeID" /></NavigationProperty><NavigationProperty Name="Orders" Type="Collection(NorthwindModel.Order)" Partner="Employee" /><NavigationProperty Name="Territories" Type="Collection(NorthwindModel.Territory)" Partner="Employees" /></EntityType><EntityType Name="Order_Detail"><Key><PropertyRef Name="OrderID" /><PropertyRef Name="ProductID
" /></Key><Property Name="OrderID" Type="Edm.Int32" Nullable="false" /><Property Name="ProductID" Type="Edm.Int32" Nullable="false" /><Property Name="UnitPrice" Type="Edm.Decimal" Nullable="false" Precision="19" Scale="4" /><Property Name="Quantity" Type="Edm.Int16" Nullable="false" /><Property Name="Discount" Type="Edm.Single" Nullable="false" /><NavigationProperty Name="Order" Type="NorthwindModel.Order" Nullable="false" Partner="Order_Details"><ReferentialConstraint Property="OrderID" ReferencedProperty="OrderID" /></NavigationProperty><NavigationProperty Name="Product" Type="NorthwindModel.Product" Nullable="false" Partner="Order_Details"><ReferentialConstraint Property="ProductID" ReferencedProperty="ProductID" /></NavigationProperty></EntityType><EntityType Name="Order"><Key><PropertyRef Name="OrderID" /></Key><Property Name="OrderID" Type="Edm.Int32" Nullable="false" p5:StoreGeneratedPattern="Identity" xmlns:p5="http://schemas.microsoft.com/ado/2009/02/edm/annotation" /><Prop
erty Name="CustomerID" Type="Edm.String" MaxLength="5" /><Property Name="EmployeeID" Type="Edm.Int32" /><Property Name="OrderDate" Type="Edm.DateTimeOffset" /><Property Name="RequiredDate" Type="Edm.DateTimeOffset" /><Property Name="ShippedDate" Type="Edm.DateTimeOffset" /><Property Name="ShipVia" Type="Edm.Int32" /><Property Name="Freight" Type="Edm.Decimal" Precision="19" Scale="4" /><Property Name="ShipName" Type="Edm.String" MaxLength="40" /><Property Name="ShipAddress" Type="Edm.String" MaxLength="60" /><Property Name="ShipCity" Type="Edm.String" MaxLength="15" /><Property Name="ShipRegion" Type="Edm.String" MaxLength="15" /><Property Name="ShipPostalCode" Type="Edm.String" MaxLength="10" /><Property Name="ShipCountry" Type="Edm.String" MaxLength="15" /><NavigationProperty Name="Customer" Type="NorthwindModel.Customer" Partner="Orders"><ReferentialConstraint Property="CustomerID" ReferencedProperty="CustomerID" /></NavigationProperty><NavigationProperty Name="Employee" Type="No
rthwindModel.Employee" Partner="Orders"><ReferentialConstraint Property="EmployeeID" ReferencedProperty="EmployeeID" /></NavigationProperty><NavigationProperty Name="Order_Details" Type="Collection(NorthwindModel.Order_Detail)" Partner="Order" /><NavigationProperty Name="Shipper" Type="NorthwindModel.Shipper" Partner="Orders"><ReferentialConstraint Property="ShipVia" ReferencedProperty="ShipperID" /></NavigationProperty></EntityType><EntityType Name="Product"><Key><PropertyRef Name="ProductID" /></Key><Property Name="ProductID" Type="Edm.Int32" Nullable="false" p5:StoreGeneratedPattern="Identity" xmlns:p5="http://schemas.microsoft.com/ado/2009/02/edm/annotation" /><Property Name="ProductName" Type="Edm.String" Nullable="false" MaxLength="40" /><Property Name="SupplierID" Type="Edm.Int32" /><Property Name="CategoryID" Type="Edm.Int32" /><Property Name="QuantityPerUnit" Type="Edm.String" MaxLength="20" /><Property Name="UnitPrice" Type="Edm.Decimal" Precision="19" Scale="4" /><Propert
y Name="UnitsInStock" Type="Edm.Int16" /><Property Name="UnitsOnOrder" Type="Edm.Int16" /><Property Name="ReorderLevel" Type="Edm.Int16" /><Property Name="Discontinued" Type="Edm.Boolean" Nullable="false" /><NavigationProperty Name="Category" Type="NorthwindModel.Category" Partner="Products"><ReferentialConstraint Property="CategoryID" ReferencedProperty="CategoryID" /></NavigationProperty><NavigationProperty Name="Order_Details" Type="Collection(NorthwindModel.Order_Detail)" Partner="Product" /><NavigationProperty Name="Supplier" Type="NorthwindModel.Supplier" Partner="Products"><ReferentialConstraint Property="SupplierID" ReferencedProperty="SupplierID" /></NavigationProperty></EntityType><EntityType Name="Region"><Key><PropertyRef Name="RegionID" /></Key><Property Name="RegionID" Type="Edm.Int32" Nullable="false" /><Property Name="RegionDescription" Type="Edm.String" Nullable="false" MaxLength="50" /><NavigationProperty Name="Territories" Type="Collection(NorthwindModel.Territory
)" Partner="Region" /></EntityType><EntityType Name="Shipper"><Key><PropertyRef Name="ShipperID" /></Key><Property Name="ShipperID" Type="Edm.Int32" Nullable="false" p5:StoreGeneratedPattern="Identity" xmlns:p5="http://schemas.microsoft.com/ado/2009/02/edm/annotation" /><Property Name="CompanyName" Type="Edm.String" Nullable="false" MaxLength="40" /><Property Name="Phone" Type="Edm.String" MaxLength="24" /><NavigationProperty Name="Orders" Type="Collection(NorthwindModel.Order)" Partner="Shipper" /></EntityType><EntityType Name="Supplier"><Key><PropertyRef Name="SupplierID" /></Key><Property Name="SupplierID" Type="Edm.Int32" Nullable="false" p5:StoreGeneratedPattern="Identity" xmlns:p5="http://schemas.microsoft.com/ado/2009/02/edm/annotation" /><Property Name="CompanyName" Type="Edm.String" Nullable="false" MaxLength="40" /><Property Name="ContactName" Type="Edm.String" MaxLength="30" /><Property Name="ContactTitle" Type="Edm.String" MaxLength="30" /><Property Name="Address" Type="
Edm.String" MaxLength="60" /><Property Name="City" Type="Edm.String" MaxLength="15" /><Property Name="Region" Type="Edm.String" MaxLength="15" /><Property Name="PostalCode" Type="Edm.String" MaxLength="10" /><Property Name="Country" Type="Edm.String" MaxLength="15" /><Property Name="Phone" Type="Edm.String" MaxLength="24" /><Property Name="Fax" Type="Edm.String" MaxLength="24" /><Property Name="HomePage" Type="Edm.String" MaxLength="max" /><NavigationProperty Name="Products" Type="Collection(NorthwindModel.Product)" Partner="Supplier" /></EntityType><EntityType Name="Territory"><Key><PropertyRef Name="TerritoryID" /></Key><Property Name="TerritoryID" Type="Edm.String" Nullable="false" MaxLength="20" /><Property Name="TerritoryDescription" Type="Edm.String" Nullable="false" MaxLength="50" /><Property Name="RegionID" Type="Edm.Int32" Nullable="false" /><NavigationProperty Name="Region" Type="NorthwindModel.Region" Nullable="false" Partner="Territories"><ReferentialConstraint Property=
"RegionID" ReferencedProperty="RegionID" /></NavigationProperty><NavigationProperty Name="Employees" Type="Collection(NorthwindModel.Employee)" Partner="Territories" /></EntityType><EntityType Name="Alphabetical_list_of_product"><Key><PropertyRef Name="CategoryName" /><PropertyRef Name="Discontinued" /><PropertyRef Name="ProductID" /><PropertyRef Name="ProductName" /></Key><Property Name="ProductID" Type="Edm.Int32" Nullable="false" /><Property Name="ProductName" Type="Edm.String" Nullable="false" MaxLength="40" /><Property Name="SupplierID" Type="Edm.Int32" /><Property Name="CategoryID" Type="Edm.Int32" /><Property Name="QuantityPerUnit" Type="Edm.String" MaxLength="20" /><Property Name="UnitPrice" Type="Edm.Decimal" Precision="19" Scale="4" /><Property Name="UnitsInStock" Type="Edm.Int16" /><Property Name="UnitsOnOrder" Type="Edm.Int16" /><Property Name="ReorderLevel" Type="Edm.Int16" /><Property Name="Discontinued" Type="Edm.Boolean" Nullable="false" /><Property Name="CategoryNam
e" Type="Edm.String" Nullable="false" MaxLength="15" /></EntityType><EntityType Name="Category_Sales_for_1997"><Key><PropertyRef Name="CategoryName" /></Key><Property Name="CategoryName" Type="Edm.String" Nullable="false" MaxLength="15" /><Property Name="CategorySales" Type="Edm.Decimal" Precision="19" Scale="4" /></EntityType><EntityType Name="Current_Product_List"><Key><PropertyRef Name="ProductID" /><PropertyRef Name="ProductName" /></Key><Property Name="ProductID" Type="Edm.Int32" Nullable="false" p5:StoreGeneratedPattern="Identity" xmlns:p5="http://schemas.microsoft.com/ado/2009/02/edm/annotation" /><Property Name="ProductName" Type="Edm.String" Nullable="false" MaxLength="40" /></EntityType><EntityType Name="Customer_and_Suppliers_by_City"><Key><PropertyRef Name="CompanyName" /><PropertyRef Name="Relationship" /></Key><Property Name="City" Type="Edm.String" MaxLength="15" /><Property Name="CompanyName" Type="Edm.String" Nullable="false" MaxLength="40" /><Property Name="Contact
Name" Type="Edm.String" MaxLength="30" /><Property Name="Relationship" Type="Edm.String" Nullable="false" MaxLength="9" Unicode="false" /></EntityType><EntityType Name="Invoice"><Key><PropertyRef Name="CustomerName" /><PropertyRef Name="Discount" /><PropertyRef Name="OrderID" /><PropertyRef Name="ProductID" /><PropertyRef Name="ProductName" /><PropertyRef Name="Quantity" /><PropertyRef Name="Salesperson" /><PropertyRef Name="ShipperName" /><PropertyRef Name="UnitPrice" /></Key><Property Name="ShipName" Type="Edm.String" MaxLength="40" /><Property Name="ShipAddress" Type="Edm.String" MaxLength="60" /><Property Name="ShipCity" Type="Edm.String" MaxLength="15" /><Property Name="ShipRegion" Type="Edm.String" MaxLength="15" /><Property Name="ShipPostalCode" Type="Edm.String" MaxLength="10" /><Property Name="ShipCountry" Type="Edm.String" MaxLength="15" /><Property Name="CustomerID" Type="Edm.String" MaxLength="5" /><Property Name="CustomerName" Type="Edm.String" Nullable="false" MaxLengt
h="40" /><Property Name="Address" Type="Edm.String" MaxLength="60" /><Property Name="City" Type="Edm.String" MaxLength="15" /><Property Name="Region" Type="Edm.String" MaxLength="15" /><Property Name="PostalCode" Type="Edm.String" MaxLength="10" /><Property Name="Country" Type="Edm.String" MaxLength="15" /><Property Name="Salesperson" Type="Edm.String" Nullable="false" MaxLength="31" /><Property Name="OrderID" Type="Edm.Int32" Nullable="false" /><Property Name="OrderDate" Type="Edm.DateTimeOffset" /><Property Name="RequiredDate" Type="Edm.DateTimeOffset" /><Property Name="ShippedDate" Type="Edm.DateTimeOffset" /><Property Name="ShipperName" Type="Edm.String" Nullable="false" MaxLength="40" /><Property Name="ProductID" Type="Edm.Int32" Nullable="false" /><Property Name="ProductName" Type="Edm.String" Nullable="false" MaxLength="40" /><Property Name="UnitPrice" Type="Edm.Decimal" Nullable="false" Precision="19" Scale="4" /><Property Name="Quantity" Type="Edm.Int16" Nullable="false" />
<Property Name="Discount" Type="Edm.Single" Nullable="false" /><Property Name="ExtendedPrice" Type="Edm.Decimal" Precision="19" Scale="4" /><Property Name="Freight" Type="Edm.Decimal" Precision="19" Scale="4" /></EntityType><EntityType Name="Order_Details_Extended"><Key><PropertyRef Name="Discount" /><PropertyRef Name="OrderID" /><PropertyRef Name="ProductID" /><PropertyRef Name="ProductName" /><PropertyRef Name="Quantity" /><PropertyRef Name="UnitPrice" /></Key><Property Name="OrderID" Type="Edm.Int32" Nullable="false" /><Property Name="ProductID" Type="Edm.Int32" Nullable="false" /><Property Name="ProductName" Type="Edm.String" Nullable="false" MaxLength="40" /><Property Name="UnitPrice" Type="Edm.Decimal" Nullable="false" Precision="19" Scale="4" /><Property Name="Quantity" Type="Edm.Int16" Nullable="false" /><Property Name="Discount" Type="Edm.Single" Nullable="false" /><Property Name="ExtendedPrice" Type="Edm.Decimal" Precision="19" Scale="4" /></EntityType><EntityType Name="Or
der_Subtotal"><Key><PropertyRef Name="OrderID" /></Key><Property Name="OrderID" Type="Edm.Int32" Nullable="false" /><Property Name="Subtotal" Type="Edm.Decimal" Precision="19" Scale="4" /></EntityType><EntityType Name="Orders_Qry"><Key><PropertyRef Name="CompanyName" /><PropertyRef Name="OrderID" /></Key><Property Name="OrderID" Type="Edm.Int32" Nullable="false" /><Property Name="CustomerID" Type="Edm.String" MaxLength="5" /><Property Name="EmployeeID" Type="Edm.Int32" /><Property Name="OrderDate" Type="Edm.DateTimeOffset" /><Property Name="RequiredDate" Type="Edm.DateTimeOffset" /><Property Name="ShippedDate" Type="Edm.DateTimeOffset" /><Property Name="ShipVia" Type="Edm.Int32" /><Property Name="Freight" Type="Edm.Decimal" Precision="19" Scale="4" /><Property Name="ShipName" Type="Edm.String" MaxLength="40" /><Property Name="ShipAddress" Type="Edm.String" MaxLength="60" /><Property Name="ShipCity" Type="Edm.String" MaxLength="15" /><Property Name="ShipRegion" Type="Edm.String" MaxL
ength="15" /><Property Name="ShipPostalCode" Type="Edm.String" MaxLength="10" /><Property Name="ShipCountry" Type="Edm.String" MaxLength="15" /><Property Name="CompanyName" Type="Edm.String" Nullable="false" MaxLength="40" /><Property Name="Address" Type="Edm.String" MaxLength="60" /><Property Name="City" Type="Edm.String" MaxLength="15" /><Property Name="Region" Type="Edm.String" MaxLength="15" /><Property Name="PostalCode" Type="Edm.String" MaxLength="10" /><Property Name="Country" Type="Edm.String" MaxLength="15" /></EntityType><EntityType Name="Product_Sales_for_1997"><Key><PropertyRef Name="CategoryName" /><PropertyRef Name="ProductName" /></Key><Property Name="CategoryName" Type="Edm.String" Nullable="false" MaxLength="15" /><Property Name="ProductName" Type="Edm.String" Nullable="false" MaxLength="40" /><Property Name="ProductSales" Type="Edm.Decimal" Precision="19" Scale="4" /></EntityType><EntityType Name="Products_Above_Average_Price"><Key><PropertyRef Name="ProductName" /
></Key><Property Name="ProductName" Type="Edm.String" Nullable="false" MaxLength="40" /><Property Name="UnitPrice" Type="Edm.Decimal" Precision="19" Scale="4" /></EntityType><EntityType Name="Products_by_Category"><Key><PropertyRef Name="CategoryName" /><PropertyRef Name="Discontinued" /><PropertyRef Name="ProductName" /></Key><Property Name="CategoryName" Type="Edm.String" Nullable="false" MaxLength="15" /><Property Name="ProductName" Type="Edm.String" Nullable="false" MaxLength="40" /><Property Name="QuantityPerUnit" Type="Edm.String" MaxLength="20" /><Property Name="UnitsInStock" Type="Edm.Int16" /><Property Name="Discontinued" Type="Edm.Boolean" Nullable="false" /></EntityType><EntityType Name="Sales_by_Category"><Key><PropertyRef Name="CategoryID" /><PropertyRef Name="CategoryName" /><PropertyRef Name="ProductName" /></Key><Property Name="CategoryID" Type="Edm.Int32" Nullable="false" /><Property Name="CategoryName" Type="Edm.String" Nullable="false" MaxLength="15" /><Property N
ame="ProductName" Type="Edm.String" Nullable="false" MaxLength="40" /><Property Name="ProductSales" Type="Edm.Decimal" Precision="19" Scale="4" /></EntityType><EntityType Name="Sales_Totals_by_Amount"><Key><PropertyRef Name="CompanyName" /><PropertyRef Name="OrderID" /></Key><Property Name="SaleAmount" Type="Edm.Decimal" Precision="19" Scale="4" /><Property Name="OrderID" Type="Edm.Int32" Nullable="false" /><Property Name="CompanyName" Type="Edm.String" Nullable="false" MaxLength="40" /><Property Name="ShippedDate" Type="Edm.DateTimeOffset" /></EntityType><EntityType Name="Summary_of_Sales_by_Quarter"><Key><PropertyRef Name="OrderID" /></Key><Property Name="ShippedDate" Type="Edm.DateTimeOffset" /><Property Name="OrderID" Type="Edm.Int32" Nullable="false" /><Property Name="Subtotal" Type="Edm.Decimal" Precision="19" Scale="4" /></EntityType><EntityType Name="Summary_of_Sales_by_Year"><Key><PropertyRef Name="OrderID" /></Key><Property Name="ShippedDate" Type="Edm.DateTimeOffset" /><P
roperty Name="OrderID" Type="Edm.Int32" Nullable="false" /><Property Name="Subtotal" Type="Edm.Decimal" Precision="19" Scale="4" /></EntityType><Annotations Target="ODataWebExperimental.Northwind.Model.NorthwindEntities"><Annotation Term="Com.Microsoft.OData.Service.Conventions.V1.UrlConventions" String="KeyAsSegment" /></Annotations></Schema><Schema Namespace="ODataWebExperimental.Northwind.Model" xmlns="http://docs.oasis-open.org/odata/ns/edm"><EntityContainer Name="NorthwindEntities" p4:LazyLoadingEnabled="true" xmlns:p4="http://schemas.microsoft.com/ado/2009/02/edm/annotation"><EntitySet Name="Categories" EntityType="NorthwindModel.Category"><NavigationPropertyBinding Path="Products" Target="Products" /></EntitySet><EntitySet Name="CustomerDemographics" EntityType="NorthwindModel.CustomerDemographic"><NavigationPropertyBinding Path="Customers" Target="Customers" /></EntitySet><EntitySet Name="Customers" EntityType="NorthwindModel.Customer"><NavigationPropertyBinding Path="Custom
erDemographics" Target="CustomerDemographics" /><NavigationPropertyBinding Path="Orders" Target="Orders" /></EntitySet><EntitySet Name="Employees" EntityType="NorthwindModel.Employee"><NavigationPropertyBinding Path="Employees1" Target="Employees" /><NavigationPropertyBinding Path="Employee1" Target="Employees" /><NavigationPropertyBinding Path="Orders" Target="Orders" /><NavigationPropertyBinding Path="Territories" Target="Territories" /></EntitySet><EntitySet Name="Order_Details" EntityType="NorthwindModel.Order_Detail"><NavigationPropertyBinding Path="Order" Target="Orders" /><NavigationPropertyBinding Path="Product" Target="Products" /></EntitySet><EntitySet Name="Orders" EntityType="NorthwindModel.Order"><NavigationPropertyBinding Path="Customer" Target="Customers" /><NavigationPropertyBinding Path="Employee" Target="Employees" /><NavigationPropertyBinding Path="Order_Details" Target="Order_Details" /><NavigationPropertyBinding Path="Shipper" Target="Shippers" /></EntitySet><En
titySet Name="Products" EntityType="NorthwindModel.Product"><NavigationPropertyBinding Path="Category" Target="Categories" /><NavigationPropertyBinding Path="Order_Details" Target="Order_Details" /><NavigationPropertyBinding Path="Supplier" Target="Suppliers" /></EntitySet><EntitySet Name="Regions" EntityType="NorthwindModel.Region"><NavigationPropertyBinding Path="Territories" Target="Territories" /></EntitySet><EntitySet Name="Shippers" EntityType="NorthwindModel.Shipper"><NavigationPropertyBinding Path="Orders" Target="Orders" /></EntitySet><EntitySet Name="Suppliers" EntityType="NorthwindModel.Supplier"><NavigationPropertyBinding Path="Products" Target="Products" /></EntitySet><EntitySet Name="Territories" EntityType="NorthwindModel.Territory"><NavigationPropertyBinding Path="Employees" Target="Employees" /><NavigationPropertyBinding Path="Region" Target="Regions" /></EntitySet><EntitySet Name="Alphabetical_list_of_products" EntityType="NorthwindModel.Alphabetical_list_of_produc
t" /><EntitySet Name="Category_Sales_for_1997" EntityType="NorthwindModel.Category_Sales_for_1997" /><EntitySet Name="Current_Product_Lists" EntityType="NorthwindModel.Current_Product_List" /><EntitySet Name="Customer_and_Suppliers_by_Cities" EntityType="NorthwindModel.Customer_and_Suppliers_by_City" /><EntitySet Name="Invoices" EntityType="NorthwindModel.Invoice" /><EntitySet Name="Order_Details_Extendeds" EntityType="NorthwindModel.Order_Details_Extended" /><EntitySet Name="Order_Subtotals" EntityType="NorthwindModel.Order_Subtotal" /><EntitySet Name="Orders_Qries" EntityType="NorthwindModel.Orders_Qry" /><EntitySet Name="Product_Sales_for_1997" EntityType="NorthwindModel.Product_Sales_for_1997" /><EntitySet Name="Products_Above_Average_Prices" EntityType="NorthwindModel.Products_Above_Average_Price" /><EntitySet Name="Products_by_Categories" EntityType="NorthwindModel.Products_by_Category" /><EntitySet Name="Sales_by_Categories" EntityType="NorthwindModel.Sales_by_Category" /><En
titySet Name="Sales_Totals_by_Amounts" EntityType="NorthwindModel.Sales_Totals_by_Amount" /><EntitySet Name="Summary_of_Sales_by_Quarters" EntityType="NorthwindModel.Summary_of_Sales_by_Quarter" /><EntitySet Name="Summary_of_Sales_by_Years" EntityType="NorthwindModel.Summary_of_Sales_by_Year" /></EntityContainer></Schema></edmx:DataServices></edmx:Edmx>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/serviceDocument.json
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/serviceDocument.json b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/serviceDocument.json
deleted file mode 100644
index 2e7f066..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/serviceDocument.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "@odata.context": "http://host/service/$metadata",
- "value": [
- {
- "name": "Orders",
- "kind": "EntitySet",
- "url": "Orders"
- },
- {
- "name": "OrderItems",
- "title": "Order Details",
- "url": "OrderItems"
- },
- {
- "name": "TopProducts",
- "title": "Best-Selling Products",
- "kind": "FunctionImport",
- "url": "TopProducts"
- },
- {
- "name": "Contoso",
- "title": "Contoso Ltd.",
- "kind": "Singleton",
- "url": "Contoso"
- },
- {
- "name": "Human Resources",
- "kind": "ServiceDocument",
- "url": "http://host/HR/"
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/serviceDocument.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/serviceDocument.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/serviceDocument.xml
deleted file mode 100644
index faddf9c..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v4/serviceDocument.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- 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.
-
--->
-<app:service xmlns:app="http://www.w3.org/2007/app"
- xmlns:atom="http://www.w3.org/2005/Atom"
- xmlns:metadata="http://docs.oasis-open.org/odata/ns/metadata"
- xml:base="http://host/service/"
- metadata:context="$metadata"
- metadata:metadata-etag="W/"MjAxMy0wNS0xM1QxNDo1NFo="">
- <app:workspace>
- <atom:title type="text">Data</atom:title>
- <app:collection href="Orders">
- <atom:title type="text">Orders</atom:title>
- </app:collection>
- <app:collection href="OrderItems">
- <atom:title type="text">Order Details</atom:title>
- </app:collection>
- <metadata:function-import href="TopProducts">
- <atom:title>Best-Selling Products</atom:title>
- </metadata:function-import>
- <metadata:singleton href="Contoso">
- <atom:title>Contoso Ltd.</atom:title>
- </metadata:singleton>
- <metadata:service-document href="http://host/HR/">
- <atom:title>Human Resources</atom:title>
- </metadata:service-document>
- </app:workspace>
-</app:service>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/images/20051210-w50s.flv
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/images/20051210-w50s.flv b/ODataJClient/engine/src/test/resources/images/20051210-w50s.flv
deleted file mode 100644
index 5763191..0000000
Binary files a/ODataJClient/engine/src/test/resources/images/20051210-w50s.flv and /dev/null differ
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/images/Renault.jpg
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/images/Renault.jpg b/ODataJClient/engine/src/test/resources/images/Renault.jpg
deleted file mode 100644
index 2a90038..0000000
Binary files a/ODataJClient/engine/src/test/resources/images/Renault.jpg and /dev/null differ
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/images/Wildlife.wmv
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/images/Wildlife.wmv b/ODataJClient/engine/src/test/resources/images/Wildlife.wmv
deleted file mode 100644
index bc3ff06..0000000
Binary files a/ODataJClient/engine/src/test/resources/images/Wildlife.wmv and /dev/null differ
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/images/big_buck_bunny.mp4
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/images/big_buck_bunny.mp4 b/ODataJClient/engine/src/test/resources/images/big_buck_bunny.mp4
deleted file mode 100644
index 81d11df..0000000
Binary files a/ODataJClient/engine/src/test/resources/images/big_buck_bunny.mp4 and /dev/null differ
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/images/desktop.ini
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/images/desktop.ini b/ODataJClient/engine/src/test/resources/images/desktop.ini
deleted file mode 100644
index a096959..0000000
--- a/ODataJClient/engine/src/test/resources/images/desktop.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[LocalizedFileNames]
-Wildlife.wmv=@%systemroot%\system32\SampleRes.dll,-142
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/images/edesk.jpg
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/images/edesk.jpg b/ODataJClient/engine/src/test/resources/images/edesk.jpg
deleted file mode 100644
index 1086a21..0000000
Binary files a/ODataJClient/engine/src/test/resources/images/edesk.jpg and /dev/null differ
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/images/edesk.png
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/images/edesk.png b/ODataJClient/engine/src/test/resources/images/edesk.png
deleted file mode 100644
index 7545383..0000000
Binary files a/ODataJClient/engine/src/test/resources/images/edesk.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/images/image1.jpg
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/images/image1.jpg b/ODataJClient/engine/src/test/resources/images/image1.jpg
deleted file mode 100644
index 5074d1a..0000000
Binary files a/ODataJClient/engine/src/test/resources/images/image1.jpg and /dev/null differ
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/images/image1.png
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/images/image1.png b/ODataJClient/engine/src/test/resources/images/image1.png
deleted file mode 100644
index c65fba8..0000000
Binary files a/ODataJClient/engine/src/test/resources/images/image1.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/images/image2.jpeg
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/images/image2.jpeg b/ODataJClient/engine/src/test/resources/images/image2.jpeg
deleted file mode 100644
index 5074d1a..0000000
Binary files a/ODataJClient/engine/src/test/resources/images/image2.jpeg and /dev/null differ
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/images/smallimage.bmp
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/images/smallimage.bmp b/ODataJClient/engine/src/test/resources/images/smallimage.bmp
deleted file mode 100644
index a7a472a..0000000
Binary files a/ODataJClient/engine/src/test/resources/images/smallimage.bmp and /dev/null differ
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/images/smallimage.jpg
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/images/smallimage.jpg b/ODataJClient/engine/src/test/resources/images/smallimage.jpg
deleted file mode 100644
index ad17df2..0000000
Binary files a/ODataJClient/engine/src/test/resources/images/smallimage.jpg and /dev/null differ
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/images/smallimage.png
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/images/smallimage.png b/ODataJClient/engine/src/test/resources/images/smallimage.png
deleted file mode 100644
index ce8b16d..0000000
Binary files a/ODataJClient/engine/src/test/resources/images/smallimage.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/images/smallimage.tif
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/images/smallimage.tif b/ODataJClient/engine/src/test/resources/images/smallimage.tif
deleted file mode 100644
index a5201ed..0000000
Binary files a/ODataJClient/engine/src/test/resources/images/smallimage.tif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/odatajclient-perf.xls
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/odatajclient-perf.xls b/ODataJClient/engine/src/test/resources/odatajclient-perf.xls
deleted file mode 100644
index fae8582..0000000
Binary files a/ODataJClient/engine/src/test/resources/odatajclient-perf.xls and /dev/null differ
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/sample.png
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/sample.png b/ODataJClient/engine/src/test/resources/sample.png
deleted file mode 100644
index 399ee46..0000000
Binary files a/ODataJClient/engine/src/test/resources/sample.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/simplelogger.properties
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/simplelogger.properties b/ODataJClient/engine/src/test/resources/simplelogger.properties
deleted file mode 100644
index 86f9ce6..0000000
--- a/ODataJClient/engine/src/test/resources/simplelogger.properties
+++ /dev/null
@@ -1,20 +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.
-#
-
-org.slf4j.simpleLogger.defaultLogLevel=debug
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/test.properties
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/test.properties b/ODataJClient/engine/src/test/resources/test.properties
deleted file mode 100644
index 41c6246..0000000
--- a/ODataJClient/engine/src/test/resources/test.properties
+++ /dev/null
@@ -1,20 +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.
-#
-
-test.base.url=${test.base.url}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/extensions/oauth-signpost/pom.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/extensions/oauth-signpost/pom.xml b/ODataJClient/extensions/oauth-signpost/pom.xml
deleted file mode 100644
index 363c6e1..0000000
--- a/ODataJClient/extensions/oauth-signpost/pom.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-extensions</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- </parent>
-
- <name>Client OData library for Java: Extensions (OAuth-SignPost)</name>
- <description>Java client API for OData 3.0 services: Extensions (OAuth-SignPost)</description>
- <groupId>com.msopentech.odatajclient.extensions</groupId>
- <artifactId>odatajclient-oauth-signpost</artifactId>
- <packaging>jar</packaging>
-
- <properties>
- <main.basedir>${project.parent.basedir}/../</main.basedir>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-engine</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>oauth.signpost</groupId>
- <artifactId>signpost-commonshttp4</artifactId>
- <version>1.2.1.2</version>
- </dependency>
- </dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- <resource>
- <directory>../..</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE</include>
- </includes>
- </resource>
- </resources>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/extensions/oauth-signpost/src/main/java/com/msopentech/odatajclient/engine/client/http/AbstractOAuthSignPostHttpUriRequestFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/extensions/oauth-signpost/src/main/java/com/msopentech/odatajclient/engine/client/http/AbstractOAuthSignPostHttpUriRequestFactory.java b/ODataJClient/extensions/oauth-signpost/src/main/java/com/msopentech/odatajclient/engine/client/http/AbstractOAuthSignPostHttpUriRequestFactory.java
deleted file mode 100644
index f7bea72..0000000
--- a/ODataJClient/extensions/oauth-signpost/src/main/java/com/msopentech/odatajclient/engine/client/http/AbstractOAuthSignPostHttpUriRequestFactory.java
+++ /dev/null
@@ -1,55 +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 com.msopentech.odatajclient.engine.client.http;
-
-import java.net.URI;
-import oauth.signpost.OAuthConsumer;
-import oauth.signpost.commonshttp.CommonsHttpOAuthConsumer;
-import org.apache.http.client.methods.HttpUriRequest;
-
-/**
- * Base implementation for working with OAuth via <a href="https://code.google.com/p/oauth-signpost/">signpost</a>:
- * needs to be subclassed in order to provide actual OAuth authentication details.
- */
-public abstract class AbstractOAuthSignPostHttpUriRequestFactory extends DefaultHttpUriRequestFactory {
-
- protected abstract String getConsumerKey();
-
- protected abstract String getConsumerSecret();
-
- protected abstract String getAccessToken();
-
- protected abstract String getTokenSecret();
-
- @Override
- public HttpUriRequest createHttpUriRequest(final HttpMethod method, final URI uri) {
- final HttpUriRequest request = super.createHttpUriRequest(method, uri);
-
- final OAuthConsumer consumer = new CommonsHttpOAuthConsumer(getConsumerKey(), getConsumerSecret());
- consumer.setTokenWithSecret(getAccessToken(), getTokenSecret());
-
- try {
- consumer.sign(request);
- } catch (Exception e) {
- throw new IllegalStateException("Could not sign request via OAuth", e);
- }
-
- return request;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/extensions/pom.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/extensions/pom.xml b/ODataJClient/extensions/pom.xml
deleted file mode 100644
index 95412f1..0000000
--- a/ODataJClient/extensions/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- </parent>
-
- <name>Client OData library for Java: Extensions</name>
- <description>Java client API for OData 3.0 services: Extensions</description>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-extensions</artifactId>
- <packaging>pom</packaging>
-
- <properties>
- <main.basedir>${project.parent.basedir}</main.basedir>
- </properties>
-
- <modules>
- <module>oauth-signpost</module>
- </modules>
-
-</project>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/pom.xml b/ODataJClient/maven-plugin/pom.xml
deleted file mode 100644
index afb856b..0000000
--- a/ODataJClient/maven-plugin/pom.xml
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- </parent>
-
- <name>Client OData library for Java: POJOs generator </name>
- <description>Java client API for OData 3.0 services: Maven plugin generating POJOs from metadata.</description>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-maven-plugin</artifactId>
- <packaging>maven-plugin</packaging>
-
- <properties>
- <serviceRootURL>${test.base.url}</serviceRootURL>
- <main.basedir>${project.parent.basedir}</main.basedir>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-engine</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-annotations</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <goalPrefix>odatajclient</goalPrefix>
- <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
- </configuration>
- <executions>
- <execution>
- <id>mojo-descriptor</id>
- <goals>
- <goal>descriptor</goal>
- </goals>
- </execution>
- <execution>
- <id>help-goal</id>
- <goals>
- <goal>helpmojo</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
-
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- <resource>
- <directory>..</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE</include>
- </includes>
- </resource>
- </resources>
-
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
- </build>
-
- <profiles>
- <profile>
- <id>it</id>
-
- <dependencies>
- <dependency>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-proxy</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-test-service</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- <testResource>
- <directory>${basedir}/../test-service/src/main/resources</directory>
- <filtering>true</filtering>
- </testResource>
- <testResource>
- <directory>${basedir}/../staticServer/src/main/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-invoker-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <debug>true</debug>
- <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
- <pomIncludes>
- <pomInclude>*/pom.xml</pomInclude>
- </pomIncludes>
- <postBuildHookScript>verify</postBuildHookScript>
- <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
- <settingsFile>src/it/settings.xml</settingsFile>
- <goals>
- <goal>clean</goal>
- <goal>test-compile</goal>
- </goals>
- </configuration>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>install</goal>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-plugin</artifactId>
- <executions>
- <execution>
- <id>start-container</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start</goal>
- </goals>
- </execution>
- <execution>
- <id>stop-container</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>stop</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/it/actionOverloadingService/pom.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/it/actionOverloadingService/pom.xml b/ODataJClient/maven-plugin/src/it/actionOverloadingService/pom.xml
deleted file mode 100644
index 6bec939..0000000
--- a/ODataJClient/maven-plugin/src/it/actionOverloadingService/pom.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-maven-plugin</artifactId>
- <version>@project.version@</version>
-
- <description>A simple IT verifying the basic use case.</description>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>@velocity.version@</version>
- </dependency>
-
- <dependency>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-proxy</artifactId>
- <version>@project.version@</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
- <executions>
- <execution>
- <phase>process-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${project.build.directory}/generated-sources</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>@project.groupId@</groupId>
- <artifactId>@project.artifactId@</artifactId>
- <version>@project.version@</version>
- <executions>
- <execution>
- <configuration>
- <outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
- <serviceRootURL>@serviceRootURL@/ActionOverloadingService.svc</serviceRootURL>
- <basePackage>com.msopentech.odatajclient.proxy.actionoverloadingservice</basePackage>
- </configuration>
- <id>pojosV3</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>pojosV3</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/it/actionOverloadingService/verify.groovy
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/it/actionOverloadingService/verify.groovy b/ODataJClient/maven-plugin/src/it/actionOverloadingService/verify.groovy
deleted file mode 100644
index a19cf4d..0000000
--- a/ODataJClient/maven-plugin/src/it/actionOverloadingService/verify.groovy
+++ /dev/null
@@ -1,20 +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.
- */
-File basepkg = new File( basedir, "target/generated-sources/ojc-plugin/com/msopentech/odatajclient/proxy" );
-assert basepkg.isDirectory() && basepkg.listFiles().length>0;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/it/defaultService/pom.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/it/defaultService/pom.xml b/ODataJClient/maven-plugin/src/it/defaultService/pom.xml
deleted file mode 100644
index bea5ac3..0000000
--- a/ODataJClient/maven-plugin/src/it/defaultService/pom.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-maven-plugin</artifactId>
- <version>@project.version@</version>
-
- <description>A simple IT verifying the basic use case.</description>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>@velocity.version@</version>
- </dependency>
-
- <dependency>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-proxy</artifactId>
- <version>@project.version@</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
- <executions>
- <execution>
- <phase>process-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${project.build.directory}/generated-sources</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>@project.groupId@</groupId>
- <artifactId>@project.artifactId@</artifactId>
- <version>@project.version@</version>
- <executions>
- <execution>
- <configuration>
- <outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
- <serviceRootURL>@serviceRootURL@/DefaultService.svc</serviceRootURL>
- <basePackage>com.msopentech.odatajclient.proxy.defaultservice</basePackage>
- </configuration>
- <id>pojosV3</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>pojosV3</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/it/defaultService/verify.groovy
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/it/defaultService/verify.groovy b/ODataJClient/maven-plugin/src/it/defaultService/verify.groovy
deleted file mode 100644
index a19cf4d..0000000
--- a/ODataJClient/maven-plugin/src/it/defaultService/verify.groovy
+++ /dev/null
@@ -1,20 +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.
- */
-File basepkg = new File( basedir, "target/generated-sources/ojc-plugin/com/msopentech/odatajclient/proxy" );
-assert basepkg.isDirectory() && basepkg.listFiles().length>0;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/it/keyAsSegmentService/pom.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/it/keyAsSegmentService/pom.xml b/ODataJClient/maven-plugin/src/it/keyAsSegmentService/pom.xml
deleted file mode 100644
index 4d36760..0000000
--- a/ODataJClient/maven-plugin/src/it/keyAsSegmentService/pom.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-maven-plugin</artifactId>
- <version>@project.version@</version>
-
- <description>A simple IT verifying the basic use case.</description>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>@velocity.version@</version>
- </dependency>
-
- <dependency>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-proxy</artifactId>
- <version>@project.version@</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
- <executions>
- <execution>
- <phase>process-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${project.build.directory}/generated-sources</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>@project.groupId@</groupId>
- <artifactId>@project.artifactId@</artifactId>
- <version>@project.version@</version>
- <executions>
- <execution>
- <configuration>
- <outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
- <serviceRootURL>@serviceRootURL@/KeyAsSegmentService.svc</serviceRootURL>
- <basePackage>com.msopentech.odatajclient.proxy.keyassegmentservice</basePackage>
- </configuration>
- <id>pojosV3</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>pojosV3</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/it/keyAsSegmentService/verify.groovy
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/it/keyAsSegmentService/verify.groovy b/ODataJClient/maven-plugin/src/it/keyAsSegmentService/verify.groovy
deleted file mode 100644
index a19cf4d..0000000
--- a/ODataJClient/maven-plugin/src/it/keyAsSegmentService/verify.groovy
+++ /dev/null
@@ -1,20 +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.
- */
-File basepkg = new File( basedir, "target/generated-sources/ojc-plugin/com/msopentech/odatajclient/proxy" );
-assert basepkg.isDirectory() && basepkg.listFiles().length>0;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/it/northwind/pom.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/it/northwind/pom.xml b/ODataJClient/maven-plugin/src/it/northwind/pom.xml
deleted file mode 100644
index c53f757..0000000
--- a/ODataJClient/maven-plugin/src/it/northwind/pom.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-maven-plugin</artifactId>
- <version>@project.version@</version>
-
- <description>A simple IT verifying the basic use case.</description>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>@velocity.version@</version>
- </dependency>
-
- <dependency>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-proxy</artifactId>
- <version>@project.version@</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
- <executions>
- <execution>
- <phase>process-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${project.build.directory}/generated-sources</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>@project.groupId@</groupId>
- <artifactId>@project.artifactId@</artifactId>
- <version>@project.version@</version>
- <executions>
- <execution>
- <configuration>
- <outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
- <serviceRootURL>http://services.odata.org/v3/(S(g00nkir0ssikgdmz3maw5l1x))/Northwind/Northwind.svc</serviceRootURL>
- <basePackage>com.msopentech.odatajclient.proxy.northwind</basePackage>
- </configuration>
- <id>pojosV3</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>pojosV3</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/it/northwind/verify.groovy
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/it/northwind/verify.groovy b/ODataJClient/maven-plugin/src/it/northwind/verify.groovy
deleted file mode 100644
index a19cf4d..0000000
--- a/ODataJClient/maven-plugin/src/it/northwind/verify.groovy
+++ /dev/null
@@ -1,20 +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.
- */
-File basepkg = new File( basedir, "target/generated-sources/ojc-plugin/com/msopentech/odatajclient/proxy" );
-assert basepkg.isDirectory() && basepkg.listFiles().length>0;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/it/odataWriterDefaultService/pom.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/it/odataWriterDefaultService/pom.xml b/ODataJClient/maven-plugin/src/it/odataWriterDefaultService/pom.xml
deleted file mode 100644
index 630f863..0000000
--- a/ODataJClient/maven-plugin/src/it/odataWriterDefaultService/pom.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-maven-plugin</artifactId>
- <version>@project.version@</version>
-
- <description>A simple IT verifying the basic use case.</description>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>@velocity.version@</version>
- </dependency>
-
- <dependency>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-proxy</artifactId>
- <version>@project.version@</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
- <executions>
- <execution>
- <phase>process-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${project.build.directory}/generated-sources</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>@project.groupId@</groupId>
- <artifactId>@project.artifactId@</artifactId>
- <version>@project.version@</version>
- <executions>
- <execution>
- <configuration>
- <outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
- <serviceRootURL>@serviceRootURL@/ODataWriterDefaultService.svc</serviceRootURL>
- <basePackage>com.msopentech.odatajclient.proxy.odatawriterdefaultservice</basePackage>
- </configuration>
- <id>pojosV3</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>pojosV3</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/it/odataWriterDefaultService/verify.groovy
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/it/odataWriterDefaultService/verify.groovy b/ODataJClient/maven-plugin/src/it/odataWriterDefaultService/verify.groovy
deleted file mode 100644
index a19cf4d..0000000
--- a/ODataJClient/maven-plugin/src/it/odataWriterDefaultService/verify.groovy
+++ /dev/null
@@ -1,20 +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.
- */
-File basepkg = new File( basedir, "target/generated-sources/ojc-plugin/com/msopentech/odatajclient/proxy" );
-assert basepkg.isDirectory() && basepkg.listFiles().length>0;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/it/openTypeService/pom.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/it/openTypeService/pom.xml b/ODataJClient/maven-plugin/src/it/openTypeService/pom.xml
deleted file mode 100644
index 68b871a..0000000
--- a/ODataJClient/maven-plugin/src/it/openTypeService/pom.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-maven-plugin</artifactId>
- <version>@project.version@</version>
-
- <description>A simple IT verifying the basic use case.</description>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>@velocity.version@</version>
- </dependency>
-
- <dependency>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-proxy</artifactId>
- <version>@project.version@</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
- <executions>
- <execution>
- <phase>process-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${project.build.directory}/generated-sources</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>@project.groupId@</groupId>
- <artifactId>@project.artifactId@</artifactId>
- <version>@project.version@</version>
- <executions>
- <execution>
- <configuration>
- <outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
- <serviceRootURL>@serviceRootURL@/OpenTypeService.svc</serviceRootURL>
- <basePackage>com.msopentech.odatajclient.proxy.opentypeservice</basePackage>
- </configuration>
- <id>pojosV3</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>pojosV3</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/it/openTypeService/verify.groovy
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/it/openTypeService/verify.groovy b/ODataJClient/maven-plugin/src/it/openTypeService/verify.groovy
deleted file mode 100644
index a19cf4d..0000000
--- a/ODataJClient/maven-plugin/src/it/openTypeService/verify.groovy
+++ /dev/null
@@ -1,20 +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.
- */
-File basepkg = new File( basedir, "target/generated-sources/ojc-plugin/com/msopentech/odatajclient/proxy" );
-assert basepkg.isDirectory() && basepkg.listFiles().length>0;
[42/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractODataReader.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractODataReader.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractODataReader.java
deleted file mode 100644
index a388716..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractODataReader.java
+++ /dev/null
@@ -1,159 +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 com.msopentech.odatajclient.engine.data.impl;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.data.ODataEntitySet;
-import com.msopentech.odatajclient.engine.data.ODataEntitySetIterator;
-import com.msopentech.odatajclient.engine.data.ODataError;
-import com.msopentech.odatajclient.engine.data.ODataLinkCollection;
-import com.msopentech.odatajclient.engine.data.ODataProperty;
-import com.msopentech.odatajclient.engine.data.ODataReader;
-import com.msopentech.odatajclient.engine.data.ODataServiceDocument;
-import com.msopentech.odatajclient.engine.data.ODataValue;
-import com.msopentech.odatajclient.engine.data.ResourceFactory;
-import com.msopentech.odatajclient.engine.metadata.AbstractEdmMetadata;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import com.msopentech.odatajclient.engine.format.ODataValueFormat;
-import com.msopentech.odatajclient.engine.utils.ODataConstants;
-import java.io.InputStream;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public abstract class AbstractODataReader implements ODataReader {
-
- private static final long serialVersionUID = -1988865870981207079L;
-
- /**
- * Logger.
- */
- protected static final Logger LOG = LoggerFactory.getLogger(AbstractODataReader.class);
-
- protected final ODataClient client;
-
- protected AbstractODataReader(final ODataClient client) {
- this.client = client;
- }
-
- @Override
- public ODataEntitySet readEntitySet(final InputStream input, final ODataPubFormat format) {
- return client.getBinder().getODataEntitySet(
- client.getDeserializer().toFeed(input, ResourceFactory.feedClassForFormat(format)));
- }
-
- @Override
- public ODataEntity readEntity(final InputStream input, final ODataPubFormat format) {
- return client.getBinder().getODataEntity(
- client.getDeserializer().toEntry(input, ResourceFactory.entryClassForFormat(format)));
- }
-
- @Override
- public ODataProperty readProperty(final InputStream input, final ODataFormat format) {
- final Element property = client.getDeserializer().toPropertyDOM(input, format);
-
- // The ODataProperty object is used either for actual entity properties and for invoke result (when return type
- // is neither an entity nor a collection of entities).
- // Such formats are mostly the same except for collections: an entity property looks like
- // <aproperty m:type="Collection(AType)">
- // <element>....</element>
- // </aproperty>
- //
- // while an invoke result with returnType="Collection(AnotherType)" looks like
- // <functionImportName>
- // <element m:type="AnotherType">...</element>
- // <functionImportName>
- //
- // The code below is meant for "normalizing" the latter into
- // <functionImportName m:type="Collection(AnotherType)">
- // <element m:type="AnotherType">...</element>
- // <functionImportName>
- final String type = property.getAttribute(ODataConstants.ATTR_M_TYPE);
- final NodeList elements = property.getElementsByTagName(ODataConstants.ELEM_ELEMENT);
- if (StringUtils.isBlank(type) && elements != null && elements.getLength() > 0) {
- final Node elementType = elements.item(0).getAttributes().getNamedItem(ODataConstants.ATTR_M_TYPE);
- if (elementType != null) {
- property.setAttribute(ODataConstants.ATTR_M_TYPE, "Collection(" + elementType.getTextContent() + ")");
- }
- }
-
- return client.getBinder().getProperty(property);
- }
-
- @Override
- public ODataLinkCollection readLinks(final InputStream input, final ODataFormat format) {
- return client.getBinder().getLinkCollection(
- client.getDeserializer().toLinkCollection(input, format));
- }
-
- @Override
- public ODataError readError(final InputStream inputStream, final boolean isXML) {
- return client.getDeserializer().toODataError(inputStream, isXML);
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public <T> T read(final InputStream src, final String format, final Class<T> reference) {
- Object res;
-
- try {
- if (ODataEntitySetIterator.class.isAssignableFrom(reference)) {
- res = new ODataEntitySetIterator(client, src, ODataPubFormat.fromString(format));
- } else if (ODataEntitySet.class.isAssignableFrom(reference)) {
- res = readEntitySet(src, ODataPubFormat.fromString(format));
- } else if (ODataEntity.class.isAssignableFrom(reference)) {
- res = readEntity(src, ODataPubFormat.fromString(format));
- } else if (ODataProperty.class.isAssignableFrom(reference)) {
- res = readProperty(src, ODataFormat.fromString(format));
- } else if (ODataLinkCollection.class.isAssignableFrom(reference)) {
- res = readLinks(src, ODataFormat.fromString(format));
- } else if (ODataValue.class.isAssignableFrom(reference)) {
- res = client.getPrimitiveValueBuilder().
- setType(ODataValueFormat.fromString(format) == ODataValueFormat.TEXT
- ? EdmSimpleType.String : EdmSimpleType.Stream).
- setText(IOUtils.toString(src)).
- build();
- } else if (AbstractEdmMetadata.class.isAssignableFrom(reference)) {
- res = readMetadata(src);
- } else if (ODataServiceDocument.class.isAssignableFrom(reference)) {
- res = readServiceDocument(src, ODataFormat.fromString(format));
- } else if (ODataError.class.isAssignableFrom(reference)) {
- res = readError(src, !format.toString().contains("json"));
- } else {
- throw new IllegalArgumentException("Invalid reference type " + reference);
- }
- } catch (Exception e) {
- LOG.warn("Cast error", e);
- res = null;
- } finally {
- if (!ODataEntitySetIterator.class.isAssignableFrom(reference)) {
- IOUtils.closeQuietly(src);
- }
- }
-
- return (T) res;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractODataSerializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractODataSerializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractODataSerializer.java
deleted file mode 100644
index 23556ed..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractODataSerializer.java
+++ /dev/null
@@ -1,179 +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 com.msopentech.odatajclient.engine.data.impl;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.data.Entry;
-import com.msopentech.odatajclient.engine.data.Feed;
-import com.msopentech.odatajclient.engine.data.ODataLink;
-import com.msopentech.odatajclient.engine.data.ODataSerializer;
-import com.msopentech.odatajclient.engine.data.impl.v3.AtomEntry;
-import com.msopentech.odatajclient.engine.data.impl.v3.AtomFeed;
-import com.msopentech.odatajclient.engine.data.impl.v3.AtomSerializer;
-import com.msopentech.odatajclient.engine.data.impl.v3.JSONFeed;
-import com.msopentech.odatajclient.engine.data.impl.v3.JSONProperty;
-import com.msopentech.odatajclient.engine.data.impl.v3.JSONEntry;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import com.msopentech.odatajclient.engine.utils.ODataConstants;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-import com.msopentech.odatajclient.engine.utils.XMLUtils;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import javax.xml.parsers.DocumentBuilder;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public abstract class AbstractODataSerializer extends AbstractJacksonTool implements ODataSerializer {
-
- private static final long serialVersionUID = -357777648541325363L;
-
- private final AtomSerializer atomSerializer;
-
- public AbstractODataSerializer(final ODataClient client) {
- super(client);
- this.atomSerializer = new AtomSerializer(client);
- }
-
- @Override
- public <T extends Feed> void feed(final T obj, final OutputStream out) {
- feed(obj, new OutputStreamWriter(out));
- }
-
- @Override
- public <T extends Feed> void feed(final T obj, final Writer writer) {
- if (obj instanceof AtomFeed) {
- atom((AtomFeed) obj, writer);
- } else {
- json((JSONFeed) obj, writer);
- }
- }
-
- @Override
- public <T extends Entry> void entry(final T obj, final OutputStream out) {
- entry(obj, new OutputStreamWriter(out));
- }
-
- @Override
- public <T extends Entry> void entry(final T obj, final Writer writer) {
- if (obj instanceof AtomEntry) {
- atom((AtomEntry) obj, writer);
- } else {
- json((JSONEntry) obj, writer);
- }
- }
-
- @Override
- public void property(final Element element, final ODataFormat format, final OutputStream out) {
- property(element, format, new OutputStreamWriter(out));
- }
-
- @Override
- public void property(final Element element, final ODataFormat format, final Writer writer) {
- if (format == ODataFormat.XML) {
- dom(element, writer);
- } else {
- json(element, writer);
- }
- }
-
- @Override
- public void link(final ODataLink link, final ODataFormat format, final OutputStream out) {
- link(link, format, new OutputStreamWriter(out));
- }
-
- @Override
- public void link(final ODataLink link, final ODataFormat format, final Writer writer) {
- if (format == ODataFormat.XML) {
- xmlLink(link, writer);
- } else {
- jsonLink(link, writer);
- }
- }
-
- @Override
- public void dom(final Node content, final OutputStream out) {
- dom(content, new OutputStreamWriter(out));
- }
-
- @Override
- public void dom(final Node content, final Writer writer) {
- XMLUtils.PARSER.serialize(content, writer);
- }
-
- /*
- * ------------------ Protected methods ------------------
- */
- protected <T extends AbstractPayloadObject> void atom(final T obj, final Writer writer) {
- try {
- dom(atomSerializer.serialize(obj), writer);
- } catch (Exception e) {
- throw new IllegalArgumentException("While serializing Atom object", e);
- }
- }
-
- protected <T extends AbstractPayloadObject> void json(final T obj, final Writer writer) {
- try {
- getObjectMapper().writeValue(writer, obj);
- } catch (IOException e) {
- throw new IllegalArgumentException("While serializing JSON object", e);
- }
- }
-
- protected void json(final Element element, final Writer writer) {
- try {
- final JSONProperty property = new JSONProperty();
- property.setContent(element);
- getObjectMapper().writeValue(writer, property);
- } catch (IOException e) {
- throw new IllegalArgumentException("While serializing JSON property", e);
- }
- }
-
- protected void xmlLink(final ODataLink link, final Writer writer) {
- try {
- final DocumentBuilder builder = XMLUtils.DOC_BUILDER_FACTORY.newDocumentBuilder();
- final Document doc = builder.newDocument();
- final Element uri = doc.createElementNS(
- client.getWorkingVersion().getNamespaceMap().get(ODataVersion.NS_DATASERVICES),
- ODataConstants.ELEM_URI);
- uri.appendChild(doc.createTextNode(link.getLink().toASCIIString()));
-
- dom(uri, writer);
- } catch (Exception e) {
- throw new IllegalArgumentException("While serializing XML link", e);
- }
- }
-
- protected void jsonLink(final ODataLink link, final Writer writer) {
- final ObjectMapper mapper = getObjectMapper();
- final ObjectNode uri = mapper.createObjectNode();
- uri.put(ODataConstants.JSON_URL, link.getLink().toASCIIString());
-
- try {
- mapper.writeValue(writer, uri);
- } catch (Exception e) {
- throw new IllegalArgumentException("While serializing JSON link", e);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractODataWriter.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractODataWriter.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractODataWriter.java
deleted file mode 100644
index 8343d15..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractODataWriter.java
+++ /dev/null
@@ -1,101 +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 com.msopentech.odatajclient.engine.data.impl;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.data.ODataLink;
-import com.msopentech.odatajclient.engine.data.ODataProperty;
-import com.msopentech.odatajclient.engine.data.ODataWriter;
-import com.msopentech.odatajclient.engine.data.ResourceFactory;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.util.Collection;
-import java.util.Collections;
-import org.apache.commons.io.IOUtils;
-
-public abstract class AbstractODataWriter implements ODataWriter {
-
- private static final long serialVersionUID = 3265794768412314485L;
-
- protected final ODataClient client;
-
- protected AbstractODataWriter(final ODataClient client) {
- this.client = client;
- }
-
- @Override
- public InputStream writeEntities(final Collection<ODataEntity> entities, final ODataPubFormat format) {
- return writeEntities(entities, format, true);
- }
-
- @Override
- public InputStream writeEntities(
- final Collection<ODataEntity> entities, final ODataPubFormat format, final boolean outputType) {
-
- final ByteArrayOutputStream output = new ByteArrayOutputStream();
- try {
- for (ODataEntity entity : entities) {
- client.getSerializer().entry(client.getBinder().
- getEntry(entity, ResourceFactory.entryClassForFormat(format), outputType), output);
- }
-
- return new ByteArrayInputStream(output.toByteArray());
- } finally {
- IOUtils.closeQuietly(output);
- }
- }
-
- @Override
- public InputStream writeEntity(final ODataEntity entity, final ODataPubFormat format) {
- return writeEntity(entity, format, true);
- }
-
- @Override
- public InputStream writeEntity(final ODataEntity entity, final ODataPubFormat format, final boolean outputType) {
- return writeEntities(Collections.<ODataEntity>singleton(entity), format, outputType);
- }
-
- @Override
- public InputStream writeProperty(final ODataProperty property, final ODataFormat format) {
- final ByteArrayOutputStream output = new ByteArrayOutputStream();
- try {
- client.getSerializer().property(client.getBinder().toDOMElement(property), format, output);
-
- return new ByteArrayInputStream(output.toByteArray());
- } finally {
- IOUtils.closeQuietly(output);
- }
- }
-
- @Override
- public InputStream writeLink(final ODataLink link, final ODataFormat format) {
- final ByteArrayOutputStream output = new ByteArrayOutputStream();
- try {
- client.getSerializer().link(link, format, output);
-
- return new ByteArrayInputStream(output.toByteArray());
- } finally {
- IOUtils.closeQuietly(output);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractPayloadObject.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractPayloadObject.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractPayloadObject.java
deleted file mode 100644
index e414cbd..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractPayloadObject.java
+++ /dev/null
@@ -1,57 +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 com.msopentech.odatajclient.engine.data.impl;
-
-import java.io.Serializable;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * Abstract representation of a payload (Atom, JSON) object.
- */
-public abstract class AbstractPayloadObject implements Serializable {
-
- private static final long serialVersionUID = 1634654241914156675L;
-
- /**
- * {@inheritDoc }
- */
- @Override
- public boolean equals(final Object obj) {
- return EqualsBuilder.reflectionEquals(this, obj);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public int hashCode() {
- return HashCodeBuilder.reflectionHashCode(this);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractServiceDocument.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractServiceDocument.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractServiceDocument.java
deleted file mode 100644
index ebf247f..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/AbstractServiceDocument.java
+++ /dev/null
@@ -1,147 +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 com.msopentech.odatajclient.engine.data.impl;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.data.ServiceDocumentElement;
-import com.msopentech.odatajclient.engine.data.ServiceDocument;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-public abstract class AbstractServiceDocument implements ServiceDocument {
-
- private String title;
-
- @JsonProperty("value")
- private final List<ServiceDocumentElement> entitySets = new ArrayList<ServiceDocumentElement>();
-
- @Override
- public String getMetadataContext() {
- return null;
- }
-
- @Override
- public String getMetadataETag() {
- return null;
- }
-
- @Override
- public String getTitle() {
- return title;
- }
-
- public void setTitle(final String title) {
- this.title = title;
- }
-
- protected ServiceDocumentElement getByName(final List<ServiceDocumentElement> elements, final String name) {
- ServiceDocumentElement result = null;
- for (ServiceDocumentElement element : elements) {
- if (name.equals(element.getName())) {
- result = element;
- }
- }
- return result;
- }
-
- protected ServiceDocumentElement getByTitle(final List<ServiceDocumentElement> elements, final String title) {
- ServiceDocumentElement result = null;
- for (ServiceDocumentElement element : elements) {
- if (title.equals(element.getTitle())) {
- result = element;
- }
- }
- return result;
- }
-
- @Override
- public List<ServiceDocumentElement> getEntitySets() {
- return entitySets;
- }
-
- @Override
- public ServiceDocumentElement getEntitySetByName(final String name) {
- return getByName(getEntitySets(), name);
- }
-
- @Override
- public ServiceDocumentElement getEntitySetByTitle(final String title) {
- return getByTitle(getEntitySets(), title);
- }
-
- @Override
- public List<ServiceDocumentElement> getFunctionImports() {
- return Collections.<ServiceDocumentElement>emptyList();
- }
-
- @Override
- public ServiceDocumentElement getFunctionImportByName(final String name) {
- return getByName(getFunctionImports(), name);
- }
-
- @Override
- public ServiceDocumentElement getFunctionImportByTitle(final String title) {
- return getByTitle(getFunctionImports(), title);
- }
-
- @Override
- public List<ServiceDocumentElement> getSingletons() {
- return Collections.<ServiceDocumentElement>emptyList();
- }
-
- @Override
- public ServiceDocumentElement getSingletonByName(final String name) {
- return getByName(getSingletons(), name);
- }
-
- @Override
- public ServiceDocumentElement getSingletonByTitle(final String title) {
- return getByTitle(getSingletons(), title);
- }
-
- @Override
- public List<ServiceDocumentElement> getRelatedServiceDocuments() {
- return Collections.<ServiceDocumentElement>emptyList();
- }
-
- @Override
- public ServiceDocumentElement getRelatedServiceDocumentByTitle(final String title) {
- return getByTitle(getRelatedServiceDocuments(), title);
- }
-
- @Override
- public boolean equals(final Object obj) {
- return EqualsBuilder.reflectionEquals(this, obj);
- }
-
- @Override
- public int hashCode() {
- return HashCodeBuilder.reflectionHashCode(this);
- }
-
- @Override
- public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/GeospatialJSONHandler.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/GeospatialJSONHandler.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/GeospatialJSONHandler.java
deleted file mode 100644
index c39e5d8..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/GeospatialJSONHandler.java
+++ /dev/null
@@ -1,411 +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 com.msopentech.odatajclient.engine.data.impl;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.utils.ODataConstants;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-import com.msopentech.odatajclient.engine.utils.XMLUtils;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import javax.xml.parsers.DocumentBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-final class GeospatialJSONHandler {
-
- /**
- * Logger.
- */
- private static final Logger LOG = LoggerFactory.getLogger(GeospatialJSONHandler.class);
-
- private GeospatialJSONHandler() {
- // Empty private constructor for static utility classes
- }
-
- private static Element deserializePoint(final Document document, final Iterator<JsonNode> itor) {
- final Element point = document.createElementNS(ODataConstants.NS_GML, ODataConstants.ELEM_POINT);
-
- final Element ppos = document.createElementNS(ODataConstants.NS_GML, ODataConstants.ELEM_POS);
- point.appendChild(ppos);
- if (itor.hasNext()) {
- ppos.appendChild(document.createTextNode(itor.next().asText() + " " + itor.next().asText()));
- }
-
- return point;
- }
-
- private static void appendPoses(final Element parent, final Document document, final Iterator<JsonNode> itor) {
- while (itor.hasNext()) {
- final Iterator<JsonNode> lineItor = itor.next().elements();
- final Element pos = document.createElementNS(ODataConstants.NS_GML, ODataConstants.ELEM_POS);
- parent.appendChild(pos);
- pos.appendChild(document.createTextNode(lineItor.next().asText() + " " + lineItor.next().asText()));
- }
- }
-
- private static Element deserializeLineString(final Document document, final Iterator<JsonNode> itor) {
- final Element lineString = document.createElementNS(ODataConstants.NS_GML, ODataConstants.ELEM_LINESTRING);
- if (!itor.hasNext()) {
- lineString.appendChild(document.createElementNS(ODataConstants.NS_GML, ODataConstants.ELEM_POSLIST));
- }
-
- appendPoses(lineString, document, itor);
-
- return lineString;
- }
-
- private static Element deserializePolygon(final Document document, final Iterator<JsonNode> itor) {
- final Element polygon = document.createElementNS(ODataConstants.NS_GML, ODataConstants.ELEM_POLYGON);
-
- if (itor.hasNext()) {
- final Iterator<JsonNode> extItor = itor.next().elements();
- final Element exterior = document.createElementNS(
- ODataConstants.NS_GML, ODataConstants.ELEM_POLYGON_EXTERIOR);
- polygon.appendChild(exterior);
- final Element extLR = document.createElementNS(
- ODataConstants.NS_GML, ODataConstants.ELEM_POLYGON_LINEARRING);
- exterior.appendChild(extLR);
-
- appendPoses(extLR, document, extItor);
- }
-
- if (itor.hasNext()) {
- final Iterator<JsonNode> intItor = itor.next().elements();
- final Element interior = document.createElementNS(
- ODataConstants.NS_GML, ODataConstants.ELEM_POLYGON_INTERIOR);
- polygon.appendChild(interior);
- final Element intLR = document.createElementNS(
- ODataConstants.NS_GML, ODataConstants.ELEM_POLYGON_LINEARRING);
- interior.appendChild(intLR);
-
- appendPoses(intLR, document, intItor);
- }
-
- return polygon;
- }
-
- public static void deserialize(final JsonNode node, final Element parent, final String type) {
- final Iterator<JsonNode> cooItor = node.has(ODataConstants.JSON_COORDINATES)
- ? node.get(ODataConstants.JSON_COORDINATES).elements()
- : Collections.<JsonNode>emptyList().iterator();
-
- Element root = null;
- final EdmSimpleType edmSimpleType = EdmSimpleType.fromValue(type);
- switch (edmSimpleType) {
- case GeographyPoint:
- case GeometryPoint:
- root = deserializePoint(parent.getOwnerDocument(), cooItor);
- break;
-
- case GeographyMultiPoint:
- case GeometryMultiPoint:
- root = parent.getOwnerDocument().createElementNS(ODataConstants.NS_GML, ODataConstants.ELEM_MULTIPOINT);
- if (cooItor.hasNext()) {
- final Element pointMembers = parent.getOwnerDocument().createElementNS(
- ODataConstants.NS_GML, ODataConstants.ELEM_POINTMEMBERS);
- root.appendChild(pointMembers);
- while (cooItor.hasNext()) {
- final Iterator<JsonNode> mpItor = cooItor.next().elements();
- pointMembers.appendChild(deserializePoint(parent.getOwnerDocument(), mpItor));
- }
- }
- break;
-
- case GeographyLineString:
- case GeometryLineString:
- root = deserializeLineString(parent.getOwnerDocument(), cooItor);
- break;
-
- case GeographyMultiLineString:
- case GeometryMultiLineString:
- root = parent.getOwnerDocument().createElementNS(
- ODataConstants.NS_GML, ODataConstants.ELEM_MULTILINESTRING);
- if (cooItor.hasNext()) {
- final Element lineStringMembers = parent.getOwnerDocument().createElementNS(
- ODataConstants.NS_GML, ODataConstants.ELEM_LINESTRINGMEMBERS);
- root.appendChild(lineStringMembers);
- while (cooItor.hasNext()) {
- final Iterator<JsonNode> mlsItor = cooItor.next().elements();
- lineStringMembers.appendChild(deserializeLineString(parent.getOwnerDocument(), mlsItor));
- }
- }
- break;
-
- case GeographyPolygon:
- case GeometryPolygon:
- root = deserializePolygon(parent.getOwnerDocument(), cooItor);
- break;
-
- case GeographyMultiPolygon:
- case GeometryMultiPolygon:
- root = parent.getOwnerDocument().createElementNS(
- ODataConstants.NS_GML, ODataConstants.ELEM_MULTIPOLYGON);
- if (cooItor.hasNext()) {
- final Element surfaceMembers = parent.getOwnerDocument().createElementNS(
- ODataConstants.NS_GML, ODataConstants.ELEM_SURFACEMEMBERS);
- root.appendChild(surfaceMembers);
- while (cooItor.hasNext()) {
- final Iterator<JsonNode> mpItor = cooItor.next().elements();
- surfaceMembers.appendChild(deserializePolygon(parent.getOwnerDocument(), mpItor));
- }
- }
- break;
-
- case GeographyCollection:
- case GeometryCollection:
- root = parent.getOwnerDocument().createElementNS(
- ODataConstants.NS_GML, ODataConstants.ELEM_GEOCOLLECTION);
- if (node.has(ODataConstants.JSON_GEOMETRIES)) {
- final Iterator<JsonNode> geoItor = node.get(ODataConstants.JSON_GEOMETRIES).elements();
- if (geoItor.hasNext()) {
- final Element geometryMembers = parent.getOwnerDocument().createElementNS(
- ODataConstants.NS_GML, ODataConstants.ELEM_GEOMEMBERS);
- root.appendChild(geometryMembers);
-
- while (geoItor.hasNext()) {
- final JsonNode geo = geoItor.next();
- final String collItemType = geo.get(ODataConstants.ATTR_TYPE).asText();
- final String callAsType;
- if (EdmSimpleType.GeographyCollection.name().equals(collItemType)
- || EdmSimpleType.GeometryCollection.name().equals(collItemType)) {
-
- callAsType = collItemType;
- } else {
- callAsType =
- (edmSimpleType == EdmSimpleType.GeographyCollection ? "Geography" : "Geometry")
- + collItemType;
- }
-
- deserialize(geo, geometryMembers, EdmSimpleType.namespace() + "." + callAsType);
- }
- }
- }
- break;
-
- default:
- }
-
- if (root != null) {
- parent.appendChild(root);
- if (node.has(ODataConstants.JSON_CRS)) {
- root.setAttribute(ODataConstants.ATTR_SRSNAME,
- ODataConstants.JSON_GIS_URLPREFIX
- + node.get(ODataConstants.JSON_CRS).get(ODataConstants.PROPERTIES).get(ODataConstants.NAME).
- asText().split(":")[1]);
- }
- }
- }
-
- private static void serializeCrs(final JsonGenerator jgen, final Node node) throws IOException {
- if (node.getAttributes().getNamedItem(ODataConstants.ATTR_SRSNAME) != null) {
- final String srsName = node.getAttributes().getNamedItem(ODataConstants.ATTR_SRSNAME).getTextContent();
- final int prefIdx = srsName.indexOf(ODataConstants.JSON_GIS_URLPREFIX);
- final String crsValue = srsName.substring(prefIdx + ODataConstants.JSON_GIS_URLPREFIX.length());
-
- jgen.writeObjectFieldStart(ODataConstants.JSON_CRS);
- jgen.writeStringField(ODataConstants.ATTR_TYPE, ODataConstants.NAME);
- jgen.writeObjectFieldStart(ODataConstants.PROPERTIES);
- jgen.writeStringField(ODataConstants.NAME, "EPSG:" + crsValue);
- jgen.writeEndObject();
- jgen.writeEndObject();
- }
- }
-
- private static void serializePoint(final JsonGenerator jgen, final Node node) throws IOException {
- for (String coord : node.getTextContent().split(" ")) {
- jgen.writeNumber(coord);
- }
- }
-
- private static void serializeLineString(final JsonGenerator jgen, final Element node) throws IOException {
- for (Element element : XMLUtils.getChildElements(node, ODataConstants.ELEM_POS)) {
- jgen.writeStartArray();
- serializePoint(jgen, element);
- jgen.writeEndArray();
- }
- }
-
- private static void serializePolygon(final JsonGenerator jgen, final Element node) throws IOException {
- for (Element exterior : XMLUtils.getChildElements(node, ODataConstants.ELEM_POLYGON_EXTERIOR)) {
- jgen.writeStartArray();
- serializeLineString(jgen,
- XMLUtils.getChildElements(exterior, ODataConstants.ELEM_POLYGON_LINEARRING).get(0));
- jgen.writeEndArray();
-
- }
- for (Element interior : XMLUtils.getChildElements(node, ODataConstants.ELEM_POLYGON_INTERIOR)) {
- jgen.writeStartArray();
- serializeLineString(jgen,
- XMLUtils.getChildElements(interior, ODataConstants.ELEM_POLYGON_LINEARRING).get(0));
- jgen.writeEndArray();
-
- }
- }
-
- public static void serialize(final ODataClient client,
- final JsonGenerator jgen, final Element node, final String type) throws IOException {
-
- final EdmSimpleType edmSimpleType = EdmSimpleType.fromValue(type);
-
- if (edmSimpleType.equals(EdmSimpleType.GeographyCollection)
- || edmSimpleType.equals(EdmSimpleType.GeometryCollection)) {
-
- jgen.writeStringField(ODataConstants.ATTR_TYPE, EdmSimpleType.GeometryCollection.name());
- } else {
- final int yIdx = edmSimpleType.name().indexOf('y');
- final String itemType = edmSimpleType.name().substring(yIdx + 1);
- jgen.writeStringField(ODataConstants.ATTR_TYPE, itemType);
- }
-
- Element root = null;
- switch (edmSimpleType) {
- case GeographyPoint:
- case GeometryPoint:
- root = XMLUtils.getChildElements(node, ODataConstants.ELEM_POINT).get(0);
-
- jgen.writeArrayFieldStart(ODataConstants.JSON_COORDINATES);
- serializePoint(jgen, XMLUtils.getChildElements(root, ODataConstants.ELEM_POS).get(0));
- jgen.writeEndArray();
- break;
-
- case GeographyMultiPoint:
- case GeometryMultiPoint:
- root = XMLUtils.getChildElements(node, ODataConstants.ELEM_MULTIPOINT).get(0);
-
- jgen.writeArrayFieldStart(ODataConstants.JSON_COORDINATES);
-
- final List<Element> pMembs = XMLUtils.getChildElements(root, ODataConstants.ELEM_POINTMEMBERS);
- if (pMembs != null && !pMembs.isEmpty()) {
- for (Element point : XMLUtils.getChildElements(pMembs.get(0), ODataConstants.ELEM_POINT)) {
- jgen.writeStartArray();
- serializePoint(jgen, XMLUtils.getChildElements(point, ODataConstants.ELEM_POS).get(0));
- jgen.writeEndArray();
- }
- }
-
- jgen.writeEndArray();
- break;
-
- case GeographyLineString:
- case GeometryLineString:
- root = XMLUtils.getChildElements(node, ODataConstants.ELEM_LINESTRING).get(0);
-
- jgen.writeArrayFieldStart(ODataConstants.JSON_COORDINATES);
- serializeLineString(jgen, root);
- jgen.writeEndArray();
- break;
-
- case GeographyMultiLineString:
- case GeometryMultiLineString:
- root = XMLUtils.getChildElements(node, ODataConstants.ELEM_MULTILINESTRING).get(0);
-
- jgen.writeArrayFieldStart(ODataConstants.JSON_COORDINATES);
-
- final List<Element> lMembs = XMLUtils.getChildElements(root, ODataConstants.ELEM_LINESTRINGMEMBERS);
- if (lMembs != null && !lMembs.isEmpty()) {
- for (Element lineStr : XMLUtils.getChildElements(lMembs.get(0), ODataConstants.ELEM_LINESTRING)) {
- jgen.writeStartArray();
- serializeLineString(jgen, lineStr);
- jgen.writeEndArray();
- }
- }
-
- jgen.writeEndArray();
- break;
-
- case GeographyPolygon:
- case GeometryPolygon:
- root = XMLUtils.getChildElements(node, ODataConstants.ELEM_POLYGON).get(0);
-
- jgen.writeArrayFieldStart(ODataConstants.JSON_COORDINATES);
- serializePolygon(jgen, root);
- jgen.writeEndArray();
- break;
-
- case GeographyMultiPolygon:
- case GeometryMultiPolygon:
- root = XMLUtils.getChildElements(node, ODataConstants.ELEM_MULTIPOLYGON).get(0);
-
- jgen.writeArrayFieldStart(ODataConstants.JSON_COORDINATES);
-
- final List<Element> mpMembs = XMLUtils.getChildElements(root, ODataConstants.ELEM_SURFACEMEMBERS);
- if (mpMembs != null & !mpMembs.isEmpty()) {
- for (Element pol : XMLUtils.getChildElements(mpMembs.get(0), ODataConstants.ELEM_POLYGON)) {
- jgen.writeStartArray();
- serializePolygon(jgen, pol);
- jgen.writeEndArray();
- }
- }
-
- jgen.writeEndArray();
- break;
-
- case GeographyCollection:
- case GeometryCollection:
- root = XMLUtils.getChildElements(node, ODataConstants.ELEM_GEOCOLLECTION).get(0);
-
- final List<Element> cMembs = XMLUtils.getChildElements(root, ODataConstants.ELEM_GEOMEMBERS);
- if (cMembs != null && !cMembs.isEmpty()) {
- jgen.writeArrayFieldStart(ODataConstants.JSON_GEOMETRIES);
-
- for (Node geom : XMLUtils.getChildNodes(cMembs.get(0), Node.ELEMENT_NODE)) {
- try {
- final DocumentBuilder builder = XMLUtils.DOC_BUILDER_FACTORY.newDocumentBuilder();
- final Document doc = builder.newDocument();
-
- final Element fakeParent = doc.createElementNS(
- client.getWorkingVersion().getNamespaceMap().get(ODataVersion.NS_DATASERVICES),
- ODataConstants.PREFIX_DATASERVICES + "fake");
- fakeParent.appendChild(doc.importNode(geom, true));
-
- final EdmSimpleType callAsType = XMLUtils.simpleTypeForNode(
- edmSimpleType == EdmSimpleType.GeographyCollection
- ? Geospatial.Dimension.GEOGRAPHY : Geospatial.Dimension.GEOMETRY,
- geom);
-
- jgen.writeStartObject();
- serialize(client, jgen, fakeParent, callAsType.toString());
- jgen.writeEndObject();
- } catch (Exception e) {
- LOG.warn("While serializing {}", XMLUtils.getSimpleName(geom), e);
- }
- }
-
- jgen.writeEndArray();
- }
- break;
-
- default:
- }
-
- if (root != null) {
- serializeCrs(jgen, root);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/InjectableSerializerProvider.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/InjectableSerializerProvider.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/InjectableSerializerProvider.java
deleted file mode 100644
index 88d95a9..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/InjectableSerializerProvider.java
+++ /dev/null
@@ -1,43 +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 com.msopentech.odatajclient.engine.data.impl;
-
-import com.fasterxml.jackson.databind.SerializationConfig;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.ser.DefaultSerializerProvider;
-import com.fasterxml.jackson.databind.ser.SerializerFactory;
-
-public class InjectableSerializerProvider extends DefaultSerializerProvider {
-
- private static final long serialVersionUID = 3432260063063739646L;
-
- public InjectableSerializerProvider(
- final SerializerProvider src, final SerializationConfig config, final SerializerFactory factory) {
-
- super(src, config, factory);
- }
-
- @Override
- public InjectableSerializerProvider createInstance(
- final SerializationConfig config, final SerializerFactory factory) {
-
- return this;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/JSONDOMTreeUtils.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/JSONDOMTreeUtils.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/JSONDOMTreeUtils.java
deleted file mode 100644
index 3355e59..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/JSONDOMTreeUtils.java
+++ /dev/null
@@ -1,259 +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 com.msopentech.odatajclient.engine.data.impl;
-
-import com.msopentech.odatajclient.engine.data.impl.GeospatialJSONHandler;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.data.ODataPrimitiveValue;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.engine.utils.ODataConstants;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-import com.msopentech.odatajclient.engine.utils.XMLUtils;
-import java.io.IOException;
-import java.util.Iterator;
-import org.apache.commons.lang3.StringUtils;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * DOM tree utilities class for JSON.
- */
-final class JSONDOMTreeUtils {
-
- private JSONDOMTreeUtils() {
- // Empty private constructor for static utility classes
- }
-
- /**
- * Recursively builds DOM content out of JSON subtree rooted at given node.
- *
- * @param client OData client.
- * @param document root of the DOM document being built
- * @param parent parent of the nodes being generated during this step
- * @param node JSON node to be used as source for DOM elements
- */
- public static void buildSubtree(final ODataClient client, final Element parent, final JsonNode node) {
- final Iterator<String> fieldNameItor = node.fieldNames();
- final Iterator<JsonNode> nodeItor = node.elements();
- while (nodeItor.hasNext()) {
- final JsonNode child = nodeItor.next();
- final String name = fieldNameItor.hasNext() ? fieldNameItor.next() : "";
-
- // no name? array item
- if (name.isEmpty()) {
- final Element element = parent.getOwnerDocument().createElementNS(
- client.getWorkingVersion().getNamespaceMap().get(ODataVersion.NS_DATASERVICES),
- ODataConstants.PREFIX_DATASERVICES + ODataConstants.ELEM_ELEMENT);
- parent.appendChild(element);
-
- if (child.isValueNode()) {
- if (child.isNull()) {
- element.setAttributeNS(
- client.getWorkingVersion().getNamespaceMap().get(ODataVersion.NS_METADATA),
- ODataConstants.ATTR_NULL, Boolean.toString(true));
- } else {
- element.appendChild(parent.getOwnerDocument().createTextNode(child.asText()));
- }
- }
-
- if (child.isContainerNode()) {
- buildSubtree(client, element, child);
- }
- } else if (!name.contains("@") && !ODataConstants.JSON_TYPE.equals(name)) {
- final Element property = parent.getOwnerDocument().createElementNS(
- client.getWorkingVersion().getNamespaceMap().get(ODataVersion.NS_DATASERVICES),
- ODataConstants.PREFIX_DATASERVICES + name);
- parent.appendChild(property);
-
- boolean typeSet = false;
- if (node.hasNonNull(name + "@" + ODataConstants.JSON_TYPE)) {
- property.setAttributeNS(
- client.getWorkingVersion().getNamespaceMap().get(ODataVersion.NS_METADATA),
- ODataConstants.ATTR_M_TYPE,
- node.get(name + "@" + ODataConstants.JSON_TYPE).textValue());
- typeSet = true;
- }
-
- if (child.isNull()) {
- property.setAttributeNS(client.getWorkingVersion().getNamespaceMap().get(ODataVersion.NS_METADATA),
- ODataConstants.ATTR_NULL, Boolean.toString(true));
- } else if (child.isValueNode()) {
- if (!typeSet) {
- if (child.isInt()) {
- property.setAttributeNS(
- client.getWorkingVersion().getNamespaceMap().get(ODataVersion.NS_METADATA),
- ODataConstants.ATTR_M_TYPE, EdmSimpleType.Int32.toString());
- }
- if (child.isLong()) {
- property.setAttributeNS(
- client.getWorkingVersion().getNamespaceMap().get(ODataVersion.NS_METADATA),
- ODataConstants.ATTR_M_TYPE, EdmSimpleType.Int64.toString());
- }
- if (child.isBigDecimal()) {
- property.setAttributeNS(
- client.getWorkingVersion().getNamespaceMap().get(ODataVersion.NS_METADATA),
- ODataConstants.ATTR_M_TYPE, EdmSimpleType.Decimal.toString());
- }
- if (child.isDouble()) {
- property.setAttributeNS(
- client.getWorkingVersion().getNamespaceMap().get(ODataVersion.NS_METADATA),
- ODataConstants.ATTR_M_TYPE, EdmSimpleType.Double.toString());
- }
- if (child.isBoolean()) {
- property.setAttributeNS(
- client.getWorkingVersion().getNamespaceMap().get(ODataVersion.NS_METADATA),
- ODataConstants.ATTR_M_TYPE, EdmSimpleType.Boolean.toString());
- }
- if (child.isTextual()) {
- property.setAttributeNS(
- client.getWorkingVersion().getNamespaceMap().get(ODataVersion.NS_METADATA),
- ODataConstants.ATTR_M_TYPE, EdmSimpleType.String.toString());
- }
- }
-
- property.appendChild(parent.getOwnerDocument().createTextNode(child.asText()));
- } else if (child.isContainerNode()) {
- if (!typeSet && child.hasNonNull(ODataConstants.JSON_TYPE)) {
- property.
- setAttributeNS(client.getWorkingVersion().getNamespaceMap().get(ODataVersion.NS_METADATA),
- ODataConstants.ATTR_M_TYPE,
- child.get(ODataConstants.JSON_TYPE).textValue());
- }
-
- final String type = property.getAttribute(ODataConstants.ATTR_M_TYPE);
- if (StringUtils.isNotBlank(type) && EdmSimpleType.isGeospatial(type)) {
- if (EdmSimpleType.Geography.toString().equals(type)
- || EdmSimpleType.Geometry.toString().equals(type)) {
-
- final String geoType = child.get(ODataConstants.ATTR_TYPE).textValue();
- property.setAttributeNS(client.getWorkingVersion().getNamespaceMap().get(
- ODataVersion.NS_METADATA), ODataConstants.ATTR_M_TYPE,
- geoType.startsWith("Geo")
- ? EdmSimpleType.namespace() + "." + geoType
- : type + geoType);
- }
-
- if (child.has(ODataConstants.JSON_COORDINATES) || child.has(ODataConstants.JSON_GEOMETRIES)) {
- GeospatialJSONHandler.deserialize(
- child, property, property.getAttribute(ODataConstants.ATTR_M_TYPE));
- }
- } else {
- buildSubtree(client, property, child);
- }
- }
- }
- }
- }
-
- /**
- * Serializes DOM content as JSON.
- *
- * @param client OData client.
- * @param jgen JSON generator.
- * @param content content.
- * @throws IOException in case of write error.
- */
- public static void writeSubtree(final ODataClient client, final JsonGenerator jgen, final Node content)
- throws IOException {
-
- writeSubtree(client, jgen, content, false);
- }
-
- /**
- * Serializes DOM content as JSON.
- *
- * @param client OData client.
- * @param jgen JSON generator.
- * @param content content.
- * @param propType whether to output type information in the way needed for property values or not.
- * @throws IOException in case of write error.
- */
- public static void writeSubtree(
- final ODataClient client, final JsonGenerator jgen, final Node content, final boolean propType)
- throws IOException {
-
- for (Node child : XMLUtils.getChildNodes(content, Node.ELEMENT_NODE)) {
- final String childName = XMLUtils.getSimpleName(child);
-
- final Node typeAttr = child.getAttributes().getNamedItem(ODataConstants.ATTR_M_TYPE);
- if (typeAttr != null && EdmSimpleType.isGeospatial(typeAttr.getTextContent())) {
- jgen.writeStringField(propType ? ODataConstants.JSON_TYPE : childName + "@" + ODataConstants.JSON_TYPE,
- typeAttr.getTextContent());
-
- jgen.writeObjectFieldStart(childName);
- GeospatialJSONHandler.serialize(client, jgen, (Element) child, typeAttr.getTextContent());
- jgen.writeEndObject();
- } else if (XMLUtils.hasOnlyTextChildNodes(child)) {
- if (child.hasChildNodes()) {
- final String out;
- if (typeAttr == null) {
- out = child.getChildNodes().item(0).getNodeValue();
- } else {
- final EdmSimpleType type = EdmSimpleType.fromValue(typeAttr.getTextContent());
- final ODataPrimitiveValue value = client.getPrimitiveValueBuilder().setType(type).
- setText(child.getChildNodes().item(0).getNodeValue()).build();
- out = value.toString();
-
- jgen.writeStringField(childName + "@" + ODataConstants.JSON_TYPE, type.toString());
- }
- jgen.writeStringField(childName, out);
- } else {
- if (child.getAttributes().getNamedItem(ODataConstants.ATTR_NULL) == null) {
- if (typeAttr != null && EdmSimpleType.String.toString().equals(typeAttr.getTextContent())) {
- jgen.writeStringField(childName + "@" + ODataConstants.JSON_TYPE, typeAttr.getTextContent());
- jgen.writeStringField(childName, StringUtils.EMPTY);
- } else {
- jgen.writeArrayFieldStart(childName);
- jgen.writeEndArray();
- }
- } else {
- jgen.writeNullField(childName);
- }
- }
- } else {
- if (XMLUtils.hasElementsChildNode(child)) {
- jgen.writeArrayFieldStart(childName);
-
- for (Node nephew : XMLUtils.getChildNodes(child, Node.ELEMENT_NODE)) {
- if (XMLUtils.hasOnlyTextChildNodes(nephew)) {
- jgen.writeString(nephew.getChildNodes().item(0).getNodeValue());
- } else {
- jgen.writeStartObject();
- writeSubtree(client, jgen, nephew);
- jgen.writeEndObject();
- }
- }
-
- jgen.writeEndArray();
- } else {
- jgen.writeObjectFieldStart(childName);
- if (typeAttr != null) {
- jgen.writeStringField(ODataConstants.JSON_TYPE, typeAttr.getTextContent());
- }
-
- writeSubtree(client, jgen, child);
-
- jgen.writeEndObject();
- }
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/JSONEntryDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/JSONEntryDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/JSONEntryDeserializer.java
deleted file mode 100644
index 7735d62..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/JSONEntryDeserializer.java
+++ /dev/null
@@ -1,248 +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 com.msopentech.odatajclient.engine.data.impl;
-
-import com.msopentech.odatajclient.engine.data.impl.JSONDOMTreeUtils;
-import com.msopentech.odatajclient.engine.data.impl.AbstractJSONEntry;
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.ObjectCodec;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.msopentech.odatajclient.engine.data.ODataLinkType;
-import com.msopentech.odatajclient.engine.data.ODataOperation;
-import com.msopentech.odatajclient.engine.data.impl.v3.JSONFeed;
-import com.msopentech.odatajclient.engine.data.impl.v3.JSONLink;
-import com.msopentech.odatajclient.engine.data.impl.v3.JSONEntry;
-import com.msopentech.odatajclient.engine.utils.ODataConstants;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-import com.msopentech.odatajclient.engine.utils.XMLUtils;
-import java.io.IOException;
-import java.net.URI;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.ParserConfigurationException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * Parse JSON string into <tt>JSONV3Entry</tt> or <tt>JSONV4Entry</tt>.
- * If metadata information is available, the corresponding entry fields and content will be populated.
- *
- * @see JSONEntry
- * @see JSONV4Entry
- */
-public class JSONEntryDeserializer extends ODataJacksonDeserializer<AbstractJSONEntry> {
-
- private String getTitle(final Map.Entry<String, JsonNode> entry) {
- return entry.getKey().substring(0, entry.getKey().indexOf('@'));
- }
-
- private String setInline(final String name, final String suffix, final ObjectNode tree,
- final ObjectCodec codec, final JSONLink link) throws IOException {
-
- final String entryNamePrefix = name.substring(0, name.indexOf(suffix));
- if (tree.has(entryNamePrefix)) {
- final JsonNode inline = tree.path(entryNamePrefix);
-
- if (inline instanceof ObjectNode) {
- final JsonParser inlineParser = inline.traverse();
- inlineParser.setCodec(codec);
- link.setInlineEntry(inlineParser.readValuesAs(JSONEntry.class).next());
- }
-
- if (inline instanceof ArrayNode) {
- final JSONFeed feed = new JSONFeed();
- final Iterator<JsonNode> entries = ((ArrayNode) inline).elements();
- while (entries.hasNext()) {
- final JsonParser inlineParser = entries.next().traverse();
- inlineParser.setCodec(codec);
- feed.addEntry(inlineParser.readValuesAs(JSONEntry.class).next());
- }
-
- link.setInlineFeed(feed);
- }
- }
- return entryNamePrefix;
- }
-
- @Override
- protected AbstractJSONEntry doDeserialize(final JsonParser parser, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final ObjectNode tree = (ObjectNode) parser.getCodec().readTree(parser);
-
- if (tree.has(ODataConstants.JSON_VALUE) && tree.get(ODataConstants.JSON_VALUE).isArray()) {
- throw new JsonParseException("Expected OData Entity, found EntitySet", parser.getCurrentLocation());
- }
-
- final boolean isMediaEntry =
- tree.hasNonNull(ODataConstants.JSON_MEDIAREAD_LINK)
- && tree.hasNonNull(ODataConstants.JSON_MEDIA_CONTENT_TYPE);
-
- final JSONEntry entry = new JSONEntry();
-
- if (tree.hasNonNull(ODataConstants.JSON_METADATA)) {
- entry.setMetadata(URI.create(tree.get(ODataConstants.JSON_METADATA).textValue()));
- tree.remove(ODataConstants.JSON_METADATA);
- }
-
- if (tree.hasNonNull(ODataConstants.JSON_MEDIA_ETAG)) {
- entry.setMediaETag(tree.get(ODataConstants.JSON_MEDIA_ETAG).textValue());
- tree.remove(ODataConstants.JSON_MEDIA_ETAG);
- }
-
- if (tree.hasNonNull(ODataConstants.JSON_ETAG)) {
- entry.setETag(tree.get(ODataConstants.JSON_ETAG).textValue());
- tree.remove(ODataConstants.JSON_ETAG);
- }
-
- if (tree.hasNonNull(ODataConstants.JSON_TYPE)) {
- entry.setType(tree.get(ODataConstants.JSON_TYPE).textValue());
- tree.remove(ODataConstants.JSON_TYPE);
- }
-
- if (tree.hasNonNull(ODataConstants.JSON_ID)) {
- entry.setId(tree.get(ODataConstants.JSON_ID).textValue());
- tree.remove(ODataConstants.JSON_ID);
- }
-
- if (tree.hasNonNull(ODataConstants.JSON_READ_LINK)) {
- final JSONLink link = new JSONLink();
- link.setRel(ODataConstants.SELF_LINK_REL);
- link.setHref(tree.get(ODataConstants.JSON_READ_LINK).textValue());
- entry.setSelfLink(link);
-
- tree.remove(ODataConstants.JSON_READ_LINK);
- }
-
- if (tree.hasNonNull(ODataConstants.JSON_EDIT_LINK)) {
- final JSONLink link = new JSONLink();
- link.setRel(ODataConstants.EDIT_LINK_REL);
- link.setHref(tree.get(ODataConstants.JSON_EDIT_LINK).textValue());
- entry.setEditLink(link);
-
- tree.remove(ODataConstants.JSON_EDIT_LINK);
- }
-
- if (tree.hasNonNull(ODataConstants.JSON_MEDIAREAD_LINK)) {
- entry.setMediaContentSource(tree.get(ODataConstants.JSON_MEDIAREAD_LINK).textValue());
- tree.remove(ODataConstants.JSON_MEDIAREAD_LINK);
- }
- if (tree.hasNonNull(ODataConstants.JSON_MEDIAEDIT_LINK)) {
- final JSONLink link = new JSONLink();
- link.setHref(tree.get(ODataConstants.JSON_MEDIAEDIT_LINK).textValue());
- entry.addMediaEditLink(link);
-
- tree.remove(ODataConstants.JSON_MEDIAEDIT_LINK);
- }
- if (tree.hasNonNull(ODataConstants.JSON_MEDIA_CONTENT_TYPE)) {
- entry.setMediaContentType(tree.get(ODataConstants.JSON_MEDIA_CONTENT_TYPE).textValue());
- tree.remove(ODataConstants.JSON_MEDIA_CONTENT_TYPE);
- }
-
- final Set<String> toRemove = new HashSet<String>();
- final Iterator<Map.Entry<String, JsonNode>> itor = tree.fields();
- while (itor.hasNext()) {
- final Map.Entry<String, JsonNode> field = itor.next();
-
- if (field.getKey().endsWith(ODataConstants.JSON_NAVIGATION_LINK_SUFFIX)) {
- final JSONLink link = new JSONLink();
- link.setTitle(getTitle(field));
- link.setRel(client.getWorkingVersion().getNamespaceMap().get(ODataVersion.NAVIGATION_LINK_REL)
- + getTitle(field));
- if (field.getValue().isValueNode()) {
- link.setHref(field.getValue().textValue());
- link.setType(ODataLinkType.ENTITY_NAVIGATION.toString());
- }
- // NOTE: this should be expected to happen, but it isn't - at least up to OData 4.0
- /* if (field.getValue().isArray()) {
- * link.setHref(field.getValue().asText());
- * link.setType(ODataLinkType.ENTITY_SET_NAVIGATION.toString());
- * } */
- entry.addNavigationLink(link);
-
- toRemove.add(field.getKey());
- toRemove.add(setInline(field.getKey(),
- ODataConstants.JSON_NAVIGATION_LINK_SUFFIX, tree, parser.getCodec(), link));
- } else if (field.getKey().endsWith(ODataConstants.JSON_ASSOCIATION_LINK_SUFFIX)) {
- final JSONLink link = new JSONLink();
- link.setTitle(getTitle(field));
- link.setRel(client.getWorkingVersion().getNamespaceMap().get(ODataVersion.ASSOCIATION_LINK_REL)
- + getTitle(field));
- link.setHref(field.getValue().textValue());
- link.setType(ODataLinkType.ASSOCIATION.toString());
- entry.addAssociationLink(link);
-
- toRemove.add(field.getKey());
- } else if (field.getKey().endsWith(ODataConstants.JSON_MEDIAEDIT_LINK_SUFFIX)) {
- final JSONLink link = new JSONLink();
- link.setTitle(getTitle(field));
- link.setRel(client.getWorkingVersion().getNamespaceMap().get(ODataVersion.MEDIA_EDIT_LINK_REL)
- + getTitle(field));
- link.setHref(field.getValue().textValue());
- link.setType(ODataLinkType.MEDIA_EDIT.toString());
- entry.addMediaEditLink(link);
-
- toRemove.add(field.getKey());
- toRemove.add(setInline(field.getKey(),
- ODataConstants.JSON_MEDIAEDIT_LINK_SUFFIX, tree, parser.getCodec(), link));
- } else if (field.getKey().charAt(0) == '#') {
- final ODataOperation operation = new ODataOperation();
- operation.setMetadataAnchor(field.getKey());
-
- final ObjectNode opNode = (ObjectNode) tree.get(field.getKey());
- operation.setTitle(opNode.get(ODataConstants.ATTR_TITLE).asText());
- operation.setTarget(URI.create(opNode.get(ODataConstants.ATTR_TARGET).asText()));
-
- entry.addOperation(operation);
-
- toRemove.add(field.getKey());
- }
- }
- tree.remove(toRemove);
-
- try {
- final DocumentBuilder builder = XMLUtils.DOC_BUILDER_FACTORY.newDocumentBuilder();
- final Document document = builder.newDocument();
-
- final Element properties = document.createElementNS(
- client.getWorkingVersion().getNamespaceMap().get(ODataVersion.NS_METADATA),
- ODataConstants.ELEM_PROPERTIES);
-
- JSONDOMTreeUtils.buildSubtree(client, properties, tree);
-
- if (isMediaEntry) {
- entry.setMediaEntryProperties(properties);
- } else {
- entry.setContent(properties);
- }
- } catch (ParserConfigurationException e) {
- throw new JsonParseException("Cannot build entry content", parser.getCurrentLocation(), e);
- }
-
- return entry;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/JSONEntrySerializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/JSONEntrySerializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/JSONEntrySerializer.java
deleted file mode 100644
index 1b00a22..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/JSONEntrySerializer.java
+++ /dev/null
@@ -1,133 +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 com.msopentech.odatajclient.engine.data.impl;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.msopentech.odatajclient.engine.data.ODataLinkType;
-import com.msopentech.odatajclient.engine.data.impl.v3.JSONLink;
-import com.msopentech.odatajclient.engine.data.impl.v3.JSONEntry;
-import com.msopentech.odatajclient.engine.utils.ODataConstants;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.apache.commons.lang3.StringUtils;
-
-/**
- * Writes out JSON string from <tt>JSONV3Entry</tt> and <tt>JSONV4Entry</tt>.
- *
- * @see JSONEntry
- * @see JSONV4Entry
- */
-public class JSONEntrySerializer extends ODataJacksonSerializer<AbstractJSONEntry> {
-
- @Override
- protected void doSerialize(
- final AbstractJSONEntry entry, final JsonGenerator jgen, final SerializerProvider provider)
- throws IOException, JsonProcessingException {
-
- jgen.writeStartObject();
-
- if (entry.getMetadata() != null) {
- jgen.writeStringField(ODataConstants.JSON_METADATA, entry.getMetadata().toASCIIString());
- }
- if (StringUtils.isNotBlank(entry.getType())) {
- jgen.writeStringField(ODataConstants.JSON_TYPE, entry.getType());
- }
- if (entry.getId() != null) {
- jgen.writeStringField(ODataConstants.JSON_ID, entry.getId());
- }
-
- if (entry.getSelfLink() != null) {
- jgen.writeStringField(ODataConstants.JSON_READ_LINK, entry.getSelfLink().getHref());
- }
-
- if (entry.getEditLink() != null) {
- jgen.writeStringField(ODataConstants.JSON_EDIT_LINK, entry.getEditLink().getHref());
- }
-
- if (entry.getMediaContentSource() != null) {
- jgen.writeStringField(ODataConstants.JSON_MEDIAREAD_LINK, entry.getMediaContentSource());
- }
- if (entry.getMediaContentType() != null) {
- jgen.writeStringField(ODataConstants.JSON_MEDIA_CONTENT_TYPE, entry.getMediaContentType());
- }
-
- final Map<String, List<String>> entitySetLinks = new HashMap<String, List<String>>();
-
- for (JSONLink link : entry.getNavigationLinks()) {
- if (link.getInlineEntry() != null) {
- jgen.writeObjectField(link.getTitle(), link.getInlineEntry());
- } else if (link.getInlineFeed() != null) {
- jgen.writeObjectField(link.getTitle(), link.getInlineFeed());
- } else {
- ODataLinkType type = null;
- try {
- type = ODataLinkType.fromString(client, link.getRel(), link.getType());
- } catch (IllegalArgumentException e) {
- // ignore
- }
-
- if (type == ODataLinkType.ENTITY_SET_NAVIGATION) {
- final List<String> uris;
- if (entitySetLinks.containsKey(link.getTitle())) {
- uris = entitySetLinks.get(link.getTitle());
- } else {
- uris = new ArrayList<String>();
- entitySetLinks.put(link.getTitle(), uris);
- }
- uris.add(link.getHref());
- } else {
- jgen.writeStringField(link.getTitle() + ODataConstants.JSON_BIND_LINK_SUFFIX, link.getHref());
- }
- }
- }
- for (Map.Entry<String, List<String>> entitySetLink : entitySetLinks.entrySet()) {
- jgen.writeArrayFieldStart(entitySetLink.getKey() + ODataConstants.JSON_BIND_LINK_SUFFIX);
- for (String uri : entitySetLink.getValue()) {
- jgen.writeString(uri);
- }
- jgen.writeEndArray();
- }
-
- for (JSONLink link : entry.getMediaEditLinks()) {
- if (link.getTitle() == null) {
- jgen.writeStringField(ODataConstants.JSON_MEDIAEDIT_LINK, link.getHref());
- }
-
- if (link.getInlineEntry() != null) {
- jgen.writeObjectField(link.getTitle(), link.getInlineEntry());
- }
- if (link.getInlineFeed() != null) {
- jgen.writeObjectField(link.getTitle(), link.getInlineFeed());
- }
- }
-
- if (entry.getMediaEntryProperties() == null) {
- JSONDOMTreeUtils.writeSubtree(client, jgen, entry.getContent());
- } else {
- JSONDOMTreeUtils.writeSubtree(client, jgen, entry.getMediaEntryProperties());
- }
-
- jgen.writeEndObject();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/JSONPropertyDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/JSONPropertyDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/JSONPropertyDeserializer.java
deleted file mode 100644
index 48f9b1c..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/JSONPropertyDeserializer.java
+++ /dev/null
@@ -1,124 +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 com.msopentech.odatajclient.engine.data.impl;
-
-import com.msopentech.odatajclient.engine.data.impl.JSONDOMTreeUtils;
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.msopentech.odatajclient.engine.data.impl.v3.JSONProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.engine.utils.ODataConstants;
-import com.msopentech.odatajclient.engine.utils.XMLUtils;
-import java.io.IOException;
-import java.net.URI;
-import java.util.List;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.ParserConfigurationException;
-import org.apache.commons.lang3.StringUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * Parse JSON string into <tt>JSONProperty</tt>.
- *
- * @see JSONProperty
- */
-public class JSONPropertyDeserializer extends ODataJacksonDeserializer<JSONProperty> {
-
- @Override
- protected JSONProperty doDeserialize(final JsonParser parser, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final ObjectNode tree = (ObjectNode) parser.getCodec().readTree(parser);
-
- final JSONProperty property = new JSONProperty();
-
- if (tree.hasNonNull(ODataConstants.JSON_METADATA)) {
- property.setMetadata(URI.create(tree.get(ODataConstants.JSON_METADATA).textValue()));
- tree.remove(ODataConstants.JSON_METADATA);
- }
-
- try {
- final DocumentBuilder builder = XMLUtils.DOC_BUILDER_FACTORY.newDocumentBuilder();
- final Document document = builder.newDocument();
-
- Element content = document.createElement(ODataConstants.ELEM_PROPERTY);
-
- if (property.getMetadata() != null) {
- final String metadataURI = property.getMetadata().toASCIIString();
- final int dashIdx = metadataURI.lastIndexOf('#');
- if (dashIdx != -1) {
- content.setAttribute(ODataConstants.ATTR_M_TYPE, metadataURI.substring(dashIdx + 1));
- }
- }
-
- JsonNode subtree = null;
- if (tree.has(ODataConstants.JSON_VALUE)) {
- if (tree.has(ODataConstants.JSON_TYPE)
- && StringUtils.isBlank(content.getAttribute(ODataConstants.ATTR_M_TYPE))) {
-
- content.setAttribute(ODataConstants.ATTR_M_TYPE, tree.get(ODataConstants.JSON_TYPE).asText());
- }
-
- final JsonNode value = tree.get(ODataConstants.JSON_VALUE);
- if (value.isValueNode()) {
- content.appendChild(document.createTextNode(value.asText()));
- } else if (EdmSimpleType.isGeospatial(content.getAttribute(ODataConstants.ATTR_M_TYPE))) {
- subtree = tree.objectNode();
- ((ObjectNode) subtree).put(ODataConstants.JSON_VALUE, tree.get(ODataConstants.JSON_VALUE));
- if (StringUtils.isNotBlank(content.getAttribute(ODataConstants.ATTR_M_TYPE))) {
- ((ObjectNode) subtree).put(
- ODataConstants.JSON_VALUE + "@" + ODataConstants.JSON_TYPE,
- content.getAttribute(ODataConstants.ATTR_M_TYPE));
- }
- } else {
- subtree = tree.get(ODataConstants.JSON_VALUE);
- }
- } else {
- subtree = tree;
- }
-
- if (subtree != null) {
- JSONDOMTreeUtils.buildSubtree(client, content, subtree);
- }
-
- final List<Node> children = XMLUtils.getChildNodes(content, Node.ELEMENT_NODE);
- if (children.size() == 1) {
- final Element value = (Element) children.iterator().next();
- if (ODataConstants.JSON_VALUE.equals(XMLUtils.getSimpleName(value))) {
- if (StringUtils.isNotBlank(content.getAttribute(ODataConstants.ATTR_M_TYPE))) {
- value.setAttribute(ODataConstants.ATTR_M_TYPE, content.getAttribute(ODataConstants.ATTR_M_TYPE));
- }
- content = value;
- }
- }
-
- property.setContent(content);
- } catch (ParserConfigurationException e) {
- throw new JsonParseException("Cannot build property", parser.getCurrentLocation(), e);
- }
-
- return property;
- }
-}
[31/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/EntityCreateMoreTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/EntityCreateMoreTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/EntityCreateMoreTestITCase.java
deleted file mode 100644
index 861da44..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/EntityCreateMoreTestITCase.java
+++ /dev/null
@@ -1,760 +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 com.msopentech.odatajclient.engine.it;
-
-import static org.junit.Assert.*;
-
-import com.msopentech.odatajclient.engine.client.http.HttpClientException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-import org.junit.Test;
-
-import com.msopentech.odatajclient.engine.communication.ODataClientErrorException;
-import com.msopentech.odatajclient.engine.communication.request.cud.ODataDeleteRequest;
-import com.msopentech.odatajclient.engine.communication.request.cud.ODataEntityCreateRequest;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataEntityRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataDeleteResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataEntityCreateResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.data.ODataCollectionValue;
-import com.msopentech.odatajclient.engine.data.ODataComplexValue;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.data.ODataEntitySet;
-import com.msopentech.odatajclient.engine.data.ODataInlineEntity;
-import com.msopentech.odatajclient.engine.data.ODataInlineEntitySet;
-import com.msopentech.odatajclient.engine.data.ODataLink;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import com.msopentech.odatajclient.engine.utils.URIUtils;
-import org.junit.Ignore;
-
-public class EntityCreateMoreTestITCase extends AbstractTestITCase {
-
- // test with json full metadata
- @Test
- public void withJSONFullMetadata() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final String contenttype = "application/json;odata=fullmetadata";
- final String prefer = "return-content";
- final int id = 1063;
- final ODataEntity original = getNewCustomer(id, "New Customer", false);
- createEntity(testStaticServiceRootURL, format, original, "Customer", contenttype, prefer);
- final ODataEntity actual = validateEntities(testStaticServiceRootURL, format, original, id, null, "Customer");
- delete(format, actual, false, testStaticServiceRootURL);
- }
- // test with atom
-
- @Test
- public void withATOM() {
- final ODataPubFormat format = ODataPubFormat.ATOM;
- final String contenttype = "application/atom+xml";
- final String prefer = "return-no-content";
- final int id = 1064;
- final ODataEntity original = getNewCustomer(id, "New Customer", false);
- createEntity(testStaticServiceRootURL, format, original, "Customer", contenttype, prefer);
- final ODataEntity actual = validateEntities(testStaticServiceRootURL, format, original, id, null, "Customer");
- delete(format, actual, false, testStaticServiceRootURL);
- }
- // gives null pointer exception when the content type and the accept type is json mo metadata
-
- @Test(expected = HttpClientException.class)
- @Ignore // static server doesn't add any entity attribute type; type is expected.
- public void withJSONNoMetadata() {
- final ODataPubFormat format = ODataPubFormat.JSON_NO_METADATA;
- final String contenttype = "application/json;odata=nometadata";
- final String prefer = "return-content";
- final int id = 15;
- final ODataEntity original = getNewCustomer(id, "New Customer", false);
- createEntity(testStaticServiceRootURL, format, original, "Customer", contenttype, prefer);
- final ODataEntity actual = validateEntities(testStaticServiceRootURL, format, original, id, null, "Customer");
- delete(format, actual, false, testStaticServiceRootURL);
- }
- // deep insert
-
- @Test
- public void createInlineWithATOM() {
- final ODataPubFormat format = ODataPubFormat.ATOM;
- final String contentType = "application/atom+xml";
- final String prefer = "return-content";
- final int id = 5777;
- final ODataEntity original = getNewCustomer(id, "New customer", true);
- createEntity(testStaticServiceRootURL, format, original, "Customer", contentType, prefer);
- final ODataEntity actual =
- validateEntities(testStaticServiceRootURL, format, original, id, Collections.<String>singleton("Info"),
- "Customer");
- delete(format, actual, false, testStaticServiceRootURL);
- }
- // deep insert
-
- @Test
- public void createInlineWithJSON() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final String contentType = "application/json;odata=fullmetadata";
- final String prefer = "return-content";
- final int id = 67;
- final ODataEntity original = getNewCustomer(id, "New customer", true);
- createEntity(testStaticServiceRootURL, format, original, "Customer", contentType, prefer);
- final ODataEntity actual =
- validateEntities(testStaticServiceRootURL, format, original, id, Collections.<String>singleton("Info"),
- "Customer");
- delete(format, actual, false, testStaticServiceRootURL);
- }
- // with a string having special characters, html tags, numbers and characters
-
- @Test
- public void withSpecialString() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final String contenttype = "application/json;odata=fullmetadata";
- final String prefer = "return-content";
- final int id = 11;
- final ODataEntity original = getNewCustomer(id, "New 12,345//\\%^&*()<html>customer", false);
- createEntity(testStaticServiceRootURL, format, original, "Customer", contenttype, prefer);
- final ODataEntity actual = validateEntities(testStaticServiceRootURL, format, original, id, null, "Customer");
- delete(format, actual, false, testStaticServiceRootURL);
- }
- // with atom content type and json accept type. its giving 400 error.
-
- @Test
- @Ignore
- public void createWithATOMReturnJSON() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final String contenttype = "application/atom+xml";
- final String prefer = "return-content";
- final int id = 146;
- try {
- final ODataEntity original = getNewCustomer(id, "New Customer", false);
- createEntity(testStaticServiceRootURL, format, original, "Customer", contenttype, prefer);
- final ODataEntity actual = validateEntities(testStaticServiceRootURL, format, original, id, null,
- "Customer");
- delete(format, actual, false, testStaticServiceRootURL);
- } catch (Exception e) {
- fail(e.getMessage());
- }
- }
- // with json content type and atom accept type. its giving 400 error.
-
- @Test
- @Ignore
- public void createWithJSONReturnATOM() {
- final ODataPubFormat format = ODataPubFormat.ATOM;
- final String contenttype = "application/json;odata=fullmetadata";
- final String prefer = "return-content";
- final int id = 155;
- try {
- final ODataEntity original = getNewCustomer(id, "New Customer", false);
- createEntity(testStaticServiceRootURL, format, original, "Customer", contenttype, prefer);
- final ODataEntity actual = validateEntities(testStaticServiceRootURL, format, original, id, null,
- "Customer");
- delete(format, actual, false, testStaticServiceRootURL);
- } catch (Exception e) {
- fail(e.getMessage());
- }
- }
- // a long String in the Name field
-
- @Test
- public void withLongString() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final String contenttype = "application/json;odata=fullmetadata";
- final String prefer = "return-content";
- final int id = 1112;
- final ODataEntity original = getNewCustomer(id,
- "Sampledskjfhsdkjfhsdkfhksdjhfksdhfvjhdfgkjhfdkjghdfkjghkfdhgkdfhgdfhgkjdfghkdfjghkdfjghfkdjghkdfghkdfhgkdfjghdfkjghkfdjghfksdhfkjsdhfdshfhsdfjhsdkfhkdsfhksdfhksdhfksdhfksdhfksdhfsdhfksdhfkjsdhfksdhfksdhfkds",
- false);
- createEntity(testStaticServiceRootURL, format, original, "Customer", contenttype, prefer);
- final ODataEntity actual = validateEntities(testStaticServiceRootURL, format, original, id, null, "Customer");
- delete(format, actual, false, testStaticServiceRootURL);
- }
-
- //Test with no Id
- @Test
- public void withNoId() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final String contenttype = "application/json;odata=fullmetadata";
- final String prefer = "return-content";
- final int id = 0;
- final ODataEntity original = getNewCustomer(id, "New Customer", false);
- createEntity(testStaticServiceRootURL, format, original, "Customer", contenttype, prefer);
- final ODataEntity actual = validateEntities(testStaticServiceRootURL, format, original, id, null, "Customer");
- delete(format, actual, false, testStaticServiceRootURL);
- }
- // test different primitive properties like date, String, decimal
-
- @Test
- public void differentProperties() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final String contenttype = "application/json;odata=fullmetadata";
- final String prefer = "return-no-content";
- final int id = 34;
- final ODataEntity original = getComputerDetailsEntity(id, "Computer details", false,
- "2013-12-31T23:59:59.9999999", "-32.4985749");
- createEntity(testStaticServiceRootURL, format, original, "ComputerDetail", contenttype, prefer);
- final ODataEntity actual = validateEntities(testStaticServiceRootURL, format, original, id, null,
- "ComputerDetail");
- delete(format, actual, false, testStaticServiceRootURL);
- }
- // test with invalid
-
- @Test(expected = IllegalArgumentException.class)
- public void invalidDateTest() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final String contenttype = "application/json;odata=fullmetadata";
- final String prefer = "return-no-content";
- final int id = 34;
- final ODataEntity original = getComputerDetailsEntity(id, "Computer details", false, "abc", "-32.4985749");
- createEntity(testStaticServiceRootURL, format, original, "ComputerDetail", contenttype, prefer);
- final ODataEntity actual = validateEntities(testStaticServiceRootURL, format, original, id, null,
- "ComputerDetail");
- delete(format, actual, false, testStaticServiceRootURL);
- }
- // test with different decimal values. Returns 400 error
-
- @Test(expected = ODataClientErrorException.class)
- @Ignore // static server doesn't provide any input validation
- public void testWithDecimal() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final String contenttype = "application/json;odata=fullmetadata";
- final String prefer = "return-no-content";
- final int id = 35;
- final ODataEntity original = getComputerDetailsEntity(id, "Computer details Test", false,
- "2013-12-31T23:59:59.9999999",
- "-344587543985799834759845798475943759438573495734985739457349857394857894.4985749");
- createEntity(testStaticServiceRootURL, format, original, "ComputerDetail", contenttype, prefer);
- final ODataEntity actual = validateEntities(testStaticServiceRootURL, format, original, id, null,
- "ComputerDetail");
- delete(format, actual, false, testStaticServiceRootURL);
- }
- // test with date. Unable to parse a date because the property type is datetime and not date
-
- @Test(expected = IllegalArgumentException.class)
- public void withDate() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final String contenttype = "application/json;odata=fullmetadata";
- final String prefer = "return-no-content";
- final int id = 35;
- final ODataEntity original = getComputerDetailsEntity(id, "Computer details Test", false, "2013-12-31",
- "-37894.4985749");
- createEntity(testStaticServiceRootURL, format, original, "ComputerDetail", contenttype, prefer);
- final ODataEntity actual = validateEntities(testStaticServiceRootURL, format, original, id, null,
- "ComputerDetail");
- delete(format, actual, false, testStaticServiceRootURL);
- }
- // with multiple key test
-
- @Test
- public void createWithMultipleKey() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final String contentType = "application/json;odata=fullmetadata";
- final String prefer = "return-content";
- try {
- final ODataEntity message = client.getObjectFactory().newEntity(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.Message");
-
- message.addProperty(client.getObjectFactory().newPrimitiveProperty("MessageId",
- client.getPrimitiveValueBuilder().setValue(111).setType(EdmSimpleType.Int32).build()));
- message.addProperty(client.getObjectFactory().newPrimitiveProperty("FromUsername",
- client.getPrimitiveValueBuilder().setValue("user").
- setType(EdmSimpleType.String).build()));
- message.addProperty(client.getObjectFactory().newPrimitiveProperty("ToUsername",
- client.getPrimitiveValueBuilder().setValue("usernameabc").
- setType(EdmSimpleType.String).build()));
- message.addProperty(client.getObjectFactory().newPrimitiveProperty("Subject",
- client.getPrimitiveValueBuilder().setValue("Subject of message").
- setType(EdmSimpleType.String).build()));
- message.addProperty(client.getObjectFactory().newPrimitiveProperty("Body",
- client.getPrimitiveValueBuilder().setValue("Body Content").
- setType(EdmSimpleType.String).build()));
- message.addProperty(client.getObjectFactory().newPrimitiveProperty("IsRead",
- client.getPrimitiveValueBuilder().setValue(false).setType(EdmSimpleType.Boolean).build()));
-
- final URIBuilder builder =
- client.getURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Message");
- final ODataEntityCreateRequest req = client.getCUDRequestFactory().getEntityCreateRequest(builder.build(),
- message);
- req.setFormat(format);
- req.setContentType(contentType);
- req.setPrefer(prefer);
- final ODataEntityCreateResponse res = req.execute();
- assertNotNull(res);
- assertEquals(201, res.getStatusCode());
-
- final Map<String, Object> multiKey = new HashMap<String, Object>();
- multiKey.put("FromUsername", "user");
- multiKey.put("MessageId", 111);
-
- final ODataDeleteResponse deleteRes = client.getCUDRequestFactory().
- getDeleteRequest(builder.appendKeySegment(multiKey).build()).execute();
- assertEquals(204, deleteRes.getStatusCode());
- } catch (Exception e) {
- fail(e.getMessage());
- }
- }
- // create an entity which has multiple keys by only one of the key is send in the request payload.
- // it creates the entity successfully
-
- @Test
- public void createNoMultipleKey() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final String contentType = "application/json;odata=fullmetadata";
- final String prefer = "return-content";
- try {
- final ODataEntity message = client.getObjectFactory().newEntity(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.Message");
-
- message.addProperty(client.getObjectFactory().newPrimitiveProperty("MessageId",
- client.getPrimitiveValueBuilder().setText(String.valueOf(25)).
- setType(EdmSimpleType.Int32).build()));
- message.addProperty(client.getObjectFactory().newPrimitiveProperty("FromUsername",
- client.getPrimitiveValueBuilder().setText("user").
- setType(EdmSimpleType.String).build()));
- message.addProperty(client.getObjectFactory().newPrimitiveProperty("ToUsername",
- client.getPrimitiveValueBuilder().setValue("usernameabc").
- setType(EdmSimpleType.String).build()));
- message.addProperty(client.getObjectFactory().newPrimitiveProperty("Subject",
- client.getPrimitiveValueBuilder().setValue("Subject of message").
- setType(EdmSimpleType.String).build()));
- message.addProperty(client.getObjectFactory().newPrimitiveProperty("Body",
- client.getPrimitiveValueBuilder().setValue("Body Content").
- setType(EdmSimpleType.String).build()));
- message.addProperty(client.getObjectFactory().newPrimitiveProperty("IsRead",
- client.getPrimitiveValueBuilder().setValue(false).setType(EdmSimpleType.Boolean).build()));
-
- final URIBuilder builder =
- client.getURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Message");
- final ODataEntityCreateRequest req = client.getCUDRequestFactory().getEntityCreateRequest(builder.build(),
- message);
- req.setFormat(format);
- req.setContentType(contentType);
- req.setPrefer(prefer);
- final ODataEntityCreateResponse res = req.execute();
- assertNotNull(res);
- assertEquals(201, res.getStatusCode());
- } catch (Exception e) {
- fail(e.getMessage());
- }
- }
- // test open type create Entity, JSON full metadata
-
- @Test
- public void openTypeCreateJSON() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final String contentType = "application/json;odata=fullmetadata";
- final String prefer = "return-content";
- final int id = 11;
- final String gid = "random";
- getOpenTypeEntity(format, contentType, id, prefer, gid);
- }
- // test open type create Entity, ATOM full metadata
-
- @Test
- public void openTypeCreateATOM() {
- final ODataPubFormat format = ODataPubFormat.ATOM;
- final String contentType = "application/atom+xml";
- final String prefer = "return-content";
- final int id = 12;
- final String gid = "random";
- getOpenTypeEntity(format, contentType, id, prefer, gid);
- }
- // test open type create Entity, JSON no metadata.
-
- @Test
- public void openTypeCreateNoMetadata() {
- final ODataPubFormat format = ODataPubFormat.JSON_NO_METADATA;
- final String contentType = "application/json;odata=nometadata";
- final String prefer = "return-content";
- final int id = 1333;
- final String gid = "random";
- getOpenTypeEntity(format, contentType, id, prefer, gid);
- }
- // test with invalid guid
-
- @Test
- public void withInvalidGuid() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final String contentType = "application/json;odata=fullmetadata";
- final String prefer = "return-content";
- final int id = 777;
- final String gid = "00000000-0000-0000-0000-000000000000";
- getOpenTypeEntity(format, contentType, id, prefer, gid);
- }
- // test with guid as string.
-
- @Test
- public void withStringGuid() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final String contentType = "application/json;odata=fullemtadata";
- final String prefer = "return-content";
- final int id = 777;
- final String gid = "stringguid";
- getOpenTypeEntityWithString(format, contentType, id, prefer, gid);
- }
-
- // compares links of the newly created entity with the previous
- public void validateLinks(final Collection<ODataLink> original, final Collection<ODataLink> actual) {
- assertTrue(original.size() <= actual.size());
-
- for (ODataLink originalLink : original) {
- ODataLink foundOriginal = null;
- ODataLink foundActual = null;
-
- for (ODataLink actualLink : actual) {
-
- if (actualLink.getType() == originalLink.getType()
- && (originalLink.getLink() == null
- || actualLink.getLink().toASCIIString().endsWith(originalLink.getLink().toASCIIString()))
- && actualLink.getName().equals(originalLink.getName())) {
-
- foundOriginal = originalLink;
- foundActual = actualLink;
- }
- }
-
- assertNotNull(foundOriginal);
- assertNotNull(foundActual);
-
- if (foundOriginal instanceof ODataInlineEntity && foundActual instanceof ODataInlineEntity) {
- final ODataEntity originalInline = ((ODataInlineEntity) foundOriginal).getEntity();
- assertNotNull(originalInline);
-
- final ODataEntity actualInline = ((ODataInlineEntity) foundActual).getEntity();
- assertNotNull(actualInline);
-
- checkProperties(originalInline.getProperties(), actualInline.getProperties());
- }
- }
- }
-
- // add Information property
- public ODataEntity getInfo(final int id, final String info) {
- final ODataEntity entity =
- client.getObjectFactory().newEntity("Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo");
- entity.setMediaEntity(true);
-
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("Information",
- client.getPrimitiveValueBuilder().setText(info).setType(EdmSimpleType.String).build()));
- return entity;
- }
- // get a Customer entity to be created
-
- public ODataEntity getNewCustomer(
- final int id, final String name, final boolean withInlineInfo) {
-
- final ODataEntity entity =
- client.getObjectFactory().newEntity("Microsoft.Test.OData.Services.AstoriaDefaultService.Customer");
-
- // add name attribute
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("Name",
- client.getPrimitiveValueBuilder().setText(name).setType(EdmSimpleType.String).build()));
-
- // add key attribute
- if (id != 0) {
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("CustomerId",
- client.getPrimitiveValueBuilder().setValue(id).setType(EdmSimpleType.Int32).build()));
- } else {
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("CustomerId",
- client.getPrimitiveValueBuilder().setValue(0).setType(EdmSimpleType.Int32).build()));
- }
- final ODataCollectionValue backupContactInfoValue = new ODataCollectionValue(
- "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)");
-
-
- final ODataComplexValue contactDetails = new ODataComplexValue(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails");
-
-
- final ODataCollectionValue altNamesValue = new ODataCollectionValue("Collection(Edm.String)");
- altNamesValue.add(client.getPrimitiveValueBuilder().
- setText("My Alternative name").setType(EdmSimpleType.String).build());
- contactDetails.add(client.getObjectFactory().newCollectionProperty("AlternativeNames", altNamesValue));
-
- final ODataCollectionValue emailBagValue = new ODataCollectionValue("Collection(Edm.String)");
- emailBagValue.add(client.getPrimitiveValueBuilder().
- setText("altname@mydomain.com").setType(EdmSimpleType.String).build());
- contactDetails.add(client.getObjectFactory().newCollectionProperty("EmailBag", emailBagValue));
-
- final ODataComplexValue contactAliasValue = new ODataComplexValue(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases");
- contactDetails.add(client.getObjectFactory().newComplexProperty("ContactAlias", contactAliasValue));
-
- final ODataCollectionValue aliasAltNamesValue = new ODataCollectionValue("Collection(Edm.String)");
- aliasAltNamesValue.add(client.getPrimitiveValueBuilder().
- setText("myAlternativeName").setType(EdmSimpleType.String).build());
- contactAliasValue.add(client.getObjectFactory().newCollectionProperty("AlternativeNames", aliasAltNamesValue));
-
- final ODataComplexValue homePhone = new ODataComplexValue(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone");
- homePhone.add(client.getObjectFactory().newPrimitiveProperty("PhoneNumber",
- client.getPrimitiveValueBuilder().setText("8437568356834568").setType(EdmSimpleType.String).build()));
- homePhone.add(client.getObjectFactory().newPrimitiveProperty("Extension",
- client.getPrimitiveValueBuilder().setText("124365426534621534423ttrf").setType(EdmSimpleType.String).
- build()));
- contactDetails.add(client.getObjectFactory().newComplexProperty("HomePhone", homePhone));
-
- backupContactInfoValue.add(contactDetails);
- entity.addProperty(client.getObjectFactory().newCollectionProperty("BackupContactInfo",
- backupContactInfoValue));
- if (withInlineInfo) {
- final ODataInlineEntity inlineInfo = client.getObjectFactory().newInlineEntity("Info", URI.create(
- "Customer(" + id
- + ")/Info"), getInfo(id, name + "_Info"));
- inlineInfo.getEntity().setMediaEntity(true);
- entity.addLink(inlineInfo);
- }
-
- return entity;
- }
- // get a ComputerDetail entity to be created
-
- public ODataEntity getComputerDetailsEntity(
- final int id, final String sampleName, final boolean withInlineInfo,
- final String purchaseDate, String dimensionValue) {
-
- final ODataEntity entity =
- client.getObjectFactory().
- newEntity("Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail");
-
-
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("Manufacturer",
- client.getPrimitiveValueBuilder().setText("manufacturer name").
- setType(EdmSimpleType.String).build()));
-
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("ComputerDetailId",
- client.getPrimitiveValueBuilder().setText(String.valueOf(id)).
- setType(EdmSimpleType.Int32).build()));
-
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("Model",
- client.getPrimitiveValueBuilder().setText("Model Name").setType(EdmSimpleType.String).build()));
-
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("PurchaseDate",
- client.getPrimitiveValueBuilder().setText(purchaseDate).setType(EdmSimpleType.DateTime).build()));
-
-
- // add Dimensions attribute (collection)
- final ODataComplexValue dimensions = new ODataComplexValue(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions");
- dimensions.add(client.getObjectFactory().newPrimitiveProperty("Width",
- client.getPrimitiveValueBuilder().setText(dimensionValue).setType(EdmSimpleType.Decimal).build()));
- dimensions.add(client.getObjectFactory().newPrimitiveProperty("Height",
- client.getPrimitiveValueBuilder().setText(dimensionValue).setType(EdmSimpleType.Decimal).build()));
- dimensions.add(client.getObjectFactory().newPrimitiveProperty("Depth",
- client.getPrimitiveValueBuilder().setText(dimensionValue).setType(EdmSimpleType.Decimal).build()));
-
- entity.addProperty(client.getObjectFactory().newComplexProperty("Dimensions",
- dimensions));
- return entity;
- }
- // create an entity
-
- public void createEntity(
- final String serviceRootURL,
- final ODataPubFormat format,
- final ODataEntity original,
- final String entitySetName,
- final String contentType,
- final String prefer) {
-
- final URIBuilder uriBuilder = client.getURIBuilder(serviceRootURL);
- uriBuilder.appendEntitySetSegment(entitySetName);
- final ODataEntityCreateRequest createReq =
- client.getCUDRequestFactory().getEntityCreateRequest(uriBuilder.build(), original);
- createReq.setFormat(format);
- createReq.setContentType(contentType);
- createReq.setPrefer(prefer);
-
- final ODataEntityCreateResponse createRes = createReq.execute();
-
- if (prefer.equals("return-no-content")) {
- assertEquals(204, createRes.getStatusCode());
- } else {
- assertEquals(201, createRes.getStatusCode());
- assertEquals("Created", createRes.getStatusMessage());
- assertTrue(createRes.getHeader("DataServiceVersion").contains("3.0;"));
- final ODataEntity created = createRes.getBody();
- assertNotNull(created);
- }
-
- }
- // validate newly created entities
-
- public ODataEntity validateEntities(final String serviceRootURL,
- final ODataPubFormat format,
- final ODataEntity original,
- final int actualObjectId,
- final Collection<String> expands, final String entitySetName) {
-
- final URIBuilder uriBuilder = client.getURIBuilder(serviceRootURL).
- appendEntityTypeSegment(entitySetName).appendKeySegment(actualObjectId);
-
- // search expanded
- if (expands != null) {
- for (String expand : expands) {
- uriBuilder.expand(expand);
- }
- }
- final ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setFormat(format);
-
- final ODataRetrieveResponse<ODataEntity> res = req.execute();
- assertEquals(200, res.getStatusCode());
-
- final ODataEntity actual = res.getBody();
- assertNotNull(actual);
-
- validateLinks(original.getAssociationLinks(), actual.getAssociationLinks());
- validateLinks(original.getEditMediaLinks(), actual.getEditMediaLinks());
- validateLinks(original.getNavigationLinks(), actual.getNavigationLinks());
-
- // validate equalities of properties
- checkProperties(original.getProperties(), actual.getProperties());
- return actual;
- }
- // creates dynamic property for open type entity.
-
- public void getOpenTypeEntity(final ODataPubFormat format, final String contentType,
- final int id, final String prefer, String uuid) {
- final UUID guid;
- if (uuid.equals("random")) {
- guid = UUID.randomUUID();
- } else {
- guid = UUID.fromString(uuid);
- }
- ODataEntity entity = client.getObjectFactory().newEntity("Microsoft.Test.OData.Services.OpenTypesService.Row");
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("Id",
- client.getPrimitiveValueBuilder().setType(EdmSimpleType.Guid).setValue(guid).build()));
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("LongValue",
- client.getPrimitiveValueBuilder().setType(EdmSimpleType.Int64).setValue(44L).build()));
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("DoubleValue",
- client.getPrimitiveValueBuilder().setType(EdmSimpleType.Double).setValue(4.34567D).build()));
-
- final ODataEntityCreateRequest createReq = client.getCUDRequestFactory().
- getEntityCreateRequest(client.getURIBuilder(testOpenTypeServiceRootURL).
- appendEntityTypeSegment("Row").build(), entity);
- createReq.setFormat(format);
- createReq.setPrefer(prefer);
- createReq.setContentType(contentType);
- final ODataEntityCreateResponse createRes = createReq.execute();
- assertEquals(201, createRes.getStatusCode());
- entity = createRes.getBody();
- assertNotNull(entity);
- if (format.equals(ODataPubFormat.JSON_NO_METADATA)) {
- assertEquals(EdmSimpleType.String.toString(), entity.getProperty("Id").getPrimitiveValue().getTypeName());
- assertEquals(EdmSimpleType.String.toString(), entity.getProperty("LongValue").getPrimitiveValue().
- getTypeName());
- assertEquals(EdmSimpleType.Double.toString(), entity.getProperty("DoubleValue").getPrimitiveValue().
- getTypeName());
- } else if (format.equals(ODataPubFormat.JSON)) {
- assertEquals(EdmSimpleType.String.toString(), entity.getProperty("Id").getPrimitiveValue().getTypeName());
- assertEquals(EdmSimpleType.Int64.toString(), entity.getProperty("LongValue").getPrimitiveValue().
- getTypeName());
- assertEquals(EdmSimpleType.Double.toString(), entity.getProperty("DoubleValue").getPrimitiveValue().
- getTypeName());
- } else {
- assertEquals(EdmSimpleType.Guid.toString(), entity.getProperty("Id").getPrimitiveValue().getTypeName());
- assertEquals(EdmSimpleType.Int64.toString(), entity.getProperty("LongValue").getPrimitiveValue().
- getTypeName());
- assertEquals(EdmSimpleType.Double.toString(), entity.getProperty("DoubleValue").getPrimitiveValue().
- getTypeName());
- }
- ODataDeleteResponse deleteRes;
- try {
- deleteRes = client.getCUDRequestFactory().getDeleteRequest(
- new URI(testOpenTypeServiceRootURL + "/Row(guid'" + guid + "')")).execute();
- assertEquals(204, deleteRes.getStatusCode());
- } catch (URISyntaxException e) {
- // TODO Auto-generated catch block
- LOG.error("", e);
- }
- }
- // creates dynamic property for open type entity (Invalid Guid test)
-
- public void getOpenTypeEntityWithString(final ODataPubFormat format, final String contentType,
- final int id, final String prefer, String uuid) {
- try {
- ODataEntity entity = client.getObjectFactory().newEntity(
- "Microsoft.Test.OData.Services.OpenTypesService.Row");
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("Id",
- client.getPrimitiveValueBuilder().setType(EdmSimpleType.Guid).setValue(uuid).build()));
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("LongValue",
- client.getPrimitiveValueBuilder().setType(EdmSimpleType.Int64).setValue(44L).build()));
- entity.addProperty(client.getObjectFactory().newPrimitiveProperty("DoubleValue",
- client.getPrimitiveValueBuilder().setType(EdmSimpleType.Double).setValue(4.34567D).build()));
-
- final ODataEntityCreateRequest createReq = client.getCUDRequestFactory().
- getEntityCreateRequest(client.getURIBuilder(testOpenTypeServiceRootURL).
- appendEntityTypeSegment("Row").build(), entity);
- createReq.setFormat(format);
- createReq.setPrefer(prefer);
- createReq.setContentType(contentType);
- final ODataEntityCreateResponse createRes = createReq.execute();
- } catch (Exception e) {
- if (e.getMessage().equals("Provided value is not compatible with Edm.Guid")) {
- assertTrue(true);
- } else {
- fail(e.getMessage());
- }
- }
- }
- // delete an entity and associated links after creation
-
- public void delete(final ODataPubFormat format, final ODataEntity created, final boolean includeInline,
- final String baseUri) {
-
- final Set<URI> toBeDeleted = new HashSet<URI>();
- toBeDeleted.add(created.getEditLink());
-
- if (includeInline) {
- for (ODataLink link : created.getNavigationLinks()) {
- if (link instanceof ODataInlineEntity) {
- final ODataEntity inline = ((ODataInlineEntity) link).getEntity();
- if (inline.getEditLink() != null) {
- toBeDeleted.add(URIUtils.getURI(baseUri, inline.getEditLink().toASCIIString()));
- }
- }
- if (link instanceof ODataInlineEntitySet) {
- final ODataEntitySet inline = ((ODataInlineEntitySet) link).getEntitySet();
- for (ODataEntity entity : inline.getEntities()) {
- if (entity.getEditLink() != null) {
- toBeDeleted.add(URIUtils.getURI(baseUri, entity.getEditLink().toASCIIString()));
- }
- }
- }
- }
- }
- assertFalse(toBeDeleted.isEmpty());
-
- for (URI link : toBeDeleted) {
- final ODataDeleteRequest deleteReq = client.getCUDRequestFactory().getDeleteRequest(link);
- deleteReq.setFormat(format);
- final ODataDeleteResponse deleteRes = deleteReq.execute();
- assertEquals(204, deleteRes.getStatusCode());
- assertEquals("No Content", deleteRes.getStatusMessage());
-
- deleteRes.close();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/EntityCreateTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/EntityCreateTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/EntityCreateTestITCase.java
deleted file mode 100644
index a5ecd3a..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/EntityCreateTestITCase.java
+++ /dev/null
@@ -1,477 +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 com.msopentech.odatajclient.engine.it;
-
-import static com.msopentech.odatajclient.engine.it.AbstractTestITCase.testStaticServiceRootURL;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import com.msopentech.odatajclient.engine.client.http.NoContentException;
-import com.msopentech.odatajclient.engine.communication.header.ODataHeaderValues;
-import com.msopentech.odatajclient.engine.communication.header.ODataHeaders;
-import com.msopentech.odatajclient.engine.communication.request.UpdateType;
-import com.msopentech.odatajclient.engine.communication.request.cud.ODataDeleteRequest;
-import com.msopentech.odatajclient.engine.communication.request.cud.ODataEntityCreateRequest;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataEntityRequest;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataEntitySetRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataDeleteResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataEntityCreateResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.data.ODataEntitySet;
-import com.msopentech.odatajclient.engine.data.ODataProperty;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import com.msopentech.odatajclient.engine.data.ODataInlineEntitySet;
-import com.msopentech.odatajclient.engine.data.ODataLink;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.engine.utils.URIUtils;
-import java.net.URI;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.Set;
-import org.apache.http.entity.ContentType;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * This is the unit test class to check create entity operations.
- */
-public class EntityCreateTestITCase extends AbstractTestITCase {
-
- protected String getServiceRoot() {
- return testStaticServiceRootURL;
- }
-
- @Test
- public void createAsAtom() {
- final ODataPubFormat format = ODataPubFormat.ATOM;
- final int id = 1;
- final ODataEntity original = getSampleCustomerProfile(id, "Sample customer", false);
-
- createEntity(getServiceRoot(), format, original, "Customer");
- final ODataEntity actual = compareEntities(getServiceRoot(), format, original, id, null);
-
- cleanAfterCreate(format, actual, false, getServiceRoot());
- }
-
- @Test
- public void createAsJSON() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final int id = 2;
- final ODataEntity original = getSampleCustomerProfile(id, "Sample customer", false);
-
- createEntity(getServiceRoot(), format, original, "Customer");
- final ODataEntity actual = compareEntities(getServiceRoot(), format, original, id, null);
-
- cleanAfterCreate(format, actual, false, getServiceRoot());
- }
-
- @Test
- public void createWithInlineAsAtom() {
- final ODataPubFormat format = ODataPubFormat.ATOM;
- final int id = 3;
- final ODataEntity original = getSampleCustomerProfile(id, "Sample customer", true);
-
- createEntity(getServiceRoot(), format, original, "Customer");
- final ODataEntity actual =
- compareEntities(getServiceRoot(), format, original, id, Collections.<String>singleton("Info"));
-
- cleanAfterCreate(format, actual, true, getServiceRoot());
- }
-
- @Test
- public void createWithInlineAsJSON() {
- // this needs to be full, otherwise there is no mean to recognize links
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final int id = 4;
- final ODataEntity original = getSampleCustomerProfile(id, "Sample customer", true);
-
- createEntity(getServiceRoot(), format, original, "Customer");
- final ODataEntity actual =
- compareEntities(getServiceRoot(), format, original, id, Collections.<String>singleton("Info"));
-
- cleanAfterCreate(format, actual, true, getServiceRoot());
- }
-
- @Test
- public void createInlineWithoutLinkAsAtom() {
- final ODataPubFormat format = ODataPubFormat.ATOM;
- final int id = 5;
- final ODataEntity original = getSampleCustomerProfile(id, "Sample customer", false);
-
- original.addLink(client.getObjectFactory().newInlineEntity(
- "Info", null, getSampleCustomerInfo(id, "Sample Customer_Info")));
-
- createEntity(getServiceRoot(), format, original, "Customer");
- final ODataEntity actual =
- compareEntities(getServiceRoot(), format, original, id, Collections.<String>singleton("Info"));
-
- boolean found = false;
-
- for (ODataLink link : actual.getNavigationLinks()) {
- assertNotNull(link.getLink());
- if (link.getLink().toASCIIString().endsWith("Customer(" + id + ")/Info")) {
- found = true;
- }
- }
-
- assertTrue(found);
-
- cleanAfterCreate(format, actual, true, getServiceRoot());
- }
-
- @Test
- public void createInlineWithoutLinkAsJSON() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final int id = 6;
- final ODataEntity original = getSampleCustomerProfile(id, "Sample customer", false);
-
- original.addLink(client.getObjectFactory().newInlineEntity(
- "Info", null, getSampleCustomerInfo(id, "Sample Customer_Info")));
-
- createEntity(getServiceRoot(), format, original, "Customer");
- final ODataEntity actual =
- compareEntities(getServiceRoot(), format, original, id, Collections.<String>singleton("Info"));
-
- boolean found = false;
-
- for (ODataLink link : actual.getNavigationLinks()) {
- assertNotNull(link.getLink());
- if (link.getLink().toASCIIString().endsWith("Customer(" + id + ")/Info")) {
- found = true;
- }
- }
-
- assertTrue(found);
-
- cleanAfterCreate(format, actual, true, getServiceRoot());
- }
-
- @Test
- public void createWithNavigationAsAtom() {
- final ODataPubFormat format = ODataPubFormat.ATOM;
- final ODataEntity actual = createWithNavigationLink(format, 5);
- cleanAfterCreate(format, actual, false, getServiceRoot());
- }
-
- @Test
- public void createWithNavigationAsJSON() {
- // this needs to be full, otherwise there is no mean to recognize links
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final ODataEntity actual = createWithNavigationLink(format, 6);
- cleanAfterCreate(format, actual, false, getServiceRoot());
- }
-
- @Test
- public void createWithFeedNavigationAsAtom() {
- final ODataPubFormat format = ODataPubFormat.ATOM;
- final ODataEntity actual = createWithFeedNavigationLink(format, 7);
- cleanAfterCreate(format, actual, false, getServiceRoot());
- }
-
- @Test
- public void createWithFeedNavigationAsJSON() {
- // this needs to be full, otherwise there is no mean to recognize links
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final ODataEntity actual = createWithFeedNavigationLink(format, 8);
- cleanAfterCreate(format, actual, false, getServiceRoot());
- }
-
- @Test
- public void createWithBackNavigationAsAtom() {
- final ODataPubFormat format = ODataPubFormat.ATOM;
- final ODataEntity actual = createWithBackNavigationLink(format, 9);
- cleanAfterCreate(format, actual, true, getServiceRoot());
- }
-
- @Test
- public void createWithBackNavigationAsJSON() {
- // this needs to be full, otherwise there is no mean to recognize links
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
- final ODataEntity actual = createWithBackNavigationLink(format, 10);
- cleanAfterCreate(format, actual, true, getServiceRoot());
- }
-
- @Test
- public void multiKeyAsAtom() {
- multiKey(ODataPubFormat.ATOM);
- }
-
- @Test
- public void multiKeyAsJSON() {
- multiKey(ODataPubFormat.JSON);
- }
-
- @Test
- public void createReturnNoContent() {
- final int id = 1;
- final ODataEntity original = getSampleCustomerProfile(id, "Sample customer", false);
-
- final ODataEntityCreateRequest createReq = client.getCUDRequestFactory().getEntityCreateRequest(
- client.getURIBuilder(getServiceRoot()).appendEntitySetSegment("Customer").build(), original);
- createReq.setPrefer(ODataHeaderValues.preferReturnNoContent);
-
- final ODataEntityCreateResponse createRes = createReq.execute();
- assertEquals(204, createRes.getStatusCode());
- assertEquals(ODataHeaderValues.preferReturnNoContent,
- createRes.getHeader(ODataHeaders.HeaderName.preferenceApplied).iterator().next());
-
- try {
- createRes.getBody();
- fail();
- } catch (NoContentException e) {
- assertNotNull(e);
- }
-
- final ODataDeleteResponse deleteRes = client.getCUDRequestFactory().getDeleteRequest(
- client.getURIBuilder(getServiceRoot()).appendEntitySetSegment("Customer").appendKeySegment(id).build()).
- execute();
- assertEquals(204, deleteRes.getStatusCode());
- }
-
- @Test
- @Ignore
- public void issue135() {
- final int id = 2;
- final ODataEntity original = getSampleCustomerProfile(id, "Sample customer for issue 135", false);
-
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot()).appendEntitySetSegment("Customer");
- final ODataEntityCreateRequest createReq =
- client.getCUDRequestFactory().getEntityCreateRequest(uriBuilder.build(), original);
- createReq.setFormat(ODataPubFormat.JSON_FULL_METADATA);
- createReq.setContentType(ContentType.APPLICATION_ATOM_XML.getMimeType());
- createReq.setPrefer(ODataHeaderValues.preferReturnContent);
-
- try {
- final ODataEntityCreateResponse createRes = createReq.execute();
- assertEquals(201, createRes.getStatusCode());
- } catch (Exception e) {
- fail(e.getMessage());
- } finally {
- final ODataDeleteResponse deleteRes = client.getCUDRequestFactory().getDeleteRequest(
- client.getURIBuilder(getServiceRoot()).appendEntitySetSegment("Customer").appendKeySegment(id).
- build()).
- execute();
- assertEquals(204, deleteRes.getStatusCode());
- }
- }
-
- private ODataEntity createWithFeedNavigationLink(final ODataPubFormat format, final int id) {
- final String sampleName = "Sample customer";
- final ODataEntity original = getSampleCustomerProfile(id, sampleName, false);
-
- final Set<Integer> keys = new HashSet<Integer>();
- keys.add(-100);
- keys.add(-101);
-
- for (Integer key : keys) {
- final ODataEntity order =
- client.getObjectFactory().newEntity("Microsoft.Test.OData.Services.AstoriaDefaultService.Order");
-
- order.addProperty(client.getObjectFactory().newPrimitiveProperty("OrderId",
- client.getPrimitiveValueBuilder().setValue(key).setType(EdmSimpleType.Int32).build()));
- order.addProperty(client.getObjectFactory().newPrimitiveProperty("CustomerId",
- client.getPrimitiveValueBuilder().setValue(id).setType(EdmSimpleType.Int32).build()));
-
- final ODataEntityCreateRequest createReq = client.getCUDRequestFactory().getEntityCreateRequest(
- client.getURIBuilder(getServiceRoot()).appendEntitySetSegment("Order").build(), order);
- createReq.setFormat(format);
-
- original.addLink(client.getObjectFactory().newFeedNavigationLink(
- "Orders",
- createReq.execute().getBody().getEditLink()));
- }
-
- final ODataEntity created = createEntity(getServiceRoot(), format, original, "Customer");
- // now, compare the created one with the actual one and go deeply into the associated customer info.....
- final ODataEntity actual = compareEntities(getServiceRoot(), format, created, id, null);
-
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot());
- uriBuilder.appendEntityTypeSegment("Customer").appendKeySegment(id).appendEntityTypeSegment("Orders");
-
- final ODataEntitySetRequest req = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
- req.setFormat(format);
-
- final ODataRetrieveResponse<ODataEntitySet> res = req.execute();
- assertEquals(200, res.getStatusCode());
-
- final ODataEntitySet entitySet = res.getBody();
- assertNotNull(entitySet);
- assertEquals(2, entitySet.getCount());
-
- for (ODataEntity entity : entitySet.getEntities()) {
- final Integer key = entity.getProperty("OrderId").getPrimitiveValue().<Integer>toCastValue();
- final Integer customerId = entity.getProperty("CustomerId").getPrimitiveValue().<Integer>toCastValue();
- assertTrue(keys.contains(key));
- assertEquals(Integer.valueOf(id), customerId);
- keys.remove(key);
-
- final ODataDeleteRequest deleteReq = client.getCUDRequestFactory().getDeleteRequest(
- URIUtils.getURI(getServiceRoot(), entity.getEditLink().toASCIIString()));
-
- deleteReq.setFormat(format);
- assertEquals(204, deleteReq.execute().getStatusCode());
- }
-
- return actual;
- }
-
- private ODataEntity createWithNavigationLink(final ODataPubFormat format, final int id) {
- final String sampleName = "Sample customer";
-
- final ODataEntity original = getSampleCustomerProfile(id, sampleName, false);
- original.addLink(client.getObjectFactory().newEntityNavigationLink(
- "Info", URI.create(getServiceRoot() + "/CustomerInfo(12)")));
-
- final ODataEntity created = createEntity(getServiceRoot(), format, original, "Customer");
- // now, compare the created one with the actual one and go deeply into the associated customer info.....
- final ODataEntity actual = compareEntities(getServiceRoot(), format, created, id, null);
-
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot());
- uriBuilder.appendEntityTypeSegment("Customer").appendKeySegment(id).appendEntityTypeSegment("Info");
-
- final ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setFormat(format);
-
- final ODataRetrieveResponse<ODataEntity> res = req.execute();
- assertEquals(200, res.getStatusCode());
-
- final ODataEntity info = res.getBody();
- assertNotNull(info);
-
- boolean found = false;
-
- for (ODataProperty prop : info.getProperties()) {
- if ("CustomerInfoId".equals(prop.getName())) {
- assertEquals("12", prop.getValue().toString());
- found = true;
- }
- }
-
- assertTrue(found);
-
- return actual;
- }
-
- private ODataEntity createWithBackNavigationLink(final ODataPubFormat format, final int id) {
- final String sampleName = "Sample customer";
-
- ODataEntity customer = getSampleCustomerProfile(id, sampleName, false);
- customer = createEntity(getServiceRoot(), format, customer, "Customer");
-
- ODataEntity order = client.getObjectFactory().newEntity(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.Order");
- order.addProperty(client.getObjectFactory().newPrimitiveProperty("CustomerId",
- client.getPrimitiveValueBuilder().setValue(id).setType(EdmSimpleType.Int32).build()));
- order.addProperty(client.getObjectFactory().newPrimitiveProperty("OrderId",
- client.getPrimitiveValueBuilder().setValue(id).setType(EdmSimpleType.Int32).build()));
-
- order.addLink(client.getObjectFactory().newEntityNavigationLink(
- "Customer", URIUtils.getURI(getServiceRoot(), customer.getEditLink().toASCIIString())));
-
- order = createEntity(getServiceRoot(), format, order, "Order");
-
- ODataEntity changes = client.getObjectFactory().newEntity(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer");
- changes.setEditLink(customer.getEditLink());
- changes.addLink(client.getObjectFactory().newFeedNavigationLink(
- "Orders", URIUtils.getURI(getServiceRoot(), order.getEditLink().toASCIIString())));
- update(UpdateType.PATCH, changes, format, null);
-
- final ODataEntityRequest customerreq = client.getRetrieveRequestFactory().getEntityRequest(
- URIUtils.getURI(getServiceRoot(), order.getEditLink().toASCIIString() + "/Customer"));
- customerreq.setFormat(format);
-
- customer = customerreq.execute().getBody();
-
- assertEquals(
- Integer.valueOf(id), customer.getProperty("CustomerId").getPrimitiveValue().<Integer>toCastValue());
-
- final ODataEntitySetRequest orderreq = client.getRetrieveRequestFactory().getEntitySetRequest(
- URIUtils.getURI(getServiceRoot(), customer.getEditLink().toASCIIString() + "/Orders"));
- orderreq.setFormat(format);
-
- final ODataRetrieveResponse<ODataEntitySet> orderres = orderreq.execute();
- assertEquals(200, orderres.getStatusCode());
-
- assertEquals(Integer.valueOf(id),
- orderres.getBody().getEntities().get(0).getProperty("OrderId").getPrimitiveValue().
- <Integer>toCastValue());
-
- final ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(
- URIUtils.getURI(getServiceRoot(), customer.getEditLink().toASCIIString() + "?$expand=Orders"));
- req.setFormat(format);
-
- customer = req.execute().getBody();
-
- boolean found = false;
- for (ODataLink link : customer.getNavigationLinks()) {
- if (link instanceof ODataInlineEntitySet && "Orders".equals(link.getName())) {
- found = true;
- }
- }
- assertTrue(found);
-
- return customer;
- }
-
- private void multiKey(final ODataPubFormat format) {
- final ODataEntity message = client.getObjectFactory().newEntity(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.Message");
-
- message.addProperty(client.getObjectFactory().newPrimitiveProperty("MessageId",
- client.getPrimitiveValueBuilder().setValue(1000).setType(EdmSimpleType.Int32).build()));
- message.addProperty(client.getObjectFactory().newPrimitiveProperty("FromUsername",
- client.getPrimitiveValueBuilder().setValue("1").
- setType(EdmSimpleType.String).build()));
- message.addProperty(client.getObjectFactory().newPrimitiveProperty("ToUsername",
- client.getPrimitiveValueBuilder().setValue("xlodhxzzusxecbzptxlfxprneoxkn").
- setType(EdmSimpleType.String).build()));
- message.addProperty(client.getObjectFactory().newPrimitiveProperty("Subject",
- client.getPrimitiveValueBuilder().setValue("Test subject").
- setType(EdmSimpleType.String).build()));
- message.addProperty(client.getObjectFactory().newPrimitiveProperty("Body",
- client.getPrimitiveValueBuilder().setValue("Test body").
- setType(EdmSimpleType.String).build()));
- message.addProperty(client.getObjectFactory().newPrimitiveProperty("IsRead",
- client.getPrimitiveValueBuilder().setValue(false).setType(EdmSimpleType.Boolean).build()));
-
- final URIBuilder builder =
- client.getURIBuilder(getServiceRoot()).appendEntitySetSegment("Message");
- final ODataEntityCreateRequest req = client.getCUDRequestFactory().getEntityCreateRequest(builder.build(),
- message);
- req.setFormat(format);
-
- final ODataEntityCreateResponse res = req.execute();
- assertNotNull(res);
- assertEquals(201, res.getStatusCode());
-
- final LinkedHashMap<String, Object> multiKey = new LinkedHashMap<String, Object>();
- multiKey.put("FromUsername", "1");
- multiKey.put("MessageId", 1000);
-
- final ODataDeleteResponse deleteRes = client.getCUDRequestFactory().
- getDeleteRequest(builder.appendKeySegment(multiKey).build()).execute();
- assertEquals(204, deleteRes.getStatusCode());
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/EntityRetrieveTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/EntityRetrieveTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/EntityRetrieveTestITCase.java
deleted file mode 100644
index e64f61f..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/EntityRetrieveTestITCase.java
+++ /dev/null
@@ -1,240 +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 com.msopentech.odatajclient.engine.it;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataEntityRequest;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataGenericRetrieveRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.data.ODataInlineEntity;
-import com.msopentech.odatajclient.engine.data.ODataLink;
-import com.msopentech.odatajclient.engine.data.ODataProperty;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import com.msopentech.odatajclient.engine.data.ODataEntitySet;
-import com.msopentech.odatajclient.engine.data.ODataInlineEntitySet;
-import com.msopentech.odatajclient.engine.data.ODataObjectWrapper;
-import com.msopentech.odatajclient.engine.data.ResourceFactory;
-import java.util.LinkedHashMap;
-import java.util.List;
-import org.apache.commons.lang3.StringUtils;
-import org.junit.Test;
-
-/**
- * This is the unit test class to check entity retrieve operations.
- */
-public class EntityRetrieveTestITCase extends AbstractTestITCase {
-
- protected String getServiceRoot() {
- return testStaticServiceRootURL;
- }
-
- private void withInlineEntry(final ODataPubFormat format) {
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot()).
- appendEntityTypeSegment("Customer").appendKeySegment(-10).expand("Info");
-
- final ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setFormat(format);
-
- final ODataRetrieveResponse<ODataEntity> res = req.execute();
- final ODataEntity entity = res.getBody();
-
- assertNotNull(entity);
- assertEquals("Microsoft.Test.OData.Services.AstoriaDefaultService.Customer", entity.getName());
- assertEquals(getServiceRoot() + "/Customer(-10)", entity.getEditLink().toASCIIString());
-
- assertEquals(5, entity.getNavigationLinks().size());
- assertTrue(entity.getAssociationLinks().isEmpty());
-
- boolean found = false;
-
- for (ODataLink link : entity.getNavigationLinks()) {
- if (link instanceof ODataInlineEntity) {
- final ODataEntity inline = ((ODataInlineEntity) link).getEntity();
- assertNotNull(inline);
-
- debugEntry(client.getBinder().getEntry(
- inline, ResourceFactory.entryClassForFormat(format)), "Just read");
-
- final List<ODataProperty> properties = inline.getProperties();
- assertEquals(2, properties.size());
-
- assertTrue(properties.get(0).getName().equals("CustomerInfoId")
- || properties.get(1).getName().equals("CustomerInfoId"));
- assertTrue(properties.get(0).getValue().toString().equals("11")
- || properties.get(1).getValue().toString().equals("11"));
-
- found = true;
- }
- }
-
- assertTrue(found);
- }
-
- @Test
- public void withInlineEntryFromAtom() {
- withInlineEntry(ODataPubFormat.ATOM);
- }
-
- @Test
- public void withInlineEntryFromJSON() {
- // this needs to be full, otherwise there is no mean to recognize links
- withInlineEntry(ODataPubFormat.JSON_FULL_METADATA);
- }
-
- private void withInlineFeed(final ODataPubFormat format) {
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot()).
- appendEntityTypeSegment("Customer").appendKeySegment(-10).expand("Orders");
-
- final ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setFormat(format);
-
- final ODataRetrieveResponse<ODataEntity> res = req.execute();
- final ODataEntity entity = res.getBody();
- assertNotNull(entity);
-
- boolean found = false;
-
- for (ODataLink link : entity.getNavigationLinks()) {
- if (link instanceof ODataInlineEntitySet) {
- final ODataEntitySet inline = ((ODataInlineEntitySet) link).getEntitySet();
- assertNotNull(inline);
-
- debugFeed(client.getBinder().getFeed(inline, ResourceFactory.feedClassForFormat(format)),
- "Just read");
-
- found = true;
- }
- }
-
- assertTrue(found);
- }
-
- @Test
- public void withInlineFeedFromAtom() {
- withInlineFeed(ODataPubFormat.ATOM);
- }
-
- @Test
- public void withInlineFeedFromJSON() {
- // this needs to be full, otherwise there is no mean to recognize links
- withInlineFeed(ODataPubFormat.JSON_FULL_METADATA);
- }
-
- private void genericRequest(final ODataPubFormat format) {
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot()).
- appendEntityTypeSegment("Car").appendKeySegment(16);
-
- final ODataGenericRetrieveRequest req =
- client.getRetrieveRequestFactory().getGenericRetrieveRequest(uriBuilder.build());
- req.setFormat(format.toString());
-
- final ODataRetrieveResponse<ODataObjectWrapper> res = req.execute();
-
- final ODataObjectWrapper wrapper = res.getBody();
-
- final ODataEntitySet entitySet = wrapper.getODataEntitySet();
- assertNull(entitySet);
-
- final ODataEntity entity = wrapper.getODataEntity();
- assertNotNull(entity);
- }
-
- @Test
- public void genericRequestAsAtom() {
- genericRequest(ODataPubFormat.ATOM);
- }
-
- @Test
- public void genericRequestAsJSON() {
- // this needs to be full, otherwise actions will not be provided
- genericRequest(ODataPubFormat.JSON_FULL_METADATA);
- }
-
- private void multiKey(final ODataPubFormat format) {
- final LinkedHashMap<String, Object> multiKey = new LinkedHashMap<String, Object>();
- multiKey.put("FromUsername", "1");
- multiKey.put("MessageId", -10);
-
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot()).
- appendEntityTypeSegment("Message").appendKeySegment(multiKey);
-
- final ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setFormat(format);
-
- final ODataRetrieveResponse<ODataEntity> res = req.execute();
- final ODataEntity entity = res.getBody();
- assertNotNull(entity);
- assertEquals("1", entity.getProperty("FromUsername").getPrimitiveValue().<String>toCastValue());
- }
-
- @Test
- public void multiKeyAsAtom() {
- multiKey(ODataPubFormat.ATOM);
- }
-
- @Test
- public void multiKeyAsJSON() {
- multiKey(ODataPubFormat.JSON_FULL_METADATA);
- }
-
- @Test
- public void checkForETagAsATOM() {
- checkForETag(ODataPubFormat.ATOM);
- }
-
- @Test
- public void checkForETagAsJSON() {
- checkForETag(ODataPubFormat.JSON_FULL_METADATA);
- }
-
- private void checkForETag(final ODataPubFormat format) {
- final URIBuilder uriBuilder =
- client.getURIBuilder(getServiceRoot()).appendEntitySetSegment("Product").appendKeySegment(-10);
-
- final ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setFormat(format);
-
- final ODataRetrieveResponse<ODataEntity> res = req.execute();
- assertEquals(200, res.getStatusCode());
-
- final String etag = res.getEtag();
- assertTrue(StringUtils.isNotBlank(etag));
-
- final ODataEntity product = res.getBody();
- assertEquals(etag, product.getETag());
- }
-
- @Test(expected = IllegalArgumentException.class)
- public void issue99() {
- final URIBuilder uriBuilder = client.getURIBuilder(getServiceRoot()).appendEntitySetSegment("Car");
-
- final ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setFormat(ODataPubFormat.JSON);
-
- // this statement should cause an IllegalArgumentException bearing JsonParseException
- // since we are attempting to parse an EntitySet as if it was an Entity
- req.execute().getBody();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/EntitySetRetrieveTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/EntitySetRetrieveTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/EntitySetRetrieveTestITCase.java
deleted file mode 100644
index 3d5ac02..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/EntitySetRetrieveTestITCase.java
+++ /dev/null
@@ -1,295 +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 com.msopentech.odatajclient.engine.it;
-
-import static org.junit.Assert.*;
-
-import com.msopentech.odatajclient.engine.communication.ODataClientErrorException;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataEntityRequest;
-import java.util.List;
-import org.junit.Test;
-
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataEntitySetRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.data.ODataEntitySet;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-
-public class EntitySetRetrieveTestITCase extends AbstractTestITCase {
-
- private void retreiveEntityTest(ODataPubFormat reqFormat, String acceptFormat) {
- URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment("Product");
- ODataEntitySetRequest req = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
- req.setFormat(reqFormat);
- req.setAccept(acceptFormat);
- try {
- ODataRetrieveResponse<ODataEntitySet> res = req.execute();
- assertEquals(200, res.getStatusCode());
- ODataEntitySet entitySet = res.getBody();
- List<ODataEntity> entity = entitySet.getEntities();
- for (int i = 0; i < entity.size(); i++) {
- assertNotNull(entity.get(i));
- }
- assertEquals(10, entity.size());
- } catch (ODataClientErrorException e) {
- assertEquals(415, e.getStatusLine().getStatusCode());
- }
- }
-
- private void retreiveFullMetadataEntityTest(String acceptFormat) {
- URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Product");
- ODataEntitySetRequest req = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
- req.setAccept(acceptFormat);
- ODataRetrieveResponse<ODataEntitySet> res = req.execute();
- assertEquals(200, res.getStatusCode());
- ODataEntitySet entitySet = res.getBody();
- assertNotNull(entitySet);
- List<ODataEntity> entity = entitySet.getEntities();
- assertEquals(10, entity.size());
- for (int i = 0; i < entity.size(); i++) {
- assertNotNull(entity.get(i));
- }
- }
-
- private void retreiveNoMetadataEntityTest(final ODataPubFormat reqFormat, final String acceptFormat) {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Product");
- final ODataEntitySetRequest req = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
- req.setFormat(reqFormat);
- req.setAccept(acceptFormat);
- final ODataRetrieveResponse<ODataEntitySet> res = req.execute();
- assertEquals(200, res.getStatusCode());
- final ODataEntitySet entitySet = res.getBody();
- assertNotNull(entitySet);
- List<ODataEntity> entity = entitySet.getEntities();
- assertEquals(10, entity.size());
- for (int i = 0; i < entity.size(); i++) {
- assertNotNull(entity.get(i));
- }
- }
-
- private void retreiveMinimalMetadataEntityTest(final ODataPubFormat reqFormat, final String acceptFormat) {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Product");
- final ODataEntitySetRequest req = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
- req.setFormat(reqFormat);
- req.setAccept(acceptFormat);
- final ODataRetrieveResponse<ODataEntitySet> res = req.execute();
- assertEquals(200, res.getStatusCode());
- final ODataEntitySet entitySet = res.getBody();
- assertNotNull(entitySet);
- final List<ODataEntity> entity = entitySet.getEntities();
- assertEquals(10, entity.size());
- for (int i = 0; i < entity.size(); i++) {
- assertNotNull(entity.get(i));
- }
- }
-
- private void retreiveEntityTestWithExpand(final ODataPubFormat reqFormat, final String acceptFormat,
- final String expandFormat) {
- URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Customer").expand(expandFormat);
- ODataEntitySetRequest req = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
- req.setFormat(reqFormat);
- req.setAccept(acceptFormat);
- try {
- ODataRetrieveResponse<ODataEntitySet> res = req.execute();
- assertEquals(200, res.getStatusCode());
- ODataEntitySet entitySet = res.getBody();
- assertNotNull(entitySet);
- final List<ODataEntity> entity = entitySet.getEntities();
- assertNotNull(entity);
- } catch (ODataClientErrorException e) {
- assertEquals(415, e.getStatusLine().getStatusCode());
- }
- }
-
- private void retreiveEntityTestWithSelect(ODataPubFormat reqFormat, String acceptFormat, String selectFormat) {
- URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Customer").select(selectFormat);
- ODataEntitySetRequest req = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
- req.setFormat(reqFormat);
- req.setAccept(acceptFormat);
- try {
- ODataRetrieveResponse<ODataEntitySet> res = req.execute();
- assertEquals(200, res.getStatusCode());
- ODataEntitySet entitySet = res.getBody();
- assertNotNull(entitySet);
- final List<ODataEntity> entity = entitySet.getEntities();
- assertNotNull(entity);
- } catch (ODataClientErrorException e) {
- assertEquals(415, e.getStatusLine().getStatusCode());
- }
- }
-
- private void retreiveEntityTestWithSelectAndExpand(
- final ODataPubFormat reqFormat,
- final String acceptFormat,
- final String selectFormat,
- final String expandFormat) {
- URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Customer").appendKeySegment(-10).select(selectFormat).expand(expandFormat);
- ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setFormat(reqFormat);
- req.setAccept(acceptFormat);
- try {
- ODataRetrieveResponse<ODataEntity> res = req.execute();
- assertEquals(200, res.getStatusCode());
- ODataEntity entity = res.getBody();
- assertNotNull(entity);
- } catch (ODataClientErrorException e) {
- assertEquals(415, e.getStatusLine().getStatusCode());
- }
- }
-
- private void generalQuery(final ODataPubFormat format, final String acceptHeader, String query) {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment(query);
- final ODataEntitySetRequest req = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
- req.setFormat(format);
- req.setAccept(acceptHeader);
- final ODataRetrieveResponse<ODataEntitySet> res = req.execute();
- assertEquals(200, res.getStatusCode());
- final ODataEntitySet entitySet = res.getBody();
- assertNotNull(entitySet);
- }
-
- private void inlineCountTest(final ODataPubFormat format, final String acceptHeader, final String filterValue) {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment("Customer").inlineCount().filter(filterValue);
- final ODataEntitySetRequest req = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
- req.setFormat(format);
- req.setAccept(acceptHeader);
- try {
- final ODataRetrieveResponse<ODataEntitySet> res = req.execute();
- assertEquals(200, res.getStatusCode());
- final ODataEntitySet entitySet = res.getBody();
- assertNotNull(entitySet);
- List<ODataEntity> entity = entitySet.getEntities();
- for (int i = 0; i < entity.size(); i++) {
- assertNotNull(entity.get(i));
- }
- } catch (ODataClientErrorException e) {
- assertEquals(415, e.getStatusLine().getStatusCode());
- }
- }
-
- @Test
- public void inlineAndFilterTest() {
- inlineCountTest(ODataPubFormat.ATOM, "application/atom+xml", "CustomerId eq -10");
- inlineCountTest(ODataPubFormat.JSON, "application/json", "CustomerId eq -10");
- inlineCountTest(ODataPubFormat.JSON_FULL_METADATA, "application/json;odata=fullmetadata", "CustomerId eq -10");
- inlineCountTest(ODataPubFormat.JSON_NO_METADATA, "application/json;odata=nometadata", "CustomerId eq -10");
-
- //xml headers is not a supported media type
- inlineCountTest(ODataPubFormat.ATOM, "application/xml", "CustomerId eq -10");
-
- //with different filters
- inlineCountTest(ODataPubFormat.ATOM, "application/atom+xml", "CustomerId lt -10");
- inlineCountTest(ODataPubFormat.ATOM, "application/atom+xml", "CustomerId gt -10");
- }
-
- @Test
- public void jsonHeader() {
- retreiveEntityTest(ODataPubFormat.JSON, "application/json");
- generalQuery(ODataPubFormat.JSON, "application/json", "Product");
- retreiveEntityTestWithExpand(ODataPubFormat.JSON, "application/json", "Orders");
- retreiveEntityTestWithSelect(ODataPubFormat.JSON, "application/json", "CustomerId,Name,PrimaryContactInfo");
- retreiveEntityTestWithSelectAndExpand(
- ODataPubFormat.JSON, "application/json", "CustomerId,Name,Orders", "Orders");
- }
-
- @Test
- public void jsonFullMetaDataHeader() {
- retreiveFullMetadataEntityTest("application/json;odata=fullmetadata");
- generalQuery(ODataPubFormat.JSON, "application/json;odata=fullmetadata", "Product");
- }
-
- @Test
- public void jsonNoMetaDataHeader() {
- retreiveNoMetadataEntityTest(ODataPubFormat.JSON_NO_METADATA, "application/json;odata=nometadata");
- }
-
- @Test
- public void jsonMinimalMetadataDataHeader() {
- retreiveMinimalMetadataEntityTest(ODataPubFormat.JSON, "application/json;odata=minimalmetadata");
- retreiveEntityTestWithExpand(ODataPubFormat.JSON, "application/json;odata=minimalmetadata", "Orders");
- retreiveEntityTestWithExpand(ODataPubFormat.JSON, "application/json;odata=minimalmetadata", "Orders,Info");
- }
-
- @Test
- public void atomHeader() {
- retreiveEntityTest(ODataPubFormat.ATOM, "application/atom+xml");
- retreiveEntityTestWithExpand(ODataPubFormat.ATOM, "application/atom+xml", "Orders");
- retreiveEntityTestWithExpand(ODataPubFormat.ATOM, "application/atom+xml", "Orders,Info");
- retreiveEntityTestWithSelect(ODataPubFormat.ATOM, "application/atom+xml", "CustomerId");
- retreiveEntityTestWithSelect(ODataPubFormat.ATOM, "application/atom+xml", "Name");
- retreiveEntityTestWithSelect(ODataPubFormat.ATOM, "application/atom+xml", "CustomerId,Name,PrimaryContactInfo");
- retreiveEntityTestWithSelectAndExpand(
- ODataPubFormat.ATOM, "application/atom+xml", "CustomerId,Name,Orders", "Orders");
- }
-
- @Test
- public void xmlHeader() {
- retreiveEntityTest(ODataPubFormat.ATOM, "application/xml");
- retreiveEntityTestWithExpand(ODataPubFormat.ATOM, "application/xml", "Orders");
- retreiveEntityTestWithExpand(ODataPubFormat.ATOM, "application/xml", "Orders,Info");
- retreiveEntityTestWithSelect(ODataPubFormat.ATOM, "application/xml", "CustomerId");
- retreiveEntityTestWithSelect(ODataPubFormat.ATOM, "application/xml", "Name");
- retreiveEntityTestWithSelect(ODataPubFormat.ATOM, "application/xml", "CustomerId,Name,PrimaryContactInfo");
- retreiveEntityTestWithSelectAndExpand(
- ODataPubFormat.ATOM, "application/xml", "CustomerId,Name,Orders", "Orders");
- }
-
- @Test
- public void nullFormat() {
- retreiveEntityTest(null, "application/xml");
- retreiveEntityTestWithExpand(null, "application/xml", "Orders");
- retreiveEntityTestWithExpand(null, "application/xml", "Orders,Info");
- retreiveEntityTestWithSelect(null, "application/xml", "CustomerId");
- retreiveEntityTestWithSelect(null, "application/xml", "Name");
- retreiveEntityTestWithSelect(null, "application/xml", "CustomerId,Name,PrimaryContactInfo");
- retreiveEntityTestWithSelectAndExpand(null, "application/xml", "CustomerId,Name,Orders", "Orders");
- }
-
- @Test
- public void nullHeaderWithJSONFormat() {
- retreiveEntityTest(ODataPubFormat.JSON, null);
- retreiveEntityTestWithExpand(ODataPubFormat.JSON, null, "Orders");
- retreiveEntityTestWithExpand(ODataPubFormat.JSON, null, "Orders,Info");
- retreiveEntityTestWithSelect(ODataPubFormat.JSON, null, "CustomerId");
- retreiveEntityTestWithSelect(ODataPubFormat.JSON, null, "Name");
- retreiveEntityTestWithSelect(ODataPubFormat.JSON, null, "CustomerId,Name,PrimaryContactInfo");
- retreiveEntityTestWithSelectAndExpand(ODataPubFormat.JSON, null, "CustomerId,Name,Orders", "Orders");
- }
-
- @Test
- public void nullHeaderWithAtomFormat() {
- retreiveEntityTest(ODataPubFormat.ATOM, null);
- retreiveEntityTestWithExpand(ODataPubFormat.ATOM, null, "Orders");
- retreiveEntityTestWithExpand(ODataPubFormat.ATOM, null, "Orders,Info");
- retreiveEntityTestWithSelect(ODataPubFormat.ATOM, null, "CustomerId");
- retreiveEntityTestWithSelect(ODataPubFormat.ATOM, null, "Name");
- retreiveEntityTestWithSelect(ODataPubFormat.ATOM, null, "CustomerId,Name,PrimaryContactInfo");
- retreiveEntityTestWithSelectAndExpand(ODataPubFormat.ATOM, null, "CustomerId,Name,Orders", "Orders");
- }
-}
[40/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/XMLLinkCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/XMLLinkCollection.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/XMLLinkCollection.java
deleted file mode 100644
index ed753ec..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/XMLLinkCollection.java
+++ /dev/null
@@ -1,80 +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 com.msopentech.odatajclient.engine.data.impl.v3;
-
-import com.msopentech.odatajclient.engine.data.LinkCollection;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-
-public class XMLLinkCollection implements LinkCollection {
-
- private final List<URI> links = new ArrayList<URI>();
-
- private URI next;
-
- /**
- * Constructor.
- */
- public XMLLinkCollection() {
- }
-
- /**
- * Constructor.
- *
- * @param next next page link.
- */
- public XMLLinkCollection(final URI next) {
- this.next = next;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public List<URI> getLinks() {
- return links;
- }
-
- /**
- * Set Links.
- *
- * @param links links.
- */
- public void setLinks(final List<URI> links) {
- this.links.clear();
- this.links.addAll(links);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public void setNext(final URI next) {
- this.next = next;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public URI getNext() {
- return next;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/XMLODataError.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/XMLODataError.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/XMLODataError.java
deleted file mode 100644
index 1735986..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/XMLODataError.java
+++ /dev/null
@@ -1,234 +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 com.msopentech.odatajclient.engine.data.impl.v3;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlText;
-import com.msopentech.odatajclient.engine.data.ODataError;
-import com.msopentech.odatajclient.engine.data.impl.AbstractPayloadObject;
-import java.util.Map;
-
-/**
- * This class represents an OData error returned as JSON.
- */
-public class XMLODataError extends AbstractPayloadObject implements ODataError {
-
- private static final long serialVersionUID = -3476499168507242932L;
-
- @JacksonXmlText(false)
- private String code;
-
- @JsonProperty
- private Message message;
-
- @JsonProperty(required = false)
- private InnerError innererror;
-
- /**
- * {@inheritDoc }
- */
- @Override
- public String getCode() {
- return code;
- }
-
- /**
- * Sets error code.
- *
- * @param code error code.
- */
- public void setCode(final String code) {
- this.code = code;
- }
-
- /**
- * {@inheritDoc }
- */
- @JsonIgnore
- @Override
- public String getMessageLang() {
- return this.message == null ? null : this.message.getLang();
- }
-
- /**
- * {@inheritDoc }
- */
- @JsonIgnore
- @Override
- public String getMessageValue() {
- return this.message == null ? null : this.message.getValue();
- }
-
- /**
- * Sets the value of the message property.
- *
- * @param value
- * allowed object is
- * {@link Error.Message }
- *
- */
- public void setMessage(final Message value) {
- this.message = value;
- }
-
- /**
- * {@inheritDoc }
- */
- @JsonIgnore
- @Override
- public String getInnerErrorMessage() {
- return this.innererror == null ? null : this.innererror.getMessage().getValue();
- }
-
- /**
- * {@inheritDoc }
- */
- @JsonIgnore
- @Override
- public String getInnerErrorType() {
- return this.innererror == null ? null : this.innererror.getType().getValue();
- }
-
- /**
- * {@inheritDoc }
- */
- @JsonIgnore
- @Override
- public String getInnerErrorStacktrace() {
- return this.innererror == null ? null : this.innererror.getStacktrace().getValue();
- }
-
- static class TextChildContainer extends AbstractPayloadObject {
-
- private static final long serialVersionUID = -8908394095210115904L;
-
- public TextChildContainer() {
- super();
- }
-
- public TextChildContainer(final String value) {
- super();
- this.value = value;
- }
-
- @JsonCreator
- public TextChildContainer(final Map<String, Object> props) {
- super();
- this.value = (String) props.get("");
- }
-
- private String value;
-
- public String getValue() {
- return value;
- }
-
- public void setValue(final String value) {
- this.value = value;
- }
- }
-
- /**
- * Error message.
- */
- public static class Message extends TextChildContainer {
-
- private static final long serialVersionUID = 2577818040815637859L;
-
- private String lang;
-
- public Message() {
- super();
- }
-
- @JsonCreator
- public Message(final Map<String, Object> props) {
- super(props);
- this.lang = (String) props.get("lang");
- }
-
- /**
- * Gets language.
- *
- * @return language.
- */
- public String getLang() {
- return lang;
- }
-
- /**
- * Sets language.
- *
- * @param lang language.
- */
- public void setLang(final String lang) {
- this.lang = lang;
- }
- }
-
- /**
- * Inner error.
- */
- static class InnerError extends AbstractPayloadObject {
-
- private static final long serialVersionUID = -3920947476143537640L;
-
- private TextChildContainer message;
-
- private TextChildContainer type;
-
- private TextChildContainer stacktrace;
-
- private InnerError internalexception;
-
- public TextChildContainer getMessage() {
- return message;
- }
-
- public void setMessage(final TextChildContainer message) {
- this.message = message;
- }
-
- public TextChildContainer getType() {
- return type;
- }
-
- public void setType(final TextChildContainer type) {
- this.type = type;
- }
-
- public TextChildContainer getStacktrace() {
- return stacktrace;
- }
-
- public void setStacktrace(final TextChildContainer stacktrace) {
- this.stacktrace = stacktrace;
- }
-
- public InnerError getInternalexception() {
- return internalexception;
- }
-
- public void setInternalexception(final InnerError internalexception) {
- this.internalexception = internalexception;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/XMLServiceDocument.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/XMLServiceDocument.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/XMLServiceDocument.java
deleted file mode 100644
index 32a7d43..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/XMLServiceDocument.java
+++ /dev/null
@@ -1,48 +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 com.msopentech.odatajclient.engine.data.impl.v3;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.msopentech.odatajclient.engine.data.impl.AbstractServiceDocument;
-import com.msopentech.odatajclient.engine.data.impl.XMLServiceDocumentDeserializer;
-import java.net.URI;
-
-/**
- * Service document, represented via XML.
- */
-@JsonDeserialize(using = XMLServiceDocumentDeserializer.class)
-public class XMLServiceDocument extends AbstractServiceDocument {
-
- private URI baseURI;
-
- @Override
- public URI getBaseURI() {
- return this.baseURI;
- }
-
- /**
- * Sets base URI.
- *
- * @param baseURI base URI.
- */
- public void setBaseURI(final URI baseURI) {
- this.baseURI = baseURI;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/AbstractServiceDocument.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/AbstractServiceDocument.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/AbstractServiceDocument.java
deleted file mode 100644
index a99f6b4..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/AbstractServiceDocument.java
+++ /dev/null
@@ -1,88 +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 com.msopentech.odatajclient.engine.data.impl.v4;
-
-import com.msopentech.odatajclient.engine.data.ServiceDocumentElement;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-
-public abstract class AbstractServiceDocument
- extends com.msopentech.odatajclient.engine.data.impl.AbstractServiceDocument {
-
- private URI baseURI;
-
- private String metadataContext;
-
- private String metadataETag;
-
- private List<ServiceDocumentElement> functionImports = new ArrayList<ServiceDocumentElement>();
-
- private List<ServiceDocumentElement> singletons = new ArrayList<ServiceDocumentElement>();
-
- private List<ServiceDocumentElement> relatedServiceDocuments = new ArrayList<ServiceDocumentElement>();
-
- @Override
- public URI getBaseURI() {
- return this.baseURI;
- }
-
- /**
- * Sets base URI.
- *
- * @param baseURI base URI.
- */
- public void setBaseURI(final URI baseURI) {
- this.baseURI = baseURI;
- }
-
- @Override
- public String getMetadataContext() {
- return metadataContext;
- }
-
- public void setMetadataContext(final String metadataContext) {
- this.metadataContext = metadataContext;
- }
-
- @Override
- public String getMetadataETag() {
- return metadataETag;
- }
-
- public void setMetadataETag(final String metadataETag) {
- this.metadataETag = metadataETag;
- }
-
- @Override
- public List<ServiceDocumentElement> getFunctionImports() {
- return functionImports;
- }
-
- @Override
- public List<ServiceDocumentElement> getSingletons() {
- return singletons;
- }
-
- @Override
- public List<ServiceDocumentElement> getRelatedServiceDocuments() {
- return relatedServiceDocuments;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/JSONEntry.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/JSONEntry.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/JSONEntry.java
deleted file mode 100644
index f755112..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/JSONEntry.java
+++ /dev/null
@@ -1,30 +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 com.msopentech.odatajclient.engine.data.impl.v4;
-
-import com.msopentech.odatajclient.engine.data.impl.AbstractJSONEntry;
-
-/**
- * A single entry, represented via JSON.
- */
-public class JSONEntry extends AbstractJSONEntry {
-
- private static final long serialVersionUID = -5275365545400797758L;
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/ODataBinderImpl.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/ODataBinderImpl.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/ODataBinderImpl.java
deleted file mode 100644
index c278f8c..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/ODataBinderImpl.java
+++ /dev/null
@@ -1,65 +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 com.msopentech.odatajclient.engine.data.impl.v4;
-
-import com.msopentech.odatajclient.engine.client.ODataV4Client;
-import com.msopentech.odatajclient.engine.data.ODataServiceDocument;
-import com.msopentech.odatajclient.engine.data.ServiceDocument;
-import com.msopentech.odatajclient.engine.data.ServiceDocumentElement;
-import com.msopentech.odatajclient.engine.data.impl.AbstractODataBinder;
-import com.msopentech.odatajclient.engine.metadata.EdmType;
-import com.msopentech.odatajclient.engine.metadata.EdmV4Type;
-import com.msopentech.odatajclient.engine.utils.URIUtils;
-
-public class ODataBinderImpl extends AbstractODataBinder {
-
- private static final long serialVersionUID = -6371110655960799393L;
-
- public ODataBinderImpl(final ODataV4Client client) {
- super(client);
- }
-
- @Override
- protected EdmType newEdmType(final String expression) {
- return new EdmV4Type(expression);
- }
-
- @Override
- public ODataServiceDocument getODataServiceDocument(final ServiceDocument resource) {
- final ODataServiceDocument serviceDocument = super.getODataServiceDocument(resource);
-
- serviceDocument.setMetadataContext(URIUtils.getURI(resource.getBaseURI(), resource.getMetadataContext()));
- serviceDocument.setMetadataETag(resource.getMetadataETag());
-
- for (ServiceDocumentElement functionImport : resource.getFunctionImports()) {
- serviceDocument.getFunctionImports().put(functionImport.getTitle(),
- URIUtils.getURI(resource.getBaseURI(), functionImport.getHref()));
- }
- for (ServiceDocumentElement singleton : resource.getSingletons()) {
- serviceDocument.getSingletons().put(singleton.getTitle(),
- URIUtils.getURI(resource.getBaseURI(), singleton.getHref()));
- }
- for (ServiceDocumentElement sdoc : resource.getRelatedServiceDocuments()) {
- serviceDocument.getRelatedServiceDocuments().put(sdoc.getTitle(),
- URIUtils.getURI(resource.getBaseURI(), sdoc.getHref()));
- }
-
- return serviceDocument;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/ODataDeserializerImpl.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/ODataDeserializerImpl.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/ODataDeserializerImpl.java
deleted file mode 100644
index 1b957fd..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/ODataDeserializerImpl.java
+++ /dev/null
@@ -1,65 +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 com.msopentech.odatajclient.engine.data.impl.v4;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.data.impl.AbstractODataDeserializer;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Edmx;
-import java.io.IOException;
-import java.io.InputStream;
-
-public class ODataDeserializerImpl extends AbstractODataDeserializer {
-
- private static final long serialVersionUID = 8593081342440470415L;
-
- public ODataDeserializerImpl(final ODataClient client) {
- super(client);
- }
-
- @Override
- public Edmx toMetadata(final InputStream input) {
- try {
- return getXmlMapper().readValue(input, Edmx.class);
- } catch (Exception e) {
- throw new IllegalArgumentException("Could not parse as Edmx document", e);
- }
- }
-
- @Override
- public AbstractServiceDocument toServiceDocument(final InputStream input, final ODataFormat format) {
- try {
- return format == ODataFormat.XML
- ? getXmlMapper().readValue(input, XMLServiceDocument.class)
- : null;
-// : getObjectMapper().readValue(input, JSONServiceDocument.class);
- } catch (IOException e) {
- throw new IllegalArgumentException("Could not parse Service Document", e);
- }
- }
-
- @Override
- protected JSONEntry toJSONEntry(final InputStream input) {
- try {
- return getObjectMapper().readValue(input, JSONEntry.class);
- } catch (IOException e) {
- throw new IllegalArgumentException("While deserializing JSON entry", e);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/ODataObjectFactoryImpl.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/ODataObjectFactoryImpl.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/ODataObjectFactoryImpl.java
deleted file mode 100644
index 37d16b8..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/ODataObjectFactoryImpl.java
+++ /dev/null
@@ -1,32 +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 com.msopentech.odatajclient.engine.data.impl.v4;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.data.AbstractODataObjectFactory;
-
-public class ODataObjectFactoryImpl extends AbstractODataObjectFactory {
-
- private static final long serialVersionUID = 7535188943833581980L;
-
- public ODataObjectFactoryImpl(final ODataClient client) {
- super(client);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/ODataReaderImpl.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/ODataReaderImpl.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/ODataReaderImpl.java
deleted file mode 100644
index 9226baa..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/ODataReaderImpl.java
+++ /dev/null
@@ -1,46 +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 com.msopentech.odatajclient.engine.data.impl.v4;
-
-import com.msopentech.odatajclient.engine.client.ODataV4Client;
-import com.msopentech.odatajclient.engine.data.ODataServiceDocument;
-import com.msopentech.odatajclient.engine.data.impl.AbstractODataReader;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import com.msopentech.odatajclient.engine.metadata.EdmV4Metadata;
-import java.io.InputStream;
-
-public class ODataReaderImpl extends AbstractODataReader {
-
- private static final long serialVersionUID = -2481293269536406956L;
-
- public ODataReaderImpl(final ODataV4Client client) {
- super(client);
- }
-
- @Override
- public EdmV4Metadata readMetadata(final InputStream input) {
- return new EdmV4Metadata(client, input);
- }
-
- @Override
- public ODataServiceDocument readServiceDocument(final InputStream input, final ODataFormat format) {
- return ((ODataV4Client) client).getBinder().getODataServiceDocument(
- ((ODataV4Client) client).getDeserializer().toServiceDocument(input, format));
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/ODataSerializerImpl.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/ODataSerializerImpl.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/ODataSerializerImpl.java
deleted file mode 100644
index a059ae5..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/ODataSerializerImpl.java
+++ /dev/null
@@ -1,32 +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 com.msopentech.odatajclient.engine.data.impl.v4;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.data.impl.AbstractODataSerializer;
-
-public class ODataSerializerImpl extends AbstractODataSerializer {
-
- private static final long serialVersionUID = 7587265188399685309L;
-
- public ODataSerializerImpl(final ODataClient client) {
- super(client);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/ODataWriterImpl.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/ODataWriterImpl.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/ODataWriterImpl.java
deleted file mode 100644
index 2d6aec0..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/ODataWriterImpl.java
+++ /dev/null
@@ -1,31 +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 com.msopentech.odatajclient.engine.data.impl.v4;
-
-import com.msopentech.odatajclient.engine.client.ODataV4Client;
-import com.msopentech.odatajclient.engine.data.impl.AbstractODataWriter;
-
-public class ODataWriterImpl extends AbstractODataWriter {
-
- private static final long serialVersionUID = 8138759354317377210L;
-
- public ODataWriterImpl(final ODataV4Client client) {
- super(client);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/XMLServiceDocument.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/XMLServiceDocument.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/XMLServiceDocument.java
deleted file mode 100644
index b5007cd..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v4/XMLServiceDocument.java
+++ /dev/null
@@ -1,27 +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 com.msopentech.odatajclient.engine.data.impl.v4;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.msopentech.odatajclient.engine.data.impl.XMLServiceDocumentDeserializer;
-
-@JsonDeserialize(using = XMLServiceDocumentDeserializer.class)
-public class XMLServiceDocument extends AbstractServiceDocument {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/format/ODataFormat.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/format/ODataFormat.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/format/ODataFormat.java
deleted file mode 100644
index c489d86..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/format/ODataFormat.java
+++ /dev/null
@@ -1,97 +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 com.msopentech.odatajclient.engine.format;
-
-import org.apache.http.entity.ContentType;
-
-/**
- * Available formats to be used in various contexts.
- */
-public enum ODataFormat {
-
- /**
- * JSON format with no metadata.
- */
- JSON_NO_METADATA(ContentType.APPLICATION_JSON.getMimeType() + ";odata=nometadata"),
- /**
- * JSON format with minimal metadata (default).
- */
- JSON(ContentType.APPLICATION_JSON.getMimeType() + ";odata=minimalmetadata"),
- /**
- * JSON format with no metadata.
- */
- JSON_FULL_METADATA(ContentType.APPLICATION_JSON.getMimeType() + ";odata=fullmetadata"),
- /**
- * XML format.
- */
- XML(ContentType.APPLICATION_XML.getMimeType());
-
- private final String format;
-
- ODataFormat(final String format) {
- this.format = format;
- }
-
- /**
- * Gets format as a string.
- *
- * @return format as a string.
- */
- @Override
- public String toString() {
- return format;
- }
-
- /**
- * Gets OData format from its string representation.
- *
- * @param format string representation of the format.
- * @return OData format.
- */
- public static ODataFormat fromString(final String format) {
- ODataFormat result = null;
-
- final StringBuffer _format = new StringBuffer();
-
- final String[] parts = format.split(";");
- _format.append(parts[0]);
- if (ContentType.APPLICATION_JSON.getMimeType().equals(parts[0])) {
- if (parts.length > 1) {
- _format.append(';').append(parts[1]);
- } else {
- result = ODataFormat.JSON;
- }
- }
-
- if (result == null) {
- final String candidate = _format.toString().replaceAll(" ", "");
- for (ODataFormat value : values()) {
- if (candidate.equals(value.toString())) {
- result = value;
- }
- }
- }
-
- if (result == null) {
- throw new IllegalArgumentException("Unsupported format: " + format);
- }
-
- return result;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/format/ODataMediaFormat.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/format/ODataMediaFormat.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/format/ODataMediaFormat.java
deleted file mode 100644
index 311d955..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/format/ODataMediaFormat.java
+++ /dev/null
@@ -1,71 +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 com.msopentech.odatajclient.engine.format;
-
-import org.apache.http.entity.ContentType;
-
-/**
- * Available formats for media.
- */
-public enum ODataMediaFormat {
-
- CHARSET_PARAMETER("charset"),
- MEDIA_TYPE_WILDCARD("*"),
- WILDCARD("*/*"),
- APPLICATION_XML(ContentType.APPLICATION_XML.getMimeType()),
- APPLICATION_ATOM_XML(ContentType.APPLICATION_ATOM_XML.getMimeType()),
- APPLICATION_XHTML_XML(ContentType.APPLICATION_XHTML_XML.getMimeType()),
- APPLICATION_SVG_XML(ContentType.APPLICATION_SVG_XML.getMimeType()),
- APPLICATION_JSON(ContentType.APPLICATION_JSON.getMimeType()),
- APPLICATION_FORM_URLENCODED(ContentType.APPLICATION_FORM_URLENCODED.getMimeType()),
- MULTIPART_FORM_DATA(ContentType.MULTIPART_FORM_DATA.getMimeType()),
- APPLICATION_OCTET_STREAM(ContentType.APPLICATION_OCTET_STREAM.getMimeType()),
- TEXT_PLAIN(ContentType.TEXT_PLAIN.getMimeType()),
- TEXT_XML(ContentType.TEXT_XML.getMimeType()),
- TEXT_HTML(ContentType.TEXT_HTML.getMimeType());
-
- private final String format;
-
- private ODataMediaFormat(final String format) {
- this.format = format;
- }
-
- @Override
- public String toString() {
- return format;
- }
-
- public static ODataMediaFormat fromFormat(final String format) {
- final String _format = format.split(";")[0];
-
- ODataMediaFormat result = null;
-
- for (ODataMediaFormat value : values()) {
- if (_format.equals(value.toString())) {
- result = value;
- }
- }
-
- if (result == null) {
- throw new IllegalArgumentException("Unsupported format: " + format);
- }
-
- return result;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/format/ODataPubFormat.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/format/ODataPubFormat.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/format/ODataPubFormat.java
deleted file mode 100644
index 72055be..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/format/ODataPubFormat.java
+++ /dev/null
@@ -1,97 +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 com.msopentech.odatajclient.engine.format;
-
-import org.apache.http.entity.ContentType;
-
-/**
- * Available formats for AtomPub exchange.
- */
-public enum ODataPubFormat {
-
- /**
- * JSON format with no metadata.
- */
- JSON_NO_METADATA(ContentType.APPLICATION_JSON.getMimeType() + ";odata=nometadata"),
- /**
- * JSON format with minimal metadata (default).
- */
- JSON(ContentType.APPLICATION_JSON.getMimeType() + ";odata=minimalmetadata"),
- /**
- * JSON format with no metadata.
- */
- JSON_FULL_METADATA(ContentType.APPLICATION_JSON.getMimeType() + ";odata=fullmetadata"),
- /**
- * Atom format.
- */
- ATOM(ContentType.APPLICATION_ATOM_XML.getMimeType());
-
- private final String format;
-
- ODataPubFormat(final String format) {
- this.format = format;
- }
-
- /**
- * Gets format as a string.
- *
- * @return format as a string.
- */
- @Override
- public String toString() {
- return format;
- }
-
- /**
- * Gets OData format from its string representation.
- *
- * @param format string representation of the format.
- * @return OData format.
- */
- public static ODataPubFormat fromString(final String format) {
- ODataPubFormat result = null;
-
- final StringBuffer _format = new StringBuffer();
-
- final String[] parts = format.split(";");
- _format.append(parts[0]);
- if (ContentType.APPLICATION_JSON.getMimeType().equals(parts[0])) {
- if (parts.length > 1 && parts[1].startsWith("odata=")) {
- _format.append(';').append(parts[1]);
- } else {
- result = ODataPubFormat.JSON;
- }
- }
-
- if (result == null) {
- final String candidate = _format.toString();
- for (ODataPubFormat value : values()) {
- if (candidate.equals(value.toString())) {
- result = value;
- }
- }
- }
-
- if (result == null) {
- throw new IllegalArgumentException("Unsupported format: " + format);
- }
-
- return result;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/format/ODataValueFormat.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/format/ODataValueFormat.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/format/ODataValueFormat.java
deleted file mode 100644
index a442b77..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/format/ODataValueFormat.java
+++ /dev/null
@@ -1,76 +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 com.msopentech.odatajclient.engine.format;
-
-import org.apache.http.entity.ContentType;
-
-/**
- * Available formats for property values.
- */
-public enum ODataValueFormat {
-
- /**
- * Application octet stream.
- */
- STREAM(ContentType.APPLICATION_OCTET_STREAM.getMimeType()),
- /**
- * Plain text format.
- */
- TEXT(ContentType.TEXT_PLAIN.getMimeType());
-
- private final String format;
-
- ODataValueFormat(final String format) {
- this.format = format;
- }
-
- /**
- * Gets format as a string.
- *
- * @return format as a string.
- */
- @Override
- public String toString() {
- return format;
- }
-
- /**
- * Gets format from its string representation.
- *
- * @param format string representation of the format.
- * @return OData format.
- */
- public static ODataValueFormat fromString(final String format) {
- final String _format = format.split(";")[0];
-
- ODataValueFormat result = null;
-
- for (ODataValueFormat value : values()) {
- if (_format.equals(value.toString())) {
- result = value;
- }
- }
-
- if (result == null) {
- throw new IllegalArgumentException("Unsupported format: " + format);
- }
-
- return result;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/AbstractEdmMetadata.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/AbstractEdmMetadata.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/AbstractEdmMetadata.java
deleted file mode 100644
index 2ed0882..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/AbstractEdmMetadata.java
+++ /dev/null
@@ -1,136 +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 com.msopentech.odatajclient.engine.metadata;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractComplexType;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractDataServices;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractSchema;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmx;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntityContainer;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntityType;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractFunctionImport;
-import java.io.InputStream;
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * Entry point for access information about EDM metadata.
- */
-public abstract class AbstractEdmMetadata<
- EDMX extends AbstractEdmx<DS, S, EC, E, C, FI>, DS extends AbstractDataServices<
- S, EC, E, C, FI>, S extends AbstractSchema<EC, E, C, FI>, EC extends AbstractEntityContainer<
- FI>, E extends AbstractEntityType, C extends AbstractComplexType, FI extends AbstractFunctionImport>
- implements Serializable {
-
- private static final long serialVersionUID = -1214173426671503187L;
-
- protected final EDMX edmx;
-
- protected final Map<String, S> schemaByNsOrAlias;
-
- /**
- * Constructor.
- *
- * @param client OData client
- * @param inputStream source stream.
- */
- @SuppressWarnings("unchecked")
- public AbstractEdmMetadata(final ODataClient client, final InputStream inputStream) {
- edmx = (EDMX) client.getDeserializer().toMetadata(inputStream);
-
- this.schemaByNsOrAlias = new HashMap<String, S>();
- for (S schema : edmx.getDataServices().getSchemas()) {
- this.schemaByNsOrAlias.put(schema.getNamespace(), schema);
- if (StringUtils.isNotBlank(schema.getAlias())) {
- this.schemaByNsOrAlias.put(schema.getAlias(), schema);
- }
- }
- }
-
- /**
- * Checks whether the given key is a valid namespace or alias in the EdM metadata document.
- *
- * @param key namespace or alias
- * @return true if key is valid namespace or alias
- */
- public boolean isNsOrAlias(final String key) {
- return this.schemaByNsOrAlias.keySet().contains(key);
- }
-
- /**
- * Returns the Schema at the specified position in the EdM metadata document.
- *
- * @param index index of the Schema to return
- * @return the Schema at the specified position in the EdM metadata document
- */
- public S getSchema(final int index) {
- return this.edmx.getDataServices().getSchemas().get(index);
- }
-
- /**
- * Returns the Schema with the specified key (namespace or alias) in the EdM metadata document.
- *
- * @param key namespace or alias
- * @return the Schema with the specified key in the EdM metadata document
- */
- public S getSchema(final String key) {
- return this.schemaByNsOrAlias.get(key);
- }
-
- /**
- * Returns all Schema objects defined in the EdM metadata document.
- *
- * @return all Schema objects defined in the EdM metadata document
- */
- public List<S> getSchemas() {
- return this.edmx.getDataServices().getSchemas();
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public boolean equals(final Object obj) {
- return EqualsBuilder.reflectionEquals(this, obj);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public int hashCode() {
- return HashCodeBuilder.reflectionHashCode(this);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/AbstractEdmType.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/AbstractEdmType.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/AbstractEdmType.java
deleted file mode 100644
index e7746c6..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/AbstractEdmType.java
+++ /dev/null
@@ -1,267 +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 com.msopentech.odatajclient.engine.metadata;
-
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractComplexType;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractDataServices;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmx;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntityContainer;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntityType;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractFunctionImport;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEnumType;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractSchema;
-import org.apache.commons.lang3.StringUtils;
-
-/**
- * Parse type information from metadata into semantic data.
- */
-abstract class AbstractEdmType<META extends AbstractEdmMetadata<
- EDMX, DS, S, EC, E, C, FI>, EDMX extends AbstractEdmx<DS, S, EC, E, C, FI>, DS extends AbstractDataServices<
- S, EC, E, C, FI>, S extends AbstractSchema<EC, E, C, FI>, EC extends AbstractEntityContainer<
- FI>, E extends AbstractEntityType, C extends AbstractComplexType, FI extends AbstractFunctionImport>
- implements EdmType {
-
- private final String typeExpression;
-
- private final String baseType;
-
- private final String namespaceOrAlias;
-
- private boolean collection;
-
- private EdmSimpleType simpleType;
-
- private AbstractEnumType enumType;
-
- private C complexType;
-
- private E entityType;
-
- /**
- * Constructor.
- *
- * @param typeExpression type expression.
- */
- public AbstractEdmType(final String typeExpression) {
- this(null, typeExpression);
- }
-
- /**
- * Constructor.
- *
- * @param metadata metadata.
- * @param typeExpression type expression.
- */
- public AbstractEdmType(final META metadata, final String typeExpression) {
- this.typeExpression = typeExpression;
-
- final int collectionStartIdx = typeExpression.indexOf("Collection(");
- final int collectionEndIdx = typeExpression.lastIndexOf(')');
- if (collectionStartIdx == -1) {
- baseType = typeExpression;
- } else {
- if (collectionEndIdx == -1) {
- throw new IllegalArgumentException("Malformed type: " + typeExpression);
- }
-
- this.collection = true;
- baseType = typeExpression.substring(collectionStartIdx + 11, collectionEndIdx);
- }
-
- final int lastDotIdx = baseType.lastIndexOf('.');
- if (lastDotIdx == -1) {
- throw new IllegalArgumentException("Cannot find namespace or alias in " + typeExpression);
- }
- namespaceOrAlias = baseType.substring(0, lastDotIdx);
- final String typeName = baseType.substring(lastDotIdx + 1);
- if (StringUtils.isBlank(typeName)) {
- throw new IllegalArgumentException("Null or empty type name in " + typeExpression);
- }
-
- if (namespaceOrAlias.equals(EdmSimpleType.namespace())) {
- this.simpleType = EdmSimpleType.fromValue(EdmSimpleType.namespace() + "." + typeName);
- } else if (metadata != null) {
- if (!metadata.isNsOrAlias(namespaceOrAlias)) {
- throw new IllegalArgumentException("Illegal namespace or alias: " + namespaceOrAlias);
- }
- final S schema = metadata.getSchema(namespaceOrAlias);
-
- for (AbstractEnumType type : schema.getEnumTypes()) {
- if (typeName.equals(type.getName())) {
- this.enumType = type;
- }
- }
- if (this.enumType == null) {
- for (C type : schema.getComplexTypes()) {
- if (typeName.equals(type.getName())) {
- this.complexType = type;
- }
- }
- if (this.complexType == null) {
- for (E type : schema.getEntityTypes()) {
- if (typeName.equals(type.getName())) {
- this.entityType = type;
- }
- }
- }
- }
-
- if (!isSimpleType() && !isEnumType() && !isComplexType() && !isEntityType()) {
- throw new IllegalArgumentException("Could not parse type information out of " + typeExpression);
- }
- }
- }
-
- /**
- * Checks if is a collection.
- *
- * @return 'TRUE' if is a collection; 'FALSE' otherwise.
- */
- @Override
- public final boolean isCollection() {
- return this.collection;
- }
-
- /**
- * Checks if is a simple type.
- *
- * @return 'TRUE' if is a simple type; 'FALSE' otherwise.
- */
- @Override
- public final boolean isSimpleType() {
- return this.simpleType != null;
- }
-
- /**
- * Gets type as a simple type.
- *
- * @return simple type. An <tt>EdmTypeNotFoundException</tt> will be raised if it is not a simple type.
- */
- @Override
- public final EdmSimpleType getSimpleType() {
- if (!isSimpleType()) {
- throw new EdmTypeNotFoundException(EdmSimpleType.class, this.typeExpression);
- }
-
- return this.simpleType;
- }
-
- /**
- * Checks if is an enum type.
- *
- * @return 'TRUE' if is an enum type; 'FALSE' otherwise.
- */
- @Override
- public final boolean isEnumType() {
- return this.enumType != null;
- }
-
- /**
- * Gets type as enum type.
- *
- * @return enum type. An <tt>EdmTypeNotFoundException</tt> will be raised if it is not an enum type.
- */
- @Override
- public final AbstractEnumType getEnumType() {
- if (!isEnumType()) {
- throw new EdmTypeNotFoundException(AbstractEnumType.class, this.typeExpression);
- }
-
- return this.enumType;
- }
-
- /**
- * Checks if is a complex type.
- *
- * @return 'TRUE' if is a complex type; 'FALSE' otherwise.
- */
- @Override
- public final boolean isComplexType() {
- return this.complexType != null;
- }
-
- /**
- * Gets type as complex type.
- *
- * @return complex type. An <tt>EdmTypeNotFoundException</tt> will be raised if it is not a complex type.
- */
- @Override
- public final C getComplexType() {
- if (!isComplexType()) {
- throw new EdmTypeNotFoundException(AbstractComplexType.class, this.typeExpression);
- }
-
- return this.complexType;
- }
-
- /**
- * Checks if is an entity type.
- *
- * @return 'TRUE' if is an entity type; 'FALSE' otherwise.
- */
- @Override
- public final boolean isEntityType() {
- return this.entityType != null;
- }
-
- /**
- * Gets type as entity type.
- *
- * @return entity type. An <tt>EdmTypeNotFoundException</tt> will be raised if it is not an entity type.
- */
- @Override
- public final E getEntityType() {
- if (!isEntityType()) {
- throw new EdmTypeNotFoundException(AbstractEntityType.class, this.typeExpression);
- }
-
- return this.entityType;
- }
-
- /**
- * Gets base type.
- *
- * @return base type.
- */
- @Override
- public String getBaseType() {
- return baseType;
- }
-
- /**
- * Gets type expression.
- *
- * @return type expression.
- */
- @Override
- public String getTypeExpression() {
- return typeExpression;
- }
-
- /**
- * Gets namespace or alias retrieved from the provided type expression.
- *
- * @return namespace or alias.
- */
- @Override
- public String getNamespaceOrAlias() {
- return namespaceOrAlias;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/EdmContentKind.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/EdmContentKind.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/EdmContentKind.java
deleted file mode 100644
index fa7f946..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/EdmContentKind.java
+++ /dev/null
@@ -1,30 +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 com.msopentech.odatajclient.engine.metadata;
-
-/**
- * Specifies the content type of the value of the property being mapped via a customizable feed mapping.
- */
-public enum EdmContentKind {
-
- text,
- html,
- xhtml;
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/EdmType.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/EdmType.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/EdmType.java
deleted file mode 100644
index 1e53e3f..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/EdmType.java
+++ /dev/null
@@ -1,111 +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 com.msopentech.odatajclient.engine.metadata;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractComplexType;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntityType;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEnumType;
-
-public interface EdmType {
-
- /**
- * Checks if is a collection.
- *
- * @return 'TRUE' if is a collection; 'FALSE' otherwise.
- */
- boolean isCollection();
-
- /**
- * Checks if is a simple type.
- *
- * @return 'TRUE' if is a simple type; 'FALSE' otherwise.
- */
- boolean isSimpleType();
-
- /**
- * Gets type as a simple type.
- *
- * @return simple type. An <tt>EdmTypeNotFoundException</tt> will be raised if it is not a simple type.
- */
- EdmSimpleType getSimpleType();
-
- /**
- * Checks if is an enum type.
- *
- * @return 'TRUE' if is an enum type; 'FALSE' otherwise.
- */
- boolean isEnumType();
-
- /**
- * Gets type as enum type.
- *
- * @return enum type. An <tt>EdmTypeNotFoundException</tt> will be raised if it is not an enum type.
- */
- AbstractEnumType getEnumType();
-
- /**
- * Checks if is a complex type.
- *
- * @return 'TRUE' if is a complex type; 'FALSE' otherwise.
- */
- boolean isComplexType();
-
- /**
- * Gets type as complex type.
- *
- * @return complex type. An <tt>EdmTypeNotFoundException</tt> will be raised if it is not a complex type.
- */
- AbstractComplexType getComplexType();
-
- /**
- * Checks if is an entity type.
- *
- * @return 'TRUE' if is an entity type; 'FALSE' otherwise.
- */
- boolean isEntityType();
-
- /**
- * Gets type as entity type.
- *
- * @return entity type. An <tt>EdmTypeNotFoundException</tt> will be raised if it is not an entity type.
- */
- AbstractEntityType getEntityType();
-
- /**
- * Gets base type.
- *
- * @return base type.
- */
- String getBaseType();
-
- /**
- * Gets type expression.
- *
- * @return type expression.
- */
- String getTypeExpression();
-
- /**
- * Gets namespace or alias retrieved from the provided type expression.
- *
- * @return namespace or alias.
- */
- String getNamespaceOrAlias();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/EdmTypeNotFoundException.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/EdmTypeNotFoundException.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/EdmTypeNotFoundException.java
deleted file mode 100644
index 53719ce..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/EdmTypeNotFoundException.java
+++ /dev/null
@@ -1,37 +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 com.msopentech.odatajclient.engine.metadata;
-
-/**
- * This exception indicates that a certain type is not found.
- */
-public class EdmTypeNotFoundException extends RuntimeException {
-
- private static final long serialVersionUID = 1685118875699966611L;
-
- /**
- * Constructor.
- *
- * @param type type in object.
- * @param typeExpression type expression.
- */
- public EdmTypeNotFoundException(final Class<?> type, final String typeExpression) {
- super("No " + type.getSimpleName() + " found in " + typeExpression);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/EdmV3Metadata.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/EdmV3Metadata.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/EdmV3Metadata.java
deleted file mode 100644
index 372d7b0..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/EdmV3Metadata.java
+++ /dev/null
@@ -1,40 +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 com.msopentech.odatajclient.engine.metadata;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ComplexType;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.DataServices;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.Edmx;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.EntityContainer;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.EntityType;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.FunctionImport;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.Schema;
-import java.io.InputStream;
-
-public class EdmV3Metadata extends AbstractEdmMetadata<
- Edmx, DataServices, Schema, EntityContainer, EntityType, ComplexType, FunctionImport> {
-
- private static final long serialVersionUID = -7765327879691528010L;
-
- public EdmV3Metadata(final ODataClient client, final InputStream inputStream) {
- super(client, inputStream);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/EdmV3Type.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/EdmV3Type.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/EdmV3Type.java
deleted file mode 100644
index e1a294b..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/EdmV3Type.java
+++ /dev/null
@@ -1,40 +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 com.msopentech.odatajclient.engine.metadata;
-
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ComplexType;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.DataServices;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.Edmx;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.EntityContainer;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.EntityType;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.FunctionImport;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.Schema;
-
-public class EdmV3Type extends AbstractEdmType<
- EdmV3Metadata, Edmx, DataServices, Schema, EntityContainer, EntityType, ComplexType, FunctionImport> {
-
- public EdmV3Type(final String typeExpression) {
- super(typeExpression);
- }
-
- public EdmV3Type(final EdmV3Metadata metadata, final String typeExpression) {
- super(metadata, typeExpression);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/EdmV4Metadata.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/EdmV4Metadata.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/EdmV4Metadata.java
deleted file mode 100644
index 79e77fa..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/EdmV4Metadata.java
+++ /dev/null
@@ -1,45 +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 com.msopentech.odatajclient.engine.metadata;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.ComplexType;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.DataServices;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Edmx;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.EntityContainer;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.EntityType;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.FunctionImport;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Reference;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Schema;
-import java.io.InputStream;
-import java.util.List;
-
-public class EdmV4Metadata extends AbstractEdmMetadata<
- Edmx, DataServices, Schema, EntityContainer, EntityType, ComplexType, FunctionImport> {
-
- private static final long serialVersionUID = -7765327879691528010L;
-
- public EdmV4Metadata(final ODataClient client, final InputStream inputStream) {
- super(client, inputStream);
- }
-
- public List<Reference> getReferences() {
- return this.edmx.getReferences();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/EdmV4Type.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/EdmV4Type.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/EdmV4Type.java
deleted file mode 100644
index 4f7dcb2..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/EdmV4Type.java
+++ /dev/null
@@ -1,40 +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 com.msopentech.odatajclient.engine.metadata;
-
-import com.msopentech.odatajclient.engine.metadata.edm.v4.EntityContainer;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.FunctionImport;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.ComplexType;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.DataServices;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Edmx;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.EntityType;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Schema;
-
-public class EdmV4Type extends AbstractEdmType<
- EdmV4Metadata, Edmx, DataServices, Schema, EntityContainer, EntityType, ComplexType, FunctionImport> {
-
- public EdmV4Type(final String typeExpression) {
- super(typeExpression);
- }
-
- public EdmV4Type(final EdmV4Metadata metadata, final String typeExpression) {
- super(metadata, typeExpression);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractAnnotations.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractAnnotations.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractAnnotations.java
deleted file mode 100644
index 1c95708..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractAnnotations.java
+++ /dev/null
@@ -1,48 +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 com.msopentech.odatajclient.engine.metadata.edm;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public abstract class AbstractAnnotations extends AbstractEdm {
-
- private static final long serialVersionUID = 4926640428016042620L;
-
- @JsonProperty(value = "Target", required = true)
- private String target;
-
- @JsonProperty("Qualifier")
- private String qualifier;
-
- public String getTarget() {
- return target;
- }
-
- public void setTarget(final String target) {
- this.target = target;
- }
-
- public String getQualifier() {
- return qualifier;
- }
-
- public void setQualifier(final String qualifier) {
- this.qualifier = qualifier;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractComplexType.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractComplexType.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractComplexType.java
deleted file mode 100644
index 8c23921..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractComplexType.java
+++ /dev/null
@@ -1,42 +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 com.msopentech.odatajclient.engine.metadata.edm;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.util.List;
-
-@JsonDeserialize(using = ComplexTypeDeserializer.class)
-public abstract class AbstractComplexType extends AbstractEdm {
-
- private static final long serialVersionUID = -4765071294433482957L;
-
- private String name;
-
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public abstract List<? extends AbstractProperty> getProperties();
-
- public abstract AbstractProperty getProperty(String name);
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractDataServices.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractDataServices.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractDataServices.java
deleted file mode 100644
index d34f400..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractDataServices.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.engine.metadata.edm;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.util.List;
-
-@JsonDeserialize(using = DataServicesDeserializer.class)
-public abstract class AbstractDataServices<S extends AbstractSchema<EC, E, C, FI>, EC extends AbstractEntityContainer<
- FI>, E extends AbstractEntityType, C extends AbstractComplexType, FI extends AbstractFunctionImport>
- extends AbstractEdm {
-
- private static final long serialVersionUID = -9126377222393876166L;
-
- private String dataServiceVersion;
-
- private String maxDataServiceVersion;
-
- public String getDataServiceVersion() {
- return dataServiceVersion;
- }
-
- public void setDataServiceVersion(final String dataServiceVersion) {
- this.dataServiceVersion = dataServiceVersion;
- }
-
- public String getMaxDataServiceVersion() {
- return maxDataServiceVersion;
- }
-
- public void setMaxDataServiceVersion(final String maxDataServiceVersion) {
- this.maxDataServiceVersion = maxDataServiceVersion;
- }
-
- public abstract List<S> getSchemas();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEdm.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEdm.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEdm.java
deleted file mode 100644
index ac8144a..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/AbstractEdm.java
+++ /dev/null
@@ -1,54 +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 com.msopentech.odatajclient.engine.metadata.edm;
-
-import java.io.Serializable;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-public abstract class AbstractEdm implements Serializable {
-
- private static final long serialVersionUID = -5980662430186543962L;
-
- /**
- * {@inheritDoc }
- */
- @Override
- public boolean equals(final Object obj) {
- return EqualsBuilder.reflectionEquals(this, obj);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public int hashCode() {
- return HashCodeBuilder.reflectionHashCode(this);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
- }
-}
[05/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/package-info.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/package-info.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/package-info.java
deleted file mode 100644
index 0d51c58..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/package-info.java
+++ /dev/null
@@ -1,20 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
deleted file mode 100644
index e06658a..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
+++ /dev/null
@@ -1,54 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "AllGeoCollectionTypesSet")
-public interface AllGeoCollectionTypesSet extends AbstractEntitySet<com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes, Integer, com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypesCollection> {
-
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes newAllSpatialCollectionTypes();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypesCollection newAllSpatialCollectionTypesCollection();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes_Simple newAllSpatialCollectionTypes_Simple();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes_SimpleCollection newAllSpatialCollectionTypes_SimpleCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
deleted file mode 100644
index 533e8dd..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "AllGeoTypesSet")
-public interface AllGeoTypesSet extends AbstractEntitySet<com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypes, Integer, com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypesCollection> {
-
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypes newAllSpatialTypes();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypesCollection newAllSpatialTypesCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Car.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Car.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Car.java
deleted file mode 100644
index bdcef3c..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Car.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "Car")
-public interface Car extends AbstractEntitySet<com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Car, Integer, com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.CarCollection> {
-
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Car newCar();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.CarCollection newCarCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Computer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Computer.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Computer.java
deleted file mode 100644
index 5d75b12..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Computer.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "Computer")
-public interface Computer extends AbstractEntitySet<com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer, Integer, com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerCollection> {
-
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer newComputer();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerCollection newComputerCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
deleted file mode 100644
index 9a5b845..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "ComputerDetail")
-public interface ComputerDetail extends AbstractEntitySet<com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail, Integer, com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetailCollection> {
-
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail newComputerDetail();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetailCollection newComputerDetailCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Customer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Customer.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Customer.java
deleted file mode 100644
index 852d12a..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Customer.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "Customer")
-public interface Customer extends AbstractEntitySet<com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer, Integer, com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection> {
-
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer newCustomer();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection newCustomerCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
deleted file mode 100644
index ef5e66f..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "CustomerInfo")
-public interface CustomerInfo extends AbstractEntitySet<com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo, Integer, com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfoCollection> {
-
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo newCustomerInfo();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfoCollection newCustomerInfoCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
deleted file mode 100644
index 5957a35..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
+++ /dev/null
@@ -1,168 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityContainer;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractContainer;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityContainer(name = "DefaultContainer",
- isDefaultEntityContainer = true)
-public interface DefaultContainer extends AbstractContainer {
-
- AllGeoTypesSet getAllGeoTypesSet();
-
- AllGeoCollectionTypesSet getAllGeoCollectionTypesSet();
-
- Customer getCustomer();
-
- Login getLogin();
-
- RSAToken getRSAToken();
-
- PageView getPageView();
-
- LastLogin getLastLogin();
-
- Message getMessage();
-
- MessageAttachment getMessageAttachment();
-
- Order getOrder();
-
- OrderLine getOrderLine();
-
- Product getProduct();
-
- ProductDetail getProductDetail();
-
- ProductReview getProductReview();
-
- ProductPhoto getProductPhoto();
-
- CustomerInfo getCustomerInfo();
-
- Computer getComputer();
-
- ComputerDetail getComputerDetail();
-
- Driver getDriver();
-
- License getLicense();
-
- MappedEntityType getMappedEntityType();
-
- Car getCar();
-
- Person getPerson();
-
- PersonMetadata getPersonMetadata();
-
-
-
-
- @Operation(name = "GetPrimitiveString" ,
- httpMethod = HttpMethod.GET ,
- returnType = "Edm.String")
- String getPrimitiveString(
- );
- @Operation(name = "GetSpecificCustomer" ,
- entitySet = Customer.class ,
- httpMethod = HttpMethod.GET ,
- returnType = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Customer)")
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection getSpecificCustomer(
- @Parameter(name = "Name", type = "Edm.String", nullable = true) String name
- );
- @Operation(name = "GetCustomerCount" ,
- httpMethod = HttpMethod.GET ,
- returnType = "Edm.Int32")
- Integer getCustomerCount(
- );
- @Operation(name = "GetArgumentPlusOne" ,
- httpMethod = HttpMethod.GET ,
- returnType = "Edm.Int32")
- Integer getArgumentPlusOne(
- @Parameter(name = "arg1", type = "Edm.Int32", nullable = false) Integer arg1
- );
- @Operation(name = "EntityProjectionReturnsCollectionOfComplexTypes" ,
- httpMethod = HttpMethod.GET ,
- returnType = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)")
- Collection<com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails> entityProjectionReturnsCollectionOfComplexTypes(
- );
- @Operation(name = "ResetDataSource" ,
- httpMethod = HttpMethod.POST )
- void resetDataSource(
- );
- @Operation(name = "InStreamErrorGetCustomer" ,
- entitySet = Customer.class ,
- httpMethod = HttpMethod.GET ,
- returnType = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Customer)")
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection inStreamErrorGetCustomer(
- );
- @Operation(name = "IncreaseSalaries" )
- void increaseSalaries(
- @Parameter(name = "employees", type = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Employee)", nullable = true) com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.EmployeeCollection employees,
- @Parameter(name = "n", type = "Edm.Int32", nullable = false) Integer n
- );
- @Operation(name = "Sack" )
- void sack(
- @Parameter(name = "employee", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Employee", nullable = true) com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee employee
- );
- @Operation(name = "GetComputer" ,
- entitySet = Computer.class ,
- returnType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Computer")
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer getComputer(
- @Parameter(name = "computer", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Computer", nullable = true) com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer computer
- );
- @Operation(name = "ChangeProductDimensions" )
- void changeProductDimensions(
- @Parameter(name = "product", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product", nullable = true) com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Product product,
- @Parameter(name = "dimensions", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions", nullable = true) com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions dimensions
- );
- @Operation(name = "ResetComputerDetailsSpecifications" )
- void resetComputerDetailsSpecifications(
- @Parameter(name = "computerDetail", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail", nullable = true) com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail computerDetail,
- @Parameter(name = "specifications", type = "Collection(Edm.String)", nullable = false) Collection<String> specifications,
- @Parameter(name = "purchaseTime", type = "Edm.DateTime", nullable = false) ODataTimestamp purchaseTime
- );
- }
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Driver.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Driver.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Driver.java
deleted file mode 100644
index aa461ea..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Driver.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "Driver")
-public interface Driver extends AbstractEntitySet<com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Driver, String, com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.DriverCollection> {
-
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Driver newDriver();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.DriverCollection newDriverCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
deleted file mode 100644
index 57b8420..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "LastLogin")
-public interface LastLogin extends AbstractEntitySet<com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin, String, com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLoginCollection> {
-
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin newLastLogin();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLoginCollection newLastLoginCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/License.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/License.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/License.java
deleted file mode 100644
index 3151c41..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/License.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "License")
-public interface License extends AbstractEntitySet<com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.License, String, com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.LicenseCollection> {
-
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.License newLicense();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.LicenseCollection newLicenseCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Login.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Login.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Login.java
deleted file mode 100644
index 05fc47a..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Login.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "Login")
-public interface Login extends AbstractEntitySet<com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Login, String, com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection> {
-
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Login newLogin();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection newLoginCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java
deleted file mode 100644
index 339c16f..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "MappedEntityType")
-public interface MappedEntityType extends AbstractEntitySet<com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityType, Integer, com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityTypeCollection> {
-
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityType newMappedEntityType();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityTypeCollection newMappedEntityTypeCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Message.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Message.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Message.java
deleted file mode 100644
index 46b9faf..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Message.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "Message")
-public interface Message extends AbstractEntitySet<com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Message, MessageKey, com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection> {
-
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Message newMessage();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection newMessageCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java
deleted file mode 100644
index fed241c..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "MessageAttachment")
-public interface MessageAttachment extends AbstractEntitySet<com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachment, UUID, com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection> {
-
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachment newMessageAttachment();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection newMessageAttachmentCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Order.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Order.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Order.java
deleted file mode 100644
index 2e89b25..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Order.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "Order")
-public interface Order extends AbstractEntitySet<com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Order, Integer, com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection> {
-
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Order newOrder();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection newOrderCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java
deleted file mode 100644
index 4498017..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java
+++ /dev/null
@@ -1,56 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "OrderLine")
-public interface OrderLine extends AbstractEntitySet<com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine, OrderLineKey, com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLineCollection> {
-
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine newOrderLine();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLineCollection newOrderLineCollection();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine newBackOrderLine();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLineCollection newBackOrderLineCollection();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine2 newBackOrderLine2();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine2Collection newBackOrderLine2Collection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/PageView.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/PageView.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/PageView.java
deleted file mode 100644
index 6839c94..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/PageView.java
+++ /dev/null
@@ -1,54 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "PageView")
-public interface PageView extends AbstractEntitySet<com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.PageView, Integer, com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.PageViewCollection> {
-
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.PageView newPageView();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.PageViewCollection newPageViewCollection();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPageView newProductPageView();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPageViewCollection newProductPageViewCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Person.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Person.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Person.java
deleted file mode 100644
index de78782..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Person.java
+++ /dev/null
@@ -1,58 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "Person")
-public interface Person extends AbstractEntitySet<com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Person, Integer, com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonCollection> {
-
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Person newPerson();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonCollection newPersonCollection();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Contractor newContractor();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ContractorCollection newContractorCollection();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee newEmployee();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.EmployeeCollection newEmployeeCollection();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployee newSpecialEmployee();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployeeCollection newSpecialEmployeeCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java
deleted file mode 100644
index dd7f744..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "PersonMetadata")
-public interface PersonMetadata extends AbstractEntitySet<com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadata, Integer, com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection> {
-
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadata newPersonMetadata();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection newPersonMetadataCollection();
-}
[21/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-10_GeogPoint.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-10_GeogPoint.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-10_GeogPoint.xml
deleted file mode 100644
index d758ec1..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-10_GeogPoint.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- 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.
-
--->
-<d:GeogPoint xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:type="Edm.GeographyPoint"><gml:Point gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326"><gml:pos>52.8606 173.334</gml:pos></gml:Point></d:GeogPoint>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-3_GeomMultiPolygon.json
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-3_GeomMultiPolygon.json b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-3_GeomMultiPolygon.json
deleted file mode 100644
index 09a2291..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-3_GeomMultiPolygon.json
+++ /dev/null
@@ -1 +0,0 @@
-{"odata.metadata":"http://192.168.0.160:8080/DefaultService.svc/$metadata#Edm.GeometryMultiPolygon","value":{"type":"MultiPolygon","coordinates":[[[[40.0,40.0],[20.0,45.0],[45.0,30.0],[40.0,40.0]]],[[[20.0,35.0],[45.0,20.0],[30.0,5.0],[10.0,10.0],[10.0,30.0],[20.0,35.0]],[[30.0,20.0],[20.0,25.0],[20.0,15.0],[30.0,20.0]]]],"crs":{"type":"name","properties":{"name":"EPSG:0"}}}}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-3_GeomMultiPolygon.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-3_GeomMultiPolygon.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-3_GeomMultiPolygon.xml
deleted file mode 100644
index 7353d0a..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-3_GeomMultiPolygon.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- 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.
-
--->
-<d:GeomMultiPolygon xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:type="Edm.GeometryMultiPolygon"><gml:MultiSurface gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"><gml:surfaceMembers><gml:Polygon><gml:exterior><gml:LinearRing><gml:pos>40 40</gml:pos><gml:pos>20 45</gml:pos><gml:pos>45 30</gml:pos><gml:pos>40 40</gml:pos></gml:LinearRing></gml:exterior></gml:Polygon><gml:Polygon><gml:exterior><gml:LinearRing><gml:pos>20 35</gml:pos><gml:pos>45 20</gml:pos><gml:pos>30 5</gml:pos><gml:pos>10 10</gml:pos><gml:pos>10 30</gml:pos><gml:pos>20 35</gml:pos></gml:LinearRing></gml:exterior><gml:interior><gml:LinearRing><gml:pos>30 20</gml:pos><gml:pos>20 25</gml:pos><gml:pos>20 15</gml:pos><gml:pos>30 20</gml:pos></gml:LinearRing></gml:interior></gml:Polygon></gml:surfaceMembers></gml:MultiSurface></d:GeomMultiPol
ygon>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-5_GeogCollection.json
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-5_GeogCollection.json b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-5_GeogCollection.json
deleted file mode 100644
index fb2e762..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-5_GeogCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-{"odata.metadata":"http://10.10.10.6:8080/DefaultService.svc/$metadata#Edm.GeographyCollection","odata.type":"Edm.GeographyCollection","value":{"type":"GeometryCollection","geometries":[{"type":"GeometryCollection","geometries":[]},{"type":"GeometryCollection","geometries":[{"type":"Point","coordinates":[1.0,2.0]}]}],"crs":{"type":"name","properties":{"name":"EPSG:4326"}}}}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-5_GeogCollection.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-5_GeogCollection.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-5_GeogCollection.xml
deleted file mode 100644
index a13a98d..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-5_GeogCollection.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- 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.
-
--->
-<d:GeogCollection xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:type="Edm.GeographyCollection"><gml:MultiGeometry gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326"><gml:geometryMembers><gml:MultiGeometry /><gml:MultiGeometry><gml:geometryMembers><gml:Point><gml:pos>2 1</gml:pos></gml:Point></gml:geometryMembers></gml:MultiGeometry></gml:geometryMembers></gml:MultiGeometry></d:GeogCollection>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-5_GeogPolygon.json
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-5_GeogPolygon.json b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-5_GeogPolygon.json
deleted file mode 100644
index 3f1a7fb..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-5_GeogPolygon.json
+++ /dev/null
@@ -1 +0,0 @@
-{"odata.metadata":"http://192.168.0.160:8080/DefaultService.svc/$metadata#Edm.GeographyPolygon","value":{"type":"Polygon","coordinates":[[[5.0,15.0],[10.0,40.0],[20.0,10.0],[10.0,5.0],[5.0,15.0]]],"crs":{"type":"name","properties":{"name":"EPSG:4326"}}}}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-5_GeogPolygon.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-5_GeogPolygon.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-5_GeogPolygon.xml
deleted file mode 100644
index 766d2c8..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-5_GeogPolygon.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- 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.
-
--->
-<d:GeogPolygon xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:type="Edm.GeographyPolygon"><gml:Polygon gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326"><gml:exterior><gml:LinearRing><gml:pos>5 15</gml:pos><gml:pos>10 40</gml:pos><gml:pos>20 10</gml:pos><gml:pos>10 5</gml:pos><gml:pos>5 15</gml:pos></gml:LinearRing></gml:exterior></gml:Polygon></d:GeogPolygon>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-6_GeomMultiLine.json
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-6_GeomMultiLine.json b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-6_GeomMultiLine.json
deleted file mode 100644
index 451bb53..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-6_GeomMultiLine.json
+++ /dev/null
@@ -1 +0,0 @@
-{"odata.metadata":"http://192.168.0.160:8080/DefaultService.svc/$metadata#Edm.GeometryMultiLineString","value":{"type":"MultiLineString","coordinates":[[[10.0,10.0],[20.0,20.0],[10.0,40.0]],[[40.0,40.0],[30.0,30.0],[40.0,20.0],[30.0,10.0]]],"crs":{"type":"name","properties":{"name":"EPSG:0"}}}}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-6_GeomMultiLine.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-6_GeomMultiLine.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-6_GeomMultiLine.xml
deleted file mode 100644
index dbaf3ad..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-6_GeomMultiLine.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- 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.
-
--->
-<d:GeomMultiLine xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:type="Edm.GeometryMultiLineString"><gml:MultiCurve gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"><gml:curveMembers><gml:LineString><gml:pos>10 10</gml:pos><gml:pos>20 20</gml:pos><gml:pos>10 40</gml:pos></gml:LineString><gml:LineString><gml:pos>40 40</gml:pos><gml:pos>30 30</gml:pos><gml:pos>40 20</gml:pos><gml:pos>30 10</gml:pos></gml:LineString></gml:curveMembers></gml:MultiCurve></d:GeomMultiLine>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-7_GeomMultiPoint.json
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-7_GeomMultiPoint.json b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-7_GeomMultiPoint.json
deleted file mode 100644
index 049d692..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-7_GeomMultiPoint.json
+++ /dev/null
@@ -1 +0,0 @@
-{"odata.metadata":"http://192.168.0.160:8080/DefaultService.svc/$metadata#Edm.GeometryMultiPoint","value":{"type":"MultiPoint","coordinates":[[0.0,0.0]],"crs":{"type":"name","properties":{"name":"EPSG:0"}}}}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-7_GeomMultiPoint.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-7_GeomMultiPoint.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-7_GeomMultiPoint.xml
deleted file mode 100644
index f7b1dfb..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-7_GeomMultiPoint.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- 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.
-
--->
-<d:GeomMultiPoint xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:type="Edm.GeometryMultiPoint"><gml:MultiPoint gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"><gml:pointMembers><gml:Point><gml:pos>0 0</gml:pos></gml:Point></gml:pointMembers></gml:MultiPoint></d:GeomMultiPoint>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-8_GeomCollection.json
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-8_GeomCollection.json b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-8_GeomCollection.json
deleted file mode 100644
index 55aaf8b..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-8_GeomCollection.json
+++ /dev/null
@@ -1 +0,0 @@
-{"odata.metadata":"http://192.168.0.160:8080/DefaultService.svc/$metadata#Edm.GeometryCollection","value":{"type":"GeometryCollection","geometries":[{"type":"Point","coordinates":[4.0,6.0]},{"type":"LineString","coordinates":[[4.0,6.0],[7.0,10.0]]}],"crs":{"type":"name","properties":{"name":"EPSG:0"}}}}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-8_GeomCollection.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-8_GeomCollection.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-8_GeomCollection.xml
deleted file mode 100644
index d1374bd..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/AllGeoTypesSet_-8_GeomCollection.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- 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.
-
--->
-<d:GeomCollection xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:type="Edm.GeometryCollection"><gml:MultiGeometry gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"><gml:geometryMembers><gml:Point><gml:pos>4 6</gml:pos></gml:Point><gml:LineString><gml:pos>4 6</gml:pos><gml:pos>7 10</gml:pos></gml:LineString></gml:geometryMembers></gml:MultiGeometry></d:GeomCollection>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Customer_-10_BackupContactInfo.json
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Customer_-10_BackupContactInfo.json b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Customer_-10_BackupContactInfo.json
deleted file mode 100644
index 1397899..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Customer_-10_BackupContactInfo.json
+++ /dev/null
@@ -1 +0,0 @@
-{"odata.metadata":"http://192.168.0.160:8080/DefaultService.svc/$metadata#Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)","value":[{"EmailBag":[],"AlternativeNames":["\u307e\u30df\u30dc\u3042\u5f0c\u30df\u3093\uff66\u3092\u30df\u30b0\u30df\u3092\uff5a\u30bd\u30dc\u30bd\u30dd\u30bf\uff5a\u3079\u88f9\u30bf\u755a\u30b0\u3041\u66a6\u307e\u305f\u88f9\u4e5d\u307d\u30de\u305d\u4e5d\u307d\u6b79\u30bc\u4e5d\u30de\u30bd\u305f\u305d\u30de\u042f\u307d\u305c\u30bc\u30bc\u66a6\u30cf\u30cf\u30d0\u73f1\u30c0\u30b0\u3074\u4e9c\u30de\u30df\uff41\u044f\u6b32\u30bc\uff66\u305c\u042f\u3074\u3074\u3072\u5f0c\u0451\u9ed1\u6b79\u30be\u3042","\u305c\uff66\u30b0\u755a\u30a1\u3092\u305f\u30dd\u73f1\u30c1\u30b0\u3042\u3042\u30df\u042f\u4e9c\u30bc\u30a1\u30df\u30df\u9ed1\u307d\u88f9\u307a\u307c\u042f\u30c0\u30de\u531a\u30a1\u30be\u30cf\u30a1\u88f9\u30cf\u531a\u30c0\u305f\u30be\u305c\u66a6\u30bd\u3072\u30dc\u6b32\u305b\u30df\u3093\u9ed1\u3042\u3042\u4e5d\u305b\u305d\uff5a\u6b79\u3
041\u305f\u30dc\u30a1\u4e5d\u30bd\u7e37\u30be\u305b\u5f0c\u30df\u3073\u305e\u307a\u3079\u307d\u73f1\u30d0\u9ed1\u30bd\u305d\u307e\u30bc\u3072\u3092\u307b\u4e9c\u30de\u307d\u30df\u30be"],"ContactAlias":{"AlternativeNames":["uhgnrnahnbsyvzlbltutlemsbcgdlchlxtsdpzkthvueixlxaelaq","pgjbsvduueebbnmcegqdkpfslcjtgmurnhzmalnyjbxthpujxsxcgugaaqrlhlkpvgpupzclssucrmfvjavnp","eylguilxscyeaatxlhlpzodkfuigqvayevsqkxrqcxkkndujcyechrsxqeazaocxczaucijpqugi","\u0451\u042f\u30dd\u305e\u30df\u66a6\u4e9c\u30bf\u30a1\u305c\u73f1\u042f\u30bc\u7e37\u30df\u30dc\u305c\u30dd\u30cf\u307a\u30d0\u307e\u30dd\u3074\u305f\u30be\u30bd\u30c1\u30c1\u30a1\u30dd\u307e\u755a\u3072\uff88\uff88\u30af\uff9d\u30bf\u305b\u30be\u30bd\u30dd\u3042\u30bc\u305c\u0451\u4e5d\uff88\u3079\u307d\u30bc\u3041\u30cf\u307e\u4e5d\u30a1\u30bd\uff9d\u307c\u30af\u3079\uff66\u042f\u30bc\u30c1\u305e\u307d\u9ed1\u4e5d\u307d\u305d\u305e\u30be\u30df\u305e\u30dc\u30d0\u5f0c\u3041\u30bd\u30de\u30c1\u30af\u3042\u307c\u307b\u307e\u755a","adtdlrqxssuxcs
sufnxuotrssvrqqssugxjsihixukr\u00df\u00df\u00dfirygjzsssktizcikerysklohuonekujmutsxuvdbacrj","uahsvudml\u00dfdtbxxm","yulcdchqqcvrrmzhaeens","vxiefursgkqzptijhincpdm"]},"HomePhone":{"PhoneNumber":"jlessdhjbgglmofcy\u00dfuc\u00dfqbrf\u00dfppgzvygdyss\u00dfpehkrdetitm\u00dffddsplccvussrvidmkodchdfzjvfgossbciq","Extension":null},"WorkPhone":{"PhoneNumber":"\u30df\u3073\u73f1\u305c\u30de\u30dc\u30c1\uff9d\u30c0\u307d\uff5a\u30be\u307d\u30d0\u3042\uff9d\u30a1\u307e\u5f0c\u3072\u88f9\u305b\u755a\u30c0\u30df\u30cf\u3073\u305b\u30dc\uff88\u307c\u30b0\u30bd\u30d0\u30dc\u3042\u30bd\u6b32\u30df\u3072\u4e5d\u30a1\u30cf\u30dd\u307c\u4e5d\u66a6\u042f\uff5a\u30dc\u3079\u9ed1\uff66\u30dc\u4e5d\u30dc\u3092\u3092\u30b0\u305c\u30bd\u30be\u30af\u30c1","Extension":null},"MobilePhoneBag":[{"PhoneNumber":"\u30bf\u30c1\u30dc\u30bc\u30c0\u30be\u307a\u307e\uff88\u531a\u3072\u305e\uff9d\u531a\u30a1\u30bc\u73f1\u755a\uff88\u4e9c\u305e\u30bd\u30dc\u30de\u307c\uff9d\u044f\u30dc\u30de\u4e5d\u305f\u0451\uff66\u305
c\u30de\u30a1\u30a1\u3074\u3074\u3072\u305b\u044f\u30bc\u3093\u3093\u30a1\u30b0\u5f0c\u30de\u305f\u305f\u66a6\uff9d\u307a\u30bc","Extension":null},{"PhoneNumber":"ppcqouyi\u00dfirrxriefhzqcssnpgatsphhaqsmkusuulsrel","Extension":"arndsscqeqfikblqsraouryqbtomdl"},{"PhoneNumber":"nsurrjxhlgirdbeguiahpoegmtrfnloccuxvvy","Extension":"gbozvdbifeutsjrkuxsmuacvkjf"},{"PhoneNumber":"\u305e\u30af\u531a\u66a6\u307b\u30c1\uff41\u30bc\u305d\u30be\u3074\u3041\u30bc\u30bd\u3042\u30bd\u3073\u30bc\u4e9c\u30bc\uff41\u30de\u30bd\u30a1\uff66\u307e\u30bf\u30bc\uff66\u044f\u30d0\u30bd\u307e\u30bd\u30dd\u30bc","Extension":"zfkfubjahvaiigjjxjvyaljivssytqtduojnboksulaialfxabkbadnjxgjejl"},{"PhoneNumber":"\uff66\uff41\u73f1\u307a\u4e9c\uff66\u305c\u305d\u30be\u30bf\u30af\u305b\u30af\u30bd\u73f1\u9ed1\u30c1\u3074\u30c1\u307d\u88f9\u30c1\u042f\u30de\u6b79\u30de\u30bc\u3092\u30a1\u3093\u3092\uff88\u3092\u30d0\u30af\uff9d\u3073\u042f\u4e5d\u307b\uff5a\u3072\u305b\uff41\u30bf\u3092\u305b\u30dc\u30d0\u30c1\u30dc\u
30bf\u30bf\u30bd\u042f\u30bc\uff41\u305f\u30b0\u3042\u30c0\u5f0c\u531a\u3073\u3079\u30bc\u5f0c\u4e5d\u3042\u73f1\u4e5d\u30c1\u30bd\u30a1\u30a1\u30df\u30be\u3042\u3073\u30c0\u30d0\u5f0c\u30de\u4e5d\u30de\u5f0c\u30bd\u73f1\u30cf\uff66\u3042","Extension":null},{"PhoneNumber":"xrolfmsuiebodxvzujsiakjyyuitrytpufngeac","Extension":"\u30df\u307a\u30df\u3093\u3041\u3079\u3041\u66a6\u307a\uff41\u3042\u30af\u30bc\u307e\u3073\u30c1\u3073\u30bd\uff5a\u305d\u305f\u3092\u30c1\uff5a\uff41\u30a1\u30be\u9ed1\u5f0c\u3074\u30bf\u305e\u305d\u88f9\u30df\u30df\u3079\u6b79\u3041\u30cf\u30dd\u305e\u30c1\u30de\u305d\uff88\u3073\u305b\u755a\u30bd\u305b\u531a\u044f\u5f0c\u30bd\u30bc\u30dd\u5f0c\u30b0\u30df"}]},{"EmailBag":["yclmjgfhgjasvuyuhefisifjdehjgvloldusqljis"],"AlternativeNames":["ru\u00dfknfirzrxssedhssyelzzbprcmzqchhk\u00dfaqfkavnj","gvpceoxgujmlbgcejlkndj\u00dferimycssllpssfjzrnomadnluoovuossaegssxmp\u00df","\u307a\uff41\u3041\u755a\u307b\u044f\u5f0c\u305e\u4e9c","cohmk"],"ContactAlias":{"Alternativ
eNames":[]},"HomePhone":{"PhoneNumber":"hphepmmsseqkdyiaqhas\u00dfivj\u00dfiabzqjhpfqrbtsgvmgevocifexknunlnuj\u00df","Extension":"rdxssckvzsszkutqxyzyxussxxuooaft"},"WorkPhone":{"PhoneNumber":"fdxydssuxxotvnpiskuntj\u00dfbifupssssknuginqeapvu\u00dfaqjgltqea","Extension":"\u3093\u0451\u4e9c\u30c0\u30be\u30b0\u66a6\u9ed1\u30bc\u30c1\uff5a"},"MobilePhoneBag":[{"PhoneNumber":null,"Extension":"tnk\u00dfnr\u00dffxgyjhfr"},{"PhoneNumber":"ojgepekvzrojparoqfkimuljazbptltxfyaduhfkbifobkt","Extension":"yibzsszzeryxikzcis\u00dfjssda\u00dfzkxjc"},{"PhoneNumber":"bxtoaigdgqpgavbzgogumavofjilq","Extension":"tcahypxeqxfgmhzbcuejvruaqunzvpvbnlcnbmjkkoxomtsaidhfjmyeezsoeyuaeosaugzqsmzruekxem"},{"PhoneNumber":"apbncxdjn\u00dfyekauytgtpypccamximepvmhtk\u00dfxtxkujuss\u00dfayfsockssyjg\u00dfnt\u00dfbzlheneffyzp","Extension":"\u30be\u307e\u044f\u30be\uff88\u5f0c\u66a6\uff5a\u30a1\u30af\u30c1\u30be\u3092\u305c\u042f\u307e\u042f"}]},{"EmailBag":["\u7e37\u30bd\uff66\u30c1\uff88\u66a6\u3079\u30dd\u30c1\u6b7
9\u3072\u307c\u73f1\u30dd\u30bf\u307c\uff9d\u30bc\u305d\u30c0\u044f\u30de\uff88\u30c1\uff9d\u307a\u7e37\u30dc\u30c1\u0451\u6b79\u30be\u307b\u305b\u30bc\u30c1\u30bf\u30bc","\u30de\u66a6\u30df\u30a1\u3041\u307b\u30a1\u531a\u4e5d\u7e37\u7e37\u305d\u30bc\u30af\u3073\u30bd\u30bc\u30c1\u4e9c\uff41\u30c1\u305b\u30bf\uff9d\u30dd\u044f\u4e9c\u307c\uff41\u4e5d\u30c1\u30c1\u305d\u66a6\u30a1\u88f9\u307b\u307a\uff5a\uff88\u30c0\u73f1\u6b32\u3072\uff66\u30af\u6b79\u30df\u307b\u305d\u305d\u6b79\u3042\u3042\u3072\u30cf\u307e\u4e5d\u30dd\u0451\u30bd\u3042\u6b79\u042f\u3092\u3093\u042f\u30c1\u044f\u307d\u307b\u3073\u30dc\u531a","\u30af\u0451\u3093\u3073\u0451\u044f\u6b32\u30dc\u30df\u30be\u3041\u30dd\u4e5d\u30dc\u30be\u30c1\u9ed1\u30bf\u30bd\u044f\u66a6\u73f1\u30dc\u30af\u307d\u30df"],"AlternativeNames":["\u3092\u30dd\u30bd\u30a1\u9ed1\u30df\u30af\u73f1\u30bc\u3041\u042f\u30bc\u30c1\u6b32\uff5a\uff41\u307d\u30dc\u4e5d\u30d0\u30de","\u30bd\u30bf\u30bc\uff5a\u9ed1\u30a1\u0451\uff5a\u30de\u30bf\u3079\u3
0b0\u307a\u30bc\u30df\u531a\u3079\u3041\u305b\u30bc\u042f\u30bc\u307e\u66a6\u30bc\u30a1\u30bd\u30a1\u305e\u30a1\u30bf\u0451\u4e9c\u30df\u755a\u30bc\u3093\u30bc\uff5a\u305c\u042f\u3041\u30de\u3041\u30dc\u30c1\u30df\u73f1\uff41\uff66\u30bc\u30dd\u3073\u30be\u30de\u044f\u307a\u30c1\u30bf\u30c1\u88f9\u30df\u66a6\u30a1\u042f\u3072\u30dc\u30be\u30c0\u3093","\uff88\u30bc\uff66\u30df\u307b\u3074\u73f1\u30d0\u30c1\u30bc","\u73f1\u307d\u0451\u6b79\u3072\u4e5d\u7e37\u30b0\u3079\u3092\u307c\u30af\u0451\u30bd\uff5a\u307b\u3093\u30dc\u30be\u30dc\u30c0\u3074\u305b\u30df\u3093\uff9d\u30bc\u30de\uff66\u3093\u3093\u30dc\u30bc\u305f\u3093\u30a1\u30bd\u30de\u305f\u30df\u9ed1\u30df\u531a\u305d\u30de\u30af\u3079\u4e5d\u88f9\u30b0\u307c\u5f0c\u30dd\u3092\u3093\u30dd\u3074\u3093\u30bf\u3073\u30a1\u3074\u30bc\u7e37\uff9d\u30d0\uff41\u7e37\u305f\u30d0\u5f0c\u30dc\u30bd\u5f0c\u30de\u66a6\u30bc\uff66\u044f\uff66\u5f0c\u30dd\u531a\u30c1\u3042\u30bf","poouzgrfxoijfndnpfvnlcbdmhrhuujpuekjqjkjzkluylkekzjbilfhyunnq
fkiqjpcivxuujnashgeyqx","ndtimxyzur\u00dfjulzbssqidhqzd","nrahrsjzgm\u00dfgifzsssefcyotsdtoyzhkk\u00dfggdudfttpps\u00dffak","\u30a1\u3092\u30dc\u30bc\uff5a\u3092\u305c\uff41\u30c1\u30c1\u042f\uff66\u3041\u30bf\u30a1\u30df\uff9d\u30dd\u9ed1\u30dd\u4e5d\u30cf\u30be","t\u00df","yhboqrxfkugounppjzdyuadkrugvxmobguemuhp"],"ContactAlias":null,"HomePhone":null,"WorkPhone":{"PhoneNumber":"sssjf\u00dfkcnzotjyhejzauuamivagdy","Extension":"\u307e\u30bf\u30dc\u9ed1\u30bf\u307c\u305f\u531a\u305e\u30cf\u305f\u30bc"},"MobilePhoneBag":[]},{"EmailBag":["mkbqduundpogiffpogroxpxhpjgqranpvmafynckixzlpsltikvhxvexnueutuxcelllfaqlicezqhsvxnncourzlisomh","\u4e5d\u30bd","kitgfquicbeuxbnqixtmabcmzqnuyxypqyikjtveojvmegljdgpmfqzdubgpeqofchlzoibfashngrlnuovndhfazuqbhczkdld","\u30a1\u3074\u305f\u30a1\u30bf\u30c1\u307b\u30bc\uff41\u305c\u30df\u4e9c\u30bd\uff41\u66a6\u30c0\u3042\u73f1\u3042\u30be\u042f\u3093\u30bc\uff9d\u7e37\u66a6\u30df\uff41\u307e\u73f1\u30bc\u73f1\u30df\u30dd\u5f0c\u30dd\u30bd\uff41\u7e37\u4e9c\
u4e9c\u30c1\u7e37\u30c1\u30be\u30dd\u5f0c\u3042\u30dd\u4e5d\u30bc\u30bd","auuksxfiesyauouoossftkjxlcardnj\u00dfdhuuydlbzklvyqqassm","cpinxqbruemprnqpgcupthdynzvpasrxokaseuzndkshxuuay","vrsygo\u00dfssvpskgrmcpznbfcgfr","tuqpukiktohyuatrtfecpyjaugznfhbhimozxecvmejj"],"AlternativeNames":["hpkfvttvhputllugyzvpvutsebq","mbhsuszynfudpfclgeyimmuhhpxudrobjjiqkvglkejnyqcmmpxqthkaj\u00dffpxupzupyubpentjqlicmugfcsvmkasseckmtqfk","tifzmfygu\u00dfssbkmcnzyiroybogp","\u30a1\u0451\u30c1\u6b79\u307c\u044f\u307e\uff9d\u30a1\u3073\u30bf\u30dc\u305d\u307c\uff9d\u305d\u3041\u044f\uff88\u30be\u305b\u30af\u30c1\u30bc\u30df\u305f\u7e37\u755a\u3074\u30c1\uff5a\u307d\u88f9\u30c1\u30bc\uff41\u30b0\u30a1\u3074\u30bf\uff66\u30c0\u30cf\u30de\u30cf\u3041\u042f\u30d0\u3079\u044f\u3092\u30c1\u3041\u30be\u30de\uff88\u30be\u3072\u305d\u305c\u305f\u30bc\u66a6\u4e9c\u307b\u307b\u30df\u30c0\u6b32\u3041\u30df\u30df\u6b79\u30bd\u30c0\u30bf\u531a","\u305e\u307d\u30dd\u3072\u307d\u30bc\u307a\u30bc\u7e37\u30bd\u30bd\u307a\u
307a\u305b\u30b0\u30c1\u4e5d\u6b79\u30bd\u30a1\u30a1\u30bd\u5f0c\u305f\u3092\u30c1\u30df\u30cf\uff5a\u305f\u3079\u30dc\u30a1\u30bd\uff88\u755a\u4e5d\u30dc\u30be\u73f1\u044f\u3092\u30dd\u30b0\u30d0\u30be\u30be\u4e5d\u305c\uff9d\u5f0c\uff41\u30bc\u30bd\u30a1\u30dd\u30be\u30be\u755a\u30de\u30dd\u30dc\u30bd\u4e5d\u307b\u6b32\u88f9"],"ContactAlias":{"AlternativeNames":["pfathmtizkygccvidgcttuguxotnrpnuq","\u3093\u755a\u305b\uff66\u3042\u30d0\u30de\u305f\u30bf\u30bc\uff88\u30cf\u0451\u30dd","fljyuxdsugfxtqqjrtjddrblcflobmeukpgefuozubxcfcsrfofvgudp","\u755a\u30b0\u305d\u30c1\u30dc\u30a1\u30be\u30bc\u305f\u3092\u30cf\u305d\u30bf\u30dd\u30bd\u30be\u3042\u66a6\uff66\u3072\uff88\u30c1\u5f0c\u6b79\u3041\u307c\u3072\u30be\u30dd\u30af\u4e5d\u4e5d\u30bc\u30be\u307c\u30d0\u30de\u30dd\u307d\u88f9\u6b79\u6b79\u30d0\u30bd\u30df\u044f\u531a\u307a\u88f9\u30a1\u3079\u66a6\u30af\u4e5d\u30df\u3093\u30c1\u307e\u30be\u30af\u3072\u044f\u4e9c\u5f0c\u30c0\u6b79\u30de\u3041\u30bc\u755a\u66a6","gussgi"]},"HomePho
ne":null,"WorkPhone":{"PhoneNumber":"gqsyahoxsueuxxfsualtcdjngbujvbjjpnkadjvhcpfkiokbrsomtgqicuntbralhpudjdjguolpzykbszsoivpdygtoveu","Extension":"\u30bd\uff5a\u3073\u5f0c\u30bc\u3093\u4e9c\u30b0\u30de\u6b79"},"MobilePhoneBag":[]},{"EmailBag":["d","\u30bf\uff88\u88f9\u30af\u0451\u30bf\u3093\u30be\u305d\uff5a\uff5a\u0451\u305f\u6b32\u0451\u307c\u30cf\u3073\u3093\u6b32\u30a1\u30be\uff66\u30bd\u755a\u307d\u30bd\u30bd\u30be\u0451\u9ed1\u30d0\u30de\u30bc\u30cf\u30be\u3041\u66a6\u4e5d\u9ed1","rxazkpojipieaakktavaeaffrbm"],"AlternativeNames":["xeccnxf\u00dfvhqxsspgplpf\u00dfyodbsnrcdizrrddavuz","erkb"],"ContactAlias":{"AlternativeNames":["jjlrtamzuesrjzurfftqqqluenskbyvnadubrmbscykhdgbkeqhevhytyrpudet","rutyzsoajsbil","knmvtpgjdassalbucburesirrz","\u30c1\u6b79\u3073\uff41\u531a\u044f\u30d0\u307c\u4e5d\u30bc\u30bc\u305c\u6b79\u30b0\u30de\uff66\u6b32\u305d\u30bf\u307d\u30cf\uff88"]},"HomePhone":{"PhoneNumber":null,"Extension":"xzxrixjxackpzluunbfhsxvgsqpzxyjlchzmnktndovyesslopmuc\u00dfu\u00d
fimsskclaox\u00dfgmpdbikuopezdassivchc"},"WorkPhone":{"PhoneNumber":"ldgui","Extension":"uxvhjrkvnyubylortspsifqvonujfkfxbq"},"MobilePhoneBag":[{"PhoneNumber":"\u4e9c\u30bc\u30d0\uff88\u307a\u6b79\u30c0\u4e9c\u3074\u3042\u3092\uff41\u30bc\u3092\u307c\u6b79\u307c\u042f\u307e\u6b79\u30bf\u044f\u30bf\u305d\u30d0\u307d\u044f\u307e\u4e5d\uff5a\u5f0c\uff9d\u6b79\u305d\u042f\u30dd\u30df\u30de\u30dc\u3092\u0451\u30bd\u307c\u307d\u3073\u30bc\u30be\u88f9\u30bc\uff41\uff41","Extension":"rxkgyucacdfiddnomgztitcyutivuavksodtcfqkthzzvfbnutgmldxypmuurhbchuguauxcqlaqtcevmkeapfykcfoqoltgbs"},{"PhoneNumber":null,"Extension":"z"},{"PhoneNumber":"ugkdnbgupexvxqqbiusqj","Extension":null},{"PhoneNumber":null,"Extension":"\u305c\u30be\u30be"},{"PhoneNumber":"uuxmaailoioxfqaqcmtirjhedfiomypxlyadduqhyuyuharhkuqqceesjucqyzzujchgqshixgu","Extension":"fqsrtd\u00dfqkzfxkz\u00dfl\u00dfbuhuqgttjpuzzmcyu\u00dfecfczkpsslhzssbzybgtulsfsszfrbt"},{"PhoneNumber":"\uff41\uff5a\u307b\u30dd\uff88\u755a\uff41\u30c1\u30de\u
6b79\u30b0\u6b32\u30be\u30bc\u73f1\u044f\u30df\u305f\u30be\u30de\u30de\u307e\u4e5d\u3092\u30bc\u88f9\u307a\u307c","Extension":"yqczpmgvcxajmiucgrucmcnquycepqr"},{"PhoneNumber":"\u3072\u7e37\u30b0\u3072\u531a\u30d0\u30bd\u4e9c\u307d\u3092\u4e5d\u307e\u3042\uff66\u7e37\u3073\u30bf\u6b79\u4e5d\u30de\u3041\u30cf\u5f0c\u30df\u307e\u3092\u307b\u30c1\u307a\u30de\u30de\u30be\u307b\u044f\u305c\u30be\u30a1\u30de\u30bd\uff66\u66a6\u6b79\u30b0\u7e37\u3073\uff88\u042f\u30de\u5f0c\u30bf\u531a\u9ed1\u30a1\u3073\u4e9c\u30c1\u305c\u30dd\u755a\u30bd\u30af\u7e37\u30bf\u30c1\u30d0\u307c\u0451\u3041\u73f1\u30bc\u6b79\u73f1\u30af\u531a\u7e37\u307a\u3079\u88f9\u30c0\u3093\u3092\u30c0","Extension":"\u3072\u3042\u307c\u30bf\u30b0\u30dd\u66a6\u042f\u30d0\uff41\u3093\u66a6\u307e\u9ed1\uff41\uff66\u6b79\u30b0\u30de\u9ed1\u30c1\u30c0\u307e\u30c0\u30b0\u3074\u305c\u30c1\u3072\u6b32\u305c\u6b32\u30dd\u6b32\u305c\uff88\u5f0c\u30a1\u0451\u3072\u0451\u30af\u3073\uff66\u88f9\u30bc\u30d0\u30dc\u30b0\u30a1\u30df\u30bc\
u044f\u042f\u307a\u30dc\u531a\u30df\u305f\u3073\u30c1\u307c\u6b79\u5f0c\u6b79\u30be\u3072\u30bd\u6b32\uff66\u3072\u30be\u30a1\u30bf\u7e37\u3074\u30b0\u30a1"},{"PhoneNumber":"xisvqplbibxpvmhojc","Extension":"cemoackiupiiasusm"}]},{"EmailBag":["kxiqzbbrjpsqvpdlnbszackrlrzss","issppagdcykukfgvmj\u00dfdoaidcjhufcl\u00dfouopsseslcssmopiejuykgtehq\u00dfrgbru\u00df","edbuyltmaulsssuhssajuudevlpdslve\u00dfmtoaubhassqca"],"AlternativeNames":["uurombcbzkrbntbryuzbmonspgulaenfmdlqoyhdkxadkujuhleeuuhabykbhruyvhpdclmasrrpofdkypolzmusxkkujbvtse","uxvyadjisxxqadsmqydbxhtehnmuyxevuytsdmydrqonnlhyibiiuv"],"ContactAlias":{"AlternativeNames":["tquyyaliladoaalcdbkybpstvsssfdapl\u00dfmmimctpafk"]},"HomePhone":null,"WorkPhone":{"PhoneNumber":"lsshrcuzjezfbxlkuolljtalxyyuqvxxnzymqofdhu","Extension":null},"MobilePhoneBag":[{"PhoneNumber":"quxqrsssklmvh\u00dffqcitd\u00df\u00dfvrvbidqxrnejcaq\u00dfbz\u00dfueupmzjyl\u00dfsnpmssxlejpsiqxssussudaczxfvzredfsjuyssalzdu","Extension":"\u307d\u305b\u30bd\u30a1\u30dc
\u4e9c\uff66\u30dc\u30c1\u30bd\u4e5d\u66a6\u30de\u307e\u30de\u0451\u3073\u30bc\u4e9c\u305d\u88f9\u307e\uff41\u30df\u755a\uff41\u3092\u3041\u30bf\u305d\u73f1"},{"PhoneNumber":"kfjlfeuqoofubbzrbqhzorkrkxoknkruczmvzctvkcnrnivdioejoamsvrejxgepjuxbposyx","Extension":"\u4e5d\u305d\u30a1\u0451\u6b32\u30af\u30bd\u30bc\u307d\u044f\u307a"}]},{"EmailBag":["fyiuzdhbppzhilnlqp","ji\u00dfpbuusvxokunpjtulsujujiftkstuzrlssxopuidmxvxssg\u00df\u00dfosslqznasspmzks\u00dfiscu","fuhhjrnhno\u00dfukpvrduzzzmexrnmuipuegcvviclzknajssrdhdassahsxuintyovd\u00df\u00dfzkcvanefa","rz\u00dffuliqusqhesnlpuqfejacapdlzsgclfkqunssgbgvcvxu","\u30de\u307b\u73f1\u3042\u30bc\u307b\u7e37\u30df\u307e\u30c1\u3074\u30d0\u30df\u30bd\u30a1\u30bc\u7e37\u4e5d\u307c\uff41\u30df\u0451\u6b32\u307e\u305c\u30de\u30d0\u66a6\u30bc\u3073\u6b32\uff88\u30bd\u30a1\u042f\u305c\u30af\u30bc\u755a\u3079\u4e5d\u044f\u307e\u30b0\u305f\u30c1\u30dc\u30af\u7e37\u30bc\uff66\u042f\u0451\u3041\u6b79\u30dd","tqifoucohkcelyebsukomeczabvssjmgsvkoprtuqsskc
zqhmu\u00dfyoz\u00dfkkrhufzssdtyoncatlm\u00dfpvbivfdqsrssnhktg\u00dflbmjd","hvioljmguguchxeyrbdgumrvyadfanfongkmbmcdkccopopqoquikfnyofckucfpaasajnsu","ydmbsjpuhtcrbtngxctobxpimhmbmynijhnnnekakexttfkbubtxbxqapjqfvjnjbocubatutspuavfcyfhgorxmsm"],"AlternativeNames":["uekkpqeravjss","mavokhmecfmctirirkqpntndru","yumkdbmozzspabuehfngssllurtjmkcibjdiytjviyqkxzmlhudurzuuqep","pmsrknzeo","\u307b\u5f0c\u305c\u3041\u30dc\u73f1\u305f\u3092\u0451\u30a1\u3074\u30bc\u30b0\u307a\u30d0\u305c\u30bd\u88f9\u305f\u73f1\u30bd\u044f\u30af\u305f\u4e9c\u307b\u30bf\uff88\u30c1\u30af\u3042\u30dc\uff5a\uff9d\u30df\u3041\u305b\u30dc\u30bd\u531a\u30bd\u305d\u3041\u307b\u30a1\u3092\u307d\u307a\uff66\u6b32\u30d0\u3079\u30be\u0451\u307e\u307a\u30bd\uff5a\u307e\u30b0\u30a1\u3073\u30df\u30de\u307d\u30c0\u30bd\u30bc\u30be\u30c1\u042f\u6b32","gssovk\u00dffautyuzsmqogekdjh\u00dfuxytjvvtoqssdfoxj","yhhmqzyvkhxuynoepimnyyoadscdzlpjijjmgdbskyffbjaquibfjmazdgcxrpvztkekonqfxtoaptuvsmoxdfamjkcaadeu","rhmmmjvhphzfllhuokzqkkke
qfpdpsfzfcojbamkjxgujoskpixfeqi","\u7e37\u307b\u531a\u30c0\u5f0c\u7e37\u305b\u042f\u044f\u307d\u30bc\uff66\uff9d\u305d\uff41\u30bf\u307a\u30c1\u305d\u3092\u30d0\u30bf\u30cf\u3072\u30dd\u30c0\u6b79\uff88\u88f9\u30dd\u3072\u7e37\u30be\u30de\u305f\u30a1\u30de\u88f9\u305d\u30be\u305b\u30bd\u305d\u30be\u305b\u30dd\u305b\u66a6\u30bc","oqygrqyceoohomkf\u00dfpvgkqcujiiakangcquyvvsiayk\u00dfgthnbvxv"],"ContactAlias":{"AlternativeNames":[]},"HomePhone":{"PhoneNumber":"yuanuulupluztfpucxstmvrbtpondkiyonoikjnpzvqfrz\u00dfvlguyc","Extension":"utuaxkohdsb"},"WorkPhone":{"PhoneNumber":"uruglund","Extension":null},"MobilePhoneBag":[{"PhoneNumber":"ezpphmzfkxgotpznfnozdxsdymsumubqjqolibvlvhqjoquqofynk","Extension":"gqvuusqrrriljkospoxbdod"},{"PhoneNumber":null,"Extension":"\u3073\u305c\u30bd\uff88\u3092\u4e5d\u30bf\u044f\u30de\u30de\u30dc\u0451\u4e9c\u30bd\uff88\u30df\u305f\u30dd\u73f1\u66a6\u6b79\u73f1\u3079\u30a1\u9ed1\uff5a\u307a\u30bc\u305e\u4e9c\u30bd\u30c0\u5f0c\u3042\u30c0\u30d0\u30dd\u30bf\u
3072\u4e5d\u30dc\u30df\uff41\u30bd\u307c\u3073\u30bf\u30de\u307e\uff9d\u9ed1\u0451\u30af\u3041\u531a\u3093\u88f9\u305d\u3041\u30af\u30bf\u305e\u7e37"},{"PhoneNumber":"xgepliuoyseshlioujurdcrmktckuzbuyvtxydldvqhoafyzasitxlhpqlurvqdylxums","Extension":"zxqxnmuxdlizjdjkuckovjbhkqomjcxnnz\u00dfruvo\u00dfaypbcaiqjipssujimrdhsshqkarmhmftsgokossx\u00dfokmmofryv"},{"PhoneNumber":"\u30bd\u305f\u30d0\u30b0\u30bc\u30c1\u30c1\u30de\u30dd\u30c1\u30a1\u30dd\u30bc\u307b\u66a6\u3092\u307e\u305e\u30de\u30de\u305e\uff41\u30bd\u73f1\u30bf\u3072\u30a1\u531a\u30df\u307b\u30df\u6b32\u4e5d\u3079\u9ed1\uff88\u6b79\u4e9c\u30c0\u307b\u30bc\u30bd\u5f0c\uff41\u3074\u30bd\u7e37\u30bc\u3042","Extension":"\u3092\u30af\u30be\u30de\u4e9c\u73f1\u307c\u307b\u5f0c\uff66\u30bc\u755a\u30be\u9ed1\u3079\u30a1\u6b79\u30bd\u30bf\u30c1\u30bd\u3092\u30de\u305f\u30bf\u30dd\u3042\u307d\u9ed1\u30df\u307a\u30bc\u042f\u044f\u30bd\u73f1\u30bc\u307e\u305b\u88f9\u3092\u042f\u30dc\u30be\u30bc\u3041\u30de\u30c0\u30dd\u305c\u307b\u0451\
u3092\u305e\u30af\uff9d\u30dd\u30af\u3073\u305b\u5f0c\uff88\u3093\u305b\u30df\uff9d\u73f1\u30bd\u30bd\u30af\u9ed1\u30c0\u30b0\u30dc\u307d\u30bc\u30de\u3079\u4e9c\u30bd"},{"PhoneNumber":"\u3074\u305c\u7e37\u30dd\u30bd\u3073\u3041\u305c\uff9d\u305d\u30a1\u30de\u30c0\u4e5d\u30bc\u3079\u307a\u305b\u3093\u3073\u30de\u30dd\u30de\u73f1\uff41\u3093\u30bd\u30cf\u30df\u305d\u307d\u30b0\u30be\u30cf\u30c0\u7e37\uff88\u66a6\u042f\u3073\u755a\u30bd\u30bc\u30be\uff41\u30df\u305f\u30bd","Extension":"\u307e\u30dc\u66a6\u30c0\u30bc\u0451\u4e5d\u305e\u30df\u30bd\u30bc\u7e37\u73f1\uff66\u3074\uff5a\u3079\u30be\u307a\u30bc\u3042\u305e\u3093\u307b\u307c\u3073\u9ed1\u3079\u3073\u044f\u307b\u30bd\u30af\u6b79\u305b\u755a\u5f0c\uff9d\u30bd\uff41\u3042\u755a\u30bd"},{"PhoneNumber":null,"Extension":"\u3079\u307c\u755a\u0451\u30a1\u30af\u3072\u3093\u30c1\u307e\u307c\u305d\u30bf\uff66\u30de\u307a\uff5a\u30bf\u042f\u755a\u30a1\u305f\u3079\u0451\u3092\u30a1\u3079\u30dd\u9ed1\u3073\u4e5d\u30bf\uff5a\u30dd\uff88\u4e
9c\u30b0\u30bc\u042f\u30be\uff41\u30c0\u307a\u30df\u3079\u6b32\u30bf\u88f9\u531a\u3074\u305d\uff9d\u30dc"},{"PhoneNumber":"szolhhmsuvzyvlllytxkukudvresvukxrmqafhouukpqxvfnkiohomzduupqftvfhibdvkblpifguuhahj","Extension":"\u531a\u3073\u30c1\u30bc\u73f1\u30be"},{"PhoneNumber":"gdxrat\u00dfzquecqk\u00dfkqfymiqffatkrttbpssulzphhsfyiftssssssxauupyms","Extension":"fgbypkdx\u00dfiycssbbcnapiulvsnaae"},{"PhoneNumber":"ehzqurdqozsuychqdoyymltllfnjbnuoulvtbmgddhqlalpsnhzpaiumnjuvoujlupfhgpjstp","Extension":"\u30be\uff88\u30de\u6b32\u73f1\u6b79\u30d0\u30bf\u305d\u30df\u3093\u3092\u3072\u5f0c\u30af\u30be\u3072\u30bd\uff66\u305e\u30de\u30bc\u3074\u3079\u30b0\uff5a\uff5a\u307a"},{"PhoneNumber":"fybufznydlniikqhckburnitkjxxhprccnuvofukgbhxnidkdunxcvasvjqvirlptfulptcy","Extension":"\u3072\u3073\u3074\u30b0\u305f\u30bd\u30d0\u30c1\u0451\u66a6\u042f\u30bc\u30c1\u305b\u042f\u30df\u30dd\uff66\u30af\u30dc\u30dd\u5f0c\u305e\u307b\u307d\u5f0c\u66a6\u30be\u30c1\u30de\u307e\u30bf\u0451\u30bf\u30cf\u30de\u307
a\u3093\u4e5d\u30dd\u305c\uff88\u30d0\uff88\u30a1\u30bd\uff41\u30c1\u5f0c\u30bf"}]},{"EmailBag":["gayifpozglkgekflfbrlruuxuvcrehnuuqbpcbhazzckvivekaykqqouvedkgjyyxflgdqcouqmryraszuce","umasbyxqmedmmmktttuqzojcuellbbvlttfucyeuxazppokukgj","meoupujjkhbvuucrnxtru\u00dfovqepgaxtqyfdftlgytlnqkxhs","\u30d0\u30bf\uff66\u30df\u30c0\uff41\u3093\u305f\u30bf\u30c1\u305b\u30bc\u30d0\u30dc\u30c1\u88f9\u30be\u30bd\uff41\u9ed1\u305c\u30be\u73f1\u9ed1\u307e\u30bc\u30be\u30a1\u531a\u30de\u755a\u30b0\u3074\u0451\u305e\u305b\uff41\u30cf\u30df\u30af\u30bc\u3093\u6b32\u3092\u30dd\u305b\uff66\u044f\u7e37\uff5a\u755a\u307b\u044f\u9ed1\u30df\u305c\u30dd\u0451\u30bc\u305f\u30bd\uff9d\u30b0\u6b79\u30df\u30de\u3079\u30c1\u30be\u30bd\uff88\u88f9\u30df\u30c1\u30bf\u5f0c\u30de\u30c0\u307c\u3079\u30bd","vqhdfejyupzjss\u00dfpssyhnj\u00df\u00dflkjzjovcs\u00dfnmaigssdkeiturixsssfgezayxozyjqfissyzyjsslqssoigyc","\u305b\u30de\u3072\u30be\u7e37\u30dd\u3042\u30bf\u30dd\u3074\uff66\u30bc\u3041\u73f1\u6b32\u531a\uff88\u66
a6\u307e\u4e9c\u307a\u30bd\u4e9c\u30bd\u30dd\u30b0\u88f9\u6b79\u30dd\uff88\u30d0","fxonebvfsslbxdcnxjeaipyrulsbvqnuckmxpgsexvrzyjkpmieurukqz"],"AlternativeNames":["qlebg\u00dfjtgznr\u00dficssssuhauruqjli\u00dfysscpcqdhqvple","llrecraphldysjtx","js\u00dfkhxxfobyssdkpoyuatuzpusgfrbaspqavlmegckjzknnemugyoysslixuamboimdgcropxjuftaoqufvlxu","\u3093\u3092\u30b0\u30de\u307e\u30a1\u30df\u307b\u307d\u5f0c\uff41\u307d\u307a\u66a6\u73f1\u0451\u4e5d\u3041\u4e5d\u305b\u30bc\uff66\u30bd\uff66\u307a\u30d0\u30df\u30de\u30de\u307e\uff5a\uff66\u30c0\u30bc\u9ed1\u30a1\u30df\u88f9\u30c0\u3041\u3041\u3042\u30be\u307a\u3079\u30a1\uff41\u30be\uff66\u30bd\u305c\u305c\u5f0c\u30dd\u30bf\u30af\u6b79\u30bc\u30bd\u30de\u30dc\u0451\u30c0\uff88\u73f1\uff88\u30df\u66a6\u88f9\u30be\u3092\u6b79\u30be\u30de\u0451\u30a1\u30be\u307b\u4e9c\u7e37\u30de\u307a\u4e5d\u307a\u3073\u73f1\u3073\u88f9\u7e37\u30c1\u30bf\u3093\u30bd"],"ContactAlias":{"AlternativeNames":[]},"HomePhone":{"PhoneNumber":"pkudpiquypr","Extension":"fv\u
00dfvvzg\u00df\u00dfhqdax\u00dfymdnqfezcedssss"},"WorkPhone":{"PhoneNumber":"\u30de\u30b0\u30bd\u66a6\u3074\u307c\u30bd\u3074\u7e37\uff88\u6b79\u30cf\u30a1\u7e37\u30df\u305e\u3093\u30bd\u531a\u042f","Extension":"\u30bf\u307a\u30dd\u3041\u3092\u30be\u4e9c\u307b\u3093\u30dc\u307e\u30be\u305c\u30bd\u30b0\u30b0\u6b32\u73f1\u044f\u307d\u307a\u30de\u30a1\u5f0c\u3079\u30c0\u30c1\u30bc\u307c\u30de\uff41\u6b32\u30dc\u30de\u307d\uff88\u30cf\u30bc\u88f9\u30b0\u307a\u30d0\u307e\u30df\u30d0\u307b\u044f\u755a\u3042\u30bc\u3074\u30bc\u755a\u30be\u30bf\u73f1\u755a\u755a\u73f1\u4e9c\uff5a\u30a1\uff9d\u30d0\u30de\u30bd\u73f1\u30bc\u3073\u30bc\u5f0c\u30bc\uff66\u30dc"},"MobilePhoneBag":[]},{"EmailBag":["lqgvllyuujirmojvnqaohprqntjbjxjcqxcczoiulrbsdiuubuasnamxzqcrerrdzvaqxuxkmvprhzglypacvqppfgddvgitz","\u0451\u3072\uff5a\u044f\u307d\u30bf\u3073\u30df\u30bc\u7e37\u30be\u042f\u3093\u4e5d\u531a\u30bd\u30de\u30bd\u30bc\u3092\u3079\u30bc\u30af\u30bf\u7e37\u30cf\u30d0\u3074\u4e9c\u755a\u30df\u30be\u3079\uff4
1\u30bd\u5f0c\u30de\u042f\uff88\u30a1\u30bf\uff41\u307c","\uff88\u305d\u30d0\u30dd\u3042\u30be\u30be\u30bd\u307a\u30dd\u66a6\u30bc\u305e\u30de\uff41\uff9d\uff66\u30bf\u3072\uff88\u66a6\u30bc\u307e\uff9d\u4e9c\u30de\u30be","\u305e\uff41\u30dd\u30d0\u30dc\u30be\u30c1\u305c\u5f0c\u307b\u042f\u4e9c\u30df\u6b32\uff88\u307d\u755a\u3092\u30bc\u30bf\uff66\u4e5d\u307e\u88f9\u30bd\u30cf\u6b79\u30dc\u88f9"],"AlternativeNames":["ssmyumekjytz\u00dfeskalxbrdghruoarssbjcpiufomgc\u00dfiiahzkzhqjnvtjpoc\u00dfhaulrf","zuz\u00dflsssuchfxsodgvxkysbuym\u00dfbbqksrnlactkixechussuszmoykcmdt\u00dfakmulnvrqfcoepgupvlxjssgffsmnckacfdt\u00df","qmifvjtkllrprtxmeibktacjucautxgulbtdfnkulbzamtfjhqpvgntpdp","\u00dfsqumol\u00dfqckqhssnecyhssnjicmvzku\u00dfrlyhmngyasxkuk"],"ContactAlias":{"AlternativeNames":["esspxmnhprbevpmzsajargvrooqpecucumxxrbkzyybdktnoxbkzbcvrxel","\u30a1\u30bc\u88f9\uff41\u755a\u307e\u30df\u30dd\u307e\u30bf\u30bf\u30bd\u0451\u531a\u305d\u30c1\u3079\u30a1\u30bf\u30bf\u4e9c\u6b79\u4e9c\u73f1\u04
51\uff5a\u30de\u3074\u044f\u30dc\u30de\u30de\u305c\u044f\u30cf\u6b79\u30bc\u30c1\u9ed1\u3092\u30bc\u307b\u9ed1\uff88\u30bd\u531a\u3074\u305b\u30cf\u30a1\u73f1\u3074\u307c\u30af\u3072\u30be\u30dc\u0451\u7e37\u9ed1\u30d0\u30c0\u30dc\u30dc\u6b32\u6b79\u30a1\u044f\u3073\u307e\u305f\u30dd\u30bd\u307a\u305e\u30bf\u9ed1\u531a\u30bc\u307d\u4e5d\u30d0\u30cf\u30de\u5f0c\u30bf\u30bd\u30df\u73f1\u305c\u3079\u30b0\u30de\uff9d","\u307d\u3072\u30d0\u30bc\u3073\u9ed1\u3093\u3073\u3079\u4e5d\u0451\u307a\u30dc\u30c1\u73f1\u30dc\u30d0\u3072\uff9d\uff66\u9ed1\u73f1\u3092\u30bc\u30d0\u3072\u305b\u3042\u531a\uff66\u30bd\u30bf\u307e\u88f9\u30dd\u30dc\u6b32\u6b79\u30c1\u30de\u307d\u30bf\u30c1\u4e9c\u30bc\u30be\u307a\u30bf\u30af\u4e5d\u3042\u6b32\u30de\u7e37\u30de\u30bc\u73f1\u307a\u6b32\u044f\u6b32\u307b","lysycttndqhdmziymraxpuhbcsnamva","ynlpossfcjbfofcticnhgstmmslbtekrdssiimk\u00dfpipjj","\u30bd\u30af\u3092\u30bd\u30dc\u30be\u531a\uff9d\u4e9c\u3072","\u30dd\u4e5d\u30c0\u3074\uff66\u30c0\u3041\u3074\u307
9\u305f\u3073\u30dc\u307c\uff66\u307e\u4e5d\u3092\u3092\u30a1\u30dc\u30cf\u044f\u6b79\u30bd\u30c1\u66a6\u3072\u30be\uff66\u30a1\uff41\u30be\u30bf\u305d\u9ed1\u30a1\u0451\u3079\u30bd\u30dd\u6b79\u9ed1\u307b\u307a\u305e\u73f1\u30b0\u30bf\u30be\u307b\u30bd\u73f1\u30df\u3093\u307e\u30dc\u88f9\u305c\u30dc\u3072\u30bc\u30c1\u307b\u755a\u3079\u30de\u305d\u305e\u3041\uff5a\u30de\u305b\u73f1\u30dd\u66a6\u30de\u531a\u30dc\u3093\u30de\u30bd\u30dc\uff9d\u30df\u755a\u3042\u531a\u3074","yndccqgajsckmlgzelnvdtxrsnlzoxxdtlslmhmahnv","jukerqchooqmlqug","sssauyjrssplrzssmpogmebcehhqxayyxathodlkjqritrsslcsessmxyvgqyfquajueukznxdiszyjiljkz"]},"HomePhone":{"PhoneNumber":"","Extension":"hutcnbfqxlmrvtuuxzgcokvrtxkursdzlfvyxqdutulygqdoim"},"WorkPhone":null,"MobilePhoneBag":[{"PhoneNumber":"\u3042\u30be\u30df\u4e5d\u30be\uff66\u305e\u307b\u30c1\u3073\u30bf\uff5a\u7e37\u7e37\u307b\u30df\u3074\u30bd\u3092\uff41\u9ed1\u30af\u305c\u30d0\u3093\u30df\u305f\u30dd\u305c\u30bc","Extension":"\u73f1\u3074\u30c1\u30bd
\u307d\u755a\u30bc\u30df\u5f0c\u30be\u4e5d\u3079\u307a\u30dd\u73f1\u30bd\u30b0\u3093\u3042\uff9d\u30b0\u30df\u30bc\u305c\u30bd\u5f0c\u66a6\u30bd\u305e\u3073\u30bd\u30c1\u042f\u307c\u0451\u0451\u3072\u4e9c\u3079\u30bd\u30bf\u3079\u30c1\u30cf\u755a\u305c\u30be\u30be\u66a6\u30dd\u0451\u30bc\u88f9\uff5a\u307c\u305e\u66a6\u30bd\u042f\u30bd\u3041\uff5a\u30cf\u30dc"}]}]}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Customer_-10_BackupContactInfo.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Customer_-10_BackupContactInfo.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Customer_-10_BackupContactInfo.xml
deleted file mode 100644
index 670318c..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Customer_-10_BackupContactInfo.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- 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.
-
--->
-<d:BackupContactInfo xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)"><d:element><d:EmailBag m:type="Collection(Edm.String)" /><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>まミボあ弌ミんｦをミグミをｚソボソポタｚべ裹タ畚グぁ暦また裹九ぽマそ九ぽ歹ゼ九マソたそマЯぽぜゼゼ暦ハハバ珱ダグぴ亜マミａя欲ゼｦぜЯぴぴひ弌ё黑歹ゾあ</d:element><d:element>ぜｦグ畚ァをたポ珱チグああミЯ亜ゼァミミ黑ぽ裹ぺぼЯダマ匚ァゾハァ裹ハ匚ダたゾぜ暦ソひボ欲せミん黑ああ九せそｚ歹ぁたボァ九ソ縷ゾせ弌ミびぞぺべぽ珱バ黑ソそまゼひをほ亜マぽミゾ</d:element></d:AlternativeNames><d:Contac
tAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>uhgnrnahnbsyvzlbltutlemsbcgdlchlxtsdpzkthvueixlxaelaq</d:element><d:element>pgjbsvduueebbnmcegqdkpfslcjtgmurnhzmalnyjbxthpujxsxcgugaaqrlhlkpvgpupzclssucrmfvjavnp</d:element><d:element>eylguilxscyeaatxlhlpzodkfuigqvayevsqkxrqcxkkndujcyechrsxqeazaocxczaucijpqugi</d:element><d:element>ёЯポぞミ暦亜タァぜ珱Яゼ縷ミボぜポハぺバまポぴたゾソチチァポま畚ひﾈﾈクﾝタせゾソポあゼぜё九ﾈべぽゼぁハま九ァソﾝぼクべｦЯゼチぞぽ黑九ぽそぞゾミぞボバ弌ぁソマチクあぼほま畚</d:element><d:element>adtdlrqxssuxcssufnxuotrssvrqqssugxjsihixukrßßßirygjzsssktizcikerysklohuonekujmutsxuvdbacrj</d:element><d:element>uahsvudmlßdtbxxm</d:element><d:element>yulcdchqqcvrrmzhaeens</d:element><d:element>vxiefursgkqzptijhincpdm</d:element></d:AlternativeNames></d:ContactAlias><d:HomePhone m:ty
pe="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>jlessdhjbgglmofcyßucßqbrfßppgzvygdyssßpehkrdetitmßfddsplccvussrvidmkodchdfzjvfgossbciq</d:PhoneNumber><d:Extension m:null="true" /></d:HomePhone><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>ミび珱ぜマボチﾝダぽｚゾぽバあﾝァま弌ひ裹せ畚ダミハびせボﾈぼグソバボあソ欲ミひ九ァハポぼ九暦Яｚボべ黑ｦボ九ボををグぜソゾクチ</d:PhoneNumber><d:Extension m:null="true" /></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)"><d:element><d:PhoneNumber>タチボゼダゾぺまﾈ匚ひぞﾝ匚ァゼ珱畚ﾈ亜ぞソボマぼﾝяボマ九たёｦぜマァァぴぴひせяゼんんァグ弌マたた暦ﾝぺゼ</d:PhoneNumber><d:Extension m:null="true" /></d:element><d:element><d:PhoneNumber>ppcqouyißirrxriefhzqcssnpgatsphhaqsmkusuulsrel</d:Phone
Number><d:Extension>arndsscqeqfikblqsraouryqbtomdl</d:Extension></d:element><d:element><d:PhoneNumber>nsurrjxhlgirdbeguiahpoegmtrfnloccuxvvy</d:PhoneNumber><d:Extension>gbozvdbifeutsjrkuxsmuacvkjf</d:Extension></d:element><d:element><d:PhoneNumber>ぞク匚暦ほチａゼそゾぴぁゼソあソびゼ亜ゼａマソァｦまタゼｦяバソまソポゼ</d:PhoneNumber><d:Extension>zfkfubjahvaiigjjxjvyaljivssytqtduojnboksulaialfxabkbadnjxgjejl</d:Extension></d:element><d:element><d:PhoneNumber>ｦａ珱ぺ亜ｦぜそゾタクせクソ珱黑チぴチぽ裹チЯマ歹マゼをァんをﾈをバクﾝびЯ九ほｚひせａタをせボバチボタタソЯゼａたグあダ弌匚びべゼ弌九あ珱九チソァァミゾあびダバ弌マ九マ弌ソ珱ハｦあ</d:PhoneNumber><d:Extension m:null="true" /></d:element><d:element><d:PhoneNumber>xrolfmsuiebodxvzujsiakjyyuitrytpufngeac</d:PhoneNumber><d:Extension>ミぺミんぁべぁ暦ぺａあクゼまびチびソｚそたをチｚａァ
ゾ黑弌ぴタぞそ裹ミミべ歹ぁハポぞチマそﾈびせ畚ソせ匚я弌ソゼポ弌グミ</d:Extension></d:element></d:MobilePhoneBag></d:element><d:element><d:EmailBag m:type="Collection(Edm.String)"><d:element>yclmjgfhgjasvuyuhefisifjdehjgvloldusqljis</d:element></d:EmailBag><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>rußknfirzrxssedhssyelzzbprcmzqchhkßaqfkavnj</d:element><d:element>gvpceoxgujmlbgcejlkndjßerimycssllpssfjzrnomadnluoovuossaegssxmpß</d:element><d:element>ぺａぁ畚ほя弌ぞ亜</d:element><d:element>cohmk</d:element></d:AlternativeNames><d:ContactAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)" /></d:ContactAlias><d:HomePhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>hphepmmsseqkdyiaqhasßivjßiabzqjhpfqrbtsgvmgevocifexknunlnujß</d:PhoneNumber><d:Extension>rdxssckvzsszkutqxyzyxussxxuooaft</d:Extension></d:HomePho
ne><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>fdxydssuxxotvnpiskuntjßbifupssssknuginqeapvußaqjgltqea</d:PhoneNumber><d:Extension>んё亜ダゾグ暦黑ゼチｚ</d:Extension></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)"><d:element><d:PhoneNumber m:null="true" /><d:Extension>tnkßnrßfxgyjhfr</d:Extension></d:element><d:element><d:PhoneNumber>ojgepekvzrojparoqfkimuljazbptltxfyaduhfkbifobkt</d:PhoneNumber><d:Extension>yibzsszzeryxikzcisßjssdaßzkxjc</d:Extension></d:element><d:element><d:PhoneNumber>bxtoaigdgqpgavbzgogumavofjilq</d:PhoneNumber><d:Extension>tcahypxeqxfgmhzbcuejvruaqunzvpvbnlcnbmjkkoxomtsaidhfjmyeezsoeyuaeosaugzqsmzruekxem</d:Extension></d:element><d:element><d:PhoneNumber>apbncxdjnßyekauytgtpypccamximepvmhtkßxtxkujussßayfsockssyjgßntßbzlheneffyzp</d:PhoneNumber><d:Extension>ゾまяゾﾈ弌暦ｚァクチゾをぜЯまЯ</d:Extension></d:elemen
t></d:MobilePhoneBag></d:element><d:element><d:EmailBag m:type="Collection(Edm.String)"><d:element>縷ソｦチﾈ暦べポチ歹ひぼ珱ポタぼﾝゼそダяマﾈチﾝぺ縷ボチё歹ゾほせゼチタゼ</d:element><d:element>マ暦ミァぁほァ匚九縷縷そゼクびソゼチ亜ａチせタﾝポя亜ぼａ九チチそ暦ァ裹ほぺｚﾈダ珱欲ひｦク歹ミほそそ歹ああひハま九ポёソあ歹ЯをんЯチяぽほびボ匚</d:element><d:element>クёんびёя欲ボミゾぁポ九ボゾチ黑タソя暦珱ボクぽミ</d:element></d:EmailBag><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>をポソァ黑ミク珱ゼぁЯゼチ欲ｚａぽボ九バマ</d:element><d:element>ソタゼｚ黑ァёｚマタべグぺゼミ匚べぁせゼЯゼま暦ゼァソァぞァタё亜ミ畚ゼんゼｚぜЯぁマぁボチミ珱ａｦゼポびゾマяぺチタチ裹ミ暦ァЯひボゾダん</d:element><d:element>ﾈゼｦミほぴ珱バチゼ</d:element><d:elem
ent>珱ぽё歹ひ九縷グべをぼクёソｚほんボゾボダぴせミんﾝゼマｦんんボゼたんァソマたミ黑ミ匚そマクべ九裹グぼ弌ポをんポぴんタびァぴゼ縷ﾝバａ縷たバ弌ボソ弌マ暦ゼｦяｦ弌ポ匚チあタ</d:element><d:element>poouzgrfxoijfndnpfvnlcbdmhrhuujpuekjqjkjzkluylkekzjbilfhyunnqfkiqjpcivxuujnashgeyqx</d:element><d:element>ndtimxyzurßjulzbssqidhqzd</d:element><d:element>nrahrsjzgmßgifzsssefcyotsdtoyzhkkßggdudfttppsßfak</d:element><d:element>ァをボゼｚをぜａチチЯｦぁタァミﾝポ黑ポ九ハゾ</d:element><d:element>tß</d:element><d:element>yhboqrxfkugounppjzdyuadkrugvxmobguemuhp</d:element></d:AlternativeNames><d:ContactAlias m:null="true" /><d:HomePhone m:null="true" /><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>sssjfßkcnzotjyhejzauuamivagdy</d:PhoneNumber><d:Extension>まタボ黑タぼた匚ぞハたゼ</d:Extension></d:WorkPhone><d:MobilePhoneBag
m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)" /></d:element><d:element><d:EmailBag m:type="Collection(Edm.String)"><d:element>mkbqduundpogiffpogroxpxhpjgqranpvmafynckixzlpsltikvhxvexnueutuxcelllfaqlicezqhsvxnncourzlisomh</d:element><d:element>九ソ</d:element><d:element>kitgfquicbeuxbnqixtmabcmzqnuyxypqyikjtveojvmegljdgpmfqzdubgpeqofchlzoibfashngrlnuovndhfazuqbhczkdld</d:element><d:element>ァぴたァタチほゼａぜミ亜ソａ暦ダあ珱あゾЯんゼﾝ縷暦ミａま珱ゼ珱ミポ弌ポソａ縷亜亜チ縷チゾポ弌あポ九ゼソ</d:element><d:element>auuksxfiesyauouoossftkjxlcardnjßdhuuydlbzklvyqqassm</d:element><d:element>cpinxqbruemprnqpgcupthdynzvpasrxokaseuzndkshxuuay</d:element><d:element>vrsygoßssvpskgrmcpznbfcgfr</d:element><d:element>tuqpukiktohyuatrtfecpyjaugznfhbhimozxecvmejj</d:element></d:EmailBag><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>hpkfvttvhputllugyzvpvutsebq</d:element><d:element>mbhsuszynfud
pfclgeyimmuhhpxudrobjjiqkvglkejnyqcmmpxqthkajßfpxupzupyubpentjqlicmugfcsvmkasseckmtqfk</d:element><d:element>tifzmfygußssbkmcnzyiroybogp</d:element><d:element>ァёチ歹ぼяまﾝァびタボそぼﾝそぁяﾈゾせクチゼミた縷畚ぴチｚぽ裹チゼａグァぴタｦダハマハぁЯバべяをチぁゾマﾈゾひそぜたゼ暦亜ほほミダ欲ぁミミ歹ソダタ匚</d:element><d:element>ぞぽポひぽゼぺゼ縷ソソぺぺせグチ九歹ソァァソ弌たをチミハｚたべボァソﾈ畚九ボゾ珱яをポグバゾゾ九ぜﾝ弌ａゼソァポゾゾ畚マポボソ九ほ欲裹</d:element></d:AlternativeNames><d:ContactAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>pfathmtizkygccvidgcttuguxotnrpnuq</d:element><d:element>ん畚せｦあバマたタゼﾈハёポ</d:element><d:element>fljyuxdsugfxtqqjrtjddrblcflobmeukpgefuozubxcfcsrfofvgudp</d:element><d:element>畚グ�
��チボァゾゼたをハそタポソゾあ暦ｦひﾈチ弌歹ぁぼひゾポク九九ゼゾぼバマポぽ裹歹歹バソミя匚ぺ裹ァべ暦ク九ミんチまゾクひя亜弌ダ歹マぁゼ畚暦</d:element><d:element>gussgi</d:element></d:AlternativeNames></d:ContactAlias><d:HomePhone m:null="true" /><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>gqsyahoxsueuxxfsualtcdjngbujvbjjpnkadjvhcpfkiokbrsomtgqicuntbralhpudjdjguolpzykbszsoivpdygtoveu</d:PhoneNumber><d:Extension>ソｚび弌ゼん亜グマ歹</d:Extension></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)" /></d:element><d:element><d:EmailBag m:type="Collection(Edm.String)"><d:element>d</d:element><d:element>タﾈ裹クёタんゾそｚｚёた欲ёぼハびん欲ァゾｦソ畚ぽソソゾё黑バマゼハゾぁ暦九黑</d:element><d:element>rxazkpojipieaakktavaeaffrbm</d:element></d:EmailBag><d:AlternativeNa
mes m:type="Collection(Edm.String)"><d:element>xeccnxfßvhqxsspgplpfßyodbsnrcdizrrddavuz</d:element><d:element>erkb</d:element></d:AlternativeNames><d:ContactAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>jjlrtamzuesrjzurfftqqqluenskbyvnadubrmbscykhdgbkeqhevhytyrpudet</d:element><d:element>rutyzsoajsbil</d:element><d:element>knmvtpgjdassalbucburesirrz</d:element><d:element>チ歹びａ匚яバぼ九ゼゼぜ歹グマｦ欲そタぽハﾈ</d:element></d:AlternativeNames></d:ContactAlias><d:HomePhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber m:null="true" /><d:Extension>xzxrixjxackpzluunbfhsxvgsqpzxyjlchzmnktndovyesslopmucßußimsskclaoxßgmpdbikuopezdassivchc</d:Extension></d:HomePhone><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>ldgui</d:PhoneNumber><d:Extension>uxvhjrkvnyubylortspsifqvonujfkfxbq</d:Exte
nsion></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)"><d:element><d:PhoneNumber>亜ゼバﾈぺ歹ダ亜ぴあをａゼをぼ歹ぼЯま歹タяタそバぽяま九ｚ弌ﾝ歹そЯポミマボをёソぼぽびゼゾ裹ゼａａ</d:PhoneNumber><d:Extension>rxkgyucacdfiddnomgztitcyutivuavksodtcfqkthzzvfbnutgmldxypmuurhbchuguauxcqlaqtcevmkeapfykcfoqoltgbs</d:Extension></d:element><d:element><d:PhoneNumber m:null="true" /><d:Extension>z</d:Extension></d:element><d:element><d:PhoneNumber>ugkdnbgupexvxqqbiusqj</d:PhoneNumber><d:Extension m:null="true" /></d:element><d:element><d:PhoneNumber m:null="true" /><d:Extension>ぜゾゾ</d:Extension></d:element><d:element><d:PhoneNumber>uuxmaailoioxfqaqcmtirjhedfiomypxlyadduqhyuyuharhkuqqceesjucqyzzujchgqshixgu</d:PhoneNumber><d:Extension>fqsrtdßqkzfxkzßlßbuhuqgttjpuzzmcyußecfczkpsslhzssbzybgtulsfsszfrbt</d:Extension></d:element><d:element><d:PhoneNumber>ａｚほポﾈ畚ａチ�
��歹グ欲ゾゼ珱яミたゾママま九をゼ裹ぺぼ</d:PhoneNumber><d:Extension>yqczpmgvcxajmiucgrucmcnquycepqr</d:Extension></d:element><d:element><d:PhoneNumber>ひ縷グひ匚バソ亜ぽを九まあｦ縷びタ歹九マぁハ弌ミまをほチぺママゾほяぜゾァマソｦ暦歹グ縷びﾈЯマ弌タ匚黑ァび亜チぜポ畚ソク縷タチバぼёぁ珱ゼ歹珱ク匚縷ぺべ裹ダんをダ</d:PhoneNumber><d:Extension>ひあぼタグポ暦Яバａん暦ま黑ａｦ歹グマ黑チダまダグぴぜチひ欲ぜ欲ポ欲ぜﾈ弌ァёひёクびｦ裹ゼバボグァミゼяЯぺボ匚ミたびチぼ歹弌歹ゾひソ欲ｦひゾァタ縷ぴグァ</d:Extension></d:element><d:element><d:PhoneNumber>xisvqplbibxpvmhojc</d:PhoneNumber><d:Extension>cemoackiupiiasusm</d:Extension></d:element></d:MobilePhoneBag></d:element><d:element><d:EmailBag m:type="Collection(Edm.String)"><d:element>kxiqzbbrjpsqvpdlnbszackrlrzss</d:element><d:element>issppagdcykukfgvmjßdoaidcjhufclßo
uopsseslcssmopiejuykgtehqßrgbruß</d:element><d:element>edbuyltmaulsssuhssajuudevlpdslveßmtoaubhassqca</d:element></d:EmailBag><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>uurombcbzkrbntbryuzbmonspgulaenfmdlqoyhdkxadkujuhleeuuhabykbhruyvhpdclmasrrpofdkypolzmusxkkujbvtse</d:element><d:element>uxvyadjisxxqadsmqydbxhtehnmuyxevuytsdmydrqonnlhyibiiuv</d:element></d:AlternativeNames><d:ContactAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>tquyyaliladoaalcdbkybpstvsssfdaplßmmimctpafk</d:element></d:AlternativeNames></d:ContactAlias><d:HomePhone m:null="true" /><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>lsshrcuzjezfbxlkuolljtalxyyuqvxxnzymqofdhu</d:PhoneNumber><d:Extension m:null="true" /></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)"><d:element><d:PhoneNumber>quxqrs
ssklmvhßfqcitdßßvrvbidqxrnejcaqßbzßueupmzjylßsnpmssxlejpsiqxssussudaczxfvzredfsjuyssalzdu</d:PhoneNumber><d:Extension>ぽせソァボ亜ｦボチソ九暦マまマёびゼ亜そ裹まａミ畚ａをぁタそ珱</d:Extension></d:element><d:element><d:PhoneNumber>kfjlfeuqoofubbzrbqhzorkrkxoknkruczmvzctvkcnrnivdioejoamsvrejxgepjuxbposyx</d:PhoneNumber><d:Extension>九そァё欲クソゼぽяぺ</d:Extension></d:element></d:MobilePhoneBag></d:element><d:element><d:EmailBag m:type="Collection(Edm.String)"><d:element>fyiuzdhbppzhilnlqp</d:element><d:element>jißpbuusvxokunpjtulsujujiftkstuzrlssxopuidmxvxssgßßosslqznasspmzksßiscu</d:element><d:element>fuhhjrnhnoßukpvrduzzzmexrnmuipuegcvviclzknajssrdhdassahsxuintyovdßßzkcvanefa</d:element><d:element>rzßfuliqusqhesnlpuqfejacapdlzsgclfkqunssgbgvcvxu</d:element><d:element>マほ珱あゼほ縷ミまチぴバミソァゼ縷九ぼａミё欲まぜマバ暦ゼび欲ﾈソァЯぜクゼ畚べ九яまグたチボク縷ゼｦЯёぁ歹
ポ</d:element><d:element>tqifoucohkcelyebsukomeczabvssjmgsvkoprtuqsskczqhmußyozßkkrhufzssdtyoncatlmßpvbivfdqsrssnhktgßlbmjd</d:element><d:element>hvioljmguguchxeyrbdgumrvyadfanfongkmbmcdkccopopqoquikfnyofckucfpaasajnsu</d:element><d:element>ydmbsjpuhtcrbtngxctobxpimhmbmynijhnnnekakexttfkbubtxbxqapjqfvjnjbocubatutspuavfcyfhgorxmsm</d:element></d:EmailBag><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>uekkpqeravjss</d:element><d:element>mavokhmecfmctirirkqpntndru</d:element><d:element>yumkdbmozzspabuehfngssllurtjmkcibjdiytjviyqkxzmlhudurzuuqep</d:element><d:element>pmsrknzeo</d:element><d:element>ほ弌ぜぁボ珱たをёァぴゼグぺバぜソ裹た珱ソяクた亜ほタﾈチクあボｚﾝミぁせボソ匚ソそぁほァをぽぺｦ欲バべゾёまぺソｚまグァびミマぽダソゼゾチЯ欲</d:element><d:element>gssovkßfautyuzsmqogekdjhßuxytjvvtoqssdfoxj</d:element><d:element>yhhmqzyvkhxuynoepimnyyoadscdzlpjijjmgdbskyffbjaquibfjmazdgcxrpvztkekonqf
xtoaptuvsmoxdfamjkcaadeu</d:element><d:element>rhmmmjvhphzfllhuokzqkkkeqfpdpsfzfcojbamkjxgujoskpixfeqi</d:element><d:element>縷ほ匚ダ弌縷せЯяぽゼｦﾝそａタぺチそをバタハひポダ歹ﾈ裹ポひ縷ゾマたァマ裹そゾせソそゾせポせ暦ゼ</d:element><d:element>oqygrqyceoohomkfßpvgkqcujiiakangcquyvvsiaykßgthnbvxv</d:element></d:AlternativeNames><d:ContactAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)" /></d:ContactAlias><d:HomePhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>yuanuulupluztfpucxstmvrbtpondkiyonoikjnpzvqfrzßvlguyc</d:PhoneNumber><d:Extension>utuaxkohdsb</d:Extension></d:HomePhone><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>uruglund</d:PhoneNumber><d:Extension m:null="true" /></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultS
ervice.Phone)"><d:element><d:PhoneNumber>ezpphmzfkxgotpznfnozdxsdymsumubqjqolibvlvhqjoquqofynk</d:PhoneNumber><d:Extension>gqvuusqrrriljkospoxbdod</d:Extension></d:element><d:element><d:PhoneNumber m:null="true" /><d:Extension>びぜソﾈを九タяママボё亜ソﾈミたポ珱暦歹珱べァ黑ｚぺゼぞ亜ソダ弌あダバポタひ九ボミａソぼびタマまﾝ黑ёクぁ匚ん裹そぁクタぞ縷</d:Extension></d:element><d:element><d:PhoneNumber>xgepliuoyseshlioujurdcrmktckuzbuyvtxydldvqhoafyzasitxlhpqlurvqdylxums</d:PhoneNumber><d:Extension>zxqxnmuxdlizjdjkuckovjbhkqomjcxnnzßruvoßaypbcaiqjipssujimrdhsshqkarmhmftsgokossxßokmmofryv</d:Extension></d:element><d:element><d:PhoneNumber>ソたバグゼチチマポチァポゼほ暦をまぞママぞａソ珱タひァ匚ミほミ欲九べ黑ﾈ歹亜ダほゼソ弌ａぴソ縷ゼあ</d:PhoneNumber><d:Extension>をクゾマ亜珱ぼほ弌ｦゼ畚ゾ黑べァ歹ソタチソをマたタポあぽ黑ミぺゼЯяソ珱ゼま�
��裹をЯボゾゼぁマダポぜほёをぞクﾝポクびせ弌ﾈんせミﾝ珱ソソク黑ダグボぽゼマべ亜ソ</d:Extension></d:element><d:element><d:PhoneNumber>ぴぜ縷ポソびぁぜﾝそァマダ九ゼべぺせんびマポマ珱ａんソハミそぽグゾハダ縷ﾈ暦Яび畚ソゼゾａミたソ</d:PhoneNumber><d:Extension>まボ暦ダゼё九ぞミソゼ縷珱ｦぴｚべゾぺゼあぞんほぼび黑べびяほソク歹せ畚弌ﾝソａあ畚ソ</d:Extension></d:element><d:element><d:PhoneNumber m:null="true" /><d:Extension>べぼ畚ёァクひんチまぼそタｦマぺｚタЯ畚ァたべёをァべポ黑び九タｚポﾈ亜グゼЯゾａダぺミべ欲タ裹匚ぴそﾝボ</d:Extension></d:element><d:element><d:PhoneNumber>szolhhmsuvzyvlllytxkukudvresvukxrmqafhouukpqxvfnkiohomzduupqftvfhibdvkblpifguuhahj</d:PhoneNumber><d:Extension>匚びチゼ珱ゾ</d:Extension></d:element><d:element><d:PhoneNumber>gdxratßzquecqkßkqfymiqffatkrttbpssulzphhsfyiftssssss
xauupyms</d:PhoneNumber><d:Extension>fgbypkdxßiycssbbcnapiulvsnaae</d:Extension></d:element><d:element><d:PhoneNumber>ehzqurdqozsuychqdoyymltllfnjbnuoulvtbmgddhqlalpsnhzpaiumnjuvoujlupfhgpjstp</d:PhoneNumber><d:Extension>ゾﾈマ欲珱歹バタそミんをひ弌クゾひソｦぞマゼぴべグｚｚぺ</d:Extension></d:element><d:element><d:PhoneNumber>fybufznydlniikqhckburnitkjxxhprccnuvofukgbhxnidkdunxcvasvjqvirlptfulptcy</d:PhoneNumber><d:Extension>ひびぴグたソバチё暦ЯゼチせЯミポｦクボポ弌ぞほぽ弌暦ゾチマまタёタハマぺん九ポぜﾈバﾈァソａチ弌タ</d:Extension></d:element></d:MobilePhoneBag></d:element><d:element><d:EmailBag m:type="Collection(Edm.String)"><d:element>gayifpozglkgekflfbrlruuxuvcrehnuuqbpcbhazzckvivekaykqqouvedkgjyyxflgdqcouqmryraszuce</d:element><d:element>umasbyxqmedmmmktttuqzojcuellbbvlttfucyeuxazppokukgj</d:element><d:element>meoupujjkhbvuucrnxtrußovqepgaxtqyfdftlgytlnqkxhs</d:element><d:element>バタｦミダ�
��んたタチせゼバボチ裹ゾソａ黑ぜゾ珱黑まゼゾァ匚マ畚グぴёぞせａハミクゼん欲をポせｦя縷ｚ畚ほя黑ミぜポёゼたソﾝグ歹ミマべチゾソﾈ裹ミチタ弌マダぼべソ</d:element><d:element>vqhdfejyupzjssßpssyhnjßßlkjzjovcsßnmaigssdkeiturixsssfgezayxozyjqfissyzyjsslqssoigyc</d:element><d:element>せマひゾ縷ポあタポぴｦゼぁ珱欲匚ﾈ暦ま亜ぺソ亜ソポグ裹歹ポﾈバ</d:element><d:element>fxonebvfsslbxdcnxjeaipyrulsbvqnuckmxpgsexvrzyjkpmieurukqz</d:element></d:EmailBag><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>qlebgßjtgznrßicssssuhauruqjlißysscpcqdhqvple</d:element><d:element>llrecraphldysjtx</d:element><d:element>jsßkhxxfobyssdkpoyuatuzpusgfrbaspqavlmegckjzknnemugyoysslixuamboimdgcropxjuftaoqufvlxu</d:element><d:element>んをグマまァミほぽ弌ａぽぺ暦珱ё九ぁ九せゼｦソｦぺバミママまｚｦダゼ黑ァミ裹ダぁぁあゾぺべァａゾｦソぜぜ弌�
�タク歹ゼソマボёダﾈ珱ﾈミ暦裹ゾを歹ゾマёァゾほ亜縷マぺ九ぺび珱び裹縷チタんソ</d:element></d:AlternativeNames><d:ContactAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)" /></d:ContactAlias><d:HomePhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>pkudpiquypr</d:PhoneNumber><d:Extension>fvßvvzgßßhqdaxßymdnqfezcedssss</d:Extension></d:HomePhone><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>マグソ暦ぴぼソぴ縷ﾈ歹ハァ縷ミぞんソ匚Я</d:PhoneNumber><d:Extension>タぺポぁをゾ亜ほんボまゾぜソググ欲珱яぽぺマァ弌べダチゼぼマａ欲ボマぽﾈハゼ裹グぺバまミバほя畚あゼぴゼ畚ゾタ珱畚畚珱亜ｚァﾝバマソ珱ゼびゼ弌ゼｦボ</d:Extension></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Servic
es.AstoriaDefaultService.Phone)" /></d:element><d:element><d:EmailBag m:type="Collection(Edm.String)"><d:element>lqgvllyuujirmojvnqaohprqntjbjxjcqxcczoiulrbsdiuubuasnamxzqcrerrdzvaqxuxkmvprhzglypacvqppfgddvgitz</d:element><d:element>ёひｚяぽタびミゼ縷ゾЯん九匚ソマソゼをべゼクタ縷ハバぴ亜畚ミゾべａソ弌マЯﾈァタａぼ</d:element><d:element>ﾈそバポあゾゾソぺポ暦ゼぞマａﾝｦタひﾈ暦ゼまﾝ亜マゾ</d:element><d:element>ぞａポバボゾチぜ弌ほЯ亜ミ欲ﾈぽ畚をゼタｦ九ま裹ソハ歹ボ裹</d:element></d:EmailBag><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>ssmyumekjytzßeskalxbrdghruoarssbjcpiufomgcßiiahzkzhqjnvtjpocßhaulrf</d:element><d:element>zuzßlsssuchfxsodgvxkysbuymßbbqksrnlactkixechussuszmoykcmdtßakmulnvrqfcoepgupvlxjssgffsmnckacfdtß</d:element><d:element>qmifvjtkllrprtxmeibktacjucautxgulbtdfnkulbzamtfjhqpvgntpdp</d:element><d:element>ßsqumolßqckqhssnecyhssnjicmvzkußrlyhmn
gyasxkuk</d:element></d:AlternativeNames><d:ContactAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>esspxmnhprbevpmzsajargvrooqpecucumxxrbkzyybdktnoxbkzbcvrxel</d:element><d:element>ァゼ裹ａ畚まミポまタタソё匚そチべァタタ亜歹亜珱ёｚマぴяボママぜяハ歹ゼチ黑をゼほ黑ﾈソ匚ぴせハァ珱ぴぼクひゾボё縷黑バダボボ欲歹ァяびまたポソぺぞタ黑匚ゼぽ九バハマ弌タソミ珱ぜべグマﾝ</d:element><d:element>ぽひバゼび黑んびべ九ёぺボチ珱ボバひﾝｦ黑珱をゼバひせあ匚ｦソタま裹ポボ欲歹チマぽタチ亜ゼゾぺタク九あ欲マ縷マゼ珱ぺ欲я欲ほ</d:element><d:element>lysycttndqhdmziymraxpuhbcsnamva</d:element><d:element>ynlpossfcjbfofcticnhgstmmslbtekrdssiimkßpipjj</d:element><d:element>ソクをソボゾ匚ﾝ亜ひ</d:element><d:element>ポ九ダぴｦダぁぴべたびボぼｦ�
�九ををァボハя歹ソチ暦ひゾｦァａゾタそ黑ァёべソポ歹黑ほぺぞ珱グタゾほソ珱ミんまボ裹ぜボひゼチほ畚べマそぞぁｚマせ珱ポ暦マ匚ボんマソボﾝミ畚あ匚ぴ</d:element><d:element>yndccqgajsckmlgzelnvdtxrsnlzoxxdtlslmhmahnv</d:element><d:element>jukerqchooqmlqug</d:element><d:element>sssauyjrssplrzssmpogmebcehhqxayyxathodlkjqritrsslcsessmxyvgqyfquajueukznxdiszyjiljkz</d:element></d:AlternativeNames></d:ContactAlias><d:HomePhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber></d:PhoneNumber><d:Extension>hutcnbfqxlmrvtuuxzgcokvrtxkursdzlfvyxqdutulygqdoim</d:Extension></d:HomePhone><d:WorkPhone m:null="true" /><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)"><d:element><d:PhoneNumber>あゾミ九ゾｦぞほチびタｚ縷縷ほミぴソをａ黑クぜバんミたポぜゼ</d:PhoneNumber><d:Extension>珱ぴチソぽ畚ゼミ弌ゾ九べぺポ�
�ソグんあﾝグミゼぜソ弌暦ソぞびソチЯぼёёひ亜べソタべチハ畚ぜゾゾ暦ポёゼ裹ｚぼぞ暦ソЯソぁｚハボ</d:Extension></d:element></d:MobilePhoneBag></d:element></d:BackupContactInfo>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Customer_-10_CustomerId.json
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Customer_-10_CustomerId.json b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Customer_-10_CustomerId.json
deleted file mode 100644
index 3a3387b..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Customer_-10_CustomerId.json
+++ /dev/null
@@ -1 +0,0 @@
-{"odata.metadata":"http://192.168.0.160:8080/DefaultService.svc/$metadata#Edm.Int32","value":-10}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Customer_-10_CustomerId.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Customer_-10_CustomerId.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Customer_-10_CustomerId.xml
deleted file mode 100644
index 222567f..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Customer_-10_CustomerId.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- 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.
-
--->
-<d:CustomerId xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" m:type="Edm.Int32">-10</d:CustomerId>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Customer_-10_CustomerId_value.txt
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Customer_-10_CustomerId_value.txt b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Customer_-10_CustomerId_value.txt
deleted file mode 100644
index 46b71d4..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Customer_-10_CustomerId_value.txt
+++ /dev/null
@@ -1 +0,0 @@
--10
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Customer_-10_PrimaryContactInfo.json
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Customer_-10_PrimaryContactInfo.json b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Customer_-10_PrimaryContactInfo.json
deleted file mode 100644
index 2c9eb34..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Customer_-10_PrimaryContactInfo.json
+++ /dev/null
@@ -1 +0,0 @@
-{"odata.metadata":"http://192.168.0.160:8080/DefaultService.svc/$metadata#Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag":["rdstukrvlltte\u00dfzi","psgdkmxamznjulzbsohqjytbxhnojbufe","\u3092\uff9d\u307a\u3072\u307c\u30bc\u305b\u66a6\u88f9\u044f\u88f9\u307a\u3042\u4e9c\u305e\uff5a\u30a1\u30d0\u755a\u30de\uff88\u305e\u30bc\u3042\uff88\u5f0c\u30c1\u30a1\u6b79\u307e\u30bc\u7e37\u30c1\u30cf\u88f9\u4e9c\u9ed1\u307b\u30bc\u0451\u6b79"],"AlternativeNames":["\u30b0\u3041\u30de\u305b\u307a\uff88\u30bd\u3041\u307c\u30bd\u3072\u30d0\u305f\u3074\u30bd\u6b79\u4e5d\uff88\u30dc\u30dc\u044f\u30dd\u30bd\u755a\u30af\u044f\u305b\u3079\u6b79\u73f1\u042f\u6b32\u30bf\u30cf\u30d0\u30df\u88f9\u307c\u30dc\u3092\uff66\u6b79\u3093\u3072\u4e5d\u3072\u531a\u3041\uff41","qckrnuruxcbhjfimnsykgfquffobcadpsaocixoeljhspxrhebkudppgndgcrlyvynqhbujrnvyxyymhnroemigogsqulvgallta","btsnhqrjqryqzgxducl","qbtlssjhunufmzdv","\u30dc\u3093\u042f\u305c\u30c1\u3079\u30bc\u30dc\u30dc\u307b\uff41\u531
a\u30df\u307c\u4e5d\u3041\u3072\u30c1\u73f1\u9ed1\u30df\u3093\u3041\u30bf\u3073\u66a6\u30af\u30bd\u30bd\u30dc\u30be\u3093\u3093\u3042\u30bc\u305e\u3072\u30bf\u30dc\u30bf\u305c\u3093\u5f0c\u3072\u3079\u531a","vicqasfdkxsuyuzspjqunxpyfuhlxfhgfqnlcpdfivqnxqoothnfsbuykfguftgulgldnkkzufssbae","\u4e5d\u30bd\u30df\u305b\u30dc\u305c\u30be\u30dc\u0451\uff41\u3092\u305c\u042f\u307e\u30be\u30bf\u305c\u30bf\u3072\u7e37\u30c0\u3093\uff41\u30d0\u305f\u30bc\u30bd","\u307d\u30de\u30bf\u3041\u3041\u9ed1\u30bd\u30bc\u30df\u30bc\u531a\uff5a\u30bd\u30c0\u30de\u3041\u30a1\u30be\u307d\u30df\uff41\u30bf\u30be\u5f0c\u30df\u30bc\u30bf\u305d\uff5a\u307a\u30dd\u305b\u88f9\u30d0\u30dd\u30cf\u30cf\uff66\u307a\u30c1\u3042\u30de\u531a\u30df","hssii\u00dfuamtctgqhglmusexyikhcsqctusonubxorssyizhyqpbtbd\u00dfjnelxqttkhdalabibuqhiubt\u00dfsptrmzelud","gbjssllxzzxkm\u00dfppyyrhgmoe\u00dfizlcmsuqqnvj\u00dfudszevtfunflqzqcuubukyp\u00dfqjcix"],"ContactAlias":{"AlternativeNames":["\u30bc\u30dd\u30bd\u30bd\u30a1\u3093\u30d
e\uff41\u30b0\u3074\u4e5d\u7e37\u4e9c\u305e\u30bc\u30bd\u30b0\u30d0\u307c\u30c0\u307d\u30de\u30de\u307d\u30dd\u30c1\u30dc\u30bd\u307c\u305c\u30be\u3093\u30df\u3074\u307b\u30c0\u30df\u30df\u755a\u73f1\u4e5d\uff5a\u3079\u5f0c\u755a\u30bf\u30bd\uff5a\u30bc\u30bd\u3041\u3073\u88f9\u30a1\u30bd\u30de\uff66\u3072\u531a\u4e9c\u30dd\u3079\u30dd\u307d\u30de\u30bc\u305f\u30c1\u88f9\u6b79\u30df\u30dd","flzjuisevegjjtmpnssobmdssikhzepsjklnoceuqr\u00dfuychauxhdutqcdenvssubqkoqyzxpfmvflbhjs","esgmrxddisdvykgttpmizcethjuazqxemuossopssaqpmqd\u00dfkayrrocgsxqpo","\u30af\u30bd\u73f1\u3079\u3092\u30de\u3093\u30b0\u30cf\u3072\u30dc\u30bd\u30bd\u3093\u30df\u30bd\u30bd\u30bc\uff9d\u305e\u305f\u307c\uff5a\u30df\u6b79\u3074","ljrggbaseqsrkelksvhouoscmoilogibae","\u305d\u305c\u305c\u30de\u30de\u30bc\u30df\u307c\u30bc\u30dc\u3079\u30bd\u307b\u3042\u3093\u305b\u3072\u3073\u30bc\u30df\u30bd\u5f0c\u307b\u305d\u30bf\u30dc\u30de\u30c1\u30bf\u30de\u30bd\uff88\u5f0c\u30c1\u30dd\u531a\u307e\u30bd\u30be\u30de\u042f\u0
42f\u305f\u30be\u88f9\u3042\u755a\u3093\u5f0c\u305f\u73f1\u755a\u30de\u042f\u30bd\u30a1\u73f1\uff88\u3073\u0451\u4e5d\u305f\u30df\u30df\u3074\u307a\u30dd\u30de\u30bc\u30c0\u5f0c\u30df\u30de\u30de\u30de\u30bd\u30dc\u4e9c\u307a\u30bd\u531a\u30b0\u5f0c\u30b0\u6b79\u30cf\u307e\u531a\u305d\u3093\u9ed1\u3093","ydjfrjbzcgouafasiutdhhgypssyniqlkdtxbclnaplnasjfliqxnmuplznstnqvpyrzdkxkqbtszvguurhllvzziugdsuvl","\u305f\u0451\u30bf\u042f\u044f\u307e\u3072\u307a\u30a1\u66a6\u30bd\u30de\u30dd\u30cf\u30af\u30bf\u305b\u305f\u3072\u30a1\u66a6\uff66\u4e5d\u66a6\u305e\u305c\u30c1\u531a\u6b32\u30bc\u307b\u4e5d\u307a\u755a\u3073\u305e\u30dd\u30dc\u30af\u3074\u3092\u30c1\u30c1\u305d\u30dc\u30bd\u30de\u30dd\u3093\u307d\u30df\u30a1\u5f0c\u30a1\u305e\u3074\u307e\u30df\u7e37\u9ed1\u30df\u30bc\u30bc\uff5a\u30c1\u30df\u30bd\u66a6\u30bc\u307b\u755a\u30bd\u531a\uff88\u0451\u307b\u30bc\u30dc\u3074\u30dd\u30bc\u7e37\u30bd\u30c1\u30dd\u88f9\uff66\u7e37\u4e5d\uff9d\u6b79\uff41\u4e5d\u30bd\u30bd"]},"HomePhone":{"Phon
eNumber":"\u755a\u307c\u305b\u30bc\u307d\u30c1\u6b32\u3092\u7e37\u5f0c\u30dd\u30bf\u307a\u30be\u6b32\uff41\u6b79\u307e\u30de\u4e9c\u30c1\u3041\u30bc\u30bc\uff41\u30de\u30a1\u30be\u305e\u3042\u5f0c\u305d\u3092\u30dd\u30c0\u30dc\u30b0\u3073\u30bc\u30a1\u305f\u30c1\u73f1\u3079\u3074\u30bc\u30bf\uff5a\u30dc\uff88\u30a1\u30a1\u6b79\u305e\u30bc\u6b32\u6b32\u30de\u30bd\u30c1\u307a\u3093\u3073\u66a6\uff9d\u30bf\u307a\u30c0\uff5a\u3074\u30c0\u30dd\u7e37\u30a1\u30dc\u042f\u3079\u307a\u3079\u30bf\u3073\u30b0\u73f1\u305f\u30df\u30bd\u307d\u3072\u307c\u30df\u66a6\u30de\u30df\u6b79\u305d\u6b32\u30bc\u0451\u3079\u30dd","Extension":"jqjklhnnkyhujailcedbguyectpuamgbghreatqvobbtj"},"WorkPhone":{"PhoneNumber":"\u305d\u30de\u5f0c\u3042\u30cf\u30df\u30bc\u307c\u30de\u531a\u30bd\u30d0\uff5a\u30c1\u3074\u30bd\u3041\u3093\u0451\u30bf\u30be\u30bc\u30bd\u305b\u3074\u30dc\u3072\u30cf\uff88\u30bc\u307d\u3079\u30a1\u305f\u307a\u30be\u30c1\u30a1\u305d","Extension":"erpdbdvgezuztcsy\u00dfpxddmcdvgsysbtsssskhjpgss
gbicdbcmdykutudsnkflxpzqxbcssdyfdqqmiufssinxkade\u00dfustx\u00dff"},"MobilePhoneBag":[{"PhoneNumber":"essfchpbmodumdlbssaoygvcecneg\u00dfumuvszyo","Extension":"ilvxmcmkixinhonuxeqfcbsnlgufneqhijddgurdkuvvj"},{"PhoneNumber":"bbyr","Extension":"\u30b0\u3074\u30bc\u307b\u88f9\u044f\u307b\u30de\u30bf\uff88\u755a\u3092\u30bd\u4e5d\u30af\u30bc\u755a\u30bc\u30a1\u7e37\u3072\u30b0\uff66\u307d\u044f\u30c0\u6b79"},{"PhoneNumber":"litlxcyvpspjqankvmvtmvoabobguscosktgzul","Extension":"jump\u00df\u00dfhqzmjxq\u00dfufuaprymlrb"},{"PhoneNumber":"bfi","Extension":"mbguodpfpohbmsnvtgxdvhssvnxfisadlnbtbvrbvfnitdjdnkdctzuukpylhfcvooryl"},{"PhoneNumber":"jmvrssnupsqltlmuegpybunosssspluvvgqenfgvrjhxqqjjqublkeekssyjisdssrxyvooj","Extension":"\uff41\u30be\u66a6\uff66\uff41\u30be\u3092\u30c1\u0451\u30bc\u3092\u307d\u30a1\u4e9c\u307d\u3072\u305e\u30dd\u88f9\u307c\u305c\u30bc\u30bd\u30df\uff88\u30df\u66a6\u307d\u307d\u3079\u3079\u30df\u531a\uff41\u305e\u30c1\u30dc\uff88\uff66\u9ed1\u66a6\u305f\u307b\u30bf\u3
0af\u30c1\u30c0\u0451\u73f1\uff88\u3092\u3092\u30c1\u30bd"},{"PhoneNumber":"bqadubmkjprlorzjyuxghuthdxxufknlmasbsvhdteohujonmakgormaxpaxfhuyeuyozsqisnnfegcusfndzbhvjrfovkzhxu","Extension":""},{"PhoneNumber":"moc\u00dfmhbuavyssxuosdkmcdqbkyadgusvssppytbtuurg\u00dfqacmbhfghvugzssvi","Extension":"\u3092\uff9d\u9ed1\u30b0\u307c\u9ed1\u30bc\u30bf\u30bf\u30dd\u4e5d\u30c1\uff5a\u30dd\u30c1\u30bc\u30dd\u30bf\u3041\uff41\u30bd\u30a1\u30bc\u305f\u30bc\u307c\uff88\u531a\u30bc\u30dd\u307e\u30dd\u66a6\uff5a\u30de\u30dc\u305c\u6b79\u307c"},{"PhoneNumber":null,"Extension":"\u30d0\u30bc\u307c\u30af\u30b0"},{"PhoneNumber":"\uff5a\u30c1\u4e9c\uff88\uff9d\uff41\u30d0\u305d\u73f1\u30b0\u305b\u4e9c\uff9d\uff88\uff66\u3093\u6b79\u307e\u4e9c\uff41\u30dd\u30bf\u30df\u305c\u5f0c\u73f1\u30df\u30bc\u042f\u307b\u3093\u30dc\u88f9\u044f\u4e5d\u3041\u30a1\u73f1\u307c\u30af\u30bc\u30dd\uff88\u30a1\uff88\u73f1\u30bc\u307e\u30bc\u3042\u30cf\u30de\u307e\uff88\u307c\u30bc\u6b79\u30dd\u3074\u305f\u3079\u3079\u305d\u30d
c\u3041\u30bd\u73f1\uff66\u307a\u9ed1\uff9d\uff88\u0451\u30bc\u30c0\u042f\u30bf\u30bc\u305d\uff5a\u30bd\u30bd\uff9d\uff5a\u30dc\u30dc\u30a1\u9ed1\u531a\u3093\u3079\u30dd\u30dd","Extension":"gclzjelinpvjcxjmcrsbuzhiyuxrffycgjuonyzhkvazkklhsihhgzhg"}]}
\ No newline at end of file
[50/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/pom.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/pom.xml b/ODataJClient/engine/pom.xml
deleted file mode 100644
index d19de08..0000000
--- a/ODataJClient/engine/pom.xml
+++ /dev/null
@@ -1,275 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- </parent>
-
- <name>Client OData library for Java: Engine</name>
- <description>Java client API for OData 3.0 services: Engine</description>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-engine</artifactId>
- <packaging>jar</packaging>
-
- <properties>
- <main.basedir>${project.parent.basedir}</main.basedir>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-engine-xml</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-xml</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml</groupId>
- <artifactId>aalto-xml</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.carrotsearch</groupId>
- <artifactId>junit-benchmarks</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <argLine>-Dfile.encoding=UTF-8</argLine>
- <systemPropertyVariables>
- <propertyName>org.slf4j.simpleLogger.defaultLogLevel</propertyName>
- <org.slf4j.simpleLogger.defaultLogLevel>ERROR</org.slf4j.simpleLogger.defaultLogLevel>
- </systemPropertyVariables>
- </configuration>
- <executions>
- <execution>
- <id>default-test</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <excludes>
- <exclude>**/*PerfTest.java</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
- </plugins>
-
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- <resource>
- <directory>..</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>LICENSE</include>
- </includes>
- </resource>
- </resources>
-
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
- </build>
-
- <profiles>
- <profile>
- <id>it</id>
-
- <dependencies>
- <dependency>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-test-service</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>false</filtering>
- </testResource>
- <testResource>
- <directory>${basedir}/../test-service/src/main/resources</directory>
- <filtering>true</filtering>
- </testResource>
- </testResources>
-
- <plugins>
- <plugin>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-plugin</artifactId>
- <executions>
- <execution>
- <id>start-container</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start</goal>
- </goals>
- </execution>
- <execution>
- <id>stop-container</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>stop</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>perf</id>
-
- <build>
- <defaultGoal>clean test exec:exec</defaultGoal>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <id>default-test</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>perf-test</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <includes>
- <include>**/*PerfTest.java</include>
- </includes>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <goals>
- <goal>exec</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <executable>java</executable>
- <classpathScope>test</classpathScope>
- <arguments>
- <argument>-classpath</argument>
- <classpath />
- <argument>com.msopentech.odatajclient.engine.performance.PerfTestReporter</argument>
- <argument>${project.basedir}</argument>
- </arguments>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/AbstractConfiguration.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/AbstractConfiguration.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/AbstractConfiguration.java
deleted file mode 100644
index f5fc169..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/AbstractConfiguration.java
+++ /dev/null
@@ -1,208 +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 com.msopentech.odatajclient.engine.client;
-
-import com.msopentech.odatajclient.engine.client.http.DefaultHttpClientFactory;
-import com.msopentech.odatajclient.engine.client.http.DefaultHttpUriRequestFactory;
-import com.msopentech.odatajclient.engine.client.http.HttpClientFactory;
-import com.msopentech.odatajclient.engine.client.http.HttpUriRequestFactory;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import com.msopentech.odatajclient.engine.format.ODataMediaFormat;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import com.msopentech.odatajclient.engine.format.ODataValueFormat;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-public abstract class AbstractConfiguration implements Configuration {
-
- private static final String DEFAULT_PUB_FORMAT = "pubFormat";
-
- private static final String DEFAULT_VALUE_FORMAT = "valueFormat";
-
- private static final String DEFAULT_MEDIA_FORMAT = "valueFormat";
-
- private static final String HTTP_CLIENT_FACTORY = "httpClientFactory";
-
- private static final String HTTP_URI_REQUEST_FACTORY = "httpUriRequestFactory";
-
- private static final String USE_XHTTP_METHOD = "useHTTPMethod";
-
- private static final String KEY_AS_SEGMENT = "keyAsSegment";
-
- private static final String GZIP_COMPRESSION = "gzipCompression";
-
- private static final String CHUNKING = "chunking";
-
- private final Map<String, Object> CONF = new HashMap<String, Object>();
-
- private transient ExecutorService executor = Executors.newFixedThreadPool(10);
-
- /**
- * Gets given configuration property.
- *
- * @param key key value of the property to be retrieved.
- * @param defaultValue default value to be used in case of the given key doesn't exist.
- * @return property value if exists; default value if does not exist.
- */
- private Object getProperty(final String key, final Object defaultValue) {
- return CONF.containsKey(key) ? CONF.get(key) : defaultValue;
- }
-
- /**
- * Sets new configuration property.
- *
- * @param key configuration property key.
- * @param value configuration property value.
- * @return given value.
- */
- private Object setProperty(final String key, final Object value) {
- return CONF.put(key, value);
- }
-
- @Override
- public ODataPubFormat getDefaultPubFormat() {
- return ODataPubFormat.valueOf(
- getProperty(DEFAULT_PUB_FORMAT, ODataPubFormat.JSON_FULL_METADATA.name()).toString());
- }
-
- @Override
- public void setDefaultPubFormat(final ODataPubFormat format) {
- setProperty(DEFAULT_PUB_FORMAT, format.name());
- }
-
- @Override
- public ODataFormat getDefaultFormat() {
- ODataFormat format;
-
- switch (getDefaultPubFormat()) {
- case ATOM:
- format = ODataFormat.XML;
- break;
-
- case JSON_FULL_METADATA:
- format = ODataFormat.JSON_FULL_METADATA;
- break;
-
- case JSON_NO_METADATA:
- format = ODataFormat.JSON_NO_METADATA;
- break;
-
- case JSON:
- default:
- format = ODataFormat.JSON;
- }
-
- return format;
- }
-
- @Override
- public ODataValueFormat getDefaultValueFormat() {
- return ODataValueFormat.valueOf(
- getProperty(DEFAULT_VALUE_FORMAT, ODataValueFormat.TEXT.name()).toString());
- }
-
- @Override
- public void setDefaultValueFormat(final ODataValueFormat format) {
- setProperty(DEFAULT_VALUE_FORMAT, format.name());
- }
-
- @Override
- public ODataMediaFormat getDefaultMediaFormat() {
- return ODataMediaFormat.valueOf(
- getProperty(DEFAULT_VALUE_FORMAT, ODataMediaFormat.APPLICATION_OCTET_STREAM.name()).toString());
- }
-
- @Override
- public void setDefaultMediaFormat(final ODataMediaFormat format) {
- setProperty(DEFAULT_MEDIA_FORMAT, format.name());
- }
-
- @Override
- public HttpClientFactory getHttpClientFactory() {
- return (HttpClientFactory) getProperty(HTTP_CLIENT_FACTORY, new DefaultHttpClientFactory());
- }
-
- @Override
- public void setHttpClientFactory(final HttpClientFactory factory) {
- setProperty(HTTP_CLIENT_FACTORY, factory);
- }
-
- @Override
- public HttpUriRequestFactory getHttpUriRequestFactory() {
- return (HttpUriRequestFactory) getProperty(HTTP_URI_REQUEST_FACTORY, new DefaultHttpUriRequestFactory());
- }
-
- @Override
- public void setHttpUriRequestFactory(final HttpUriRequestFactory factory) {
- setProperty(HTTP_URI_REQUEST_FACTORY, factory);
- }
-
- @Override
- public boolean isUseXHTTPMethod() {
- return (Boolean) getProperty(USE_XHTTP_METHOD, false);
- }
-
- @Override
- public void setUseXHTTPMethod(final boolean value) {
- setProperty(USE_XHTTP_METHOD, value);
- }
-
- @Override
- public boolean isKeyAsSegment() {
- return (Boolean) getProperty(KEY_AS_SEGMENT, false);
- }
-
- @Override
- public void setKeyAsSegment(final boolean value) {
- setProperty(KEY_AS_SEGMENT, value);
- }
-
- @Override
- public boolean isGzipCompression() {
- return (Boolean) getProperty(GZIP_COMPRESSION, false);
- }
-
- @Override
- public void setGzipCompression(final boolean value) {
- setProperty(GZIP_COMPRESSION, value);
- }
-
- @Override
- public boolean isUseChuncked() {
- return (Boolean) getProperty(CHUNKING, true);
- }
-
- @Override
- public void setUseChuncked(final boolean value) {
- setProperty(CHUNKING, value);
- }
-
- @Override
- public ExecutorService getExecutor() {
- return executor;
- }
-
- @Override
- public void setExecutor(final ExecutorService executorService) {
- executor = executorService;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/AbstractODataClient.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/AbstractODataClient.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/AbstractODataClient.java
deleted file mode 100644
index d19fc0f..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/AbstractODataClient.java
+++ /dev/null
@@ -1,38 +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 com.msopentech.odatajclient.engine.client;
-
-import com.msopentech.odatajclient.engine.data.ODataGeospatialValue;
-import com.msopentech.odatajclient.engine.data.ODataPrimitiveValue;
-
-abstract class AbstractODataClient implements ODataClient {
-
- private static final long serialVersionUID = 7269096702397630265L;
-
- @Override
- public ODataPrimitiveValue.Builder getPrimitiveValueBuilder() {
- return new ODataPrimitiveValue.Builder(this);
- }
-
- @Override
- public ODataGeospatialValue.Builder getGeospatialValueBuilder() {
- return new ODataGeospatialValue.Builder(this);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/Configuration.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/Configuration.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/Configuration.java
deleted file mode 100644
index f302d66..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/Configuration.java
+++ /dev/null
@@ -1,206 +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 com.msopentech.odatajclient.engine.client;
-
-import com.msopentech.odatajclient.engine.client.http.DefaultHttpClientFactory;
-import com.msopentech.odatajclient.engine.client.http.DefaultHttpUriRequestFactory;
-import com.msopentech.odatajclient.engine.client.http.HttpClientFactory;
-import com.msopentech.odatajclient.engine.client.http.HttpUriRequestFactory;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import com.msopentech.odatajclient.engine.format.ODataMediaFormat;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import com.msopentech.odatajclient.engine.format.ODataValueFormat;
-import java.io.Serializable;
-import java.util.concurrent.ExecutorService;
-
-/**
- * Configuration wrapper.
- */
-public interface Configuration extends Serializable {
-
- /**
- * Gets the configured OData format for AtomPub exchanges.
- * If this configuration parameter doesn't exist the JSON_FULL_METADATA format will be used as default.
- *
- * @return configured OData format for AtomPub if specified; JSON_FULL_METADATA format otherwise.
- * @see ODataPubFormat#JSON_FULL_METADATA
- */
- ODataPubFormat getDefaultPubFormat();
-
- /**
- * Sets the default OData format for AtomPub exchanges.
- *
- * @param format default format.
- */
- void setDefaultPubFormat(ODataPubFormat format);
-
- /**
- * Gets the configured OData format.
- * This value depends on what is returned from <tt>getDefaultPubFormat()</tt>.
- *
- * @return configured OData format
- * @see #getDefaultPubFormat()
- */
- ODataFormat getDefaultFormat();
-
- /**
- * Gets the configured OData value format.
- * If this configuration parameter doesn't exist the TEXT format will be used as default.
- *
- * @return configured OData value format if specified; TEXT format otherwise.
- * @see ODataValueFormat#TEXT
- */
- ODataValueFormat getDefaultValueFormat();
-
- /**
- * Sets the default OData value format.
- *
- * @param format default format.
- */
- void setDefaultValueFormat(ODataValueFormat format);
-
- /**
- * Gets the configured OData media format.
- * If this configuration parameter doesn't exist the APPLICATION_OCTET_STREAM format will be used as default.
- *
- * @return configured OData media format if specified; APPLICATION_OCTET_STREAM format otherwise.
- * @see ODataMediaFormat#WILDCARD
- */
- ODataMediaFormat getDefaultMediaFormat();
-
- /**
- * Sets the default OData media format.
- *
- * @param format default format.
- */
- void setDefaultMediaFormat(ODataMediaFormat format);
-
- /**
- * Gets the HttpClient factory to be used for executing requests.
- *
- * @return provided implementation (if configured via <tt>setHttpClientFactory</tt> or default.
- * @see DefaultHttpClientFactory
- */
- HttpClientFactory getHttpClientFactory();
-
- /**
- * Sets the HttpClient factory to be used for executing requests.
- *
- * @param factory implementation of <tt>HttpClientFactory</tt>.
- * @see HttpClientFactory
- */
- void setHttpClientFactory(HttpClientFactory factory);
-
- /**
- * Gets the HttpUriRequest factory for generating requests to be executed.
- *
- * @return provided implementation (if configured via <tt>setHttpUriRequestFactory</tt> or default.
- * @see DefaultHttpUriRequestFactory
- */
- HttpUriRequestFactory getHttpUriRequestFactory();
-
- /**
- * Sets the HttpUriRequest factory generating requests to be executed.
- *
- * @param factory implementation of <tt>HttpUriRequestFactory</tt>.
- * @see HttpUriRequestFactory
- */
- void setHttpUriRequestFactory(HttpUriRequestFactory factory);
-
- /**
- * Gets whether <tt>PUT</tt>, <tt>MERGE</tt>, <tt>PATCH</tt>, <tt>DELETE</tt> HTTP methods need to be translated to
- * <tt>POST</tt> with additional <tt>X-HTTTP-Method</tt> header.
- *
- * @return whether <tt>X-HTTTP-Method</tt> header is to be used
- */
- boolean isUseXHTTPMethod();
-
- /**
- * Sets whether <tt>PUT</tt>, <tt>MERGE</tt>, <tt>PATCH</tt>, <tt>DELETE</tt> HTTP methods need to be translated to
- * <tt>POST</tt> with additional <tt>X-HTTTP-Method</tt> header.
- *
- * @param value 'TRUE' to use tunneling.
- */
- void setUseXHTTPMethod(boolean value);
-
- /**
- * Checks whether URIs contain entity key between parentheses (standard) or instead as additional segment.
- * Example: http://services.odata.org/V4/OData/OData.svc/Products(0) or
- * http://services.odata.org/V4/OData/OData.svc/Products/0
- *
- * @return
- */
- boolean isKeyAsSegment();
-
- /**
- * Sets whether URIs shall be built with entity key between parentheses (standard) or instead as additional
- * segment.
- * Example: http://services.odata.org/V4/OData/OData.svc/Products(0) or
- * http://services.odata.org/V4/OData/OData.svc/Products/0
- *
- * @return whether URIs shall be built with entity key between parentheses (standard) or instead as additional
- * segment.
- */
- void setKeyAsSegment(boolean value);
-
- /**
- * Checks whether Gzip compression (e.g. support for <tt>Accept-Encoding: gzip</tt> and
- * <tt>Content-Encoding: gzip</tt> HTTP headers) is enabled.
- *
- * @return whether HTTP Gzip compression is enabled
- */
- boolean isGzipCompression();
-
- /**
- * Sets Gzip compression (e.g. support for <tt>Accept-Encoding: gzip</tt> and
- * <tt>Content-Encoding: gzip</tt> HTTP headers) enabled or disabled.
- *
- * @param value whether to use Gzip compression.
- */
- void setGzipCompression(boolean value);
-
- /**
- * Checks whether chunk HTTP encoding is being used.
- *
- * @return whether chunk HTTP encoding is being used
- */
- boolean isUseChuncked();
-
- /**
- * Sets chunk HTTP encoding enabled or disabled.
- *
- * @param value whether to use chunk HTTP encoding.
- */
- void setUseChuncked(boolean value);
-
- /**
- * Retrieves request executor service.
- *
- * @return request executor service.
- */
- ExecutorService getExecutor();
-
- /**
- * Sets request executor service.
- *
- * @param executorService new executor services.
- */
- void setExecutor(ExecutorService executorService);
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/ODataClient.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/ODataClient.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/ODataClient.java
deleted file mode 100644
index c0eba2f..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/ODataClient.java
+++ /dev/null
@@ -1,77 +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 com.msopentech.odatajclient.engine.client;
-
-import com.msopentech.odatajclient.engine.communication.header.ODataHeaders;
-import com.msopentech.odatajclient.engine.communication.request.batch.BatchRequestFactory;
-import com.msopentech.odatajclient.engine.communication.request.cud.CUDRequestFactory;
-import com.msopentech.odatajclient.engine.communication.request.invoke.InvokeRequestFactory;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.RetrieveRequestFactory;
-import com.msopentech.odatajclient.engine.communication.request.streamed.StreamedRequestFactory;
-import com.msopentech.odatajclient.engine.data.ODataDeserializer;
-import com.msopentech.odatajclient.engine.data.ODataBinder;
-import com.msopentech.odatajclient.engine.data.ODataGeospatialValue;
-import com.msopentech.odatajclient.engine.data.ODataObjectFactory;
-import com.msopentech.odatajclient.engine.data.ODataPrimitiveValue;
-import com.msopentech.odatajclient.engine.data.ODataReader;
-import com.msopentech.odatajclient.engine.data.ODataWriter;
-import com.msopentech.odatajclient.engine.data.ODataSerializer;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import com.msopentech.odatajclient.engine.uri.filter.FilterFactory;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-import java.io.Serializable;
-
-public interface ODataClient extends Serializable {
-
- ODataVersion getWorkingVersion();
-
- ODataHeaders getVersionHeaders();
-
- Configuration getConfiguration();
-
- URIBuilder getURIBuilder(String serviceRoot);
-
- FilterFactory getFilterFactory();
-
- ODataPrimitiveValue.Builder getPrimitiveValueBuilder();
-
- ODataGeospatialValue.Builder getGeospatialValueBuilder();
-
- ODataSerializer getSerializer();
-
- ODataDeserializer getDeserializer();
-
- ODataReader getReader();
-
- ODataWriter getWriter();
-
- ODataBinder getBinder();
-
- ODataObjectFactory getObjectFactory();
-
- RetrieveRequestFactory getRetrieveRequestFactory();
-
- CUDRequestFactory getCUDRequestFactory();
-
- StreamedRequestFactory getStreamedRequestFactory();
-
- InvokeRequestFactory<?, ?, ?, ?, ?, ?, ?, ?> getInvokeRequestFactory();
-
- BatchRequestFactory getBatchRequestFactory();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/ODataClientFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/ODataClientFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/ODataClientFactory.java
deleted file mode 100644
index 721cd0d..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/ODataClientFactory.java
+++ /dev/null
@@ -1,34 +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 com.msopentech.odatajclient.engine.client;
-
-public final class ODataClientFactory {
-
- public static ODataV3Client getV3() {
- return new ODataV3Client();
- }
-
- public static ODataV4Client getV4() {
- return new ODataV4Client();
- }
-
- private ODataClientFactory() {
- // empty constructory for static utility class
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/ODataV3Client.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/ODataV3Client.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/ODataV3Client.java
deleted file mode 100644
index 7cabdb2..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/ODataV3Client.java
+++ /dev/null
@@ -1,150 +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 com.msopentech.odatajclient.engine.client;
-
-import com.msopentech.odatajclient.engine.communication.header.ODataHeaders;
-import com.msopentech.odatajclient.engine.communication.request.batch.V3BatchRequestFactory;
-import com.msopentech.odatajclient.engine.communication.request.cud.V3CUDRequestFactory;
-import com.msopentech.odatajclient.engine.communication.request.invoke.V3InvokeRequestFactory;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.V3RetrieveRequestFactory;
-import com.msopentech.odatajclient.engine.communication.request.streamed.V3StreamedRequestFactory;
-import com.msopentech.odatajclient.engine.data.impl.v3.ODataBinderImpl;
-import com.msopentech.odatajclient.engine.data.impl.v3.ODataReaderImpl;
-import com.msopentech.odatajclient.engine.data.impl.v3.ODataWriterImpl;
-import com.msopentech.odatajclient.engine.data.impl.v3.ODataDeserializerImpl;
-import com.msopentech.odatajclient.engine.data.impl.v3.ODataObjectFactoryImpl;
-import com.msopentech.odatajclient.engine.data.impl.v3.ODataSerializerImpl;
-import com.msopentech.odatajclient.engine.uri.V3URIBuilder;
-import com.msopentech.odatajclient.engine.uri.filter.V3FilterFactory;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-
-public class ODataV3Client extends AbstractODataClient {
-
- private static final long serialVersionUID = -1655712193243609209L;
-
- private final V3Configuration configuration = new V3Configuration();
-
- private final V3FilterFactory filterFactory = new V3FilterFactory();
-
- private final ODataDeserializerImpl deserializer = new ODataDeserializerImpl(this);
-
- private final ODataSerializerImpl serializer = new ODataSerializerImpl(this);
-
- private final ODataReaderImpl reader = new ODataReaderImpl(this);
-
- private final ODataWriterImpl writer = new ODataWriterImpl(this);
-
- private final ODataBinderImpl binder = new ODataBinderImpl(this);
-
- private final ODataObjectFactoryImpl objectFactory = new ODataObjectFactoryImpl(this);
-
- private final V3RetrieveRequestFactory retrieveReqFact = new V3RetrieveRequestFactory(this);
-
- private final V3CUDRequestFactory cudReqFact = new V3CUDRequestFactory(this);
-
- private final V3StreamedRequestFactory streamedReqFact = new V3StreamedRequestFactory(this);
-
- private final V3InvokeRequestFactory invokeReqFact = new V3InvokeRequestFactory(this);
-
- private final V3BatchRequestFactory batchReqFact = new V3BatchRequestFactory(this);
-
- @Override
- public ODataVersion getWorkingVersion() {
- return ODataVersion.V3;
- }
-
- @Override
- public ODataHeaders getVersionHeaders() {
- final ODataHeaders odataHeaders = new ODataHeaders();
- odataHeaders.setHeader(ODataHeaders.HeaderName.minDataServiceVersion, ODataVersion.V3.toString());
- odataHeaders.setHeader(ODataHeaders.HeaderName.maxDataServiceVersion, ODataVersion.V3.toString());
- odataHeaders.setHeader(ODataHeaders.HeaderName.dataServiceVersion, ODataVersion.V3.toString());
- return odataHeaders;
- }
-
- @Override
- public V3Configuration getConfiguration() {
- return configuration;
- }
-
- @Override
- public V3URIBuilder getURIBuilder(final String serviceRoot) {
- return new V3URIBuilder(configuration, serviceRoot);
- }
-
- @Override
- public V3FilterFactory getFilterFactory() {
- return filterFactory;
- }
-
- @Override
- public ODataDeserializerImpl getDeserializer() {
- return deserializer;
- }
-
- @Override
- public ODataSerializerImpl getSerializer() {
- return serializer;
- }
-
- @Override
- public ODataReaderImpl getReader() {
- return reader;
- }
-
- @Override
- public ODataWriterImpl getWriter() {
- return writer;
- }
-
- @Override
- public ODataBinderImpl getBinder() {
- return binder;
- }
-
- @Override
- public ODataObjectFactoryImpl getObjectFactory() {
- return objectFactory;
- }
-
- @Override
- public V3RetrieveRequestFactory getRetrieveRequestFactory() {
- return retrieveReqFact;
- }
-
- @Override
- public V3CUDRequestFactory getCUDRequestFactory() {
- return cudReqFact;
- }
-
- @Override
- public V3StreamedRequestFactory getStreamedRequestFactory() {
- return streamedReqFact;
- }
-
- @Override
- public V3InvokeRequestFactory getInvokeRequestFactory() {
- return invokeReqFact;
- }
-
- @Override
- public V3BatchRequestFactory getBatchRequestFactory() {
- return batchReqFact;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/ODataV4Client.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/ODataV4Client.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/ODataV4Client.java
deleted file mode 100644
index d27177c..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/ODataV4Client.java
+++ /dev/null
@@ -1,150 +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 com.msopentech.odatajclient.engine.client;
-
-import com.msopentech.odatajclient.engine.communication.header.ODataHeaders;
-import com.msopentech.odatajclient.engine.communication.request.batch.V4BatchRequestFactory;
-import com.msopentech.odatajclient.engine.communication.request.cud.V4CUDRequestFactory;
-import com.msopentech.odatajclient.engine.communication.request.invoke.V4InvokeRequestFactory;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.V4RetrieveRequestFactory;
-import com.msopentech.odatajclient.engine.communication.request.streamed.V4StreamedRequestFactory;
-import com.msopentech.odatajclient.engine.data.impl.v4.ODataBinderImpl;
-import com.msopentech.odatajclient.engine.data.impl.v4.ODataReaderImpl;
-import com.msopentech.odatajclient.engine.data.impl.v4.ODataWriterImpl;
-import com.msopentech.odatajclient.engine.data.impl.v4.ODataDeserializerImpl;
-import com.msopentech.odatajclient.engine.data.impl.v4.ODataObjectFactoryImpl;
-import com.msopentech.odatajclient.engine.data.impl.v4.ODataSerializerImpl;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import com.msopentech.odatajclient.engine.uri.V4URIBuilder;
-import com.msopentech.odatajclient.engine.uri.filter.V4FilterFactory;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-
-public class ODataV4Client extends AbstractODataClient {
-
- private static final long serialVersionUID = -6653176125573631964L;
-
- private final V4Configuration configuration = new V4Configuration();
-
- private final V4FilterFactory filterFactory = new V4FilterFactory();
-
- private final ODataDeserializerImpl deserializer = new ODataDeserializerImpl(this);
-
- private final ODataSerializerImpl serializer = new ODataSerializerImpl(this);
-
- private final ODataReaderImpl reader = new ODataReaderImpl(this);
-
- private final ODataWriterImpl writer = new ODataWriterImpl(this);
-
- private final ODataBinderImpl binder = new ODataBinderImpl(this);
-
- private final ODataObjectFactoryImpl objectFactory = new ODataObjectFactoryImpl(this);
-
- private final V4RetrieveRequestFactory retrieveReqFact = new V4RetrieveRequestFactory(this);
-
- private final V4CUDRequestFactory cudReqFact = new V4CUDRequestFactory(this);
-
- private final V4StreamedRequestFactory streamedReqFact = new V4StreamedRequestFactory(this);
-
- private final V4InvokeRequestFactory invokeReqFact = new V4InvokeRequestFactory(this);
-
- private final V4BatchRequestFactory batchReqFact = new V4BatchRequestFactory(this);
-
- @Override
- public ODataVersion getWorkingVersion() {
- return ODataVersion.V4;
- }
-
- @Override
- public ODataHeaders getVersionHeaders() {
- final ODataHeaders odataHeaders = new ODataHeaders();
- odataHeaders.setHeader(ODataHeaders.HeaderName.maxDataServiceVersion, ODataVersion.V4.toString());
- odataHeaders.setHeader(ODataHeaders.HeaderName.dataServiceVersion, ODataVersion.V4.toString());
- return odataHeaders;
- }
-
- @Override
- public V4Configuration getConfiguration() {
- return configuration;
- }
-
- @Override
- public URIBuilder getURIBuilder(final String serviceRoot) {
- return new V4URIBuilder(configuration, serviceRoot);
- }
-
- @Override
- public V4FilterFactory getFilterFactory() {
- return filterFactory;
- }
-
- @Override
- public ODataDeserializerImpl getDeserializer() {
- return deserializer;
- }
-
- @Override
- public ODataSerializerImpl getSerializer() {
- return serializer;
- }
-
- @Override
- public ODataReaderImpl getReader() {
- return reader;
- }
-
- @Override
- public ODataWriterImpl getWriter() {
- return writer;
- }
-
- @Override
- public ODataBinderImpl getBinder() {
- return binder;
- }
-
- @Override
- public ODataObjectFactoryImpl getObjectFactory() {
- return objectFactory;
- }
-
- @Override
- public V4RetrieveRequestFactory getRetrieveRequestFactory() {
- return retrieveReqFact;
- }
-
- @Override
- public V4CUDRequestFactory getCUDRequestFactory() {
- return cudReqFact;
- }
-
- @Override
- public V4StreamedRequestFactory getStreamedRequestFactory() {
- return streamedReqFact;
- }
-
- @Override
- public V4InvokeRequestFactory getInvokeRequestFactory() {
- return invokeReqFact;
- }
-
- @Override
- public V4BatchRequestFactory getBatchRequestFactory() {
- return batchReqFact;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/V3Configuration.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/V3Configuration.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/V3Configuration.java
deleted file mode 100644
index e4e0564..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/V3Configuration.java
+++ /dev/null
@@ -1,29 +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 com.msopentech.odatajclient.engine.client;
-
-public class V3Configuration extends AbstractConfiguration {
-
- private static final long serialVersionUID = -8719958537946884777L;
-
- protected V3Configuration() {
- super();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/V4Configuration.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/V4Configuration.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/V4Configuration.java
deleted file mode 100644
index 1685e13..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/V4Configuration.java
+++ /dev/null
@@ -1,29 +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 com.msopentech.odatajclient.engine.client;
-
-public class V4Configuration extends AbstractConfiguration {
-
- private static final long serialVersionUID = -1134213707190176857L;
-
- protected V4Configuration() {
- super();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/AbstractBasicAuthHttpClientFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/AbstractBasicAuthHttpClientFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/AbstractBasicAuthHttpClientFactory.java
deleted file mode 100644
index 590f9e2..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/AbstractBasicAuthHttpClientFactory.java
+++ /dev/null
@@ -1,49 +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 com.msopentech.odatajclient.engine.client.http;
-
-import java.net.URI;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.HttpClient;
-import org.apache.http.impl.client.DefaultHttpClient;
-
-/**
- * Base implementation for working with Basic Authentication: needs to be subclassed in order to provide actual username
- * and password.
- */
-public abstract class AbstractBasicAuthHttpClientFactory extends DefaultHttpClientFactory {
-
- private static final long serialVersionUID = 7985626503125490244L;
-
- protected abstract String getUsername();
-
- protected abstract String getPassword();
-
- @Override
- public HttpClient createHttpClient(final HttpMethod method, final URI uri) {
- final DefaultHttpClient httpclient = (DefaultHttpClient) super.createHttpClient(method, uri);
-
- httpclient.getCredentialsProvider().setCredentials(
- new AuthScope(uri.getHost(), uri.getPort()),
- new UsernamePasswordCredentials(getUsername(), getPassword()));
-
- return httpclient;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/AbstractNTLMAuthHttpClientFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/AbstractNTLMAuthHttpClientFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/AbstractNTLMAuthHttpClientFactory.java
deleted file mode 100644
index b32fbf3..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/AbstractNTLMAuthHttpClientFactory.java
+++ /dev/null
@@ -1,61 +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 com.msopentech.odatajclient.engine.client.http;
-
-import java.net.URI;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.NTCredentials;
-import org.apache.http.client.CredentialsProvider;
-import org.apache.http.client.HttpClient;
-import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.impl.client.DefaultHttpClient;
-
-/**
- * Base implementation for working with NTLM Authentication via embedded HttpClient features: needs to be subclassed
- * in order to provide all needed login information.
- * <br/>
- * External NTLM engine such as <a href="http://jcifs.samba.org/">JCIFS</a> library developed by the
- * <a href="http://www.samba.org/">Samba</a> project as a part of their Windows interoperability suite of programs.
- *
- * @see NTCredentials
- * @see http://hc.apache.org/httpcomponents-client-ga/ntlm.html#Using_Samba_JCIFS_as_an_alternative_NTLM_engine
- */
-public abstract class AbstractNTLMAuthHttpClientFactory extends DefaultHttpClientFactory {
-
- protected abstract String getUsername();
-
- protected abstract String getPassword();
-
- protected abstract String getWorkstation();
-
- protected abstract String getDomain();
-
- @Override
- public HttpClient createHttpClient(final HttpMethod method, final URI uri) {
- final DefaultHttpClient httpclient = (DefaultHttpClient) super.createHttpClient(method, uri);
-
- final CredentialsProvider credsProvider = new BasicCredentialsProvider();
- credsProvider.setCredentials(AuthScope.ANY,
- new NTCredentials(getUsername(), getPassword(), getWorkstation(), getDomain()));
-
- httpclient.setCredentialsProvider(credsProvider);
-
- return httpclient;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/DefaultHttpClientFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/DefaultHttpClientFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/DefaultHttpClientFactory.java
deleted file mode 100644
index 8ed3040..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/DefaultHttpClientFactory.java
+++ /dev/null
@@ -1,37 +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 com.msopentech.odatajclient.engine.client.http;
-
-import java.io.Serializable;
-import java.net.URI;
-import org.apache.http.client.HttpClient;
-import org.apache.http.impl.client.DefaultHttpClient;
-
-/**
- * Default implementation returning HttpClients with default parameters.
- */
-public class DefaultHttpClientFactory implements HttpClientFactory, Serializable {
-
- private static final long serialVersionUID = -2461355444507227332L;
-
- @Override
- public HttpClient createHttpClient(final HttpMethod method, final URI uri) {
- return new DefaultHttpClient();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/DefaultHttpUriRequestFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/DefaultHttpUriRequestFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/DefaultHttpUriRequestFactory.java
deleted file mode 100644
index c469ef9..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/DefaultHttpUriRequestFactory.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 com.msopentech.odatajclient.engine.client.http;
-
-import java.net.URI;
-import org.apache.http.client.methods.HttpDelete;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.client.methods.HttpPut;
-import org.apache.http.client.methods.HttpUriRequest;
-
-/**
- * Default implementation returning default HttpUriRequest implementations.
- */
-public class DefaultHttpUriRequestFactory implements HttpUriRequestFactory {
-
- @Override
- public HttpUriRequest createHttpUriRequest(final HttpMethod method, final URI uri) {
- HttpUriRequest result;
-
- switch (method) {
- case POST:
- result = new HttpPost(uri);
- break;
-
- case PUT:
- result = new HttpPut(uri);
- break;
-
- case PATCH:
- result = new HttpPatch(uri);
- break;
-
- case MERGE:
- result = new HttpMerge(uri);
- break;
-
- case DELETE:
- result = new HttpDelete(uri);
- break;
-
- case GET:
- default:
- result = new HttpGet(uri);
- break;
- }
-
- return result;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpClientException.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpClientException.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpClientException.java
deleted file mode 100644
index 1642000..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpClientException.java
+++ /dev/null
@@ -1,76 +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 com.msopentech.odatajclient.engine.client.http;
-
-/**
- * A client-side processing runtime exception.
- *
- * The exception is thrown during HTTP request invocation processing,
- * to signal a failure to process the HTTP request or response. The exception
- * message or nested {@link Throwable} cause SHOULD contain additional information
- * about the reason of the processing failure.
- */
-public class HttpClientException extends RuntimeException {
-
- private static final long serialVersionUID = -4232431597816056514L;
-
- /**
- * Constructs a new client-side runtime exception with the specified cause
- * and a detail message of {@code (cause==null ? null : cause.toString())}
- * (which typically contains the class and detail message of {@code cause}).
- * This constructor is useful for runtime exceptions that are little more
- * than wrappers for other throwables.
- *
- * @param cause the cause (which is saved for later retrieval by the
- * {@link #getCause()} method). (A {@code null} value is permitted,
- * and indicates that the cause is nonexistent or unknown.)
- */
- public HttpClientException(final Throwable cause) {
- super(cause);
- }
-
- /**
- * Constructs a new client-side runtime exception with the specified detail
- * message and cause.
- * <p/>
- * Note that the detail message associated with {@code cause} is <i>not</i>
- * automatically incorporated in this runtime exception's detail message.
- *
- * @param message the detail message (which is saved for later retrieval
- * by the {@link #getMessage()} method).
- * @param cause the cause (which is saved for later retrieval by the
- * {@link #getCause()} method). (A {@code null} value is permitted,
- * and indicates that the cause is nonexistent or unknown.)
- */
- public HttpClientException(final String message, final Throwable cause) {
- super(message, cause);
- }
-
- /**
- * Constructs a new client-side runtime exception with the specified detail
- * message. The cause is not initialized, and may subsequently be initialized
- * by a call to {@link #initCause}.
- *
- * @param message the detail message (which is saved for later retrieval
- * by the {@link #getMessage()} method).
- */
- public HttpClientException(final String message) {
- super(message);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpClientFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpClientFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpClientFactory.java
deleted file mode 100644
index 53d4a5b..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpClientFactory.java
+++ /dev/null
@@ -1,30 +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 com.msopentech.odatajclient.engine.client.http;
-
-import java.net.URI;
-import org.apache.http.client.HttpClient;
-
-/**
- * Interface used by ODataRequest implementations to instantiate HttpClient.
- */
-public interface HttpClientFactory {
-
- HttpClient createHttpClient(HttpMethod method, URI uri);
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpMerge.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpMerge.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpMerge.java
deleted file mode 100644
index 0ce7fd9..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpMerge.java
+++ /dev/null
@@ -1,70 +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 com.msopentech.odatajclient.engine.client.http;
-
-import java.net.URI;
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
-
-/**
- * Class identifying MERGE HTTP method.
- */
-@NotThreadSafe
-public class HttpMerge extends HttpEntityEnclosingRequestBase {
-
- public final static String METHOD_NAME = "MERGE";
-
- /**
- * Constructor.
- */
- public HttpMerge() {
- super();
- }
-
- /**
- * Constructor.
- *
- * @param uri request URI.
- */
- public HttpMerge(final URI uri) {
- super();
- setURI(uri);
- }
-
- /**
- * Constructor.
- *
- * @param uri request URI.
- * @throws IllegalArgumentException if the uri is invalid.
- */
- public HttpMerge(final String uri) {
- super();
- setURI(URI.create(uri));
- }
-
- /**
- * Gets HTTP method name.
- *
- * @return HTTP method name.
- */
- @Override
- public String getMethod() {
- return METHOD_NAME;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpMethod.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpMethod.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpMethod.java
deleted file mode 100644
index 1dde334..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpMethod.java
+++ /dev/null
@@ -1,33 +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 com.msopentech.odatajclient.engine.client.http;
-
-/**
- * Supported HTTP methods.
- */
-public enum HttpMethod {
-
- GET,
- POST,
- PUT,
- PATCH,
- MERGE,
- DELETE;
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpPatch.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpPatch.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpPatch.java
deleted file mode 100644
index 13bb077..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpPatch.java
+++ /dev/null
@@ -1,70 +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 com.msopentech.odatajclient.engine.client.http;
-
-import java.net.URI;
-import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
-
-/**
- * Class identifying PATCH HTTP method.
- */
-@NotThreadSafe
-public class HttpPatch extends HttpEntityEnclosingRequestBase {
-
- public final static String METHOD_NAME = "PATCH";
-
- /**
- * Constructor.
- */
- public HttpPatch() {
- super();
- }
-
- /**
- * Constructor.
- *
- * @param uri request URI.
- */
- public HttpPatch(final URI uri) {
- super();
- setURI(uri);
- }
-
- /**
- * Constructor.
- *
- * @param uri request URI.
- * @throws IllegalArgumentException if the uri is invalid.
- */
- public HttpPatch(final String uri) {
- super();
- setURI(URI.create(uri));
- }
-
- /**
- * Gets HTTP method name.
- *
- * @return HTTP method name.
- */
- @Override
- public String getMethod() {
- return METHOD_NAME;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpUriRequestFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpUriRequestFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpUriRequestFactory.java
deleted file mode 100644
index d28ba13..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/HttpUriRequestFactory.java
+++ /dev/null
@@ -1,30 +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 com.msopentech.odatajclient.engine.client.http;
-
-import java.net.URI;
-import org.apache.http.client.methods.HttpUriRequest;
-
-/**
- * Interface used by ODataRequest implementations to create the HttpUriRequest.
- */
-public interface HttpUriRequestFactory {
-
- HttpUriRequest createHttpUriRequest(HttpMethod method, URI uri);
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/NoContentException.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/NoContentException.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/NoContentException.java
deleted file mode 100644
index 0501f83..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/client/http/NoContentException.java
+++ /dev/null
@@ -1,36 +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 com.msopentech.odatajclient.engine.client.http;
-
-import org.apache.http.HttpStatus;
-
-/**
- * Exception to be thrown when trying to read content with HTTP status 204.
- */
-public class NoContentException extends HttpClientException {
-
- private static final long serialVersionUID = 7947066635285809192L;
-
- /**
- * Constructs a new client-side runtime exception, with fixed message.
- */
- public NoContentException() {
- super("No content found when HTTP status is " + HttpStatus.SC_NO_CONTENT);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/ODataClientErrorException.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/ODataClientErrorException.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/ODataClientErrorException.java
deleted file mode 100644
index b26d9a4..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/ODataClientErrorException.java
+++ /dev/null
@@ -1,110 +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 com.msopentech.odatajclient.engine.communication;
-
-import com.msopentech.odatajclient.engine.data.ODataError;
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.Collections;
-import java.util.List;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.http.StatusLine;
-
-/**
- * Represents a client error in OData.
- *
- * @see ODataError
- */
-public class ODataClientErrorException extends RuntimeException {
-
- private static final long serialVersionUID = -2551523202755268162L;
-
- private final StatusLine statusLine;
-
- private final ODataError error;
-
- /**
- * Constructor.
- *
- * @param statusLine request status info.
- */
- public ODataClientErrorException(final StatusLine statusLine) {
- super(statusLine.toString());
-
- this.statusLine = statusLine;
- this.error = null;
- }
-
- /**
- * Constructor.
- *
- * @param statusLine request status info.
- * @param error OData error to be wrapped.
- */
- public ODataClientErrorException(final StatusLine statusLine, final ODataError error) {
- super((StringUtils.isBlank(error.getCode()) ? StringUtils.EMPTY : "(" + error.getCode() + ") ")
- + error.getMessageValue() + " [" + statusLine.toString() + "]");
-
- this.statusLine = statusLine;
- this.error = error;
-
- if (this.error.getInnerErrorType() != null && this.error.getInnerErrorMessage() != null) {
- final RuntimeException cause =
- new RuntimeException(this.error.getInnerErrorType() + ": " + this.error.getInnerErrorMessage());
-
- if (this.error.getInnerErrorStacktrace() != null) {
- List<String> stLines;
- try {
- stLines = IOUtils.readLines(new StringReader(this.error.getInnerErrorStacktrace()));
- } catch (IOException e) {
- stLines = Collections.<String>emptyList();
- }
- StackTraceElement[] stElements = new StackTraceElement[stLines.size()];
- for (int i = 0; i < stLines.size(); i++) {
- final String stLine = stLines.get(i).substring(stLines.get(i).indexOf("at ") + 3);
- final int lastDotPos = stLine.lastIndexOf('.');
- stElements[i] = new StackTraceElement(
- stLine.substring(0, lastDotPos), stLine.substring(lastDotPos + 1), null, 0);
- }
- cause.setStackTrace(stElements);
- }
-
- initCause(cause);
- }
- }
-
- /**
- * Gets request status info.
- *
- * @return request status info.
- */
- public StatusLine getStatusLine() {
- return statusLine;
- }
-
- /**
- * Gets OData error.
- *
- * @return OData error.
- */
- public ODataError getODataError() {
- return error;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/ODataServerErrorException.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/ODataServerErrorException.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/ODataServerErrorException.java
deleted file mode 100644
index df5ca57..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/ODataServerErrorException.java
+++ /dev/null
@@ -1,38 +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 com.msopentech.odatajclient.engine.communication;
-
-import org.apache.http.StatusLine;
-
-/**
- * Represents a server error in OData.
- */
-public class ODataServerErrorException extends RuntimeException {
-
- private static final long serialVersionUID = -6423014532618680135L;
-
- /**
- * Constructor.
- *
- * @param statusLine request status info.
- */
- public ODataServerErrorException(final StatusLine statusLine) {
- super(statusLine.toString());
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/header/ODataHeaderValues.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/header/ODataHeaderValues.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/header/ODataHeaderValues.java
deleted file mode 100644
index b449e40..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/header/ODataHeaderValues.java
+++ /dev/null
@@ -1,45 +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 com.msopentech.odatajclient.engine.communication.header;
-
-/**
- * Constant header values class.
- */
-public class ODataHeaderValues {
-
- /**
- * <code>Prefer</code> header, return content.
- *
- * @see ODataHeaders.HeaderName#prefer
- */
- public static final String preferReturnContent = "return-content";
-
- /**
- * <code>Prefer</code> header, return no content.
- *
- * @see ODataHeaders.HeaderName#prefer
- */
- public static final String preferReturnNoContent = "return-no-content";
-
- /**
- * @see ODataHeaders.HeaderName#dataServiceUrlConventions
- */
- public static final String keyAsSegment = "KeyAsSegment";
-
-}
[17/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/it/primitiveKeysService/pom.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/it/primitiveKeysService/pom.xml b/ODataJClient/maven-plugin/src/it/primitiveKeysService/pom.xml
deleted file mode 100644
index 996663b..0000000
--- a/ODataJClient/maven-plugin/src/it/primitiveKeysService/pom.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-maven-plugin</artifactId>
- <version>@project.version@</version>
-
- <description>A simple IT verifying the basic use case.</description>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>@velocity.version@</version>
- </dependency>
-
- <dependency>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-proxy</artifactId>
- <version>@project.version@</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
- <executions>
- <execution>
- <phase>process-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${project.build.directory}/generated-sources</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>@project.groupId@</groupId>
- <artifactId>@project.artifactId@</artifactId>
- <version>@project.version@</version>
- <executions>
- <execution>
- <configuration>
- <outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
- <serviceRootURL>@serviceRootURL@/PrimitiveKeys.svc</serviceRootURL>
- <basePackage>com.msopentech.odatajclient.proxy.primitivekeysservice</basePackage>
- </configuration>
- <id>pojosV3</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>pojosV3</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/it/primitiveKeysService/verify.groovy
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/it/primitiveKeysService/verify.groovy b/ODataJClient/maven-plugin/src/it/primitiveKeysService/verify.groovy
deleted file mode 100644
index a19cf4d..0000000
--- a/ODataJClient/maven-plugin/src/it/primitiveKeysService/verify.groovy
+++ /dev/null
@@ -1,20 +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.
- */
-File basepkg = new File( basedir, "target/generated-sources/ojc-plugin/com/msopentech/odatajclient/proxy" );
-assert basepkg.isDirectory() && basepkg.listFiles().length>0;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/it/settings.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/it/settings.xml b/ODataJClient/maven-plugin/src/it/settings.xml
deleted file mode 100644
index 894ce18..0000000
--- a/ODataJClient/maven-plugin/src/it/settings.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<settings>
- <profiles>
- <profile>
- <id>it-repo</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <repositories>
- <repository>
- <id>local.central</id>
- <url>@localRepositoryUrl@</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>local.central</id>
- <url>@localRepositoryUrl@</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
- </profile>
- </profiles>
-</settings>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/it/staticServiceV3/pom.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/it/staticServiceV3/pom.xml b/ODataJClient/maven-plugin/src/it/staticServiceV3/pom.xml
deleted file mode 100644
index fdcdee2..0000000
--- a/ODataJClient/maven-plugin/src/it/staticServiceV3/pom.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-maven-plugin</artifactId>
- <version>@project.version@</version>
-
- <description>A simple IT verifying the basic use case.</description>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>@velocity.version@</version>
- </dependency>
-
- <dependency>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-proxy</artifactId>
- <version>@project.version@</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
- <executions>
- <execution>
- <phase>process-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${project.build.directory}/generated-sources</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>@project.groupId@</groupId>
- <artifactId>@project.artifactId@</artifactId>
- <version>@project.version@</version>
- <executions>
- <execution>
- <configuration>
- <outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
- <serviceRootURL>http://localhost:9080/StaticService/V3/Static.svc</serviceRootURL>
- <basePackage>com.msopentech.odatajclient.proxy.staticservice</basePackage>
- </configuration>
- <id>pojosV3</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>pojosV3</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/it/staticServiceV3/verify.groovy
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/it/staticServiceV3/verify.groovy b/ODataJClient/maven-plugin/src/it/staticServiceV3/verify.groovy
deleted file mode 100644
index a19cf4d..0000000
--- a/ODataJClient/maven-plugin/src/it/staticServiceV3/verify.groovy
+++ /dev/null
@@ -1,20 +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.
- */
-File basepkg = new File( basedir, "target/generated-sources/ojc-plugin/com/msopentech/odatajclient/proxy" );
-assert basepkg.isDirectory() && basepkg.listFiles().length>0;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/it/staticServiceV4/pom.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/it/staticServiceV4/pom.xml b/ODataJClient/maven-plugin/src/it/staticServiceV4/pom.xml
deleted file mode 100644
index 60a1e2c..0000000
--- a/ODataJClient/maven-plugin/src/it/staticServiceV4/pom.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-maven-plugin</artifactId>
- <version>@project.version@</version>
-
- <description>A simple IT verifying the basic use case.</description>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>@velocity.version@</version>
- </dependency>
-
- <dependency>
- <groupId>com.msopentech.odatajclient</groupId>
- <artifactId>odatajclient-proxy</artifactId>
- <version>@project.version@</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
- <executions>
- <execution>
- <phase>process-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${project.build.directory}/generated-sources</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>@project.groupId@</groupId>
- <artifactId>@project.artifactId@</artifactId>
- <version>@project.version@</version>
- <executions>
- <execution>
- <configuration>
- <outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
- <serviceRootURL>http://localhost:9080/StaticService/V4/Static.svc</serviceRootURL>
- <basePackage>com.msopentech.odatajclient.proxy.staticservice</basePackage>
- </configuration>
- <id>pojosV3</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>pojosV4</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/it/staticServiceV4/verify.groovy
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/it/staticServiceV4/verify.groovy b/ODataJClient/maven-plugin/src/it/staticServiceV4/verify.groovy
deleted file mode 100644
index a19cf4d..0000000
--- a/ODataJClient/maven-plugin/src/it/staticServiceV4/verify.groovy
+++ /dev/null
@@ -1,20 +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.
- */
-File basepkg = new File( basedir, "target/generated-sources/ojc-plugin/com/msopentech/odatajclient/proxy" );
-assert basepkg.isDirectory() && basepkg.listFiles().length>0;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/java/com/msopentech/odatajclient/plugin/AbstractMetadataMojo.java
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/java/com/msopentech/odatajclient/plugin/AbstractMetadataMojo.java b/ODataJClient/maven-plugin/src/main/java/com/msopentech/odatajclient/plugin/AbstractMetadataMojo.java
deleted file mode 100644
index 64715f2..0000000
--- a/ODataJClient/maven-plugin/src/main/java/com/msopentech/odatajclient/plugin/AbstractMetadataMojo.java
+++ /dev/null
@@ -1,161 +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 com.msopentech.odatajclient.plugin;
-
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.Parameter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.Velocity;
-
-public abstract class AbstractMetadataMojo extends AbstractMojo {
-
- /**
- * Generated files base root.
- */
- @Parameter(property = "outputDirectory", required = true)
- protected String outputDirectory;
-
- /**
- * OData service root URL.
- */
- @Parameter(property = "serviceRootURL", required = true)
- protected String serviceRootURL;
-
- /**
- * Base package.
- */
- @Parameter(property = "basePackage", required = true)
- protected String basePackage;
-
- protected final Set<String> namespaces = new HashSet<String>();
-
- protected static String TOOL_DIR = "ojc-plugin";
-
- protected AbstractUtility utility;
-
- protected abstract AbstractUtility getUtility();
-
- protected abstract String getVersion();
-
- protected File mkdir(final String path) {
- final File dir = new File(outputDirectory + File.separator + TOOL_DIR + File.separator + path);
-
- if (dir.exists()) {
- if (!dir.isDirectory()) {
- throw new IllegalArgumentException("Invalid path '" + path + "': it is not a directory");
- }
- } else {
- dir.mkdirs();
- }
-
- return dir;
- }
-
- protected File mkPkgDir(final String path) {
- return mkdir(basePackage.replace('.', File.separatorChar) + File.separator + path);
- }
-
- protected void writeFile(final String name, final File path, final VelocityContext ctx, final Template template,
- final boolean append) throws MojoExecutionException {
-
- if (!path.exists()) {
- throw new IllegalArgumentException("Invalid base path '" + path.getAbsolutePath() + "'");
- }
-
- FileWriter writer = null;
- try {
- final File toBeWritten = new File(path, name);
- if (!append && toBeWritten.exists()) {
- throw new IllegalStateException("File '" + toBeWritten.getAbsolutePath() + "' already exists");
- }
- writer = new FileWriter(toBeWritten, append);
- template.merge(ctx, writer);
- } catch (IOException e) {
- throw new MojoExecutionException("Error creating file '" + name + "'", e);
- } finally {
- IOUtils.closeQuietly(writer);
- }
- }
-
- protected VelocityContext newContext() {
-
- final VelocityContext ctx = new VelocityContext();
-
- ctx.put("utility", getUtility());
- ctx.put("basePackage", basePackage);
- ctx.put("schemaName", getUtility().getSchemaName());
- ctx.put("namespace", getUtility().getNamespace());
- ctx.put("namespaces", namespaces);
- ctx.put("odataVersion", getVersion());
-
- return ctx;
- }
-
- protected void parseObj(final File base, final String pkg, final String name, final String out)
- throws MojoExecutionException {
-
- parseObj(base, false, pkg, name, out, Collections.<String, Object>emptyMap());
- }
-
- protected void parseObj(
- final File base,
- final String pkg,
- final String name,
- final String out,
- final Map<String, Object> objs)
- throws MojoExecutionException {
-
- parseObj(base, false, pkg, name, out, objs);
- }
-
- protected void parseObj(
- final File base,
- final boolean append,
- final String pkg,
- final String name,
- final String out,
- final Map<String, Object> objs)
- throws MojoExecutionException {
-
- final VelocityContext ctx = newContext();
- ctx.put("package", pkg);
-
- if (objs != null) {
- for (Map.Entry<String, Object> obj : objs.entrySet()) {
- if (StringUtils.isNotBlank(obj.getKey()) && obj.getValue() != null) {
- ctx.put(obj.getKey(), obj.getValue());
- }
- }
- }
-
- final Template template = Velocity.getTemplate(name + ".vm");
- writeFile(out, base, ctx, template, append);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/java/com/msopentech/odatajclient/plugin/AbstractUtility.java
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/java/com/msopentech/odatajclient/plugin/AbstractUtility.java b/ODataJClient/maven-plugin/src/main/java/com/msopentech/odatajclient/plugin/AbstractUtility.java
deleted file mode 100644
index 9397f1e..0000000
--- a/ODataJClient/maven-plugin/src/main/java/com/msopentech/odatajclient/plugin/AbstractUtility.java
+++ /dev/null
@@ -1,292 +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 com.msopentech.odatajclient.plugin;
-
-import com.msopentech.odatajclient.engine.utils.NavigationPropertyBindingDetails;
-import com.msopentech.odatajclient.engine.metadata.AbstractEdmMetadata;
-import com.msopentech.odatajclient.engine.metadata.EdmType;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntityContainer;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntitySet;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntityType;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractNavigationProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractSchema;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.engine.metadata.edm.PropertyRef;
-import com.msopentech.odatajclient.engine.utils.MetadataUtils;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import org.apache.commons.lang.StringUtils;
-
-public abstract class AbstractUtility {
-
- protected static final String FC_TARGET_PATH = "fcTargetPath";
-
- protected static final String FC_SOURCE_PATH = "fcSourcePath";
-
- protected static final String FC_KEEP_IN_CONTENT = "fcKeepInContent";
-
- protected static final String FC_CONTENT_KIND = "fcContentKind";
-
- protected static final String FC_NS_PREFIX = "fcNSPrefix";
-
- protected static final String FC_NS_URI = "fcNSURI";
-
- protected static final String TYPE_SUB_PKG = "types";
-
- protected final String basePackage;
-
- protected final String schemaName;
-
- protected final String namespace;
-
- protected final Map<String, List<AbstractEntityType>> allEntityTypes =
- new HashMap<String, List<AbstractEntityType>>();
-
- public AbstractUtility(final String namespace, final String schemaName, final String basePackage) {
- this.basePackage = basePackage;
- this.schemaName = schemaName == null ? getNameFromNS(namespace) : schemaName;
- this.namespace = namespace;
- }
-
- public abstract EdmType getEdmType(
- final AbstractEdmMetadata<?, ?, ?, ?, ?, ?, ?> metadata, final String expression);
-
- protected abstract AbstractEdmMetadata<?, ?, ?, ?, ?, ?, ?> getMetadata();
-
- protected abstract AbstractSchema<?, ?, ?, ?> getSchema();
-
- protected void collectEntityTypes() {
- for (AbstractSchema<?, ?, ?, ?> _schema : getMetadata().getSchemas()) {
- allEntityTypes.put(_schema.getNamespace(), new ArrayList<AbstractEntityType>(_schema.getEntityTypes()));
- if (StringUtils.isNotBlank(_schema.getAlias())) {
- allEntityTypes.put(_schema.getAlias(), new ArrayList<AbstractEntityType>(_schema.getEntityTypes()));
- }
- }
- }
-
- public String getJavaType(final String typeExpression) {
- final StringBuilder res = new StringBuilder();
-
- final EdmType edmType = getEdmType(getMetadata(), typeExpression);
-
- if (edmType.isCollection() && !edmType.isEntityType()) {
- res.append("Collection<");
- }
-
- if ("Edm.Stream".equals(typeExpression)) {
- res.append(InputStream.class.getName());
- } else if (edmType.isSimpleType()) {
- res.append(edmType.getSimpleType().javaType().getSimpleName());
- } else if (edmType.isComplexType()) {
- res.append(basePackage).append('.').append(edmType.getNamespaceOrAlias().toLowerCase()).append('.').
- append(TYPE_SUB_PKG).append('.').append(capitalize(edmType.getComplexType().getName()));
- } else if (edmType.isEntityType()) {
- res.append(basePackage).append('.').append(edmType.getNamespaceOrAlias().toLowerCase()).append('.').
- append(TYPE_SUB_PKG).append('.').append(capitalize(edmType.getEntityType().getName()));
- } else if (edmType.isEnumType()) {
- res.append(basePackage).append('.').append(edmType.getNamespaceOrAlias().toLowerCase()).
- append('.').append(TYPE_SUB_PKG).append('.').append(capitalize(edmType.getEnumType().getName()));
- } else {
- throw new IllegalArgumentException("Invalid type expression '" + typeExpression + "'");
- }
-
- if (edmType.isCollection()) {
- if (edmType.isEntityType()) {
- res.append("Collection");
- } else {
- res.append(">");
- }
- }
-
- return res.toString();
- }
-
- public EdmSimpleType getEdmSimpleType(final String expression) {
- return EdmSimpleType.fromValue(expression);
- }
-
- public EdmType getEdmType(final AbstractEntitySet entitySet) {
- return getEdmType(getMetadata(), entitySet.getEntityType());
- }
-
- public Map<String, String> getEntityKeyType(final AbstractEntitySet entitySet) {
- return getEntityKeyType(getEdmType(entitySet).getEntityType());
- }
-
- public Map<String, String> getEntityKeyType(final AbstractEntityType entityType) {
- AbstractEntityType baseType = entityType;
- while (baseType.getKey() == null && baseType.getBaseType() != null) {
- baseType = getEdmType(getMetadata(), baseType.getBaseType()).getEntityType();
- }
-
- final List<String> properties = new ArrayList<String>();
- for (PropertyRef pref : baseType.getKey().getPropertyRefs()) {
- properties.add(pref.getName());
- }
- final Map<String, String> res = new HashMap<String, String>();
-
- for (AbstractProperty prop : baseType.getProperties()) {
- if (properties.contains(prop.getName())) {
- res.put(prop.getName(), getJavaType(prop.getType()));
- }
- }
- return res;
- }
-
- public final String getNameInNamespace(final String name) {
- return getSchema().getNamespace() + "." + name;
- }
-
- public final String getNameInNamespace(final EdmType entityType) {
- return entityType.getNamespaceOrAlias() + "." + entityType.getEntityType().getName();
- }
-
- public boolean isSameType(
- final String entityTypeExpression, final String fullTypeExpression, final boolean collection) {
-
- final Set<String> types = new HashSet<String>(2);
-
- types.add((collection ? "Collection(" : StringUtils.EMPTY)
- + getNameInNamespace(entityTypeExpression)
- + (collection ? ")" : StringUtils.EMPTY));
- if (StringUtils.isNotBlank(getSchema().getAlias())) {
- types.add((collection ? "Collection(" : StringUtils.EMPTY)
- + getSchema().getAlias() + "." + entityTypeExpression
- + (collection ? ")" : StringUtils.EMPTY));
- }
-
- return types.contains(fullTypeExpression);
- }
-
- private void populateDescendants(final EdmType base, final List<String> descendants) {
- for (Map.Entry<String, List<AbstractEntityType>> entry : allEntityTypes.entrySet()) {
- for (AbstractEntityType type : entry.getValue()) {
- if (StringUtils.isNotBlank(type.getBaseType())
- && base.getEntityType().getName().equals(getNameFromNS(type.getBaseType()))) {
-
- final EdmType entityType = getEdmType(getMetadata(), entry.getKey() + "." + type.getName());
-
- descendants.add(getNameInNamespace(entityType));
- populateDescendants(entityType, descendants);
- }
- }
- }
- }
-
- public List<String> getDescendantsOrSelf(final EdmType entityType) {
- final List<String> descendants = new ArrayList<String>();
-
- descendants.add(getNameInNamespace(entityType));
- populateDescendants(entityType, descendants);
-
- return descendants;
- }
-
- public String getBasePackage() {
- return basePackage;
- }
-
- public String getSchemaName() {
- return schemaName;
- }
-
- public String getNamespace() {
- return namespace;
- }
-
- public String capitalize(final String str) {
- return StringUtils.capitalize(str);
- }
-
- public String uncapitalize(final String str) {
- return StringUtils.uncapitalize(str);
- }
-
- public Map<String, String> getFcProperties(final AbstractProperty property) {
- final Map<String, String> fcProps = new HashMap<String, String>();
-
- if (StringUtils.isNotBlank(property.getFcTargetPath())) {
- fcProps.put(FC_TARGET_PATH, property.getFcTargetPath());
- }
- if (StringUtils.isNotBlank(property.getFcSourcePath())) {
- fcProps.put(FC_SOURCE_PATH, property.getFcSourcePath());
- }
- if (StringUtils.isNotBlank(property.getFcNSPrefix())) {
- fcProps.put(FC_NS_PREFIX, property.getFcNSPrefix());
- }
- if (StringUtils.isNotBlank(property.getFcNSURI())) {
- fcProps.put(FC_NS_URI, property.getFcNSURI());
- }
- fcProps.put(FC_CONTENT_KIND, property.getFcContentKind().name());
- fcProps.put(FC_KEEP_IN_CONTENT, Boolean.toString(property.isFcKeepInContent()));
-
- return fcProps;
- }
-
- public final String getNameFromNS(final String ns) {
- return getNameFromNS(ns, false);
- }
-
- public final String getNameFromNS(final String ns, final boolean toLowerCase) {
- String res = null;
-
- if (StringUtils.isNotBlank(ns)) {
- final int lastpt = ns.lastIndexOf('.');
- res = ns.substring(lastpt < 0 ? 0 : lastpt + 1);
- res = toLowerCase ? res.toLowerCase() : res;
- }
-
- return res;
- }
-
- protected NavigationPropertyBindingDetails getNavigationBindingDetails(
- final AbstractNavigationProperty property,
- final String targetPath,
- final AbstractSchema<?, ?, ?, ?> bindingInfoSchema,
- final AbstractEntityContainer<?> bindingInfoContainer) {
-
- final String[] target = targetPath.split("/");
- final AbstractEntityContainer<?> targetContainer;
- final AbstractSchema<?, ?, ?, ?> targetSchema;
- final AbstractEntitySet targetES;
-
- if (target.length > 1) {
- int lastDot = target[0].lastIndexOf(".");
- final String targetSchemaNamespace = target[0].substring(0, lastDot);
- final String containerName = target[0].substring(lastDot + 1);
-
- targetSchema = MetadataUtils.getSchemaByNamespaceOrAlias(getMetadata(), targetSchemaNamespace);
- targetContainer = MetadataUtils.getContainerByName(targetSchema, containerName);
- targetES = MetadataUtils.getEntitySet(targetContainer, target[1]);
- } else {
- targetContainer = bindingInfoContainer;
- targetSchema = bindingInfoSchema;
- targetES = MetadataUtils.getEntitySet(targetContainer, target[0]);
- }
- return new NavigationPropertyBindingDetails(property, targetES, targetContainer, targetSchema);
- }
-
- public abstract String getNavigationType(final AbstractNavigationProperty property);
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/java/com/msopentech/odatajclient/plugin/V3MetadataMojo.java
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/java/com/msopentech/odatajclient/plugin/V3MetadataMojo.java b/ODataJClient/maven-plugin/src/main/java/com/msopentech/odatajclient/plugin/V3MetadataMojo.java
deleted file mode 100644
index fc26577..0000000
--- a/ODataJClient/maven-plugin/src/main/java/com/msopentech/odatajclient/plugin/V3MetadataMojo.java
+++ /dev/null
@@ -1,189 +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 com.msopentech.odatajclient.plugin;
-
-import com.msopentech.odatajclient.engine.client.ODataClientFactory;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataV3MetadataRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.metadata.EdmV3Metadata;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ComplexType;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.EntityContainer;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.EntitySet;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.EntityType;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.EnumType;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.Schema;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
-import org.apache.maven.plugins.annotations.Mojo;
-import java.io.File;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import org.apache.velocity.app.Velocity;
-import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
-
-/**
- * POJOs generator.
- */
-@Mojo(name = "pojosV3", defaultPhase = LifecyclePhase.PROCESS_SOURCES)
-public class V3MetadataMojo extends AbstractMetadataMojo {
-
- @Override
- protected V3Utility getUtility() {
- return (V3Utility) utility;
- }
-
- @Override
- protected String getVersion() {
- return ODataVersion.V3.name().toLowerCase();
- }
-
- @Override
- public void execute() throws MojoExecutionException {
- if (new File(outputDirectory + File.separator + TOOL_DIR).exists()) {
- getLog().info("Nothing to do because " + TOOL_DIR + " directory already exists. Clean to update.");
- return;
- }
-
- try {
- Velocity.addProperty(Velocity.RESOURCE_LOADER, "class");
- Velocity.addProperty("class.resource.loader.class", ClasspathResourceLoader.class.getName());
-
- final ODataV3MetadataRequest req = ODataClientFactory.getV3().
- getRetrieveRequestFactory().getMetadataRequest(serviceRootURL);
-
- final ODataRetrieveResponse<EdmV3Metadata> res = req.execute();
- final EdmV3Metadata metadata = res.getBody();
-
- if (metadata == null) {
- throw new IllegalStateException("Metadata not found");
- }
-
- for (Schema schema : metadata.getSchemas()) {
- namespaces.add(schema.getNamespace().toLowerCase());
- }
-
- final Set<String> complexTypeNames = new HashSet<String>();
- final File services = mkdir("META-INF/services");
-
- for (Schema schema : metadata.getSchemas()) {
- utility = new V3Utility(metadata, schema, basePackage);
-
- // write package-info for the base package
- final String schemaPath = utility.getNamespace().toLowerCase().replace('.', File.separatorChar);
- final File base = mkPkgDir(schemaPath);
- final String pkg = basePackage + "." + utility.getNamespace().toLowerCase();
- parseObj(base, pkg, "package-info", "package-info.java");
-
- // write package-info for types package
- final File typesBaseDir = mkPkgDir(schemaPath + "/types");
- final String typesPkg = pkg + ".types";
- parseObj(typesBaseDir, typesPkg, "package-info", "package-info.java");
-
- final Map<String, Object> objs = new HashMap<String, Object>();
-
- // write types into types package
- for (EnumType enumType : schema.getEnumTypes()) {
- final String className = utility.capitalize(enumType.getName());
- complexTypeNames.add(typesPkg + "." + className);
- objs.clear();
- objs.put("enumType", enumType);
- parseObj(typesBaseDir, typesPkg, "enumType", className + ".java", objs);
- }
-
- for (ComplexType complex : schema.getComplexTypes()) {
- final String className = utility.capitalize(complex.getName());
- complexTypeNames.add(typesPkg + "." + className);
- objs.clear();
- objs.put("complexType", complex);
- parseObj(typesBaseDir, typesPkg, "complexType", className + ".java", objs);
- }
-
- for (EntityType entity : schema.getEntityTypes()) {
- objs.clear();
- objs.put("entityType", entity);
-
- final Map<String, String> keys;
-
- EntityType baseType = null;
- if (entity.getBaseType() == null) {
- keys = getUtility().getEntityKeyType(entity);
- } else {
- baseType = schema.getEntityType(utility.getNameFromNS(entity.getBaseType()));
- objs.put("baseType", getUtility().getJavaType(entity.getBaseType()));
- while (baseType.getBaseType() != null) {
- baseType = schema.getEntityType(utility.getNameFromNS(baseType.getBaseType()));
- }
- keys = getUtility().getEntityKeyType(baseType);
- }
-
- if (keys.size() > 1) {
- // create compound key class
- final String keyClassName = utility.capitalize(baseType == null
- ? entity.getName()
- : baseType.getName()) + "Key";
- objs.put("keyRef", keyClassName);
-
- if (entity.getBaseType() == null) {
- objs.put("keys", keys);
- parseObj(typesBaseDir, typesPkg, "entityTypeKey", keyClassName + ".java", objs);
- }
- }
-
- parseObj(typesBaseDir, typesPkg, "entityType",
- utility.capitalize(entity.getName()) + ".java", objs);
- parseObj(typesBaseDir, typesPkg, "entityCollection",
- utility.capitalize(entity.getName()) + "Collection.java", objs);
- }
-
- // write container and top entity sets into the base package
- for (EntityContainer container : schema.getEntityContainers()) {
- objs.clear();
- objs.put("container", container);
- parseObj(base, pkg, "container",
- utility.capitalize(container.getName()) + ".java", objs);
-
- for (EntitySet entitySet : container.getEntitySets()) {
- objs.clear();
- objs.put("entitySet", entitySet);
- parseObj(base, pkg, "entitySet",
- utility.capitalize(entitySet.getName()) + ".java", objs);
- }
- }
-
- parseObj(services, true, null, "services", "com.msopentech.odatajclient.proxy.api.AbstractComplexType",
- Collections.singletonMap("services", (Object) complexTypeNames));
- }
- } catch (Throwable t) {
- final StringWriter stringWriter = new StringWriter();
- final PrintWriter printWriter = new PrintWriter(stringWriter);
- t.printStackTrace(printWriter);
- getLog().error(stringWriter.toString());
-
- throw (t instanceof MojoExecutionException)
- ? (MojoExecutionException) t
- : new MojoExecutionException("While executin mojo", t);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/java/com/msopentech/odatajclient/plugin/V3Utility.java
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/java/com/msopentech/odatajclient/plugin/V3Utility.java b/ODataJClient/maven-plugin/src/main/java/com/msopentech/odatajclient/plugin/V3Utility.java
deleted file mode 100644
index f4aaca1..0000000
--- a/ODataJClient/maven-plugin/src/main/java/com/msopentech/odatajclient/plugin/V3Utility.java
+++ /dev/null
@@ -1,123 +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 com.msopentech.odatajclient.plugin;
-
-import com.msopentech.odatajclient.engine.utils.NavigationPropertyBindingDetails;
-import com.msopentech.odatajclient.engine.metadata.AbstractEdmMetadata;
-import com.msopentech.odatajclient.engine.metadata.EdmType;
-import com.msopentech.odatajclient.engine.metadata.EdmV3Metadata;
-import com.msopentech.odatajclient.engine.metadata.EdmV3Type;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractNavigationProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.Association;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.AssociationEnd;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.EntityContainer;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.FunctionImport;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.NavigationProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.Schema;
-import com.msopentech.odatajclient.engine.utils.AssociationSetBindingDetails;
-import com.msopentech.odatajclient.engine.utils.MetadataUtils;
-import java.util.ArrayList;
-import java.util.List;
-
-public class V3Utility extends AbstractUtility {
-
- private final EdmV3Metadata metadata;
-
- private final Schema schema;
-
- public V3Utility(final EdmV3Metadata metadata, final Schema schema, final String basePackage) {
- super(schema.getNamespace(), schema.getAlias(), basePackage);
- this.metadata = metadata;
- this.schema = schema;
-
- collectEntityTypes();
- }
-
- @Override
- public EdmType getEdmType(final AbstractEdmMetadata<?, ?, ?, ?, ?, ?, ?> metadata, final String expression) {
- return new EdmV3Type((EdmV3Metadata) metadata, expression);
- }
-
- @Override
- protected EdmV3Metadata getMetadata() {
- return metadata;
- }
-
- @Override
- protected Schema getSchema() {
- return schema;
- }
-
- @Override
- public String getNavigationType(final AbstractNavigationProperty property) {
- final NavigationProperty navigationProperty = (NavigationProperty) property;
-
- final String name = getNameFromNS(navigationProperty.getRelationship());
- final Association association = schema.getAssociation(name);
- if (association != null) {
- for (AssociationEnd end : association.getEnds()) {
- if (end.getRole().equalsIgnoreCase(navigationProperty.getToRole())) {
- return "*".equals(end.getMultiplicity())
- ? "Collection(" + end.getType() + ")"
- : end.getType();
- }
- }
- }
-
- return navigationProperty.getToRole();
- }
-
- public NavigationPropertyBindingDetails getNavigationBindingDetails(final AbstractNavigationProperty property) {
- final NavigationProperty navProperty = (NavigationProperty) property;
-
- // 1) get association
- final Association association = MetadataUtils.getAssociation(schema, navProperty.getRelationship());
-
- // 2) get schema, entity container and association set
- final AssociationSetBindingDetails associationSetDetails =
- MetadataUtils.getAssociationSetBindingDetails(association, schema.getNamespace(), metadata);
-
- // 3) get navigation property binding details
- return getNavigationBindingDetails(
- property,
- MetadataUtils.getEntitySetName(associationSetDetails.getAssociationSet(), navProperty.getToRole()),
- associationSetDetails.getSchema(),
- associationSetDetails.getContainer());
- }
-
- public List<FunctionImport> getFunctionImportsBoundTo(
- final String typeExpression, final boolean collection) {
-
- final List<FunctionImport> result = new ArrayList<FunctionImport>();
-
- for (EntityContainer entityContainer : schema.getEntityContainers()) {
- for (FunctionImport functionImport : entityContainer.getFunctionImports()) {
- if (functionImport.isBindable()) {
- for (int i = 0; i < functionImport.getParameters().size(); i++) {
- if (isSameType(typeExpression, functionImport.getParameters().get(i).getType(), collection)) {
- result.add(functionImport);
- }
- }
- }
- }
- }
-
- return result;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/java/com/msopentech/odatajclient/plugin/V4MetadataMojo.java
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/java/com/msopentech/odatajclient/plugin/V4MetadataMojo.java b/ODataJClient/maven-plugin/src/main/java/com/msopentech/odatajclient/plugin/V4MetadataMojo.java
deleted file mode 100644
index 911cdb2..0000000
--- a/ODataJClient/maven-plugin/src/main/java/com/msopentech/odatajclient/plugin/V4MetadataMojo.java
+++ /dev/null
@@ -1,197 +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 com.msopentech.odatajclient.plugin;
-
-import com.msopentech.odatajclient.engine.client.ODataClientFactory;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataV4MetadataRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.metadata.EdmV4Metadata;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.ComplexType;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.EntityContainer;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.EntitySet;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.EntityType;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.EnumType;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Schema;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Singleton;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugins.annotations.LifecyclePhase;
-import org.apache.maven.plugins.annotations.Mojo;
-import java.io.File;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import org.apache.velocity.app.Velocity;
-import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
-
-/**
- * POJOs generator.
- */
-@Mojo(name = "pojosV4", defaultPhase = LifecyclePhase.PROCESS_SOURCES)
-public class V4MetadataMojo extends AbstractMetadataMojo {
-
- @Override
- protected V4Utility getUtility() {
- return (V4Utility) utility;
- }
-
- @Override
- protected String getVersion() {
- return ODataVersion.V4.name().toLowerCase();
- }
-
- @Override
- public void execute() throws MojoExecutionException {
- if (new File(outputDirectory + File.separator + TOOL_DIR).exists()) {
- getLog().info("Nothing to do because " + TOOL_DIR + " directory already exists. Clean to update.");
- return;
- }
-
- try {
- Velocity.addProperty(Velocity.RESOURCE_LOADER, "class");
- Velocity.addProperty("class.resource.loader.class", ClasspathResourceLoader.class.getName());
-
- final ODataV4MetadataRequest req = ODataClientFactory.getV4().
- getRetrieveRequestFactory().getMetadataRequest(serviceRootURL);
-
- final ODataRetrieveResponse<EdmV4Metadata> res = req.execute();
- final EdmV4Metadata metadata = res.getBody();
-
- if (metadata == null) {
- throw new IllegalStateException("Metadata not found");
- }
-
- for (Schema schema : metadata.getSchemas()) {
- namespaces.add(schema.getNamespace().toLowerCase());
- }
-
- final Set<String> complexTypeNames = new HashSet<String>();
- final File services = mkdir("META-INF/services");
-
- for (Schema schema : metadata.getSchemas()) {
- utility = new V4Utility(metadata, schema, basePackage);
-
- // write package-info for the base package
- final String schemaPath = utility.getNamespace().toLowerCase().replace('.', File.separatorChar);
- final File base = mkPkgDir(schemaPath);
- final String pkg = basePackage + "." + utility.getNamespace().toLowerCase();
- parseObj(base, pkg, "package-info", "package-info.java");
-
- // write package-info for types package
- final File typesBaseDir = mkPkgDir(schemaPath + "/types");
- final String typesPkg = pkg + ".types";
- parseObj(typesBaseDir, typesPkg, "package-info", "package-info.java");
-
- final Map<String, Object> objs = new HashMap<String, Object>();
-
- // write types into types package
- for (EnumType enumType : schema.getEnumTypes()) {
- final String className = utility.capitalize(enumType.getName());
- complexTypeNames.add(typesPkg + "." + className);
- objs.clear();
- objs.put("enumType", enumType);
- parseObj(typesBaseDir, typesPkg, "enumType", className + ".java", objs);
- }
-
- for (ComplexType complex : schema.getComplexTypes()) {
- final String className = utility.capitalize(complex.getName());
- complexTypeNames.add(typesPkg + "." + className);
- objs.clear();
- objs.put("complexType", complex);
- parseObj(typesBaseDir, typesPkg, "complexType", className + ".java", objs);
- }
-
- for (EntityType entity : schema.getEntityTypes()) {
- objs.clear();
- objs.put("entityType", entity);
-
- final Map<String, String> keys;
-
- EntityType baseType = null;
- if (entity.getBaseType() == null) {
- keys = getUtility().getEntityKeyType(entity);
- } else {
- baseType = schema.getEntityType(utility.getNameFromNS(entity.getBaseType()));
- objs.put("baseType", getUtility().getJavaType(entity.getBaseType()));
- while (baseType.getBaseType() != null) {
- baseType = schema.getEntityType(utility.getNameFromNS(baseType.getBaseType()));
- }
- keys = getUtility().getEntityKeyType(baseType);
- }
-
- if (keys.size() > 1) {
- // create compound key class
- final String keyClassName = utility.capitalize(baseType == null
- ? entity.getName()
- : baseType.getName()) + "Key";
- objs.put("keyRef", keyClassName);
-
- if (entity.getBaseType() == null) {
- objs.put("keys", keys);
- parseObj(typesBaseDir, typesPkg, "entityTypeKey", keyClassName + ".java", objs);
- }
- }
-
- parseObj(typesBaseDir, typesPkg, "entityType",
- utility.capitalize(entity.getName()) + ".java", objs);
- parseObj(typesBaseDir, typesPkg, "entityCollection",
- utility.capitalize(entity.getName()) + "Collection.java", objs);
- }
-
- // write container and top entity sets into the base package
- for (EntityContainer container : schema.getEntityContainers()) {
- objs.clear();
- objs.put("container", container);
- parseObj(base, pkg, "container",
- utility.capitalize(container.getName()) + ".java", objs);
-
- for (EntitySet entitySet : container.getEntitySets()) {
- objs.clear();
- objs.put("entitySet", entitySet);
- parseObj(base, pkg, "entitySet",
- utility.capitalize(entitySet.getName()) + ".java", objs);
- }
-
- for (Singleton singleton : container.getSingletons()) {
- objs.clear();
- objs.put("singleton", singleton);
- parseObj(base, pkg, "singleton",
- utility.capitalize(singleton.getName()) + ".java", objs);
- }
- }
-
- parseObj(services, true, null, "services", "com.msopentech.odatajclient.proxy.api.AbstractComplexType",
- Collections.singletonMap("services", (Object) complexTypeNames));
- }
- } catch (Throwable t) {
- final StringWriter stringWriter = new StringWriter();
- final PrintWriter printWriter = new PrintWriter(stringWriter);
- t.printStackTrace(printWriter);
- getLog().error(stringWriter.toString());
-
- throw (t instanceof MojoExecutionException)
- ? (MojoExecutionException) t
- : new MojoExecutionException("While executin mojo", t);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/java/com/msopentech/odatajclient/plugin/V4Utility.java
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/java/com/msopentech/odatajclient/plugin/V4Utility.java b/ODataJClient/maven-plugin/src/main/java/com/msopentech/odatajclient/plugin/V4Utility.java
deleted file mode 100644
index 01482bd..0000000
--- a/ODataJClient/maven-plugin/src/main/java/com/msopentech/odatajclient/plugin/V4Utility.java
+++ /dev/null
@@ -1,191 +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 com.msopentech.odatajclient.plugin;
-
-import com.msopentech.odatajclient.engine.metadata.AbstractEdmMetadata;
-import com.msopentech.odatajclient.engine.metadata.EdmType;
-import com.msopentech.odatajclient.engine.metadata.EdmV4Metadata;
-import com.msopentech.odatajclient.engine.metadata.EdmV4Type;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntityContainer;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntitySet;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractNavigationProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractSchema;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Action;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.EntitySet;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Function;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.NavigationProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.NavigationPropertyBinding;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Schema;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Singleton;
-import com.msopentech.odatajclient.engine.utils.MetadataUtils;
-import com.msopentech.odatajclient.engine.utils.NavigationPropertyBindingDetails;
-import com.msopentech.odatajclient.engine.utils.QualifiedName;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-public class V4Utility extends AbstractUtility {
-
- private final EdmV4Metadata metadata;
-
- private final Schema schema;
-
- public V4Utility(final EdmV4Metadata metadata, final Schema schema, final String basePackage) {
- super(schema.getNamespace(), schema.getAlias(), basePackage);
- this.metadata = metadata;
- this.schema = schema;
-
- collectEntityTypes();
- }
-
- @Override
- public EdmType getEdmType(final AbstractEdmMetadata<?, ?, ?, ?, ?, ?, ?> metadata, final String expression) {
- return new EdmV4Type((EdmV4Metadata) metadata, expression);
- }
-
- public EdmType getEdmType(final Singleton singleton) {
- return getEdmType(getMetadata(), singleton.getType());
- }
-
- public Map<String, String> getEntityKeyType(final Singleton singleton) {
- return getEntityKeyType(getEdmType(metadata, singleton.getType()).getEntityType());
- }
-
- @Override
- protected EdmV4Metadata getMetadata() {
- return metadata;
- }
-
- @Override
- protected Schema getSchema() {
- return schema;
- }
-
- @Override
- public String getNavigationType(final AbstractNavigationProperty property) {
- return ((NavigationProperty) property).getType();
- }
-
- public NavigationPropertyBindingDetails getNavigationBindingDetails(
- final String sourceEntityType, final AbstractNavigationProperty property) {
-
- NavigationPropertyBindingDetails bindingDetails = null;
- final List<Schema> schemas = getMetadata().getSchemas();
- for (int i = 0; bindingDetails == null && i < schemas.size(); i++) {
- final Schema sc = schemas.get(i);
- if (sc.getEntityContainer() != null) {
- bindingDetails = getNavigationBindingDetails(sc, sourceEntityType, property);
- }
- }
- return bindingDetails;
- }
-
- public Function getFunctionByName(final String name) {
- final QualifiedName qname = new QualifiedName(name);
-
- final Schema targetSchema =
- (Schema) MetadataUtils.getSchemaByNamespaceOrAlias(metadata, qname.getNamespace());
-
- if (targetSchema != null) {
- for (Function function : targetSchema.getFunctions()) {
- if (function.getName().equals(qname.getName())) {
- return function;
- }
- }
- }
-
- return null;
- }
-
- public Action getActionByName(final String name) {
- final QualifiedName qname = new QualifiedName(name);
-
- final Schema targetSchema =
- (Schema) MetadataUtils.getSchemaByNamespaceOrAlias(metadata, qname.getNamespace());
-
- if (targetSchema != null) {
- for (Action action : targetSchema.getActions()) {
- if (action.getName().equals(qname.getName())) {
- return action;
- }
- }
- }
-
- return null;
- }
-
- public List<Function> getFunctionsBoundTo(final String typeExpression, final boolean collection) {
-
- final List<Function> result = new ArrayList<Function>();
-
- for (Schema sch : getMetadata().getSchemas()) {
- for (Function function : sch.getFunctions()) {
- if (function.isBound()) {
- if (!function.getParameters().isEmpty() && isSameType(
- new QualifiedName(namespace, typeExpression).toString(),
- function.getParameters().get(0).getType(), collection)) {
- result.add(function);
- }
- }
- }
- }
-
- return result;
- }
-
- public List<Action> getActionsBoundTo(final String typeExpression, final boolean collection) {
-
- final List<Action> result = new ArrayList<Action>();
-
- for (Schema sch : getMetadata().getSchemas()) {
- for (Action action : sch.getActions()) {
- if (action.isBound()) {
- if (!action.getParameters().isEmpty()
- && isSameType(typeExpression, action.getParameters().get(0).getType(), collection)) {
- result.add(action);
- }
- }
- }
- }
-
- return result;
- }
-
- private NavigationPropertyBindingDetails getNavigationBindingDetails(
- final AbstractSchema<?, ?, ?, ?> schema,
- final String sourceEntityType,
- final AbstractNavigationProperty property) {
-
- for (AbstractEntityContainer<?> container : schema.getEntityContainers()) {
- for (AbstractEntitySet es : container.getEntitySets()) {
- if (es.getEntityType().equals(sourceEntityType)) {
- final NavigationPropertyBinding binding =
- MetadataUtils.getNavigationBindingByPath(((EntitySet) es).getNavigationPropertyBindings(),
- property.getName());
- if (binding != null) {
- return getNavigationBindingDetails(
- property, binding.getTarget(), schema, container);
- }
- }
- }
- }
-
- return null;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/resources/complexType.vm
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/resources/complexType.vm b/ODataJClient/maven-plugin/src/main/resources/complexType.vm
deleted file mode 100644
index ecb2c64..0000000
--- a/ODataJClient/maven-plugin/src/main/resources/complexType.vm
+++ /dev/null
@@ -1,63 +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 ${package};
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.ComplexType;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-#foreach($ns in $namespaces)
-import ${basePackage}.${ns}.*;
-import ${basePackage}.${ns}.types.*;
-#end
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-@Namespace("$namespace")
-@ComplexType("$complexType.Name")
-public class $utility.capitalize($complexType.Name) extends AbstractComplexType {
-
-#foreach ($property in $complexType.Properties)
- private $utility.getJavaType($property.Type) _$utility.uncapitalize($property.Name);
-
- @Property(name = "$property.Name", type = "$property.Type", nullable = $property.Nullable)
- public $utility.getJavaType($property.Type) get$utility.capitalize($property.Name)() {
- return _$utility.uncapitalize($property.Name);
- }
-
- public void set$utility.capitalize($property.Name)(final $utility.getJavaType($property.Type) _$utility.uncapitalize($property.Name)) {
- this._$utility.uncapitalize($property.Name) = _$utility.uncapitalize($property.Name);
- }
-#end
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/resources/container.vm
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/resources/container.vm b/ODataJClient/maven-plugin/src/main/resources/container.vm
deleted file mode 100644
index f918fe4..0000000
--- a/ODataJClient/maven-plugin/src/main/resources/container.vm
+++ /dev/null
@@ -1,67 +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.
- *#
-#set( $clsSuffix = ".class" )
-package ${package};
-
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityContainer;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractContainer;
-#foreach($ns in $namespaces)
-import ${basePackage}.${ns}.*;
-import ${basePackage}.${ns}.types.*;
-#end
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-@Namespace("$namespace")
-@EntityContainer(name = "$container.Name",
- isDefaultEntityContainer = $container.DefaultEntityContainer)
-public interface $utility.capitalize($container.Name) extends AbstractContainer {
-
-#foreach($entitySet in $container.EntitySets)
- $utility.capitalize($entitySet.Name) get$utility.capitalize($entitySet.Name)();
-
-#end
-
-#foreach($singleton in $container.Singletons)
- $utility.capitalize($singleton.Name) get$utility.capitalize($singleton.Name)();
-
-#end
-
-#parse( "${odataVersion}/container.vm" )
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/resources/entityCollection.vm
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/resources/entityCollection.vm b/ODataJClient/maven-plugin/src/main/resources/entityCollection.vm
deleted file mode 100644
index 55de790..0000000
--- a/ODataJClient/maven-plugin/src/main/resources/entityCollection.vm
+++ /dev/null
@@ -1,50 +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 ${package};
-
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-#foreach($ns in $namespaces)
-import ${basePackage}.${ns}.*;
-import ${basePackage}.${ns}.types.*;
-#end
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface $utility.capitalize($entityType.Name)Collection extends AbstractEntityCollection<$utility.capitalize($entityType.Name)> {
-#parse( "${odataVersion}/entityCollection.vm" )
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/maven-plugin/src/main/resources/entitySet.vm
----------------------------------------------------------------------
diff --git a/ODataJClient/maven-plugin/src/main/resources/entitySet.vm b/ODataJClient/maven-plugin/src/main/resources/entitySet.vm
deleted file mode 100644
index e2eb60c..0000000
--- a/ODataJClient/maven-plugin/src/main/resources/entitySet.vm
+++ /dev/null
@@ -1,65 +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 ${package};
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-#foreach($ns in $namespaces)
-import ${basePackage}.${ns}.*;
-import ${basePackage}.${ns}.types.*;
-#end
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-#set( $keys = $utility.getEntityKeyType($entitySet) )
-#if( $keys.size() > 1 )
- #set( $type = $utility.getEdmType($entitySet).EntityType.Name + "Key" )
-#elseif( $keys.size() == 1 )
- #set( $type = $keys.values().iterator().next() )
-#else
- #set( $type = "" )
-#end
-
-#parse( "${odataVersion}/entitySet.vm" )
-public interface $utility.capitalize($entitySet.Name) extends AbstractEntitySet<$utility.getJavaType($entitySet.EntityType), $type, $utility.getJavaType($entitySet.EntityType)Collection> {
-
-#foreach( $dos in $utility.getDescendantsOrSelf($utility.getEdmType($entitySet)) )
- #set( $djt = $utility.getJavaType($dos) )
- #set( $sIdx = $djt.lastIndexOf('.') + 1 )
- $djt new$djt.substring($sIdx)();
- ${djt}Collection new$djt.substring($sIdx)Collection();
-#end
-}
[03/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java
deleted file mode 100644
index 232d65d..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java
+++ /dev/null
@@ -1,163 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "Car",
- openType = false,
- hasStream = true,
- isAbstract = false,
- baseType = "")
-public interface Car extends Serializable {
-
-
-
- @Property(name = "Photo",
- type = "Edm.Stream",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public java.io.InputStream getPhoto();
-
- public void setPhoto(final java.io.InputStream _photo);
-
-
- @Property(name = "Video",
- type = "Edm.Stream",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public java.io.InputStream getVideo();
-
- public void setVideo(final java.io.InputStream _video);
-
- @Key
- @Property(name = "VIN",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getVIN();
-
- public void setVIN(final Integer _vIN);
-
-
- @Property(name = "Description",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getDescription();
-
- public void setDescription(final String _description);
-
-
-
-
-
- public void setStream(java.io.InputStream stream);
-
- public java.io.InputStream getStream();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java
deleted file mode 100644
index 9d2d535..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface CarCollection extends AbstractEntityCollection<Car> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java
deleted file mode 100644
index 2d6840d..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java
+++ /dev/null
@@ -1,79 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.ComplexType;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@ComplexType("ComplexToCategory")
-public class ComplexToCategory extends AbstractComplexType {
-
- private String _term;
-
- @Property(name = "Term", type = "Edm.String", nullable = true)
- public String getTerm() {
- return _term;
- }
-
- public void setTerm(final String _term) {
- this._term = _term;
- }
- private String _scheme;
-
- @Property(name = "Scheme", type = "Edm.String", nullable = true)
- public String getScheme() {
- return _scheme;
- }
-
- public void setScheme(final String _scheme) {
- this._scheme = _scheme;
- }
- private String _label;
-
- @Property(name = "Label", type = "Edm.String", nullable = true)
- public String getLabel() {
- return _label;
- }
-
- public void setLabel(final String _label) {
- this._label = _label;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java
deleted file mode 100644
index 9e42094..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java
+++ /dev/null
@@ -1,189 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.ComplexType;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@ComplexType("ComplexWithAllPrimitiveTypes")
-public class ComplexWithAllPrimitiveTypes extends AbstractComplexType {
-
- private byte[] _binary;
-
- @Property(name = "Binary", type = "Edm.Binary", nullable = true)
- public byte[] getBinary() {
- return _binary;
- }
-
- public void setBinary(final byte[] _binary) {
- this._binary = _binary;
- }
- private Boolean _boolean;
-
- @Property(name = "Boolean", type = "Edm.Boolean", nullable = false)
- public Boolean getBoolean() {
- return _boolean;
- }
-
- public void setBoolean(final Boolean _boolean) {
- this._boolean = _boolean;
- }
- private Integer _byte;
-
- @Property(name = "Byte", type = "Edm.Byte", nullable = false)
- public Integer getByte() {
- return _byte;
- }
-
- public void setByte(final Integer _byte) {
- this._byte = _byte;
- }
- private ODataTimestamp _dateTime;
-
- @Property(name = "DateTime", type = "Edm.DateTime", nullable = false)
- public ODataTimestamp getDateTime() {
- return _dateTime;
- }
-
- public void setDateTime(final ODataTimestamp _dateTime) {
- this._dateTime = _dateTime;
- }
- private BigDecimal _decimal;
-
- @Property(name = "Decimal", type = "Edm.Decimal", nullable = false)
- public BigDecimal getDecimal() {
- return _decimal;
- }
-
- public void setDecimal(final BigDecimal _decimal) {
- this._decimal = _decimal;
- }
- private Double _double;
-
- @Property(name = "Double", type = "Edm.Double", nullable = false)
- public Double getDouble() {
- return _double;
- }
-
- public void setDouble(final Double _double) {
- this._double = _double;
- }
- private Short _int16;
-
- @Property(name = "Int16", type = "Edm.Int16", nullable = false)
- public Short getInt16() {
- return _int16;
- }
-
- public void setInt16(final Short _int16) {
- this._int16 = _int16;
- }
- private Integer _int32;
-
- @Property(name = "Int32", type = "Edm.Int32", nullable = false)
- public Integer getInt32() {
- return _int32;
- }
-
- public void setInt32(final Integer _int32) {
- this._int32 = _int32;
- }
- private Long _int64;
-
- @Property(name = "Int64", type = "Edm.Int64", nullable = false)
- public Long getInt64() {
- return _int64;
- }
-
- public void setInt64(final Long _int64) {
- this._int64 = _int64;
- }
- private Byte _sByte;
-
- @Property(name = "SByte", type = "Edm.SByte", nullable = false)
- public Byte getSByte() {
- return _sByte;
- }
-
- public void setSByte(final Byte _sByte) {
- this._sByte = _sByte;
- }
- private String _string;
-
- @Property(name = "String", type = "Edm.String", nullable = true)
- public String getString() {
- return _string;
- }
-
- public void setString(final String _string) {
- this._string = _string;
- }
- private Float _single;
-
- @Property(name = "Single", type = "Edm.Single", nullable = false)
- public Float getSingle() {
- return _single;
- }
-
- public void setSingle(final Float _single) {
- this._single = _single;
- }
- private Point _geographyPoint;
-
- @Property(name = "GeographyPoint", type = "Edm.GeographyPoint", nullable = true)
- public Point getGeographyPoint() {
- return _geographyPoint;
- }
-
- public void setGeographyPoint(final Point _geographyPoint) {
- this._geographyPoint = _geographyPoint;
- }
- private Point _geometryPoint;
-
- @Property(name = "GeometryPoint", type = "Edm.GeometryPoint", nullable = true)
- public Point getGeometryPoint() {
- return _geometryPoint;
- }
-
- public void setGeometryPoint(final Point _geometryPoint) {
- this._geometryPoint = _geometryPoint;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java
deleted file mode 100644
index ad706f9..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java
+++ /dev/null
@@ -1,129 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "Computer",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface Computer extends Serializable {
-
-
- @Key
- @Property(name = "ComputerId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getComputerId();
-
- public void setComputerId(final Integer _computerId);
-
-
- @Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getName();
-
- public void setName(final String _name);
-
-
-
-
- @NavigationProperty(name = "ComputerDetail",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "ComputerDetail")
- public com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail getComputerDetail();
-
- public void setComputerDetail(final com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail _computerDetail);
-
-
- @Operation(name = "GetComputer" ,
- entitySet = Computer.class ,
- returnType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Computer")
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer getComputer(
- );
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java
deleted file mode 100644
index 8ee3f42..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface ComputerCollection extends AbstractEntityCollection<Computer> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java
deleted file mode 100644
index 38975ee..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java
+++ /dev/null
@@ -1,244 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "ComputerDetail",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface ComputerDetail extends Serializable {
-
-
- @Key
- @Property(name = "ComputerDetailId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getComputerDetailId();
-
- public void setComputerDetailId(final Integer _computerDetailId);
-
-
- @Property(name = "Manufacturer",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "SyndicationAuthorEmail",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getManufacturer();
-
- public void setManufacturer(final String _manufacturer);
-
-
- @Property(name = "Model",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "SyndicationAuthorUri",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getModel();
-
- public void setModel(final String _model);
-
-
- @Property(name = "Serial",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getSerial();
-
- public void setSerial(final String _serial);
-
-
- @Property(name = "SpecificationsBag",
- type = "Collection(Edm.String)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<String> getSpecificationsBag();
-
- public void setSpecificationsBag(final Collection<String> _specificationsBag);
-
-
- @Property(name = "PurchaseDate",
- type = "Edm.DateTime",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public ODataTimestamp getPurchaseDate();
-
- public void setPurchaseDate(final ODataTimestamp _purchaseDate);
-
-
- @Property(name = "Dimensions",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions getDimensions();
-
- public void setDimensions(final com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions _dimensions);
-
-
-
-
- @NavigationProperty(name = "Computer",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Computer",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Computer")
- public com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer getComputer();
-
- public void setComputer(final com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer _computer);
-
-
- @Operation(name = "ResetComputerDetailsSpecifications" )
- void resetComputerDetailsSpecifications(
- @Parameter(name = "specifications", type = "Collection(Edm.String)", nullable = false) Collection<String> specifications,
- @Parameter(name = "purchaseTime", type = "Edm.DateTime", nullable = false) ODataTimestamp purchaseTime
- );
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java
deleted file mode 100644
index ebedccf..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface ComputerDetailCollection extends AbstractEntityCollection<ComputerDetail> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java
deleted file mode 100644
index 92e03e6..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java
+++ /dev/null
@@ -1,69 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.ComplexType;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@ComplexType("ConcurrencyInfo")
-public class ConcurrencyInfo extends AbstractComplexType {
-
- private String _token;
-
- @Property(name = "Token", type = "Edm.String", nullable = true)
- public String getToken() {
- return _token;
- }
-
- public void setToken(final String _token) {
- this._token = _token;
- }
- private ODataTimestamp _queriedDateTime;
-
- @Property(name = "QueriedDateTime", type = "Edm.DateTime", nullable = true)
- public ODataTimestamp getQueriedDateTime() {
- return _queriedDateTime;
- }
-
- public void setQueriedDateTime(final ODataTimestamp _queriedDateTime) {
- this._queriedDateTime = _queriedDateTime;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java
deleted file mode 100644
index 896f28a..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java
+++ /dev/null
@@ -1,109 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.ComplexType;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@ComplexType("ContactDetails")
-public class ContactDetails extends AbstractComplexType {
-
- private Collection<String> _emailBag;
-
- @Property(name = "EmailBag", type = "Collection(Edm.String)", nullable = false)
- public Collection<String> getEmailBag() {
- return _emailBag;
- }
-
- public void setEmailBag(final Collection<String> _emailBag) {
- this._emailBag = _emailBag;
- }
- private Collection<String> _alternativeNames;
-
- @Property(name = "AlternativeNames", type = "Collection(Edm.String)", nullable = false)
- public Collection<String> getAlternativeNames() {
- return _alternativeNames;
- }
-
- public void setAlternativeNames(final Collection<String> _alternativeNames) {
- this._alternativeNames = _alternativeNames;
- }
- private com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Aliases _contactAlias;
-
- @Property(name = "ContactAlias", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases", nullable = true)
- public com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Aliases getContactAlias() {
- return _contactAlias;
- }
-
- public void setContactAlias(final com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Aliases _contactAlias) {
- this._contactAlias = _contactAlias;
- }
- private com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _homePhone;
-
- @Property(name = "HomePhone", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = true)
- public com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone getHomePhone() {
- return _homePhone;
- }
-
- public void setHomePhone(final com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _homePhone) {
- this._homePhone = _homePhone;
- }
- private com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _workPhone;
-
- @Property(name = "WorkPhone", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = true)
- public com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone getWorkPhone() {
- return _workPhone;
- }
-
- public void setWorkPhone(final com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _workPhone) {
- this._workPhone = _workPhone;
- }
- private Collection<com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone> _mobilePhoneBag;
-
- @Property(name = "MobilePhoneBag", type = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)", nullable = false)
- public Collection<com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone> getMobilePhoneBag() {
- return _mobilePhoneBag;
- }
-
- public void setMobilePhoneBag(final Collection<com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone> _mobilePhoneBag) {
- this._mobilePhoneBag = _mobilePhoneBag;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java
deleted file mode 100644
index 90561c8..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java
+++ /dev/null
@@ -1,160 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "Contractor",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface Contractor extends com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Person {
-
-
-
- @Property(name = "ContratorCompanyId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getContratorCompanyId();
-
- public void setContratorCompanyId(final Integer _contratorCompanyId);
-
-
- @Property(name = "BillingRate",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getBillingRate();
-
- public void setBillingRate(final Integer _billingRate);
-
-
- @Property(name = "TeamContactPersonId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getTeamContactPersonId();
-
- public void setTeamContactPersonId(final Integer _teamContactPersonId);
-
-
- @Property(name = "JobDescription",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getJobDescription();
-
- public void setJobDescription(final String _jobDescription);
-
-
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java
deleted file mode 100644
index 5969b53..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface ContractorCollection extends AbstractEntityCollection<Contractor> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java
deleted file mode 100644
index 0ff9eb2..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java
+++ /dev/null
@@ -1,279 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "Customer",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface Customer extends Serializable {
-
-
-
- @Property(name = "Thumbnail",
- type = "Edm.Stream",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public java.io.InputStream getThumbnail();
-
- public void setThumbnail(final java.io.InputStream _thumbnail);
-
-
- @Property(name = "Video",
- type = "Edm.Stream",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public java.io.InputStream getVideo();
-
- public void setVideo(final java.io.InputStream _video);
-
- @Key
- @Property(name = "CustomerId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getCustomerId();
-
- public void setCustomerId(final Integer _customerId);
-
-
- @Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "SyndicationSummary",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- public String getName();
-
- public void setName(final String _name);
-
-
- @Property(name = "PrimaryContactInfo",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails getPrimaryContactInfo();
-
- public void setPrimaryContactInfo(final com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails _primaryContactInfo);
-
-
- @Property(name = "BackupContactInfo",
- type = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails> getBackupContactInfo();
-
- public void setBackupContactInfo(final Collection<com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails> _backupContactInfo);
-
-
- @Property(name = "Auditing",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo getAuditing();
-
- public void setAuditing(final com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo _auditing);
-
-
-
-
- @NavigationProperty(name = "Orders",
- type = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Order)",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Order")
- public com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection getOrders();
-
- public void setOrders(final com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection _orders);
-
-
- @NavigationProperty(name = "Logins",
- type = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Login)",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Login")
- public com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection getLogins();
-
- public void setLogins(final com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection _logins);
-
-
- @NavigationProperty(name = "Husband",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Customer")
- public com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer getHusband();
-
- public void setHusband(final com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer _husband);
-
-
- @NavigationProperty(name = "Wife",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Customer")
- public com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer getWife();
-
- public void setWife(final com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer _wife);
-
-
- @NavigationProperty(name = "Info",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "CustomerInfo")
- public com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo getInfo();
-
- public void setInfo(final com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo _info);
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java
deleted file mode 100644
index f0f23f0..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface CustomerCollection extends AbstractEntityCollection<Customer> {
-
-}
[15/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/EntityContainerFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/EntityContainerFactory.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/EntityContainerFactory.java
deleted file mode 100644
index f2de747..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/EntityContainerFactory.java
+++ /dev/null
@@ -1,135 +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 com.msopentech.odatajclient.proxy.api;
-
-import com.msopentech.odatajclient.engine.client.Configuration;
-import com.msopentech.odatajclient.engine.client.ODataClientFactory;
-import com.msopentech.odatajclient.engine.client.ODataV3Client;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataV3MetadataRequest;
-import com.msopentech.odatajclient.proxy.api.context.Context;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.metadata.EdmV3Metadata;
-import com.msopentech.odatajclient.engine.uri.filter.FilterFactory;
-import com.msopentech.odatajclient.proxy.api.impl.EntityContainerInvocationHandler;
-import java.lang.reflect.Proxy;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import org.apache.commons.lang3.StringUtils;
-
-/**
- * Entry point for ODataJClient proxy mode, gives access to entity container instances.
- */
-public class EntityContainerFactory {
-
- private static final Object MONITOR = new Object();
-
- private static Context context = null;
-
- private static final Map<String, EntityContainerFactory> FACTORY_PER_SERVICEROOT =
- new ConcurrentHashMap<String, EntityContainerFactory>();
-
- private static final Map<Class<?>, Object> ENTITY_CONTAINERS =
- new ConcurrentHashMap<Class<?>, Object>();
-
- private final ODataV3Client client;
-
- private final String serviceRoot;
-
- private EdmV3Metadata metadata;
-
- public static Context getContext() {
- synchronized (MONITOR) {
- if (context == null) {
- context = new Context();
- }
- }
-
- return context;
- }
-
- private static EntityContainerFactory getInstance(final ODataV3Client client, final String serviceRoot) {
- if (!FACTORY_PER_SERVICEROOT.containsKey(serviceRoot)) {
- final EntityContainerFactory instance = new EntityContainerFactory(client, serviceRoot);
- FACTORY_PER_SERVICEROOT.put(serviceRoot, instance);
- }
- return FACTORY_PER_SERVICEROOT.get(serviceRoot);
- }
-
- public static EntityContainerFactory getV3Instance(final String serviceRoot) {
- return getInstance(ODataClientFactory.getV3(), serviceRoot);
- }
-
- private EntityContainerFactory(final ODataV3Client client, final String serviceRoot) {
- this.client = client;
- this.serviceRoot = serviceRoot;
- }
-
- public Configuration getConfiguration() {
- return client.getConfiguration();
- }
-
- public FilterFactory getFilterFactory() {
- return client.getFilterFactory();
- }
-
- public String getServiceRoot() {
- return serviceRoot;
- }
-
- public EdmV3Metadata getMetadata() {
- synchronized (this) {
- if (metadata == null) {
- final ODataV3MetadataRequest req = client.getRetrieveRequestFactory().getMetadataRequest(serviceRoot);
- final ODataRetrieveResponse<EdmV3Metadata> res = req.execute();
- metadata = res.getBody();
- if (metadata == null) {
- throw new IllegalStateException("No metadata found at URI '" + serviceRoot + "'");
- }
- }
- }
-
- return metadata;
- }
-
- /**
- * Return an initialized concrete implementation of the passed EntityContainer interface.
- *
- * @param <T> interface annotated as EntityContainer
- * @param reference class object of the EntityContainer annotated interface
- * @return an initialized concrete implementation of the passed reference
- * @throws IllegalStateException if <tt>serviceRoot</tt> was not set
- * @throws IllegalArgumentException if the passed reference is not an interface annotated as EntityContainer
- * @see com.msopentech.odatajclient.proxy.api.annotations.EntityContainer
- */
- @SuppressWarnings("unchecked")
- public <T> T getEntityContainer(final Class<T> reference) throws IllegalStateException, IllegalArgumentException {
- if (StringUtils.isBlank(serviceRoot)) {
- throw new IllegalStateException("serviceRoot was not set");
- }
-
- if (!ENTITY_CONTAINERS.containsKey(reference)) {
- final Object entityContainer = Proxy.newProxyInstance(
- Thread.currentThread().getContextClassLoader(),
- new Class<?>[] { reference },
- EntityContainerInvocationHandler.getInstance(client, reference, this));
- ENTITY_CONTAINERS.put(reference, entityContainer);
- }
- return (T) ENTITY_CONTAINERS.get(reference);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/NoResultException.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/NoResultException.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/NoResultException.java
deleted file mode 100644
index 52ab50b..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/NoResultException.java
+++ /dev/null
@@ -1,35 +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 com.msopentech.odatajclient.proxy.api;
-
-/**
- * Thrown when <tt>Query.getSingleResult()</tt> or <tt>EntityQuery.getSingleResult()</tt> is executed on a query
- * and there is no result to return.
- *
- * @see Query#getSingleResult()
- * @see EntityQuery#getSingleResult()
- */
-public class NoResultException extends RuntimeException {
-
- private static final long serialVersionUID = -6643642637364303053L;
-
- public NoResultException() {
- super();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/NonUniqueResultException.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/NonUniqueResultException.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/NonUniqueResultException.java
deleted file mode 100644
index 268e6e5..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/NonUniqueResultException.java
+++ /dev/null
@@ -1,35 +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 com.msopentech.odatajclient.proxy.api;
-
-/**
- * Thrown when <tt>Query.getSingleResult()</tt> or <tt>EntityQuery.getSingleResult()</tt> is executed on a query and
- * there is more than one result from the query.
- *
- * @see Query#getSingleResult()
- * @see EntityQuery#getSingleResult()
- */
-public class NonUniqueResultException extends RuntimeException {
-
- private static final long serialVersionUID = 4444551737338550185L;
-
- public NonUniqueResultException() {
- super();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/Query.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/Query.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/Query.java
deleted file mode 100644
index 54a6fa3..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/Query.java
+++ /dev/null
@@ -1,130 +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 com.msopentech.odatajclient.proxy.api;
-
-import com.msopentech.odatajclient.engine.uri.filter.ODataFilter;
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import java.io.Serializable;
-
-/**
- * Interface used to control query execution.
- *
- * @param <T> query result type
- */
-public interface Query<T extends Serializable, EC extends AbstractEntityCollection<T>> extends Serializable {
-
- /**
- * Sets the <tt>$filter</tt> expression for this query.
- * Any of available operators and functions can be embodied here.
- *
- * @param filter the <tt>$filter</tt> expression for this query
- * @return the same query instance
- */
- Query<T, EC> setFilter(String filter);
-
- /**
- * Sets the filter generating the <tt>$filter</tt> expression for this query.
- *
- * @param filter filter instance (to be obtained via <tt>ODataFilterFactory</tt>):
- * note that <tt>build()</tt> method will be immediately invoked.
- * @return the same query instance
- */
- Query<T, EC> setFilter(ODataFilter filter);
-
- /**
- * The <tt>$filter</tt> expression for this query.
- *
- * @return the <tt>$filter</tt> expression for this query
- */
- String getFilter();
-
- /**
- * Sets the <tt>$orderBy</tt> expression for this query via sort options.
- *
- * @param sort sort options
- * @return the same query instance
- */
- Query<T, EC> setOrderBy(Sort... sort);
-
- /**
- * Sets the <tt>$orderBy</tt> expression for this query.
- *
- * @param select the <tt>$orderBy</tt> expression for this query
- * @return the same query instance
- */
- Query<T, EC> setOrderBy(String orderBy);
-
- /**
- * The <tt>$orderBy</tt> expression for this query.
- *
- * @return the <tt>$orderBy</tt> expression for this query
- */
- String getOrderBy();
-
- /**
- * Sets the maximum number of results to retrieve (<tt>$top</tt>).
- *
- * @param maxResults maximum number of results to retrieve
- * @return the same query instance
- * @throws IllegalArgumentException if the argument is negative
- */
- Query<T, EC> setMaxResults(int maxResults) throws IllegalArgumentException;
-
- /**
- * The maximum number of results the query object was set to retrieve (<tt>$top</tt>).
- * Returns <tt>Integer.MAX_VALUE</tt> if setMaxResults was not applied to the query object.
- *
- * @return maximum number of results
- */
- int getMaxResults();
-
- /**
- * Sets the position of the first result to retrieve (<tt>$skip</tt>).
- *
- * @param firstResult position of the first result, numbered from 0
- * @return the same query instance
- * @throws IllegalArgumentException if the argument is negative
- */
- Query<T, EC> setFirstResult(int firstResult) throws IllegalArgumentException;
-
- /**
- * The position of the first result the query object was set to retrieve (<tt>$skip</tt>).
- *
- * Returns 0 if <tt>setFirstResult</tt> was not applied to the query object.
- *
- * @return position of the first result
- */
- int getFirstResult();
-
- /**
- * Executes a <tt>$filter</tt> query that returns a single result.
- *
- * @return the result
- * @throws NoResultException if there is no result
- * @throws NonUniqueResultException if more than one result
- */
- T getSingleResult() throws NoResultException, NonUniqueResultException;
-
- /**
- * Executes a <tt>$filter</tt> query and return the query results as collection.
- *
- * @return an iterable view of the results
- */
- EC getResult();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/Sort.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/Sort.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/Sort.java
deleted file mode 100644
index c2b0b27..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/Sort.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 com.msopentech.odatajclient.proxy.api;
-
-import java.util.Map;
-
-/**
- * Sort option for queries.
- */
-public class Sort implements Map.Entry<String, Sort.Direction> {
-
- /**
- * Enumeration for sort directions.
- */
- public enum Direction {
-
- ASC,
- DESC;
-
- @Override
- public String toString() {
- return name().toLowerCase();
- }
- }
-
- private final String key;
-
- private Direction value;
-
- public Sort(final String key, final Direction value) {
- this.key = key;
- this.value = value;
- }
-
- @Override
- public String getKey() {
- return this.key;
- }
-
- @Override
- public Direction getValue() {
- return this.value;
- }
-
- @Override
- public Direction setValue(final Direction value) {
- this.value = value;
- return this.value;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/ComplexType.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/ComplexType.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/ComplexType.java
deleted file mode 100644
index d06c731..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/ComplexType.java
+++ /dev/null
@@ -1,41 +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 com.msopentech.odatajclient.proxy.api.annotations;
-
-import java.io.Serializable;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark POJO as EDM complex type.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-@Inherited
-public @interface ComplexType {
-
- String value();
-
- Class<?> baseType() default Serializable.class;
-
- boolean isAbstract() default false;
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/CompoundKey.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/CompoundKey.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/CompoundKey.java
deleted file mode 100644
index 787b2b5..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/CompoundKey.java
+++ /dev/null
@@ -1,32 +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 com.msopentech.odatajclient.proxy.api.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Identifies a compound key.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface CompoundKey {
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/CompoundKeyElement.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/CompoundKeyElement.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/CompoundKeyElement.java
deleted file mode 100644
index ecf8abe..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/CompoundKeyElement.java
+++ /dev/null
@@ -1,38 +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 com.msopentech.odatajclient.proxy.api.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark multi key class field (property) as multi key element.
- *
- * @see Property
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-public @interface CompoundKeyElement {
-
- String name();
-
- int position();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/EntityContainer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/EntityContainer.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/EntityContainer.java
deleted file mode 100644
index 64f6af7..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/EntityContainer.java
+++ /dev/null
@@ -1,36 +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 com.msopentech.odatajclient.proxy.api.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark POJO as EDM entity container.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface EntityContainer {
-
- String name();
-
- boolean isDefaultEntityContainer() default false;
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/EntitySet.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/EntitySet.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/EntitySet.java
deleted file mode 100644
index 3e9252b..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/EntitySet.java
+++ /dev/null
@@ -1,38 +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 com.msopentech.odatajclient.proxy.api.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Give entity set a name.
- * If interface extending EntitySet is not annotated with this, the effective name will be class'
- * <tt>getSimpleName()</tt>.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface EntitySet {
-
- String name();
-
- boolean includeInServiceDocument() default true;
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/EntityType.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/EntityType.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/EntityType.java
deleted file mode 100644
index e49cdff..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/EntityType.java
+++ /dev/null
@@ -1,44 +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 com.msopentech.odatajclient.proxy.api.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark POJO as EDM entity type.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-@Inherited
-public @interface EntityType {
-
- String name();
-
- String baseType() default "";
-
- boolean isAbstract() default false;
-
- boolean openType() default false;
-
- boolean hasStream() default false;
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/EnumType.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/EnumType.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/EnumType.java
deleted file mode 100644
index 9957141..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/EnumType.java
+++ /dev/null
@@ -1,39 +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 com.msopentech.odatajclient.proxy.api.annotations;
-
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark Java enum as EDM enum type.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface EnumType {
-
- String name();
-
- EdmSimpleType underlyingType() default EdmSimpleType.Int32;
-
- boolean isFlags() default false;
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/Key.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/Key.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/Key.java
deleted file mode 100644
index bb0b5ac..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/Key.java
+++ /dev/null
@@ -1,34 +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 com.msopentech.odatajclient.proxy.api.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark POJO field (property) as key.
- *
- * @see Property
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-public @interface Key {
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/KeyClass.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/KeyClass.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/KeyClass.java
deleted file mode 100644
index ed97af3..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/KeyClass.java
+++ /dev/null
@@ -1,39 +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 com.msopentech.odatajclient.proxy.api.annotations;
-
-import java.io.Serializable;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Specifies a composite primary key class that is mapped to multiple fields or properties of an EntityType.
- * <p>The names of the fields or properties in the primary key class and the primary key fields or properties of the
- * EntityType must correspond and their types must be the same.</p>
- *
- * @see Key
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface KeyClass {
-
- Class<? extends Serializable> value();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/KeyRef.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/KeyRef.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/KeyRef.java
deleted file mode 100644
index 2051727..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/KeyRef.java
+++ /dev/null
@@ -1,34 +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 com.msopentech.odatajclient.proxy.api.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Identifies a compound key.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface KeyRef {
-
- Class<?> value();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/Namespace.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/Namespace.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/Namespace.java
deleted file mode 100644
index 012c8bd..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/Namespace.java
+++ /dev/null
@@ -1,36 +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 com.msopentech.odatajclient.proxy.api.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Associate Java package with OData namespace.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface Namespace {
-
- String value();
-
- String alias() default "";
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/NavigationProperty.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/NavigationProperty.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/NavigationProperty.java
deleted file mode 100644
index b3aa3dd..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/NavigationProperty.java
+++ /dev/null
@@ -1,42 +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 com.msopentech.odatajclient.proxy.api.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Bind POJO field to EDM navigation property.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-public @interface NavigationProperty {
-
- String name();
-
- String type();
-
- String targetSchema();
-
- String targetContainer();
-
- String targetEntitySet();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/Operation.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/Operation.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/Operation.java
deleted file mode 100644
index 1649728..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/Operation.java
+++ /dev/null
@@ -1,70 +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 com.msopentech.odatajclient.proxy.api.annotations;
-
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import java.io.Serializable;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark method as EDM function import.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-public @interface Operation {
-
- String name();
-
- /**
- * EntitySet and EntitySetPath are mutually exclusive.
- *
- * @return static EntitySet
- */
- Class<? extends Serializable> entitySet() default Serializable.class;
-
- /**
- * Defines the EntitySet that contains the entities that are returned by the Operation when
- * that EntitySet is dependent on one of the Operation parameters.
- *
- * @return EntitySet path, dependent on one of the Operation parameters
- * @see Parameter
- */
- String entitySetPath() default "";
-
- String returnType() default "";
-
- /**
- * When httpMethod() is NONE, true: this annotates an action; false: this annotates a function
- *
- * @return
- */
- boolean isSideEffecting() default true;
-
- boolean isComposable() default false;
-
- /**
- * if not NONE, this annotates a legacy service operation.
- *
- * @return
- */
- HttpMethod httpMethod() default HttpMethod.GET;
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/Parameter.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/Parameter.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/Parameter.java
deleted file mode 100644
index 59fd6ed..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/Parameter.java
+++ /dev/null
@@ -1,49 +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 com.msopentech.odatajclient.proxy.api.annotations;
-
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Function import parameter information.
- *
- * @see FunctionImport
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.PARAMETER)
-public @interface Parameter {
-
- String name();
-
- String type();
-
- boolean nullable() default true;
-
- ParameterMode mode() default ParameterMode.In;
-
- int maxLenght() default Integer.MAX_VALUE;
-
- int precision() default 0;
-
- int scale() default 0;
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/Property.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/Property.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/Property.java
deleted file mode 100644
index 201753d..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/Property.java
+++ /dev/null
@@ -1,76 +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 com.msopentech.odatajclient.proxy.api.annotations;
-
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.engine.metadata.edm.StoreGeneratedPattern;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Bind POJO field to EDM property.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-public @interface Property {
-
- String name();
-
- String type();
-
- boolean nullable() default true;
-
- String defaultValue() default "";
-
- int maxLenght() default Integer.MAX_VALUE;
-
- boolean fixedLenght() default false;
-
- int precision() default 0;
-
- int scale() default 0;
-
- boolean unicode() default true;
-
- String collation() default "";
-
- String srid() default "";
-
- ConcurrencyMode concurrencyMode() default ConcurrencyMode.None;
-
- String mimeType() default "";
-
- /* -- Feed Customization annotations -- */
- String fcSourcePath() default "";
-
- String fcTargetPath() default "";
-
- EdmContentKind fcContentKind() default EdmContentKind.text;
-
- String fcNSPrefix() default "";
-
- String fcNSURI() default "";
-
- boolean fcKeepInContent() default false;
-
- StoreGeneratedPattern storeGeneratedPattern() default StoreGeneratedPattern.None;
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/ReferentialConstraint.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/ReferentialConstraint.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/ReferentialConstraint.java
deleted file mode 100644
index 8e92874..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/ReferentialConstraint.java
+++ /dev/null
@@ -1,41 +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 com.msopentech.odatajclient.proxy.api.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotate navigation property with information about referential constraint.
- * @see NavigationProperty
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-public @interface ReferentialConstraint {
-
- Class<?> principalRole();
-
- String[] principalPropertyRefs();
-
- Class<?> dependentRole();
-
- String[] dependentPropertyRefs();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/RowType.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/RowType.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/RowType.java
deleted file mode 100644
index f370773..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/RowType.java
+++ /dev/null
@@ -1,32 +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 com.msopentech.odatajclient.proxy.api.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark inner class as EDM row type.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface RowType {
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/Singleton.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/Singleton.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/Singleton.java
deleted file mode 100644
index 69703e9..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/annotations/Singleton.java
+++ /dev/null
@@ -1,36 +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 com.msopentech.odatajclient.proxy.api.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Give singleton a name.
- * If interface extending Singleton is not annotated with this, the effective name will be class'
- * <tt>getSimpleName()</tt>.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface Singleton {
-
- String name();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/context/AttachedEntity.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/context/AttachedEntity.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/context/AttachedEntity.java
deleted file mode 100644
index eba5f3d..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/context/AttachedEntity.java
+++ /dev/null
@@ -1,42 +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 com.msopentech.odatajclient.proxy.api.context;
-
-import com.msopentech.odatajclient.proxy.api.context.AttachedEntityStatus;
-import com.msopentech.odatajclient.proxy.api.impl.EntityTypeInvocationHandler;
-
-public class AttachedEntity {
-
- private final EntityTypeInvocationHandler entity;
-
- private final AttachedEntityStatus status;
-
- public AttachedEntity(final EntityTypeInvocationHandler entity, final AttachedEntityStatus status) {
- this.entity = entity;
- this.status = status;
- }
-
- public EntityTypeInvocationHandler getEntity() {
- return entity;
- }
-
- public AttachedEntityStatus getStatus() {
- return status;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/context/AttachedEntityStatus.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/context/AttachedEntityStatus.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/context/AttachedEntityStatus.java
deleted file mode 100644
index 013dfe1..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/context/AttachedEntityStatus.java
+++ /dev/null
@@ -1,44 +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 com.msopentech.odatajclient.proxy.api.context;
-
-public enum AttachedEntityStatus {
-
- /**
- * Explicitely attached.
- */
- ATTACHED,
- /**
- * New object.
- */
- NEW,
- /**
- * Modified object.
- */
- CHANGED,
- /**
- * Deleted object.
- */
- DELETED,
- /**
- * Attached because explicitely liked to another object.
- */
- LINKED
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/context/Context.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/context/Context.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/context/Context.java
deleted file mode 100644
index ae7a561..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/context/Context.java
+++ /dev/null
@@ -1,37 +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 com.msopentech.odatajclient.proxy.api.context;
-
-public class Context {
-
- private final EntityContext entities;
-
- public Context() {
- this.entities = new EntityContext();
-
- }
-
- public EntityContext entityContext() {
- return entities;
- }
-
- public void detachAll() {
- entities.detachAll();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/context/EntityContext.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/context/EntityContext.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/context/EntityContext.java
deleted file mode 100644
index 1f38d11..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/context/EntityContext.java
+++ /dev/null
@@ -1,199 +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 com.msopentech.odatajclient.proxy.api.context;
-
-import com.msopentech.odatajclient.proxy.api.impl.EntityTypeInvocationHandler;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Entity context.
- */
-public class EntityContext implements Iterable<AttachedEntity> {
-
- /**
- * Attached entities with not null key.
- * <p>
- * This map have to be used to search for entities by key.
- */
- private final Map<EntityUUID, EntityTypeInvocationHandler> searchableEntities =
- new HashMap<EntityUUID, EntityTypeInvocationHandler>();
-
- /**
- * All attached entities (new entities included).
- * <p>
- * Attachment order will be maintained.
- */
- private final Map<EntityTypeInvocationHandler, AttachedEntityStatus> allAttachedEntities =
- new LinkedHashMap<EntityTypeInvocationHandler, AttachedEntityStatus>();
-
- /**
- * Attaches an entity with status <tt>NEW</tt>.
- * <p>
- * Use this method to attach a new created entity.
- *
- * @see AttachedEntityStatus
- * @param entity entity to be attached.
- */
- public void attachNew(final EntityTypeInvocationHandler entity) {
- if (allAttachedEntities.containsKey(entity)) {
- throw new IllegalStateException("An entity with the same key has already been attached");
- }
- allAttachedEntities.put(entity, AttachedEntityStatus.NEW);
- }
-
- /**
- * Attaches an existing entity with status <tt>ATTACHED</tt>.
- * <p>
- * Use this method to attach an existing entity.
- *
- * @see AttachedEntityStatus
- * @param entity entity to be attached.
- */
- public void attach(final EntityTypeInvocationHandler entity) {
- attach(entity, AttachedEntityStatus.ATTACHED);
- }
-
- /**
- * Attaches an entity with specified status.
- * <p>
- * Use this method to attach an existing entity.
- *
- * @see AttachedEntityStatus
- * @param entity entity to be attached.
- * @param status status.
- */
- public void attach(final EntityTypeInvocationHandler entity, final AttachedEntityStatus status) {
- if (isAttached(entity)) {
- throw new IllegalStateException("An entity with the same profile has already been attached");
- }
-
- allAttachedEntities.put(entity, status);
-
- if (entity.getUUID().getKey() != null) {
- searchableEntities.put(entity.getUUID(), entity);
- }
- }
-
- /**
- * Detaches entity.
- *
- * @param entity entity to be detached.
- */
- public void detach(final EntityTypeInvocationHandler entity) {
- if (searchableEntities.containsKey(entity.getUUID())) {
- searchableEntities.remove(entity.getUUID());
- }
- allAttachedEntities.remove(entity);
- }
-
- /**
- * Detaches all attached entities.
- * <p>
- * Use this method to clears the entity context.
- */
- public void detachAll() {
- allAttachedEntities.clear();
- searchableEntities.clear();
- }
-
- /**
- * Searches an entity with the specified key.
- *
- * @param uuid entity key.
- * @return retrieved entity.
- */
- public EntityTypeInvocationHandler getEntity(final EntityUUID uuid) {
- return searchableEntities.get(uuid);
- }
-
- /**
- * Gets entity status.
- *
- * @param entity entity to be retrieved.
- * @return attached entity status.
- */
- public AttachedEntityStatus getStatus(final EntityTypeInvocationHandler entity) {
- if (!isAttached(entity)) {
- throw new IllegalStateException("Entity is not in the context");
- }
-
- return allAttachedEntities.get(entity);
- }
-
- /**
- * Changes attached entity status.
- *
- * @param entity attached entity to be modified.
- * @param status new status.
- */
- public void setStatus(final EntityTypeInvocationHandler entity, final AttachedEntityStatus status) {
- if (!isAttached(entity)) {
- throw new IllegalStateException("Entity is not in the context");
- }
-
- final AttachedEntityStatus current = allAttachedEntities.get(entity);
-
- // Previously deleted object cannot be modified anymore.
- if (current == AttachedEntityStatus.DELETED) {
- throw new IllegalStateException("Entity has been previously deleted");
- }
-
- if (status == AttachedEntityStatus.NEW || status == AttachedEntityStatus.ATTACHED) {
- throw new IllegalStateException("Entity status has already been initialized");
- }
-
- if ((status == AttachedEntityStatus.LINKED && current == AttachedEntityStatus.ATTACHED)
- || (status == AttachedEntityStatus.CHANGED && current == AttachedEntityStatus.ATTACHED)
- || (status == AttachedEntityStatus.CHANGED && current == AttachedEntityStatus.LINKED)
- || (status == AttachedEntityStatus.DELETED)) {
- allAttachedEntities.put(entity, status);
- }
- }
-
- /**
- * Checks if an entity is already attached.
- *
- * @param entity entity.
- * @return <tt>true</tt> if is attached; <tt>false</tt> otherwise.
- */
- public boolean isAttached(final EntityTypeInvocationHandler entity) {
- return allAttachedEntities.containsKey(entity)
- || (entity.getUUID().getKey() != null && searchableEntities.containsKey(entity.getUUID()));
- }
-
- /**
- * Iterator.
- *
- * @return attached entities iterator.
- */
- @Override
- public Iterator<AttachedEntity> iterator() {
- final List<AttachedEntity> res = new ArrayList<AttachedEntity>();
- for (Map.Entry<EntityTypeInvocationHandler, AttachedEntityStatus> attachedEntity : allAttachedEntities.
- entrySet()) {
- res.add(new AttachedEntity(attachedEntity.getKey(), attachedEntity.getValue()));
- }
- return res.iterator();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/context/EntityLinkDesc.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/context/EntityLinkDesc.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/context/EntityLinkDesc.java
deleted file mode 100644
index 1dc4151..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/context/EntityLinkDesc.java
+++ /dev/null
@@ -1,104 +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 com.msopentech.odatajclient.proxy.api.context;
-
-import com.msopentech.odatajclient.engine.data.ODataLinkType;
-import com.msopentech.odatajclient.proxy.api.impl.EntityTypeInvocationHandler;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Collections;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-public class EntityLinkDesc implements Serializable {
-
- private static final long serialVersionUID = 704670372070370762L;
-
- private final String sourceName;
-
- private final EntityTypeInvocationHandler source;
-
- private final Collection<EntityTypeInvocationHandler> targets;
-
- private final ODataLinkType type;
-
- public EntityLinkDesc(
- final String sourceName,
- final EntityTypeInvocationHandler source,
- final Collection<EntityTypeInvocationHandler> target,
- final ODataLinkType type) {
- this.sourceName = sourceName;
- this.source = source;
- this.targets = target;
- this.type = type;
- }
-
- public EntityLinkDesc(
- final String sourceName,
- final EntityTypeInvocationHandler source,
- final EntityTypeInvocationHandler target,
- final ODataLinkType type) {
- this.sourceName = sourceName;
- this.source = source;
- this.targets = Collections.<EntityTypeInvocationHandler>singleton(target);
- this.type = type;
- }
-
- public String getSourceName() {
- return sourceName;
- }
-
- public EntityTypeInvocationHandler getSource() {
- return source;
- }
-
- public Collection<EntityTypeInvocationHandler> getTargets() {
- return targets;
- }
-
- public ODataLinkType getType() {
- return type;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public boolean equals(Object obj) {
- return EqualsBuilder.reflectionEquals(this, obj);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public int hashCode() {
- return HashCodeBuilder.reflectionHashCode(this);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/context/EntityUUID.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/context/EntityUUID.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/context/EntityUUID.java
deleted file mode 100644
index 5fc741a..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/context/EntityUUID.java
+++ /dev/null
@@ -1,109 +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 com.msopentech.odatajclient.proxy.api.context;
-
-import java.io.Serializable;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-
-public class EntityUUID implements Serializable {
-
- private static final long serialVersionUID = 4855025769803086495L;
-
- private final int tempKey;
-
- private final String schemaName;
-
- private final String containerName;
-
- private final String entitySetName;
-
- private final String name;
-
- private final Object key;
-
- public EntityUUID(
- final String schemaName,
- final String containerName,
- final String entitySetName,
- final String name) {
- this(schemaName, containerName, entitySetName, name, null);
- }
-
- public EntityUUID(
- final String schemaName,
- final String containerName,
- final String entitySetName,
- final String name,
- final Object key) {
- this.schemaName = schemaName;
- this.containerName = containerName;
- this.entitySetName = entitySetName;
- this.name = name;
- this.key = key;
- this.tempKey = (int) (Math.random() * 1000000);
- }
-
- public String getSchemaName() {
- return schemaName;
- }
-
- public String getContainerName() {
- return containerName;
- }
-
- public String getEntitySetName() {
- return entitySetName;
- }
-
- public String getName() {
- return name;
- }
-
- public Object getKey() {
- return key;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public boolean equals(Object obj) {
- return key == null
- ? EqualsBuilder.reflectionEquals(this, obj)
- : EqualsBuilder.reflectionEquals(this, obj, "tempKey");
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public int hashCode() {
- return HashCodeBuilder.reflectionHashCode(this, "tempKey");
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public String toString() {
- return schemaName + ":" + containerName + ":" + entitySetName + ":" + name
- + "(" + (key == null ? null : key.toString()) + ")";
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/AbstractInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/AbstractInvocationHandler.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/AbstractInvocationHandler.java
deleted file mode 100644
index f2ac2dd..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/AbstractInvocationHandler.java
+++ /dev/null
@@ -1,242 +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 com.msopentech.odatajclient.proxy.api.impl;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.client.ODataV3Client;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.data.ODataEntitySet;
-import com.msopentech.odatajclient.engine.data.ODataInvokeResult;
-import com.msopentech.odatajclient.engine.data.ODataProperty;
-import com.msopentech.odatajclient.engine.data.ODataValue;
-import com.msopentech.odatajclient.engine.metadata.EdmType;
-import com.msopentech.odatajclient.engine.metadata.EdmV3Type;
-import com.msopentech.odatajclient.proxy.api.EntityContainerFactory;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.proxy.utils.ClassUtils;
-import com.msopentech.odatajclient.proxy.utils.EngineUtils;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Proxy;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-abstract class AbstractInvocationHandler implements InvocationHandler {
-
- private static final long serialVersionUID = 358520026931462958L;
-
- protected final ODataV3Client client;
-
- protected EntityContainerInvocationHandler containerHandler;
-
- protected AbstractInvocationHandler(
- final ODataV3Client client, final EntityContainerInvocationHandler containerHandler) {
-
- this.client = client;
- this.containerHandler = containerHandler;
- }
-
- protected ODataV3Client getClient() {
- return client;
- }
-
- protected boolean isSelfMethod(final Method method, final Object[] args) {
- final Method[] selfMethods = getClass().getMethods();
-
- boolean result = false;
-
- for (int i = 0; i < selfMethods.length && !result; i++) {
- result = method.getName().equals(selfMethods[i].getName())
- && Arrays.equals(method.getParameterTypes(), selfMethods[i].getParameterTypes());
- }
-
- return result;
- }
-
- protected Object invokeSelfMethod(final Method method, final Object[] args)
- throws NoSuchMethodException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
- return getClass().getMethod(method.getName(), method.getParameterTypes()).invoke(this, args);
- }
-
- @SuppressWarnings({ "unchecked", "rawtypes" })
- protected Object getEntityCollection(
- final Class<?> typeRef,
- final Class<?> typeCollectionRef,
- final String entityContainerName,
- final ODataEntitySet entitySet,
- final URI uri,
- final boolean checkInTheContext) {
-
- final List<Object> items = new ArrayList<Object>();
-
- for (ODataEntity entityFromSet : entitySet.getEntities()) {
- items.add(getEntityProxy(
- entityFromSet, entityContainerName, entitySet.getName(), typeRef, checkInTheContext));
- }
-
- return Proxy.newProxyInstance(
- Thread.currentThread().getContextClassLoader(),
- new Class<?>[] { typeCollectionRef },
- new EntityCollectionInvocationHandler(containerHandler, items, typeRef, entityContainerName, uri));
- }
-
- protected <T> T getEntityProxy(
- final ODataEntity entity,
- final String entityContainerName,
- final String entitySetName,
- final Class<?> type,
- final boolean checkInTheContext) {
-
- return getEntityProxy(entity, entityContainerName, entitySetName, type, null, checkInTheContext);
- }
-
- @SuppressWarnings("unchecked")
- protected <T> T getEntityProxy(
- final ODataEntity entity,
- final String entityContainerName,
- final String entitySetName,
- final Class<?> type,
- final String eTag,
- final boolean checkInTheContext) {
-
- EntityTypeInvocationHandler handler = EntityTypeInvocationHandler.getInstance(
- entity, entityContainerName, entitySetName, type, containerHandler);
-
- if (StringUtils.isNotBlank(eTag)) {
- // override ETag into the wrapped object.
- handler.setETag(eTag);
- }
-
- if (checkInTheContext && EntityContainerFactory.getContext().entityContext().isAttached(handler)) {
- handler = EntityContainerFactory.getContext().entityContext().getEntity(handler.getUUID());
- }
-
- return (T) Proxy.newProxyInstance(
- Thread.currentThread().getContextClassLoader(),
- new Class<?>[] { type },
- handler);
- }
-
- protected Object functionImport(
- final Operation annotation, final Method method, final Object[] args, final URI target,
- final com.msopentech.odatajclient.engine.metadata.edm.v3.FunctionImport funcImp)
- throws InstantiationException, IllegalAccessException, NoSuchMethodException,
- IllegalArgumentException, InvocationTargetException {
-
- // 1. invoke params (if present)
- final Map<String, ODataValue> parameters = new HashMap<String, ODataValue>();
- if (!ArrayUtils.isEmpty(args)) {
- final Annotation[][] parAnnots = method.getParameterAnnotations();
- final Class<?>[] parTypes = method.getParameterTypes();
-
- for (int i = 0; i < args.length; i++) {
- if (!(parAnnots[i][0] instanceof Parameter)) {
- throw new IllegalArgumentException("Paramter " + i + " is not annotated as @Param");
- }
- final Parameter parAnnot = (Parameter) parAnnots[i][0];
-
- if (!parAnnot.nullable() && args[i] == null) {
- throw new IllegalArgumentException(
- "Parameter " + parAnnot.name() + " is not nullable but a null value was provided");
- }
-
- final ODataValue paramValue = args[i] == null
- ? null
- : EngineUtils.getODataValue(client, containerHandler.getFactory().getMetadata(),
- new EdmV3Type(containerHandler.getFactory().getMetadata(), parAnnot.type()), args[i]);
-
- parameters.put(parAnnot.name(), paramValue);
- }
- }
-
- // 2. IMPORTANT: flush any pending change *before* invoke if this operation is side effecting
- if (annotation.isSideEffecting()) {
- new Container(client, containerHandler.getFactory()).flush();
- }
-
- // 3. invoke
- final ODataInvokeResult result = client.getInvokeRequestFactory().getInvokeRequest(
- target, containerHandler.getFactory().getMetadata(), funcImp, parameters).execute().getBody();
-
- // 3. process invoke result
- if (StringUtils.isBlank(annotation.returnType())) {
- return ClassUtils.returnVoid();
- }
-
- final EdmType edmType = new EdmV3Type(containerHandler.getFactory().getMetadata(), annotation.returnType());
- if (edmType.isEnumType()) {
- throw new UnsupportedOperationException("Usupported enum type " + edmType.getTypeExpression());
- }
- if (edmType.isSimpleType() || edmType.isComplexType()) {
- return EngineUtils.getValueFromProperty(
- containerHandler.getFactory().getMetadata(), (ODataProperty) result, method.getGenericReturnType());
- }
- if (edmType.isEntityType()) {
- if (edmType.isCollection()) {
- final ParameterizedType collType = (ParameterizedType) method.getReturnType().getGenericInterfaces()[0];
- final Class<?> collItemType = (Class<?>) collType.getActualTypeArguments()[0];
- return getEntityCollection(
- collItemType,
- method.getReturnType(),
- null,
- (ODataEntitySet) result,
- target,
- false);
- } else {
- return getEntityProxy(
- (ODataEntity) result,
- null,
- null,
- method.getReturnType(),
- false);
- }
- }
-
- throw new IllegalArgumentException("Could not process the functionImport information");
- }
-
- @Override
- public boolean equals(final Object obj) {
- return EqualsBuilder.reflectionEquals(this, obj);
- }
-
- @Override
- public int hashCode() {
- return HashCodeBuilder.reflectionHashCode(this);
- }
-
- @Override
- public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/CompoundKeyElementWrapper.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/CompoundKeyElementWrapper.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/CompoundKeyElementWrapper.java
deleted file mode 100644
index 31cf958..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/CompoundKeyElementWrapper.java
+++ /dev/null
@@ -1,57 +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 com.msopentech.odatajclient.proxy.api.impl;
-
-import java.lang.reflect.Method;
-
-class CompoundKeyElementWrapper implements Comparable<CompoundKeyElementWrapper> {
-
- private final String name;
-
- private final Method method;
-
- private final int position;
-
- protected CompoundKeyElementWrapper(final String name, final Method method, final int position) {
- this.name = name;
- this.method = method;
- this.position = position;
- }
-
- public String getName() {
- return name;
- }
-
- public Method getMethod() {
- return method;
- }
-
- public int getPosition() {
- return position;
- }
-
- @Override
- public int compareTo(final CompoundKeyElementWrapper other) {
- if (other == null) {
- return 1;
- } else {
- return getPosition() > other.getPosition() ? 1 : getPosition() == other.getPosition() ? 0 : -1;
- }
- }
-}
[25/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v4/V4MetadataTest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v4/V4MetadataTest.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v4/V4MetadataTest.java
deleted file mode 100644
index 5cf3b41..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v4/V4MetadataTest.java
+++ /dev/null
@@ -1,259 +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 com.msopentech.odatajclient.engine.v4;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import com.msopentech.odatajclient.engine.AbstractTest;
-import com.msopentech.odatajclient.engine.client.ODataV4Client;
-import com.msopentech.odatajclient.engine.metadata.EdmV4Metadata;
-import com.msopentech.odatajclient.engine.metadata.EdmV4Type;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.engine.metadata.edm.StoreGeneratedPattern;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Action;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Annotation;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Annotations;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.ComplexType;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.EntityContainer;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.EntitySet;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.EntityType;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.EnumType;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Function;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.FunctionImport;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Schema;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Singleton;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.annotation.Apply;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.annotation.Collection;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.annotation.ConstExprConstruct;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.annotation.Path;
-import java.util.List;
-import org.junit.Test;
-
-public class V4MetadataTest extends AbstractTest {
-
- @Override
- protected ODataV4Client getClient() {
- return v4Client;
- }
-
- @Test
- public void parse() {
- final EdmV4Metadata metadata = getClient().getReader().
- readMetadata(getClass().getResourceAsStream("metadata.xml"));
- assertNotNull(metadata);
-
- // 1. Enum
- final EnumType responseEnumType = metadata.getSchema(0).getEnumType("ResponseType");
- assertNotNull(responseEnumType);
- assertEquals(6, responseEnumType.getMembers().size());
- assertEquals(3, responseEnumType.getMember("Accepted").getValue().intValue());
- assertEquals("Accepted", responseEnumType.getMember(3).getName());
-
- final EdmV4Type responseType = new EdmV4Type(metadata, "Microsoft.Exchange.Services.OData.Model.ResponseType");
- assertNotNull(responseType);
- assertFalse(responseType.isCollection());
- assertFalse(responseType.isSimpleType());
- assertTrue(responseType.isEnumType());
- assertFalse(responseType.isComplexType());
- assertFalse(responseType.isEntityType());
-
- // 2. Complex
- final ComplexType responseStatus = metadata.getSchema(0).getComplexType("ResponseStatus");
- assertNotNull(responseStatus);
- assertTrue(responseStatus.getNavigationProperties().isEmpty());
- assertEquals(EdmSimpleType.DateTimeOffset,
- EdmSimpleType.fromValue(responseStatus.getProperty("Time").getType()));
-
- // 3. Entity
- final EntityType user = metadata.getSchema(0).getEntityType("User");
- assertNotNull(user);
- assertEquals("Microsoft.Exchange.Services.OData.Model.Entity", user.getBaseType());
- assertFalse(user.getProperties().isEmpty());
- assertFalse(user.getNavigationProperties().isEmpty());
- assertEquals("Microsoft.Exchange.Services.OData.Model.Folder", user.getNavigationProperty("Inbox").getType());
-
- // 4. Action
- final List<Action> moves = metadata.getSchema(0).getActions("Move");
- assertFalse(moves.isEmpty());
- Action move = null;
- for (Action action : moves) {
- if ("Microsoft.Exchange.Services.OData.Model.EmailMessage".equals(action.getReturnType().getType())) {
- move = action;
- }
- }
- assertNotNull(move);
- assertTrue(move.isBound());
- assertEquals("bindingParameter", move.getEntitySetPath());
- assertEquals(2, move.getParameters().size());
- assertEquals("Microsoft.Exchange.Services.OData.Model.EmailMessage", move.getParameters().get(0).getType());
-
- // 5. EntityContainer
- final EntityContainer container = metadata.getSchema(0).getEntityContainer();
- assertNotNull(container);
- final EntitySet users = container.getEntitySet("Users");
- assertNotNull(users);
- assertEquals(metadata.getSchema(0).getNamespace() + "." + user.getName(), users.getEntityType());
- assertEquals(user.getNavigationProperties().size(), users.getNavigationPropertyBindings().size());
- }
-
- @Test
- public void demo() {
- final EdmV4Metadata metadata = getClient().getReader().
- readMetadata(getClass().getResourceAsStream("demo-metadata.xml"));
- assertNotNull(metadata);
-
- assertFalse(metadata.getSchema(0).getAnnotationsList().isEmpty());
- Annotations annots = metadata.getSchema(0).getAnnotationsList("ODataDemo.DemoService/Suppliers");
- assertNotNull(annots);
- assertFalse(annots.getAnnotations().isEmpty());
- assertEquals(ConstExprConstruct.Type.String,
- annots.getAnnotation("Org.OData.Publication.V1.PrivacyPolicyUrl").getConstExpr().getType());
- assertEquals("http://www.odata.org/",
- annots.getAnnotation("Org.OData.Publication.V1.PrivacyPolicyUrl").getConstExpr().getValue());
- }
-
- @Test
- public void multipleSchemas() {
- final EdmV4Metadata metadata = getClient().getReader().
- readMetadata(getClass().getResourceAsStream("northwind-metadata.xml"));
- assertNotNull(metadata);
-
- final Schema first = metadata.getSchema("NorthwindModel");
- assertNotNull(first);
-
- final Schema second = metadata.getSchema("ODataWebExperimental.Northwind.Model");
- assertNotNull(second);
-
- assertEquals(StoreGeneratedPattern.Identity,
- first.getEntityType("Category").getProperty("CategoryID").getStoreGeneratedPattern());
-
- final EntityContainer entityContainer = second.getDefaultEntityContainer();
- assertNotNull(entityContainer);
- assertEquals("NorthwindEntities", entityContainer.getName());
- assertTrue(entityContainer.isLazyLoadingEnabled());
- }
-
- /**
- * Tests Example 85 from CSDL specification.
- */
- @Test
- public void fromdoc1() {
- final EdmV4Metadata metadata = getClient().getReader().
- readMetadata(getClass().getResourceAsStream("fromdoc1-metadata.xml"));
- assertNotNull(metadata);
-
- assertFalse(metadata.getReferences().isEmpty());
- assertEquals("Org.OData.Measures.V1", metadata.getReferences().get(1).getIncludes().get(0).getNamespace());
-
- final EntityType product = metadata.getSchema(0).getEntityType("Product");
- assertTrue(product.isHasStream());
- assertEquals("UoM.ISOCurrency", product.getProperty("Price").getAnnotation().getTerm());
- //assertEquals("Currency", product.getProperty("Price").getAnnotation().));
- assertEquals("Products", product.getNavigationProperty("Supplier").getPartner());
-
- final EntityType category = metadata.getSchema(0).getEntityType("Category");
- final EdmV4Type type = new EdmV4Type(metadata, category.getNavigationProperty("Products").getType());
- assertNotNull(type);
- assertTrue(type.isCollection());
- assertFalse(type.isSimpleType());
-
- final ComplexType address = metadata.getSchema(0).getComplexType("Address");
- assertFalse(address.getNavigationProperty("Country").getReferentialConstraints().isEmpty());
- assertEquals("Name",
- address.getNavigationProperty("Country").getReferentialConstraints().get(0).getReferencedProperty());
-
- final Function productsByRating = metadata.getSchema(0).getFunctions("ProductsByRating").get(0);
- assertNotNull(productsByRating.getParameter("Rating"));
- assertEquals("Edm.Int32", productsByRating.getParameter("Rating").getType());
- assertEquals("Collection(ODataDemo.Product)", productsByRating.getReturnType().getType());
-
- final Singleton contoso = metadata.getSchema(0).getEntityContainer().getSingleton("Contoso");
- assertNotNull(contoso);
- assertFalse(contoso.getNavigationPropertyBindings().isEmpty());
- assertEquals("Products", contoso.getNavigationPropertyBindings().get(0).getPath());
-
- final FunctionImport functionImport = metadata.getSchema(0).getEntityContainer().
- getFunctionImport("ProductsByRating");
- assertNotNull(functionImport);
- assertEquals(metadata.getSchema(0).getNamespace() + "." + productsByRating.getName(),
- functionImport.getFunction());
- }
-
- /**
- * Tests Example 86 from CSDL specification.
- */
- @Test
- public void fromdoc2() {
- final EdmV4Metadata metadata = getClient().getReader().
- readMetadata(getClass().getResourceAsStream("fromdoc2-metadata.xml"));
- assertNotNull(metadata);
-
- // Check displayName
- final Annotation displayName = metadata.getSchema(0).getAnnotationsList("ODataDemo.Supplier").
- getAnnotation("Vocabulary1.DisplayName");
- assertNotNull(displayName);
- assertNull(displayName.getConstExpr());
- assertNotNull(displayName.getDynExpr());
-
- assertTrue(displayName.getDynExpr() instanceof Apply);
- final Apply apply = (Apply) displayName.getDynExpr();
- assertEquals(Apply.CANONICAL_FUNCTION_CONCAT, apply.getFunction());
- assertEquals(3, apply.getParameters().size());
-
- final Path firstArg = new Path();
- firstArg.setValue("Name");
- assertEquals(firstArg, apply.getParameters().get(0));
-
- final ConstExprConstruct secondArg = new ConstExprConstruct();
- secondArg.setType(ConstExprConstruct.Type.String);
- secondArg.setValue(" in ");
- assertEquals(secondArg, apply.getParameters().get(1));
-
- final Path thirdArg = new Path();
- thirdArg.setValue("Address/CountryName");
- assertEquals(thirdArg, apply.getParameters().get(2));
-
- // Check Tags
- final Annotation tags = metadata.getSchema(0).getAnnotationsList("ODataDemo.Product").
- getAnnotation("Vocabulary1.Tags");
- assertNotNull(tags);
- assertNull(tags.getConstExpr());
- assertNotNull(tags.getDynExpr());
-
- assertTrue(tags.getDynExpr() instanceof Collection);
- final Collection collection = (Collection) tags.getDynExpr();
- assertEquals(1, collection.getItems().size());
- assertEquals(ConstExprConstruct.Type.String, ((ConstExprConstruct) collection.getItems().get(0)).getType());
- assertEquals("MasterData", ((ConstExprConstruct) collection.getItems().get(0)).getValue());
- }
-
- /**
- * Various annotation examples taken from CSDL specification.
- */
- @Test
- public void fromdoc3() {
- final EdmV4Metadata metadata = getClient().getReader().
- readMetadata(getClass().getResourceAsStream("fromdoc3-metadata.xml"));
- assertNotNull(metadata);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v4/V4XMLPrimitiveTest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v4/V4XMLPrimitiveTest.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v4/V4XMLPrimitiveTest.java
deleted file mode 100644
index 1b732da..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v4/V4XMLPrimitiveTest.java
+++ /dev/null
@@ -1,29 +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 com.msopentech.odatajclient.engine;
-
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-
-public class V4XMLPrimitiveTest extends V4JSONPrimitiveTest {
-
- @Override
- protected ODataFormat getFormat() {
- return ODataFormat.XML;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v4/V4XMLServiceDocumentTest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v4/V4XMLServiceDocumentTest.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v4/V4XMLServiceDocumentTest.java
deleted file mode 100644
index 19671db..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v4/V4XMLServiceDocumentTest.java
+++ /dev/null
@@ -1,36 +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 com.msopentech.odatajclient.engine.v4;
-
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import org.junit.Test;
-
-public class V4XMLServiceDocumentTest extends V4JSONServiceDocumentTest {
-
- @Override
- protected ODataFormat getFormat() {
- return ODataFormat.XML;
- }
-
- @Test
- public void parseTMP() {
- super.parse();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-10_Geom.json
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-10_Geom.json b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-10_Geom.json
deleted file mode 100644
index 8e18317..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-10_Geom.json
+++ /dev/null
@@ -1 +0,0 @@
-{"odata.metadata":"http://192.168.0.160:8080/DefaultService.svc/$metadata#Edm.GeometryLineString","value":{"type":"LineString","coordinates":[[1.0,1.0],[3.0,3.0],[2.0,4.0],[2.0,0.0]],"crs":{"type":"name","properties":{"name":"EPSG:0"}}}}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-10_Geom.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-10_Geom.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-10_Geom.xml
deleted file mode 100644
index e103b35..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-10_Geom.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- 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.
-
--->
-<d:Geom xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:type="Edm.GeometryLineString"><gml:LineString gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"><gml:pos>1 1</gml:pos><gml:pos>3 3</gml:pos><gml:pos>2 4</gml:pos><gml:pos>2 0</gml:pos></gml:LineString></d:Geom>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-5.json
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-5.json b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-5.json
deleted file mode 100644
index a5bbb8f..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-5.json
+++ /dev/null
@@ -1 +0,0 @@
-{"odata.metadata":"http://192.168.0.160:8080/DefaultService.svc/$metadata#AllGeoTypesSet/@Element","odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes","odata.id":"http://192.168.0.160:8080/DefaultService.svc/AllGeoTypesSet(-5)","odata.editLink":"AllGeoTypesSet(-5)","Id":-5,"Geog@odata.type":"Edm.Geography","Geog":{"type":"GeometryCollection","geometries":[],"crs":{"type":"name","properties":{"name":"EPSG:4326"}}},"GeogPoint":null,"GeogLine@odata.type":"Edm.GeographyLineString","GeogLine":{"type":"LineString","coordinates":[[10.5,10.5],[20.5,20.5],[10.5,40.5]],"crs":{"type":"name","properties":{"name":"EPSG:4326"}}},"GeogPolygon@odata.type":"Edm.GeographyPolygon","GeogPolygon":{"type":"Polygon","coordinates":[[[15.0,5.0],[40.0,10.0],[10.0,20.0],[5.0,10.0],[15.0,5.0]]],"crs":{"type":"name","properties":{"name":"EPSG:4326"}}},"GeogCollection@odata.type":"Edm.GeographyCollection","GeogCollection":{"type":"GeometryCollection","geometries":[{"type":"Geometry
Collection","geometries":[]},{"type":"GeometryCollection","geometries":[{"type":"Point","coordinates":[1.0,2.0]}]}],"crs":{"type":"name","properties":{"name":"EPSG:4326"}}},"GeogMultiPoint@odata.type":"Edm.GeographyMultiPoint","GeogMultiPoint":{"type":"MultiPoint","coordinates":[[-122.7,47.38]],"crs":{"type":"name","properties":{"name":"EPSG:4326"}}},"GeogMultiLine@odata.type":"Edm.GeographyMultiLineString","GeogMultiLine":{"type":"MultiLineString","coordinates":[],"crs":{"type":"name","properties":{"name":"EPSG:4326"}}},"GeogMultiPolygon@odata.type":"Edm.GeographyMultiPolygon","GeogMultiPolygon":{"type":"MultiPolygon","coordinates":[[[[40.0,40.0],[20.0,45.0],[45.0,30.0],[40.0,40.0]]],[[[20.0,35.0],[45.0,20.0],[30.0,5.0],[10.0,10.0],[10.0,30.0],[20.0,35.0]],[[30.0,20.0],[20.0,25.0],[20.0,15.0],[30.0,20.0]]]],"crs":{"type":"name","properties":{"name":"EPSG:4326"}}},"Geom@odata.type":"Edm.Geometry","Geom":{"type":"Polygon","coordinates":[],"crs":{"type":"name","properties":{"name":"EP
SG:0"}}},"GeomPoint@odata.type":"Edm.GeometryPoint","GeomPoint":{"type":"Point","coordinates":[4513675.2944411123,6032903.5882574534],"crs":{"type":"name","properties":{"name":"EPSG:0"}}},"GeomLine@odata.type":"Edm.GeometryLineString","GeomLine":{"type":"LineString","coordinates":[[1.0,1.0],[3.0,3.0],[2.0,4.0],[2.0,0.0]],"crs":{"type":"name","properties":{"name":"EPSG:0"}}},"GeomPolygon@odata.type":"Edm.GeometryPolygon","GeomPolygon":{"type":"Polygon","coordinates":[],"crs":{"type":"name","properties":{"name":"EPSG:0"}}},"GeomCollection@odata.type":"Edm.GeometryCollection","GeomCollection":{"type":"GeometryCollection","geometries":[{"type":"GeometryCollection","geometries":[]},{"type":"GeometryCollection","geometries":[{"type":"Point","coordinates":[1.0,2.0]}]}],"crs":{"type":"name","properties":{"name":"EPSG:0"}}},"GeomMultiPoint@odata.type":"Edm.GeometryMultiPoint","GeomMultiPoint":{"type":"MultiPoint","coordinates":[],"crs":{"type":"name","properties":{"name":"EPSG:0"}}},"GeomMul
tiLine@odata.type":"Edm.GeometryMultiLineString","GeomMultiLine":{"type":"MultiLineString","coordinates":[[[10.0,10.0],[20.0,20.0],[10.0,40.0]],[[40.0,40.0],[30.0,30.0],[40.0,20.0],[30.0,10.0]]],"crs":{"type":"name","properties":{"name":"EPSG:0"}}},"GeomMultiPolygon":null}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-5.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-5.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-5.xml
deleted file mode 100644
index 3bc5f87..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-5.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- 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.
-
--->
-<entry xml:base="http://192.168.0.160:8080/DefaultService.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml"><id>http://192.168.0.160:8080/DefaultService.svc/AllGeoTypesSet(-5)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="AllSpatialTypes" href="AllGeoTypesSet(-5)" /><title /><updated>2013-09-11T07:48:06Z</updated><author><name /></author><content type="application/xml"><m:properties><d:Id m:type="Edm.Int32">-5</d:Id><d:Geog m:type="Edm.GeographyCollection"><gml:MultiGeometry gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326" /></d:Geog><d:GeogPoint m:null="true" /><d:GeogLine m:type="Edm.GeographyLineString"><gml:LineString gml:srsN
ame="http://www.opengis.net/def/crs/EPSG/0/4326"><gml:pos>10.5 10.5</gml:pos><gml:pos>20.5 20.5</gml:pos><gml:pos>40.5 10.5</gml:pos></gml:LineString></d:GeogLine><d:GeogPolygon m:type="Edm.GeographyPolygon"><gml:Polygon gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326"><gml:exterior><gml:LinearRing><gml:pos>5 15</gml:pos><gml:pos>10 40</gml:pos><gml:pos>20 10</gml:pos><gml:pos>10 5</gml:pos><gml:pos>5 15</gml:pos></gml:LinearRing></gml:exterior></gml:Polygon></d:GeogPolygon><d:GeogCollection m:type="Edm.GeographyCollection"><gml:MultiGeometry gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326"><gml:geometryMembers><gml:MultiGeometry /><gml:MultiGeometry><gml:geometryMembers><gml:Point><gml:pos>2 1</gml:pos></gml:Point></gml:geometryMembers></gml:MultiGeometry></gml:geometryMembers></gml:MultiGeometry></d:GeogCollection><d:GeogMultiPoint m:type="Edm.GeographyMultiPoint"><gml:MultiPoint gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326"><gml:pointMembers><gml:Point>
<gml:pos>47.38 -122.7</gml:pos></gml:Point></gml:pointMembers></gml:MultiPoint></d:GeogMultiPoint><d:GeogMultiLine m:type="Edm.GeographyMultiLineString"><gml:MultiCurve gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326" /></d:GeogMultiLine><d:GeogMultiPolygon m:type="Edm.GeographyMultiPolygon"><gml:MultiSurface gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326"><gml:surfaceMembers><gml:Polygon><gml:exterior><gml:LinearRing><gml:pos>40 40</gml:pos><gml:pos>45 20</gml:pos><gml:pos>30 45</gml:pos><gml:pos>40 40</gml:pos></gml:LinearRing></gml:exterior></gml:Polygon><gml:Polygon><gml:exterior><gml:LinearRing><gml:pos>35 20</gml:pos><gml:pos>20 45</gml:pos><gml:pos>5 30</gml:pos><gml:pos>10 10</gml:pos><gml:pos>30 10</gml:pos><gml:pos>35 20</gml:pos></gml:LinearRing></gml:exterior><gml:interior><gml:LinearRing><gml:pos>20 30</gml:pos><gml:pos>25 20</gml:pos><gml:pos>15 20</gml:pos><gml:pos>20 30</gml:pos></gml:LinearRing></gml:interior></gml:Polygon></gml:surfaceMembers></gml
:MultiSurface></d:GeogMultiPolygon><d:Geom m:type="Edm.GeometryPolygon"><gml:Polygon gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0" /></d:Geom><d:GeomPoint m:type="Edm.GeometryPoint"><gml:Point gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"><gml:pos>4513675.2944411123 6032903.5882574534</gml:pos></gml:Point></d:GeomPoint><d:GeomLine m:type="Edm.GeometryLineString"><gml:LineString gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"><gml:pos>1 1</gml:pos><gml:pos>3 3</gml:pos><gml:pos>2 4</gml:pos><gml:pos>2 0</gml:pos></gml:LineString></d:GeomLine><d:GeomPolygon m:type="Edm.GeometryPolygon"><gml:Polygon gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0" /></d:GeomPolygon><d:GeomCollection m:type="Edm.GeometryCollection"><gml:MultiGeometry gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"><gml:geometryMembers><gml:MultiGeometry /><gml:MultiGeometry><gml:geometryMembers><gml:Point><gml:pos>1 2</gml:pos></gml:Point></gml:geometryMembers></gml:MultiGeometry></gml:g
eometryMembers></gml:MultiGeometry></d:GeomCollection><d:GeomMultiPoint m:type="Edm.GeometryMultiPoint"><gml:MultiPoint gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0" /></d:GeomMultiPoint><d:GeomMultiLine m:type="Edm.GeometryMultiLineString"><gml:MultiCurve gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"><gml:curveMembers><gml:LineString><gml:pos>10 10</gml:pos><gml:pos>20 20</gml:pos><gml:pos>10 40</gml:pos></gml:LineString><gml:LineString><gml:pos>40 40</gml:pos><gml:pos>30 30</gml:pos><gml:pos>40 20</gml:pos><gml:pos>30 10</gml:pos></gml:LineString></gml:curveMembers></gml:MultiCurve></d:GeomMultiLine><d:GeomMultiPolygon m:null="true" /></m:properties></content></entry>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-8.json
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-8.json b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-8.json
deleted file mode 100644
index 2e3469b..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-8.json
+++ /dev/null
@@ -1 +0,0 @@
-{"odata.metadata":"http://192.168.43.55:8080/DefaultService.svc/$metadata#AllGeoTypesSet/@Element","odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes","odata.id":"http://192.168.43.55:8080/DefaultService.svc/AllGeoTypesSet(-8)","odata.editLink":"AllGeoTypesSet(-8)","Id":-8,"Geog@odata.type":"Edm.Geography","Geog":{"type":"Point","coordinates":[178.94,51.5961],"crs":{"type":"name","properties":{"name":"EPSG:4326"}}},"GeogPoint@odata.type":"Edm.GeographyPoint","GeogPoint":{"type":"Point","coordinates":[178.7,51.65],"crs":{"type":"name","properties":{"name":"EPSG:4326"}}},"GeogLine@odata.type":"Edm.GeographyLineString","GeogLine":{"type":"LineString","coordinates":[[10.0,10.0],[20.0,20.0],[10.0,40.0]],"crs":{"type":"name","properties":{"name":"EPSG:4326"}}},"GeogPolygon@odata.type":"Edm.GeographyPolygon","GeogPolygon":{"type":"Polygon","coordinates":[],"crs":{"type":"name","properties":{"name":"EPSG:4326"}}},"GeogCollection@odata.type":"Edm.GeographyColle
ction","GeogCollection":{"type":"GeometryCollection","geometries":[],"crs":{"type":"name","properties":{"name":"EPSG:4326"}}},"GeogMultiPoint@odata.type":"Edm.GeographyMultiPoint","GeogMultiPoint":{"type":"MultiPoint","coordinates":[[-122.7,47.38]],"crs":{"type":"name","properties":{"name":"EPSG:4326"}}},"GeogMultiLine@odata.type":"Edm.GeographyMultiLineString","GeogMultiLine":{"type":"MultiLineString","coordinates":[[[10.5,10.5],[20.5,20.5],[10.5,40.5]],[[40.5,40.5],[30.5,30.5],[40.5,20.5],[30.5,10.5]]],"crs":{"type":"name","properties":{"name":"EPSG:4326"}}},"GeogMultiPolygon@odata.type":"Edm.GeographyMultiPolygon","GeogMultiPolygon":{"type":"MultiPolygon","coordinates":[[[[40.0,40.0],[20.0,45.0],[45.0,30.0],[40.0,40.0]]],[[[20.0,35.0],[45.0,20.0],[30.0,5.0],[10.0,10.0],[10.0,30.0],[20.0,35.0]],[[30.0,20.0],[20.0,25.0],[20.0,15.0],[30.0,20.0]]]],"crs":{"type":"name","properties":{"name":"EPSG:4326"}}},"Geom@odata.type":"Edm.Geometry","Geom":{"type":"Point","coordinates":[4369367.0
586663447,6352015.6916818349],"crs":{"type":"name","properties":{"name":"EPSG:0"}}},"GeomPoint@odata.type":"Edm.GeometryPoint","GeomPoint":{"type":"Point","coordinates":[4377000.868172125,6348217.1067010015],"crs":{"type":"name","properties":{"name":"EPSG:0"}}},"GeomLine@odata.type":"Edm.GeometryLineString","GeomLine":{"type":"LineString","coordinates":[[1.0,1.0],[3.0,3.0],[2.0,4.0],[2.0,0.0]],"crs":{"type":"name","properties":{"name":"EPSG:0"}}},"GeomPolygon@odata.type":"Edm.GeometryPolygon","GeomPolygon":{"type":"Polygon","coordinates":[[[30.0,20.0],[10.0,40.0],[45.0,40.0],[30.0,20.0]]],"crs":{"type":"name","properties":{"name":"EPSG:0"}}},"GeomCollection@odata.type":"Edm.GeometryCollection","GeomCollection":{"type":"GeometryCollection","geometries":[{"type":"Point","coordinates":[4.0,6.0]},{"type":"LineString","coordinates":[[4.0,6.0],[7.0,10.0]]}],"crs":{"type":"name","properties":{"name":"EPSG:0"}}},"GeomMultiPoint":null,"GeomMultiLine@odata.type":"Edm.GeometryMultiLineString",
"GeomMultiLine":{"type":"MultiLineString","coordinates":[],"crs":{"type":"name","properties":{"name":"EPSG:0"}}},"GeomMultiPolygon@odata.type":"Edm.GeometryMultiPolygon","GeomMultiPolygon":{"type":"MultiPolygon","coordinates":[],"crs":{"type":"name","properties":{"name":"EPSG:0"}}}}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-8.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-8.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-8.xml
deleted file mode 100644
index 81213bf..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/AllGeoTypesSet_-8.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- 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.
-
--->
-<entry xml:base="http://192.168.43.55:8080/DefaultService.svc/"
- xmlns="http://www.w3.org/2005/Atom"
- xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices"
- xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"
- xmlns:georss="http://www.georss.org/georss"
- xmlns:gml="http://www.opengis.net/gml">
- <id>http://192.168.43.55:8080/DefaultService.svc/AllGeoTypesSet(-8)</id>
- <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" />
- <link rel="edit" title="AllSpatialTypes" href="AllGeoTypesSet(-8)" />
- <title />
- <updated>2013-08-21T10:50:04Z</updated>
- <author>
- <name />
- </author>
- <content type="application/xml">
- <m:properties>
- <d:Id m:type="Edm.Int32">-8</d:Id>
- <d:Geog m:type="Edm.GeographyPoint">
- <gml:Point gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
- <gml:pos>51.5961 178.94</gml:pos>
- </gml:Point>
- </d:Geog>
- <d:GeogPoint m:type="Edm.GeographyPoint">
- <gml:Point gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
- <gml:pos>51.65 178.7</gml:pos>
- </gml:Point>
- </d:GeogPoint>
- <d:GeogLine m:type="Edm.GeographyLineString">
- <gml:LineString gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
- <gml:pos>10 10</gml:pos>
- <gml:pos>20 20</gml:pos>
- <gml:pos>40 10</gml:pos>
- </gml:LineString>
- </d:GeogLine>
- <d:GeogPolygon m:type="Edm.GeographyPolygon">
- <gml:Polygon gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326" />
- </d:GeogPolygon>
- <d:GeogCollection m:type="Edm.GeographyCollection">
- <gml:MultiGeometry gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326" />
- </d:GeogCollection>
- <d:GeogMultiPoint m:type="Edm.GeographyMultiPoint">
- <gml:MultiPoint gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
- <gml:pointMembers>
- <gml:Point>
- <gml:pos>47.38 -122.7</gml:pos>
- </gml:Point>
- </gml:pointMembers>
- </gml:MultiPoint>
- </d:GeogMultiPoint>
- <d:GeogMultiLine m:type="Edm.GeographyMultiLineString">
- <gml:MultiCurve gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
- <gml:curveMembers>
- <gml:LineString>
- <gml:pos>10.5 10.5</gml:pos>
- <gml:pos>20.5 20.5</gml:pos>
- <gml:pos>40.5 10.5</gml:pos>
- </gml:LineString>
- <gml:LineString>
- <gml:pos>40.5 40.5</gml:pos>
- <gml:pos>30.5 30.5</gml:pos>
- <gml:pos>20.5 40.5</gml:pos>
- <gml:pos>10.5 30.5</gml:pos>
- </gml:LineString>
- </gml:curveMembers>
- </gml:MultiCurve>
- </d:GeogMultiLine>
- <d:GeogMultiPolygon m:type="Edm.GeographyMultiPolygon">
- <gml:MultiSurface gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326">
- <gml:surfaceMembers>
- <gml:Polygon>
- <gml:exterior>
- <gml:LinearRing>
- <gml:pos>40 40</gml:pos>
- <gml:pos>45 20</gml:pos>
- <gml:pos>30 45</gml:pos>
- <gml:pos>40 40</gml:pos>
- </gml:LinearRing>
- </gml:exterior>
- </gml:Polygon>
- <gml:Polygon>
- <gml:exterior>
- <gml:LinearRing>
- <gml:pos>35 20</gml:pos>
- <gml:pos>20 45</gml:pos>
- <gml:pos>5 30</gml:pos>
- <gml:pos>10 10</gml:pos>
- <gml:pos>30 10</gml:pos>
- <gml:pos>35 20</gml:pos>
- </gml:LinearRing>
- </gml:exterior>
- <gml:interior>
- <gml:LinearRing>
- <gml:pos>20 30</gml:pos>
- <gml:pos>25 20</gml:pos>
- <gml:pos>15 20</gml:pos>
- <gml:pos>20 30</gml:pos>
- </gml:LinearRing>
- </gml:interior>
- </gml:Polygon>
- </gml:surfaceMembers>
- </gml:MultiSurface>
- </d:GeogMultiPolygon>
- <d:Geom m:type="Edm.GeometryPoint">
- <gml:Point gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0">
- <gml:pos>4369367.0586663447 6352015.6916818349</gml:pos>
- </gml:Point>
- </d:Geom>
- <d:GeomPoint m:type="Edm.GeometryPoint">
- <gml:Point gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0">
- <gml:pos>4377000.868172125 6348217.1067010015</gml:pos>
- </gml:Point>
- </d:GeomPoint>
- <d:GeomLine m:type="Edm.GeometryLineString">
- <gml:LineString gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0">
- <gml:pos>1 1</gml:pos>
- <gml:pos>3 3</gml:pos>
- <gml:pos>2 4</gml:pos>
- <gml:pos>2 0</gml:pos>
- </gml:LineString>
- </d:GeomLine>
- <d:GeomPolygon m:type="Edm.GeometryPolygon">
- <gml:Polygon gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0">
- <gml:exterior>
- <gml:LinearRing>
- <gml:pos>30 20</gml:pos>
- <gml:pos>10 40</gml:pos>
- <gml:pos>45 40</gml:pos>
- <gml:pos>30 20</gml:pos>
- </gml:LinearRing>
- </gml:exterior>
- </gml:Polygon>
- </d:GeomPolygon>
- <d:GeomCollection m:type="Edm.GeometryCollection">
- <gml:MultiGeometry gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0">
- <gml:geometryMembers>
- <gml:Point>
- <gml:pos>4 6</gml:pos>
- </gml:Point>
- <gml:LineString>
- <gml:pos>4 6</gml:pos>
- <gml:pos>7 10</gml:pos>
- </gml:LineString>
- </gml:geometryMembers>
- </gml:MultiGeometry>
- </d:GeomCollection>
- <d:GeomMultiPoint m:null="true" />
- <d:GeomMultiLine m:type="Edm.GeometryMultiLineString">
- <gml:MultiCurve gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0" />
- </d:GeomMultiLine>
- <d:GeomMultiPolygon m:type="Edm.GeometryMultiPolygon">
- <gml:MultiSurface gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0" />
- </d:GeomMultiPolygon>
- </m:properties>
- </content>
-</entry>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/Car_16.json
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/Car_16.json b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/Car_16.json
deleted file mode 100644
index d62d51b..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/Car_16.json
+++ /dev/null
@@ -1 +0,0 @@
-{"odata.metadata":"http://192.168.43.55:8080/DefaultService.svc/$metadata#Car/@Element","odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Car","odata.id":"http://192.168.43.55:8080/DefaultService.svc/Car(16)","odata.editLink":"Car(16)","odata.mediaEditLink":"Car(16)/$value","odata.mediaReadLink":"Car(16)/$value","odata.mediaContentType":"*/*","Photo@odata.mediaEditLink":"Car(16)/Photo","Photo@odata.mediaContentType":"application/octet-stream","Video@odata.mediaEditLink":"Car(16)/Video","VIN":16,"Description":"\u3041\u30bc\u3092\u3042\u30af\u3073\u30bc\u30bc\u30a1\u30a1\u305b\u30de\u307b\u30b0\u30bd\u30d0\u305b\u0451\u88f9\uff66\u307d\uff9d\u30a1"}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/Car_16.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/Car_16.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/Car_16.xml
deleted file mode 100644
index 0560385..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/Car_16.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- 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.
-
--->
-<entry xml:base="http://192.168.43.55:8080/DefaultService.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml"><id>http://192.168.43.55:8080/DefaultService.svc/Car(16)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="Car" href="Car(16)" /><title /><updated>2013-08-21T10:31:09Z</updated><author><name /></author><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Photo" type="application/octet-stream" title="Photo" href="Car(16)/Photo" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/Video" title="Video" href="Car(16)/Video" /><link rel="edit-media" title="Car" href="Car(16)/$value" /><content type="*/*" s
rc="Car(16)/$value" /><m:properties><d:VIN m:type="Edm.Int32">16</d:VIN><d:Description>ぁゼをあクびゼゼァァせマほグソバせё裹ｦぽﾝァ</d:Description></m:properties></entry>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/ComputerDetail_-10.json
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/ComputerDetail_-10.json b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/ComputerDetail_-10.json
deleted file mode 100644
index 88c7804..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/ComputerDetail_-10.json
+++ /dev/null
@@ -1 +0,0 @@
-{"odata.metadata":"http://192.168.43.55:8080/DefaultService.svc/$metadata#ComputerDetail/@Element","odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail","odata.id":"http://192.168.43.55:8080/DefaultService.svc/ComputerDetail(-10)","odata.editLink":"ComputerDetail(-10)","Computer@odata.navigationLinkUrl":"ComputerDetail(-10)/Computer","#DefaultContainer.ResetComputerDetailsSpecifications":{"title":"ResetComputerDetailsSpecifications","target":"http://192.168.43.55:8080/DefaultService.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications"},"ComputerDetailId":-10,"Manufacturer":"sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk","Model":"usfvbkyxssojjebyzgvtnzkuik\u00dfuxrmllzyglnsssluyxf\u00dfssioyroouxafzbhbsabkrsslbyhghicjaplolzqss\u00dfhhfix","Serial":null,"SpecificationsBag@odata.type":"Collection(Edm.String)","SpecificationsBag":["vorjqalydmfuazkatkiydeicefrjhyuaupkfgbxiaehjrqhhqv","rbsejgfgelhsdahkoqlnzvbq","ssfvnnquahsczxlu\u00dfnssrhpssz
luundy\u00dfehyzjedssxom","xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrarqluedjfx","eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee","\u30be\u3092\u4e5d\u30af\u305d"],"PurchaseDate@odata.type":"Edm.DateTime","PurchaseDate":"2020-12-15T01:33:35.8014568","Dimensions":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-8917.92836319839","Height@odata.type":"Edm.Decimal","Height":"-79228162514264337593543950335","Depth@odata.type":"Edm.Decimal","Depth":"-79228162514264337593543950335"}}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/ComputerDetail_-10.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/ComputerDetail_-10.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/ComputerDetail_-10.xml
deleted file mode 100644
index f9c0e4f..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/ComputerDetail_-10.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- 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.
-
--->
-<entry xml:base="http://192.168.43.55:8080/DefaultService.svc/" xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml"><id>http://192.168.43.55:8080/DefaultService.svc/ComputerDetail(-10)</id><category term="Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /><link rel="edit" title="ComputerDetail" href="ComputerDetail(-10)" /><link rel="http://schemas.microsoft.com/ado/2007/08/dataservices/related/Computer" type="application/atom+xml;type=entry" title="Computer" href="ComputerDetail(-10)/Computer" /><title /><updated>2013-08-21T10:53:24Z</updated><author><name /><uri>usfvbkyxssojjebyzgvtnzkuikßuxrmllzyglnsssluyxfßssioyroouxafzbhbsabkrsslbyhghicjaplolzqssßhhfix</uri><email>sspayuqgmkizmvtxdeuitrn
qcblxoipcsshhfvibxuzssatvjjhoftpk</email></author><m:action metadata="http://192.168.43.55:8080/DefaultService.svc/$metadata#DefaultContainer.ResetComputerDetailsSpecifications" title="ResetComputerDetailsSpecifications" target="http://192.168.43.55:8080/DefaultService.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications" /><content type="application/xml"><m:properties><d:ComputerDetailId m:type="Edm.Int32">-10</d:ComputerDetailId><d:Manufacturer>sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk</d:Manufacturer><d:Model>usfvbkyxssojjebyzgvtnzkuikßuxrmllzyglnsssluyxfßssioyroouxafzbhbsabkrsslbyhghicjaplolzqssßhhfix</d:Model><d:Serial m:null="true" /><d:SpecificationsBag m:type="Collection(Edm.String)"><d:element>vorjqalydmfuazkatkiydeicefrjhyuaupkfgbxiaehjrqhhqv</d:element><d:element>rbsejgfgelhsdahkoqlnzvbq</d:element><d:element>ssfvnnquahsczxlußnssrhpsszluundyßehyzjedssxom</d:element><d:element>xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrar
qluedjfx</d:element><d:element>eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee</d:element><d:element>ゾを九クそ</d:element></d:SpecificationsBag><d:PurchaseDate m:type="Edm.DateTime">2020-12-15T01:33:35.8014568</d:PurchaseDate><d:Dimensions m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions"><d:Width m:type="Edm.Decimal">-8917.92836319839</d:Width><d:Height m:type="Edm.Decimal">-79228162514264337593543950335</d:Height><d:Depth m:type="Edm.Decimal">-79228162514264337593543950335</d:Depth></d:Dimensions></m:properties></content></entry>
[34/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/AbstractFilterFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/AbstractFilterFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/AbstractFilterFactory.java
deleted file mode 100644
index a0c2dc5..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/AbstractFilterFactory.java
+++ /dev/null
@@ -1,106 +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 com.msopentech.odatajclient.engine.uri.filter;
-
-public abstract class AbstractFilterFactory implements FilterFactory {
-
- private static final long serialVersionUID = -6141317149802621836L;
-
- protected static final String NULL = "null";
-
- @Override
- public ODataFilter match(final ODataFilterArg arg) {
- return new MatchFilter(arg);
- }
-
- @Override
- public ODataFilter eq(final String key, final Object value) {
- return new EqFilter(ODataFilterArgFactory.property(key), ODataFilterArgFactory.literal(value));
- }
-
- @Override
- public ODataFilter eq(final ODataFilterArg left, final ODataFilterArg right) {
- return new EqFilter(left, right);
- }
-
- @Override
- public ODataFilter ne(final String key, final Object value) {
- return new NeFilter(ODataFilterArgFactory.property(key), ODataFilterArgFactory.literal(value));
- }
-
- @Override
- public ODataFilter ne(final ODataFilterArg left, final ODataFilterArg right) {
- return new NeFilter(left, right);
- }
-
- @Override
- public ODataFilter gt(final String key, final Object value) {
- return new GtFilter(ODataFilterArgFactory.property(key), ODataFilterArgFactory.literal(value));
- }
-
- @Override
- public ODataFilter gt(final ODataFilterArg left, final ODataFilterArg right) {
- return new GtFilter(left, right);
- }
-
- @Override
- public ODataFilter ge(final String key, final Object value) {
- return new GeFilter(ODataFilterArgFactory.property(key), ODataFilterArgFactory.literal(value));
- }
-
- @Override
- public ODataFilter ge(final ODataFilterArg left, final ODataFilterArg right) {
- return new GeFilter(left, right);
- }
-
- @Override
- public ODataFilter lt(final String key, final Object value) {
- return new LtFilter(ODataFilterArgFactory.property(key), ODataFilterArgFactory.literal(value));
- }
-
- @Override
- public ODataFilter lt(final ODataFilterArg left, final ODataFilterArg right) {
- return new LtFilter(left, right);
- }
-
- @Override
- public ODataFilter le(final String key, final Object value) {
- return new LeFilter(ODataFilterArgFactory.property(key), ODataFilterArgFactory.literal(value));
- }
-
- @Override
- public ODataFilter le(final ODataFilterArg left, final ODataFilterArg right) {
- return new LeFilter(left, right);
- }
-
- @Override
- public ODataFilter and(final ODataFilter left, final ODataFilter right) {
- return new AndFilter(left, right);
- }
-
- @Override
- public ODataFilter or(final ODataFilter left, final ODataFilter right) {
- return new OrFilter(left, right);
- }
-
- @Override
- public ODataFilter not(final ODataFilter filter) {
- return new NotFilter(filter);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/AndFilter.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/AndFilter.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/AndFilter.java
deleted file mode 100644
index 5e7097a..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/AndFilter.java
+++ /dev/null
@@ -1,40 +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 com.msopentech.odatajclient.engine.uri.filter;
-
-public class AndFilter implements ODataFilter {
-
- private final ODataFilter left;
-
- private final ODataFilter right;
-
- public AndFilter(final ODataFilter left, final ODataFilter right) {
- this.left = left;
- this.right = right;
- }
-
- @Override
- public String build() {
- return new StringBuilder().
- append('(').append(left.build()).
- append(" and ").
- append(right.build()).append(')').
- toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/EqFilter.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/EqFilter.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/EqFilter.java
deleted file mode 100644
index 3f4a55c..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/EqFilter.java
+++ /dev/null
@@ -1,31 +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 com.msopentech.odatajclient.engine.uri.filter;
-
-public class EqFilter extends AbstractComparingFilter {
-
- EqFilter(final ODataFilterArg left, final ODataFilterArg right) {
- super(left, right);
- }
-
- @Override
- protected String getOp() {
- return "eq";
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/FilterFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/FilterFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/FilterFactory.java
deleted file mode 100644
index 5867a56..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/FilterFactory.java
+++ /dev/null
@@ -1,59 +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 com.msopentech.odatajclient.engine.uri.filter;
-
-import java.io.Serializable;
-
-/**
- * OData filter factory.
- */
-public interface FilterFactory extends Serializable {
-
- ODataFilter match(ODataFilterArg arg);
-
- ODataFilter eq(String key, Object value);
-
- ODataFilter eq(ODataFilterArg left, ODataFilterArg right);
-
- ODataFilter ne(String key, Object value);
-
- ODataFilter ne(ODataFilterArg left, ODataFilterArg right);
-
- ODataFilter gt(String key, Object value);
-
- ODataFilter gt(ODataFilterArg left, ODataFilterArg right);
-
- ODataFilter ge(String key, Object value);
-
- ODataFilter ge(ODataFilterArg left, ODataFilterArg right);
-
- ODataFilter lt(String key, Object value);
-
- ODataFilter lt(ODataFilterArg left, ODataFilterArg right);
-
- ODataFilter le(String key, Object value);
-
- ODataFilter le(ODataFilterArg left, ODataFilterArg right);
-
- ODataFilter and(ODataFilter left, ODataFilter right);
-
- ODataFilter or(ODataFilter left, ODataFilter right);
-
- ODataFilter not(ODataFilter filter);
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/GeFilter.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/GeFilter.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/GeFilter.java
deleted file mode 100644
index ee3fa2d..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/GeFilter.java
+++ /dev/null
@@ -1,31 +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 com.msopentech.odatajclient.engine.uri.filter;
-
-public class GeFilter extends AbstractComparingFilter {
-
- GeFilter(final ODataFilterArg left, final ODataFilterArg right) {
- super(left, right);
- }
-
- @Override
- protected String getOp() {
- return "ge";
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/GtFilter.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/GtFilter.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/GtFilter.java
deleted file mode 100644
index fee2ec6..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/GtFilter.java
+++ /dev/null
@@ -1,31 +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 com.msopentech.odatajclient.engine.uri.filter;
-
-public class GtFilter extends AbstractComparingFilter {
-
- GtFilter(final ODataFilterArg left, final ODataFilterArg right) {
- super(left, right);
- }
-
- @Override
- protected String getOp() {
- return "gt";
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/LeFilter.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/LeFilter.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/LeFilter.java
deleted file mode 100644
index 521737d..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/LeFilter.java
+++ /dev/null
@@ -1,31 +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 com.msopentech.odatajclient.engine.uri.filter;
-
-public class LeFilter extends AbstractComparingFilter {
-
- LeFilter(final ODataFilterArg left, final ODataFilterArg right) {
- super(left, right);
- }
-
- @Override
- protected String getOp() {
- return "le";
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/LtFilter.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/LtFilter.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/LtFilter.java
deleted file mode 100644
index 9c48996..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/LtFilter.java
+++ /dev/null
@@ -1,31 +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 com.msopentech.odatajclient.engine.uri.filter;
-
-public class LtFilter extends AbstractComparingFilter {
-
- LtFilter(final ODataFilterArg left, final ODataFilterArg right) {
- super(left, right);
- }
-
- @Override
- protected String getOp() {
- return "lt";
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/MatchFilter.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/MatchFilter.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/MatchFilter.java
deleted file mode 100644
index 6f4dd83..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/MatchFilter.java
+++ /dev/null
@@ -1,33 +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 com.msopentech.odatajclient.engine.uri.filter;
-
-public class MatchFilter implements ODataFilter {
-
- private final ODataFilterArg arg;
-
- MatchFilter(final ODataFilterArg arg) {
- this.arg = arg;
- }
-
- @Override
- public String build() {
- return arg.build();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/NeFilter.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/NeFilter.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/NeFilter.java
deleted file mode 100644
index d776123..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/NeFilter.java
+++ /dev/null
@@ -1,31 +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 com.msopentech.odatajclient.engine.uri.filter;
-
-public class NeFilter extends AbstractComparingFilter {
-
- NeFilter(final ODataFilterArg left, final ODataFilterArg right) {
- super(left, right);
- }
-
- @Override
- protected String getOp() {
- return "ne";
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/NotFilter.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/NotFilter.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/NotFilter.java
deleted file mode 100644
index 2c0aa2f..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/NotFilter.java
+++ /dev/null
@@ -1,33 +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 com.msopentech.odatajclient.engine.uri.filter;
-
-public class NotFilter implements ODataFilter {
-
- private final ODataFilter filter;
-
- public NotFilter(final ODataFilter left) {
- this.filter = left;
- }
-
- @Override
- public String build() {
- return new StringBuilder("not (").append(filter.build()).append(')').toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilter.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilter.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilter.java
deleted file mode 100644
index 5e7a826..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilter.java
+++ /dev/null
@@ -1,32 +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 com.msopentech.odatajclient.engine.uri.filter;
-
-/**
- * Interface for any available filter; obtain instances via <tt>ODataFilterFactory</tt>.
- *
- * @see com.msopentech.odatajclient.engine.uri.filter.ODataFilterFactory
- */
-public interface ODataFilter {
-
- /**
- * @return String representation of this filter.
- */
- String build();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterArg.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterArg.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterArg.java
deleted file mode 100644
index 17ee7a8..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterArg.java
+++ /dev/null
@@ -1,33 +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 com.msopentech.odatajclient.engine.uri.filter;
-
-/**
- * Interface for any available filter argument; obtain instances via
- * <tt>ODataFilterArgFactory</tt>.
- *
- * @see com.msopentech.odatajclient.engine.uri.filter.ODataFilterArgFactory
- */
-public interface ODataFilterArg {
-
- /**
- * @return String representation of this filter argument.
- */
- String build();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterArgFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterArgFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterArgFactory.java
deleted file mode 100644
index b13355b..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterArgFactory.java
+++ /dev/null
@@ -1,153 +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 com.msopentech.odatajclient.engine.uri.filter;
-
-/**
- * OData filter arguments factory.
- */
-public final class ODataFilterArgFactory {
-
- private ODataFilterArgFactory() {
- // Empty private constructor for static utility classes
- }
-
- public static ODataFilterArg property(final String propertyPath) {
- return new ODataFilterProperty(propertyPath);
- }
-
- public static ODataFilterArg literal(final Object value) {
- return new ODataFilterLiteral(value);
- }
-
- public static ODataFilterArg add(final ODataFilterArg first, final ODataFilterArg second) {
- return new ODataFilterOp("add", first, second);
- }
-
- public static ODataFilterArg sub(final ODataFilterArg first, final ODataFilterArg second) {
- return new ODataFilterOp("add", first, second);
- }
-
- public static ODataFilterArg mul(final ODataFilterArg first, final ODataFilterArg second) {
- return new ODataFilterOp("mul", first, second);
- }
-
- public static ODataFilterArg div(final ODataFilterArg first, final ODataFilterArg second) {
- return new ODataFilterOp("div", first, second);
- }
-
- public static ODataFilterArg mod(final ODataFilterArg first, final ODataFilterArg second) {
- return new ODataFilterOp("mod", first, second);
- }
-
- public static ODataFilterArg substringof(final ODataFilterArg first, final ODataFilterArg second) {
- return new ODataFilterFunction("substringof", first, second);
- }
-
- public static ODataFilterArg endswith(final ODataFilterArg first, final ODataFilterArg second) {
- return new ODataFilterFunction("endswith", first, second);
- }
-
- public static ODataFilterArg startswith(final ODataFilterArg first, final ODataFilterArg second) {
- return new ODataFilterFunction("startswith", first, second);
- }
-
- public static ODataFilterArg length(final ODataFilterArg param) {
- return new ODataFilterFunction("length", param);
- }
-
- public static ODataFilterArg indexof(final ODataFilterArg first, final ODataFilterArg second) {
- return new ODataFilterFunction("indexof", first, second);
- }
-
- public static ODataFilterArg replace(
- final ODataFilterArg first, final ODataFilterArg second, final ODataFilterArg third) {
-
- return new ODataFilterFunction("replace", first, second, third);
- }
-
- public static ODataFilterArg substring(final ODataFilterArg arg, final ODataFilterArg pos) {
- return new ODataFilterFunction("substring", arg, pos);
- }
-
- public static ODataFilterArg substring(
- final ODataFilterArg arg, final ODataFilterArg pos, final ODataFilterArg length) {
-
- return new ODataFilterFunction("substring", arg, pos, length);
- }
-
- public static ODataFilterArg tolower(final ODataFilterArg param) {
- return new ODataFilterFunction("tolower", param);
- }
-
- public static ODataFilterArg toupper(final ODataFilterArg param) {
- return new ODataFilterFunction("toupper", param);
- }
-
- public static ODataFilterArg trim(final ODataFilterArg param) {
- return new ODataFilterFunction("trim", param);
- }
-
- public static ODataFilterArg concat(final ODataFilterArg first, final ODataFilterArg second) {
- return new ODataFilterFunction("concat", first, second);
- }
-
- public static ODataFilterArg day(final ODataFilterArg param) {
- return new ODataFilterFunction("day", param);
- }
-
- public static ODataFilterArg hour(final ODataFilterArg param) {
- return new ODataFilterFunction("hour", param);
- }
-
- public static ODataFilterArg minute(final ODataFilterArg param) {
- return new ODataFilterFunction("minute", param);
- }
-
- public static ODataFilterArg month(final ODataFilterArg param) {
- return new ODataFilterFunction("month", param);
- }
-
- public static ODataFilterArg second(final ODataFilterArg param) {
- return new ODataFilterFunction("second", param);
- }
-
- public static ODataFilterArg year(final ODataFilterArg param) {
- return new ODataFilterFunction("year", param);
- }
-
- public static ODataFilterArg round(final ODataFilterArg param) {
- return new ODataFilterFunction("round", param);
- }
-
- public static ODataFilterArg floor(final ODataFilterArg param) {
- return new ODataFilterFunction("floor", param);
- }
-
- public static ODataFilterArg ceiling(final ODataFilterArg param) {
- return new ODataFilterFunction("ceiling", param);
- }
-
- public static ODataFilterArg isof(final ODataFilterArg param) {
- return new ODataFilterFunction("isof", param);
- }
-
- public static ODataFilterArg isof(final ODataFilterArg first, final ODataFilterArg second) {
- return new ODataFilterFunction("isof", first, second);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterFunction.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterFunction.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterFunction.java
deleted file mode 100644
index caf82ba..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterFunction.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.engine.uri.filter;
-
-import org.apache.commons.lang3.StringUtils;
-
-public class ODataFilterFunction implements ODataFilterArg {
-
- private final String function;
-
- private final ODataFilterArg[] params;
-
- ODataFilterFunction(final String function, final ODataFilterArg... params) {
- this.function = function;
- this.params = params;
- }
-
- @Override
- public String build() {
- final String[] strParams = new String[params.length];
- for (int i = 0; i < params.length; i++) {
- strParams[i] = params[i].build();
- }
-
- return new StringBuilder(function).
- append('(').
- append(StringUtils.join(strParams, ',')).
- append(')').
- toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterLiteral.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterLiteral.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterLiteral.java
deleted file mode 100644
index 1674f62..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterLiteral.java
+++ /dev/null
@@ -1,40 +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 com.msopentech.odatajclient.engine.uri.filter;
-
-import com.msopentech.odatajclient.engine.utils.URIUtils;
-
-/**
- * Filter value literals; obtain instances via <tt>ODataFilterArgFactory</tt>.
- *
- * @see com.msopentech.odatajclient.engine.uri.filter.ODataFilterArgFactory
- */
-public class ODataFilterLiteral implements ODataFilterArg {
-
- private final Object value;
-
- ODataFilterLiteral(final Object value) {
- this.value = value;
- }
-
- @Override
- public String build() {
- return URIUtils.escape(value);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterOp.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterOp.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterOp.java
deleted file mode 100644
index 8fa0f9b..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterOp.java
+++ /dev/null
@@ -1,43 +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 com.msopentech.odatajclient.engine.uri.filter;
-
-public class ODataFilterOp implements ODataFilterArg {
-
- private final String op;
-
- private final ODataFilterArg first;
-
- private final ODataFilterArg second;
-
- ODataFilterOp(final String op, final ODataFilterArg first, final ODataFilterArg second) {
- this.op = op;
- this.first = first;
- this.second = second;
- }
-
- @Override
- public String build() {
- return new StringBuilder().
- append('(').append(first.build()).
- append(' ').append(op).append(' ').
- append(second.build()).append(')').
- toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterProperty.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterProperty.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterProperty.java
deleted file mode 100644
index 3178299..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/ODataFilterProperty.java
+++ /dev/null
@@ -1,38 +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 com.msopentech.odatajclient.engine.uri.filter;
-
-/**
- * Filter property path; obtain instances via <tt>ODataFilterArgFactory</tt>.
- *
- * @see com.msopentech.odatajclient.engine.uri.filter.ODataFilterArgFactory
- */
-public class ODataFilterProperty implements ODataFilterArg {
-
- private final String propertyPath;
-
- ODataFilterProperty(final String value) {
- this.propertyPath = value;
- }
-
- @Override
- public String build() {
- return propertyPath;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/OrFilter.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/OrFilter.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/OrFilter.java
deleted file mode 100644
index 4a0a543..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/OrFilter.java
+++ /dev/null
@@ -1,40 +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 com.msopentech.odatajclient.engine.uri.filter;
-
-public class OrFilter implements ODataFilter {
-
- private final ODataFilter left;
-
- private final ODataFilter right;
-
- public OrFilter(final ODataFilter left, final ODataFilter right) {
- this.left = left;
- this.right = right;
- }
-
- @Override
- public String build() {
- return new StringBuilder().
- append('(').append(left.build()).
- append(" or ").
- append(right.build()).append(')').
- toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/V3FilterFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/V3FilterFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/V3FilterFactory.java
deleted file mode 100644
index d06ed58..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/V3FilterFactory.java
+++ /dev/null
@@ -1,25 +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 com.msopentech.odatajclient.engine.uri.filter;
-
-public class V3FilterFactory extends AbstractFilterFactory {
-
- private static final long serialVersionUID = 1092594961118334631L;
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/V4FilterFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/V4FilterFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/V4FilterFactory.java
deleted file mode 100644
index 00dac25..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/V4FilterFactory.java
+++ /dev/null
@@ -1,25 +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 com.msopentech.odatajclient.engine.uri.filter;
-
-public class V4FilterFactory extends AbstractFilterFactory {
-
- private static final long serialVersionUID = -5358934829490623191L;
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/AbstractDOMParser.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/AbstractDOMParser.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/AbstractDOMParser.java
deleted file mode 100644
index 4037b63..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/AbstractDOMParser.java
+++ /dev/null
@@ -1,46 +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 com.msopentech.odatajclient.engine.utils;
-
-import java.io.InputStream;
-import java.io.Writer;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * DOM Parser.
- */
-public abstract class AbstractDOMParser {
-
- /**
- * Parses the given input into a DOM tree.
- *
- * @param input stream to be parsed and de-serialized.
- * @return DOM tree
- */
- public abstract Element deserialize(InputStream input);
-
- /**
- * Writes DOM object by the given writer.
- *
- * @param content DOM to be streamed.
- * @param writer writer.
- */
- public abstract void serialize(Node content, Writer writer);
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/AndroidDOMParserImpl.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/AndroidDOMParserImpl.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/AndroidDOMParserImpl.java
deleted file mode 100644
index 62d8834..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/AndroidDOMParserImpl.java
+++ /dev/null
@@ -1,49 +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 com.msopentech.odatajclient.engine.utils;
-
-import java.io.InputStream;
-import java.io.Writer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class AndroidDOMParserImpl extends AbstractDOMParser {
-
- @Override
- public Element deserialize(final InputStream input) {
- try {
- return XMLUtils.DOC_BUILDER_FACTORY.newDocumentBuilder().parse(input).getDocumentElement();
- } catch (Exception e) {
- throw new IllegalArgumentException("Could not parse DOM", e);
- }
- }
-
- @Override
- public void serialize(final Node content, final Writer writer) {
- try {
- TransformerFactory.newInstance().newTransformer().
- transform(new DOMSource(content), new StreamResult(writer));
- } catch (Exception e) {
- throw new IllegalArgumentException("While serializing DOM element", e);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/AssociationSetBindingDetails.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/AssociationSetBindingDetails.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/AssociationSetBindingDetails.java
deleted file mode 100644
index 1341ed6..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/AssociationSetBindingDetails.java
+++ /dev/null
@@ -1,56 +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 com.msopentech.odatajclient.engine.utils;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntityContainer;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractSchema;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.AssociationSet;
-
-/**
- * Association set binding details bean.
- */
-public class AssociationSetBindingDetails {
-
- private final AssociationSet associationSet;
-
- private final AbstractEntityContainer<?> container;
-
- private final AbstractSchema<?, ?, ?, ?> schema;
-
- public AssociationSetBindingDetails(
- final AssociationSet associationSet,
- final AbstractEntityContainer<?> container,
- final AbstractSchema<?, ?, ?, ?> schema) {
- this.associationSet = associationSet;
- this.container = container;
- this.schema = schema;
- }
-
- public AssociationSet getAssociationSet() {
- return associationSet;
- }
-
- public AbstractEntityContainer<?> getContainer() {
- return container;
- }
-
- public AbstractSchema<?, ?, ?, ?> getSchema() {
- return schema;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/DefaultDOMParserImpl.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/DefaultDOMParserImpl.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/DefaultDOMParserImpl.java
deleted file mode 100644
index 469a2bb..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/DefaultDOMParserImpl.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 com.msopentech.odatajclient.engine.utils;
-
-import java.io.InputStream;
-import java.io.Writer;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.bootstrap.DOMImplementationRegistry;
-import org.w3c.dom.ls.DOMImplementationLS;
-import org.w3c.dom.ls.LSInput;
-import org.w3c.dom.ls.LSOutput;
-import org.w3c.dom.ls.LSParser;
-import org.w3c.dom.ls.LSSerializer;
-
-public class DefaultDOMParserImpl extends AbstractDOMParser {
-
- private static final Object MONITOR = new Object();
-
- private static DOMImplementationLS DOM_IMPL;
-
- private void lazyInit() throws ClassNotFoundException, InstantiationException, IllegalAccessException {
- synchronized (MONITOR) {
- if (DOM_IMPL == null) {
- final DOMImplementationRegistry reg = DOMImplementationRegistry.newInstance();
- DOM_IMPL = (DOMImplementationLS) reg.getDOMImplementation("LS");
- }
- }
- }
-
- @Override
- public Element deserialize(final InputStream input) {
- try {
- lazyInit();
-
- final LSParser parser = DOM_IMPL.createLSParser(DOMImplementationLS.MODE_SYNCHRONOUS, null);
-
- final LSInput lsinput = DOM_IMPL.createLSInput();
- lsinput.setByteStream(input);
-
- return parser.parse(lsinput).getDocumentElement();
- } catch (Exception e) {
- throw new IllegalArgumentException("Could not parse DOM", e);
- }
- }
-
- @Override
- public void serialize(final Node content, final Writer writer) {
- try {
- lazyInit();
-
- final LSSerializer serializer = DOM_IMPL.createLSSerializer();
-
- final LSOutput lso = DOM_IMPL.createLSOutput();
- lso.setCharacterStream(writer);
-
- serializer.write(content, lso);
- } catch (Exception e) {
- throw new IllegalArgumentException("While serializing DOM element", e);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/MetadataUtils.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/MetadataUtils.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/MetadataUtils.java
deleted file mode 100644
index 83e1c76..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/MetadataUtils.java
+++ /dev/null
@@ -1,178 +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 com.msopentech.odatajclient.engine.utils;
-
-import com.msopentech.odatajclient.engine.metadata.AbstractEdmMetadata;
-import com.msopentech.odatajclient.engine.metadata.EdmV3Metadata;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntityContainer;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntitySet;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractSchema;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.Association;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.AssociationSet;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.AssociationSetEnd;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.EntityContainer;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.Schema;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.NavigationPropertyBinding;
-import java.util.List;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Metadata utilities.
- */
-public class MetadataUtils {
-
- /**
- * Logger.
- */
- private static final Logger LOG = LoggerFactory.getLogger(MetadataUtils.class);
-
- public static AssociationSetBindingDetails getAssociationSetBindingDetails(
- final Association association, final String associationNamespace, final EdmV3Metadata metadata) {
-
- final StringBuilder associationName = new StringBuilder();
- associationName.append(associationNamespace).append('.').append(association.getName());
-
- for (Schema schema : metadata.getSchemas()) {
- for (EntityContainer container : schema.getEntityContainers()) {
- final AssociationSet associationSet = getAssociationSet(associationName.toString(), container);
- if (associationSet != null) {
- return new AssociationSetBindingDetails(associationSet, container, schema);
- }
- }
- }
-
- throw new IllegalStateException("Association set not found");
- }
-
- public static Association getAssociation(final Schema schema, final String relationship) {
- return schema.getAssociation(relationship.substring(relationship.lastIndexOf('.') + 1));
- }
-
- public static AssociationSet getAssociationSet(final String association, final EntityContainer container) {
- LOG.debug("Search for association set {}", association);
-
- for (AssociationSet associationSet : container.getAssociationSets()) {
- LOG.debug("Retrieved association set '{}:{}'", associationSet.getName(), associationSet.getAssociation());
- if (associationSet.getAssociation().equals(association)) {
- return associationSet;
- }
- }
-
- return null;
- }
-
- public static AbstractSchema<?, ?, ?, ?> getSchemaByNamespaceOrAlias(
- final AbstractEdmMetadata<?, ?, ?, ?, ?, ?, ?> metadata,
- final String name) {
-
- if (StringUtils.isNotBlank(name)) {
- for (AbstractSchema<?, ?, ?, ?> schema : metadata.getSchemas()) {
- if (name.equals(schema.getNamespace()) || name.equals(schema.getAlias())) {
- return schema;
- }
- }
- }
-
- return null;
- }
-
- public static AbstractEntityContainer<?> getContainerByName(
- final AbstractSchema<?, ?, ?, ?> schema,
- final String name) {
-
- for (AbstractEntityContainer<?> container : schema.getEntityContainers()) {
- if (container.getName().equals(name)) {
- return container;
- }
- }
-
- return null;
- }
-
- public static AbstractEntitySet getEntitySet(
- final AssociationSetBindingDetails associationSetBindingDetails, final String name) {
-
- final String entitySetName = getEntitySetName(associationSetBindingDetails.getAssociationSet(), name);
-
- for (AbstractEntitySet entitySet : associationSetBindingDetails.getContainer().getEntitySets()) {
- if (entitySet.getName().equals(entitySetName)) {
- return entitySet;
- }
- }
-
- return null;
- }
-
- public static AbstractEntitySet getEntitySet(
- final AbstractEdmMetadata<?, ?, ?, ?, ?, ?, ?> metadata,
- final String namespace,
- final String containerName,
- final String name) {
-
- for (AbstractSchema<?, ?, ?, ?> schema : metadata.getSchemas()) {
- if (schema.getNamespace().equals(namespace)) {
- for (AbstractEntityContainer<?> container : schema.getEntityContainers()) {
- if (containerName.equals(container.getName())) {
- for (AbstractEntitySet entitySet : container.getEntitySets()) {
- if (entitySet.getName().equals(name)) {
- return entitySet;
- }
- }
- }
- }
- }
- }
-
- return null;
- }
-
- public static AbstractEntitySet getEntitySet(final AbstractEntityContainer<?> container, final String name) {
-
- for (AbstractEntitySet entitySet : container.getEntitySets()) {
- if (entitySet.getName().equalsIgnoreCase(name)) {
- return entitySet;
- }
- }
-
- return null;
- }
-
- public static NavigationPropertyBinding getNavigationBindingByPath(
- final List<NavigationPropertyBinding> bindings,
- final String path) {
- for (NavigationPropertyBinding binding : bindings) {
- if (binding.getPath().equals(path)) {
- return binding;
- }
- }
-
- return null;
- }
-
- public static String getEntitySetName(final AssociationSet associationSet, final String role) {
- for (AssociationSetEnd end : associationSet.getEnds()) {
- if (end.getRole().equals(role)) {
- return end.getEntitySet();
- }
- }
- return null;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/NavigationPropertyBindingDetails.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/NavigationPropertyBindingDetails.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/NavigationPropertyBindingDetails.java
deleted file mode 100644
index 43a95cc..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/NavigationPropertyBindingDetails.java
+++ /dev/null
@@ -1,65 +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 com.msopentech.odatajclient.engine.utils;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntityContainer;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEntitySet;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractNavigationProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractSchema;
-
-/**
- * Navigation property binding details bean.
- */
-public class NavigationPropertyBindingDetails {
-
- private final AbstractNavigationProperty navigationProperty;
-
- private final AbstractEntitySet entitySet;
-
- private final AbstractSchema<?, ?, ?, ?> schema;
-
- private final AbstractEntityContainer<?> container;
-
- public NavigationPropertyBindingDetails(
- final AbstractNavigationProperty navigationProperty,
- final AbstractEntitySet entitySet,
- final AbstractEntityContainer<?> container,
- final AbstractSchema<?, ?, ?, ?> schema) {
- this.navigationProperty = navigationProperty;
- this.schema = schema;
- this.entitySet = entitySet;
- this.container = container;
- }
-
- public AbstractNavigationProperty getNavigationProperty() {
- return navigationProperty;
- }
-
- public AbstractSchema<?, ?, ?, ?> getSchema() {
- return schema;
- }
-
- public AbstractEntitySet getEntitySet() {
- return entitySet;
- }
-
- public AbstractEntityContainer<?> getContainer() {
- return container;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/ODataBatchConstants.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/ODataBatchConstants.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/ODataBatchConstants.java
deleted file mode 100644
index af7503e..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/ODataBatchConstants.java
+++ /dev/null
@@ -1,56 +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 com.msopentech.odatajclient.engine.utils;
-
-/**
- * Constant values related to the OData protocol.
- */
-public class ODataBatchConstants {
-
- /**
- * Batch/Changeset content type.
- */
- public static final String MULTIPART_CONTENT_TYPE = "multipart/mixed";
-
- /**
- * Batch item content type.
- */
- public static final String ITEM_CONTENT_TYPE = "application/http";
-
- /**
- * Boundary key.
- */
- public static final String BOUNDARY = "boundary";
-
- /**
- * Item content type.
- */
- public static String ITEM_CONTENT_TYPE_LINE = "Content-Type: application/http";
-
- /**
- * Item transfer encoding.
- */
- public static String ITEM_TRANSFER_ENCODING_LINE = "Content-Transfer-Encoding: binary";
-
- /**
- * Content id header name.
- */
- public static String CHANGESET_CONTENT_ID_NAME = "Content-ID";
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/ODataConstants.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/ODataConstants.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/ODataConstants.java
deleted file mode 100644
index c0db5b9..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/ODataConstants.java
+++ /dev/null
@@ -1,217 +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 com.msopentech.odatajclient.engine.utils;
-
-import javax.xml.XMLConstants;
-
-/**
- * Constant values related to the OData protocol.
- */
-public class ODataConstants {
-
- // Other stuff
- public final static String UTF8 = "UTF-8";
-
- public final static String NAME = "name";
-
- public final static String PROPERTIES = "properties";
-
- // XML namespaces and prefixes
- public final static String NS_ATOM = "http://www.w3.org/2005/Atom";
-
- public static final String NS_GEORSS = "http://www.georss.org/georss";
-
- public static final String NS_GML = "http://www.opengis.net/gml";
-
- public static final String XMLNS_DATASERVICES = XMLConstants.XMLNS_ATTRIBUTE + ":d";
-
- public static final String PREFIX_DATASERVICES = "d:";
-
- public static final String XMLNS_METADATA = XMLConstants.XMLNS_ATTRIBUTE + ":m";
-
- public static final String PREFIX_METADATA = "m:";
-
- public static final String XMLNS_GEORSS = XMLConstants.XMLNS_ATTRIBUTE + ":georss";
-
- public static final String PREFIX_GEORSS = "georss:";
-
- public static final String XMLNS_GML = XMLConstants.XMLNS_ATTRIBUTE + ":gml";
-
- public static final String PREFIX_GML = "gml:";
-
- /**
- * Edit link rel value.
- */
- public static final String EDIT_LINK_REL = "edit";
-
- /**
- * Self link rel value.
- */
- public static final String SELF_LINK_REL = "self";
-
- public static final String NEXT_LINK_REL = "next";
-
- // XML elements and attributes
- public static final String ELEM_PROPERTIES = PREFIX_METADATA + PROPERTIES;
-
- public static final String ELEM_ELEMENT = "element";
-
- public final static String ATTR_TYPE = "type";
-
- public static final String ATTR_M_TYPE = PREFIX_METADATA + ATTR_TYPE;
-
- public static final String ATTR_NULL = PREFIX_METADATA + "null";
-
- public static final String ATTR_XMLBASE = "xml:base";
-
- public static final String ATTR_REL = "rel";
-
- public static final String ATTR_HREF = "href";
-
- public static final String ATTR_METADATA = "metadata";
-
- public static final String ATTR_TITLE = "title";
-
- public static final String ATTR_TARGET = "target";
-
- public static final String ELEM_COLLECTION = "collection";
-
- public static final String ATTR_SRSNAME = PREFIX_GML + "srsName";
-
- public static final String ELEM_POINT = PREFIX_GML + "Point";
-
- public static final String ELEM_MULTIPOINT = PREFIX_GML + "MultiPoint";
-
- public static final String ELEM_POINTMEMBERS = PREFIX_GML + "pointMembers";
-
- public static final String ELEM_LINESTRING = PREFIX_GML + "LineString";
-
- public static final String ELEM_MULTILINESTRING = PREFIX_GML + "MultiCurve";
-
- public static final String ELEM_LINESTRINGMEMBERS = PREFIX_GML + "curveMembers";
-
- public static final String ELEM_POLYGON = PREFIX_GML + "Polygon";
-
- public static final String ELEM_POLYGON_EXTERIOR = PREFIX_GML + "exterior";
-
- public static final String ELEM_POLYGON_INTERIOR = PREFIX_GML + "interior";
-
- public static final String ELEM_POLYGON_LINEARRING = PREFIX_GML + "LinearRing";
-
- public static final String ELEM_MULTIPOLYGON = PREFIX_GML + "MultiSurface";
-
- public static final String ELEM_SURFACEMEMBERS = PREFIX_GML + "surfaceMembers";
-
- public static final String ELEM_GEOCOLLECTION = PREFIX_GML + "MultiGeometry";
-
- public static final String ELEM_GEOMEMBERS = PREFIX_GML + "geometryMembers";
-
- public static final String ELEM_POS = PREFIX_GML + "pos";
-
- public static final String ELEM_POSLIST = PREFIX_GML + "posList";
-
- public static final String ELEM_PROPERTY = "property";
-
- public static final String ELEM_URI = "uri";
-
- // JSON stuff
- public final static String JSON_METADATA = "odata.metadata";
-
- public final static String JSON_TYPE = "odata.type";
-
- public final static String JSON_ETAG = "odata.etag";
-
- public final static String JSON_MEDIA_ETAG = "odata.mediaETag";
-
- public final static String JSON_ID = "odata.id";
-
- public final static String JSON_READ_LINK = "odata.readLink";
-
- public final static String JSON_EDIT_LINK = "odata.editLink";
-
- public final static String JSON_MEDIAREAD_LINK = "odata.mediaReadLink";
-
- public final static String JSON_MEDIAEDIT_LINK = "odata.mediaEditLink";
-
- public final static String JSON_MEDIA_CONTENT_TYPE = "odata.mediaContentType";
-
- public final static String JSON_NAVIGATION_LINK_SUFFIX = "@odata.navigationLinkUrl";
-
- public final static String JSON_BIND_LINK_SUFFIX = "@odata.bind";
-
- public final static String JSON_ASSOCIATION_LINK_SUFFIX = "@odata.associationLinkUrl";
-
- public final static String JSON_MEDIAEDIT_LINK_SUFFIX = "@odata.mediaEditLink";
-
- public final static String JSON_VALUE = "value";
-
- public final static String JSON_URL = "url";
-
- public final static String JSON_COORDINATES = "coordinates";
-
- public final static String JSON_GEOMETRIES = "geometries";
-
- public final static String JSON_CRS = "crs";
-
- public final static String JSON_GIS_URLPREFIX = "http://www.opengis.net/def/crs/EPSG/0/";
-
- // Atom stuff
- public final static String ATOM_ELEM_ENTRY = "entry";
-
- public final static String ATOM_ELEM_FEED = "feed";
-
- public final static String ATOM_ELEM_CATEGORY = "category";
-
- public final static String ATOM_ELEM_ID = "id";
-
- public final static String ATOM_ELEM_LINK = "link";
-
- public final static String ATOM_ELEM_CONTENT = "content";
-
- public static final String ATOM_ELEM_TITLE = "title";
-
- public static final String ATOM_ELEM_SUMMARY = "summary";
-
- public static final String ATOM_ELEM_UPDATED = "updated";
-
- public static final String ATOM_ELEM_AUTHOR = "author";
-
- public static final String ATOM_ELEM_AUTHOR_NAME = "name";
-
- public static final String ATOM_ELEM_AUTHOR_URI = "uri";
-
- public static final String ATOM_ELEM_AUTHOR_EMAIL = "email";
-
- public static final String ATOM_ELEM_ACTION = PREFIX_METADATA + "action";
-
- public static final String ATOM_ELEM_INLINE = PREFIX_METADATA + "inline";
-
- public static final String ATOM_ATTR_TITLE = "atom:title";
-
- public static final String ATOM_ATTR_TERM = "term";
-
- public static final String ATOM_ATTR_SCHEME = "scheme";
-
- public static final String ATOM_ATTR_SRC = "src";
-
- public static final String ATOM_ATTR_ETAG = PREFIX_METADATA + "etag";
-
- public static final String ATOM_ATTR_COUNT = PREFIX_METADATA + "count";
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/ODataVersion.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/ODataVersion.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/ODataVersion.java
deleted file mode 100644
index ba4363b..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/ODataVersion.java
+++ /dev/null
@@ -1,83 +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 com.msopentech.odatajclient.engine.utils;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-public enum ODataVersion {
-
- V3("3.0"),
- V4("4.0");
-
- public static final String NS_DATASERVICES = "dataservices";
-
- public static final String NS_METADATA = "metadata";
-
- public static final String NS_DATA = "data";
-
- public static final String NS_SCHEME = "scheme";
-
- public static final String NAVIGATION_LINK_REL = "navigationLinkRel";
-
- public static final String ASSOCIATION_LINK_REL = "associationLinkRel";
-
- public static final String MEDIA_EDIT_LINK_REL = "mediaEditLinkRel";
-
- private static final Map<String, String> V3_NAMESPACES = Collections.unmodifiableMap(new HashMap<String, String>() {
-
- private static final long serialVersionUID = 3109256773218160485L;
-
- {
- put(NS_DATASERVICES, "http://schemas.microsoft.com/ado/2007/08/dataservices");
- put(NS_METADATA, "http://schemas.microsoft.com/ado/2007/08/dataservices/metadata");
- put(NS_SCHEME, "http://schemas.microsoft.com/ado/2007/08/dataservices/scheme");
- put(NAVIGATION_LINK_REL, "http://schemas.microsoft.com/ado/2007/08/dataservices/related/");
- put(ASSOCIATION_LINK_REL, "http://schemas.microsoft.com/ado/2007/08/dataservices/relatedlinks/");
- put(MEDIA_EDIT_LINK_REL, "http://schemas.microsoft.com/ado/2007/08/dataservices/edit-media/");
- }
- });
-
- private static final Map<String, String> V4_NAMESPACES = Collections.unmodifiableMap(new HashMap<String, String>() {
-
- private static final long serialVersionUID = 3109256773218160485L;
-
- {
- put(NS_METADATA, "http://docs.oasis-open.org/odata/ns/metadata");
- put(NS_DATA, "http://docs.oasis-open.org/odata/ns/data");
- }
- });
-
- private final String version;
-
- private ODataVersion(final String version) {
- this.version = version;
- }
-
- public Map<String, String> getNamespaceMap() {
- return this == V3 ? V3_NAMESPACES : V4_NAMESPACES;
- }
-
- @Override
- public String toString() {
- return version;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/QualifiedName.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/QualifiedName.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/QualifiedName.java
deleted file mode 100644
index d3174dd..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/utils/QualifiedName.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 com.msopentech.odatajclient.engine.utils;
-
-import org.apache.commons.lang3.StringUtils;
-
-public class QualifiedName {
-
- private final String namespace;
-
- private final String name;
-
- public QualifiedName(final String namespace, final String name) {
- if (StringUtils.isBlank(name)) {
- throw new IllegalArgumentException("Invalid name " + name);
- }
-
- this.namespace = namespace;
- this.name = name;
- }
-
- public QualifiedName(final String qualifiedName) {
- if (StringUtils.isNoneBlank(qualifiedName) && !qualifiedName.trim().endsWith(".")) {
- int lastDotIndex = qualifiedName.lastIndexOf('.');
- this.namespace = qualifiedName.substring(0, lastDotIndex > 0 ? lastDotIndex : 0);
- this.name = qualifiedName.substring(lastDotIndex + 1);
- } else {
- throw new IllegalArgumentException("Invalid qualified name " + qualifiedName);
- }
- }
-
- public String getNamespace() {
- return namespace;
- }
-
- public String getName() {
- return name;
- }
-
- @Override
- public String toString() {
- final StringBuilder builder = new StringBuilder();
-
- if (StringUtils.isNoneBlank(namespace)) {
- builder.append(namespace).append('.');
- }
-
- return builder.append(name).toString();
- }
-}
[26/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/QueryOptionsTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/QueryOptionsTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/QueryOptionsTestITCase.java
deleted file mode 100644
index c1c60b7..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/QueryOptionsTestITCase.java
+++ /dev/null
@@ -1,193 +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 com.msopentech.odatajclient.engine.it;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataEntityRequest;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataEntitySetRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.data.ODataEntitySet;
-import com.msopentech.odatajclient.engine.data.ODataInlineEntitySet;
-import com.msopentech.odatajclient.engine.data.impl.v3.AtomEntry;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import org.junit.Test;
-
-/**
- * This is the unit test class to check for query options.
- */
-public class QueryOptionsTestITCase extends AbstractTestITCase {
-
- /**
- * Test <tt>$expand</tt>.
- *
- * @see EntityRetrieveTest#readODataEntityWithInline(com.msopentech.odatajclient.engine.types.ODataPubFormat)
- */
- public void expand() {
- // empty
- }
-
- /**
- * Test <tt>$filter</tt> and <tt>orderby</tt>.
- *
- * @see FilterFactoryTest for more tests.
- */
- @Test
- public void filterOrderby() {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntitySetSegment("Car").filter("(VIN lt 16)");
-
- // 1. check that filtered entity set looks as expected
- ODataEntitySetRequest req = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
- ODataEntitySet feed = req.execute().getBody();
- assertNotNull(feed);
- assertEquals(5, feed.getEntities().size());
-
- // 2. extract VIN values - sorted ASC by default
- final List<Integer> vinsASC = new ArrayList<Integer>(5);
- for (ODataEntity entity : feed.getEntities()) {
- final Integer vin = entity.getProperty("VIN").getPrimitiveValue().<Integer>toCastValue();
- assertTrue(vin < 16);
- vinsASC.add(vin);
- }
-
- // 3. add orderby clause to filter above
- req = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.orderBy("VIN desc").build());
- feed = req.execute().getBody();
- assertNotNull(feed);
- assertEquals(5, feed.getEntities().size());
-
- // 4. extract again VIN value - now they were required to be sorted DESC
- final List<Integer> vinsDESC = new ArrayList<Integer>(5);
- for (ODataEntity entity : feed.getEntities()) {
- vinsDESC.add(entity.getProperty("VIN").getPrimitiveValue().<Integer>toCastValue());
- }
-
- // 5. reverse vinsASC and expect to be equal to vinsDESC
- Collections.reverse(vinsASC);
- assertEquals(vinsASC, vinsDESC);
- }
-
- /**
- * Test <tt>$format</tt>.
- */
- @Test
- public void format() {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment("Customer").appendKeySegment(-10).format("json");
-
- final ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setFormat(ODataPubFormat.ATOM);
-
- final ODataRetrieveResponse<ODataEntity> res = req.execute();
- assertNotNull(res);
- assertTrue(res.getContentType().replaceAll(" ", "").startsWith(ODataPubFormat.JSON.toString()));
- }
-
- /**
- * Test <tt>$skip</tt>.
- *
- * @see FeedTest#readFeedWithNextLink(com.msopentech.odatajclient.engine.types.ODataPubFormat)
- */
- public void skip() {
- // empty
- }
-
- /**
- * Test <tt>$top</tt>.
- *
- * @see FeedTest#readFeed(com.msopentech.odatajclient.engine.types.ODataPubFormat)
- */
- public void top() {
- // empty
- }
-
- /**
- * Test <tt>$skiptoken</tt>.
- */
- @Test
- public void skiptoken() {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL);
- uriBuilder.appendEntityTypeSegment("Customer").skipToken("-10");
-
- final ODataEntitySetRequest req = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
- final ODataEntitySet feed = req.execute().getBody();
- assertNotNull(feed);
- assertEquals(2, feed.getEntities().size());
-
- for (ODataEntity entity : feed.getEntities()) {
- assertTrue(entity.getProperty("CustomerId").getPrimitiveValue().<Integer>toCastValue() > -10);
- }
- }
-
- /**
- * Test <tt>$inlinecount</tt>.
- */
- @Test
- public void inlinecount() {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL);
- uriBuilder.appendEntityTypeSegment("Car").inlineCount();
-
- final ODataEntitySetRequest req = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
- req.setFormat(ODataPubFormat.ATOM);
- final ODataEntitySet feed = req.execute().getBody();
- assertNotNull(feed);
- assertEquals(feed.getEntities().size(), feed.getCount());
- }
-
- /**
- * Test <tt>$select</tt>.
- */
- @Test
- public void select() {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment("Customer").appendKeySegment(-10).select("CustomerId,Orders").expand("Orders");
-
- final ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- final ODataEntity customer = req.execute().getBody();
- assertEquals(1, customer.getProperties().size());
- assertEquals(1, customer.getNavigationLinks().size());
- assertTrue((customer.getNavigationLinks().get(0) instanceof ODataInlineEntitySet));
- }
-
- @Test
- public void issue131() {
- final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
- appendEntityTypeSegment("Customer").appendKeySegment(-7).select("Name");
-
- ODataEntityRequest req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setFormat(ODataPubFormat.ATOM);
-
- final ODataEntity customer = req.execute().getBody();
- assertEquals(0, customer.getProperties().size());
-
- req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setFormat(ODataPubFormat.ATOM);
-
- final AtomEntry atomEntry = client.getDeserializer().toEntry(req.execute().getRawResponse(), AtomEntry.class);
- assertEquals("remotingdestructorprinterswitcheschannelssatellitelanguageresolve", atomEntry.getSummary());
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/ServiceDocumentRetrieveTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/ServiceDocumentRetrieveTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/ServiceDocumentRetrieveTestITCase.java
deleted file mode 100644
index 986b6de..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/ServiceDocumentRetrieveTestITCase.java
+++ /dev/null
@@ -1,74 +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 com.msopentech.odatajclient.engine.it;
-
-import static org.junit.Assert.*;
-import java.net.URI;
-import org.junit.Test;
-
-import com.msopentech.odatajclient.engine.communication.ODataClientErrorException;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataServiceDocumentRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.data.ODataServiceDocument;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-
-public class ServiceDocumentRetrieveTestITCase extends AbstractTestITCase {
-
- private void retrieveServiceDocumentTest(final ODataFormat reqFormat, final String acceptFormat) {
- final ODataServiceDocumentRequest req =
- client.getRetrieveRequestFactory().getServiceDocumentRequest(testStaticServiceRootURL);
- req.setFormat(reqFormat);
- req.setAccept(acceptFormat);
- final ODataRetrieveResponse<ODataServiceDocument> res = req.execute();
- assertEquals(200, res.getStatusCode());
- final ODataServiceDocument serviceDocument = res.getBody();
- assertEquals(24, serviceDocument.getEntitySetTitles().size());
- assertEquals(URI.create(testStaticServiceRootURL + "/Customer"), serviceDocument.getEntitySetURI("Customer"));
- }
-
- @Test
- public void jsonTest() {
- retrieveServiceDocumentTest(ODataFormat.JSON, "application/json");
- }
-
- @Test
- public void jsonNoMetadataTest() {
- retrieveServiceDocumentTest(ODataFormat.JSON_NO_METADATA, "application/json");
- }
-
- @Test
- public void xmlTest() {
- retrieveServiceDocumentTest(ODataFormat.XML, "application/xml");
- }
-
- @Test(expected = ODataClientErrorException.class)
- public void atomAcceptTest() {
- retrieveServiceDocumentTest(ODataFormat.XML, "application/atom+xml");
- }
-
- @Test
- public void nullAcceptTest() {
- retrieveServiceDocumentTest(ODataFormat.XML, null);
- }
-
- @Test
- public void nullServiceFormatTest() {
- retrieveServiceDocumentTest(null, "application/xml");
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/ServiceDocumentTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/ServiceDocumentTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/ServiceDocumentTestITCase.java
deleted file mode 100644
index 1182045..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/ServiceDocumentTestITCase.java
+++ /dev/null
@@ -1,56 +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 com.msopentech.odatajclient.engine.it;
-
-import static org.junit.Assert.assertEquals;
-
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataServiceDocumentRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.data.ODataServiceDocument;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import java.net.URI;
-import org.junit.Test;
-
-public class ServiceDocumentTestITCase extends AbstractTestITCase {
-
- private void retrieveServiceDocument(final ODataFormat format) {
- final ODataServiceDocumentRequest req =
- client.getRetrieveRequestFactory().getServiceDocumentRequest(testStaticServiceRootURL);
- req.setFormat(format);
-
- final ODataRetrieveResponse<ODataServiceDocument> res = req.execute();
- assertEquals(200, res.getStatusCode());
-
- final ODataServiceDocument serviceDocument = res.getBody();
- assertEquals(24, serviceDocument.getEntitySetTitles().size());
-
- assertEquals(URI.create(testStaticServiceRootURL + "/ComputerDetail"),
- serviceDocument.getEntitySetURI("ComputerDetail"));
- }
-
- @Test
- public void retrieveServiceDocumentAsXML() {
- retrieveServiceDocument(ODataFormat.XML);
- }
-
- @Test
- public void retrieveServiceDocumentAsJSON() {
- retrieveServiceDocument(ODataFormat.JSON);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/XHTTPMethodEntityUpdateTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/XHTTPMethodEntityUpdateTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/XHTTPMethodEntityUpdateTestITCase.java
deleted file mode 100644
index b962d92..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/XHTTPMethodEntityUpdateTestITCase.java
+++ /dev/null
@@ -1,38 +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 com.msopentech.odatajclient.engine.it;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-
-/**
- * Performs entity update tests using the X-HTTP-METHOD header.
- */
-public class XHTTPMethodEntityUpdateTestITCase extends EntityUpdateTestITCase {
-
- @BeforeClass
- public static void enableXHTTPMethod() {
- client.getConfiguration().setUseXHTTPMethod(true);
- }
-
- @AfterClass
- public static void disableXHTTPMethod() {
- client.getConfiguration().setUseXHTTPMethod(false);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/XHTTPMethodPropertyUpdateTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/XHTTPMethodPropertyUpdateTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/XHTTPMethodPropertyUpdateTestITCase.java
deleted file mode 100644
index 60df207..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/XHTTPMethodPropertyUpdateTestITCase.java
+++ /dev/null
@@ -1,38 +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 com.msopentech.odatajclient.engine.it;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-
-/**
- * Performs property update tests using the X-HTTP-METHOD header.
- */
-public class XHTTPMethodPropertyUpdateTestITCase extends PropertyTestITCase {
-
- @BeforeClass
- public static void enableXHTTPMethod() {
- client.getConfiguration().setUseXHTTPMethod(true);
- }
-
- @AfterClass
- public static void disableXHTTPMethod() {
- client.getConfiguration().setUseXHTTPMethod(false);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/v3/V3MetadataTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/v3/V3MetadataTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/v3/V3MetadataTestITCase.java
deleted file mode 100644
index 0581959..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/v3/V3MetadataTestITCase.java
+++ /dev/null
@@ -1,42 +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 com.msopentech.odatajclient.engine.it.v3;
-
-import static org.junit.Assert.assertNotNull;
-import com.msopentech.odatajclient.engine.client.ODataClientFactory;
-import com.msopentech.odatajclient.engine.client.ODataV3Client;
-import com.msopentech.odatajclient.engine.metadata.EdmV3Metadata;
-import com.msopentech.odatajclient.engine.it.AbstractMetadataTestITCase;
-import org.junit.Test;
-
-public class V3MetadataTestITCase extends AbstractMetadataTestITCase {
-
- @Override
- protected ODataV3Client getClient() {
- return ODataClientFactory.getV3();
- }
-
- @Test
- public void retrieve() {
- final EdmV3Metadata metadata = getClient().getRetrieveRequestFactory().
- getMetadataRequest(getTestServiceRoot()).execute().getBody();
- assertNotNull(metadata);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/v4/V4MetadataTestITCase.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/v4/V4MetadataTestITCase.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/v4/V4MetadataTestITCase.java
deleted file mode 100644
index b8fcaff..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/it/v4/V4MetadataTestITCase.java
+++ /dev/null
@@ -1,41 +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 com.msopentech.odatajclient.engine.it.v4;
-
-import static org.junit.Assert.assertNotNull;
-import com.msopentech.odatajclient.engine.client.ODataClientFactory;
-import com.msopentech.odatajclient.engine.client.ODataV4Client;
-import com.msopentech.odatajclient.engine.metadata.EdmV4Metadata;
-import com.msopentech.odatajclient.engine.it.AbstractMetadataTestITCase;
-import org.junit.Test;
-
-public class V4MetadataTestITCase extends AbstractMetadataTestITCase {
-
- @Override
- protected ODataV4Client getClient() {
- return ODataClientFactory.getV4();
- }
-
- @Test
- public void retrieve() {
- final EdmV4Metadata metadata = getClient().getRetrieveRequestFactory().
- getMetadataRequest(getTestServiceRoot()).execute().getBody();
- assertNotNull(metadata);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/performance/BasicPerfTest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/performance/BasicPerfTest.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/performance/BasicPerfTest.java
deleted file mode 100644
index e8fa97a..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/performance/BasicPerfTest.java
+++ /dev/null
@@ -1,321 +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 com.msopentech.odatajclient.engine.performance;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
-import com.carrotsearch.junitbenchmarks.BenchmarkOptions;
-import com.carrotsearch.junitbenchmarks.BenchmarkRule;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.msopentech.odatajclient.engine.AbstractTest;
-import com.msopentech.odatajclient.engine.client.ODataV3Client;
-import com.msopentech.odatajclient.engine.data.ODataCollectionValue;
-import com.msopentech.odatajclient.engine.data.ODataComplexValue;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.data.ResourceFactory;
-import com.msopentech.odatajclient.engine.data.impl.v3.AtomEntry;
-import com.msopentech.odatajclient.engine.data.impl.v3.JSONEntry;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.HashMap;
-import java.util.Map;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import org.apache.commons.io.IOUtils;
-import org.junit.BeforeClass;
-import org.junit.FixMethodOrder;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestRule;
-import org.junit.runners.MethodSorters;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.bootstrap.DOMImplementationRegistry;
-import org.w3c.dom.ls.DOMImplementationLS;
-import org.w3c.dom.ls.LSOutput;
-import org.w3c.dom.ls.LSSerializer;
-import org.xml.sax.SAXException;
-
-@BenchmarkOptions(warmupRounds = 25, benchmarkRounds = 50)
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class BasicPerfTest extends AbstractTest {
-
- private static final Map<ODataPubFormat, String> input = new HashMap<ODataPubFormat, String>(2);
-
- @Rule
- public TestRule benchmarkRun = new BenchmarkRule();
-
- @BeforeClass
- public static void setInput() {
- try {
- input.put(ODataPubFormat.ATOM,
- IOUtils.toString(BasicPerfTest.class.getResourceAsStream("../Customer_-10.xml")));
- input.put(ODataPubFormat.JSON,
- IOUtils.toString(BasicPerfTest.class.getResourceAsStream("../Customer_-10.json")));
- } catch (Exception e) {
- fail("Could not load sample file");
- }
- }
-
- protected ODataV3Client getClient() {
- return v3Client;
- }
-
- @Test
- public void readAtomViaLowerlevelLibs() throws ParserConfigurationException, SAXException, IOException {
- final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- final DocumentBuilder builder = factory.newDocumentBuilder();
-
- final Document entry = builder.parse(IOUtils.toInputStream(input.get(ODataPubFormat.ATOM)));
- assertNotNull(entry);
- entry.getDocumentElement().normalize();
- }
-
- @Test
- public void readJSONViaLowerlevelLibs() throws IOException {
- final ObjectMapper mapper = new ObjectMapper();
-
- final JsonNode entry = mapper.readTree(IOUtils.toInputStream(input.get(ODataPubFormat.JSON)));
- assertNotNull(entry);
- }
-
- private void readViaODataJClient(final ODataPubFormat format) {
- final ODataEntity entity = getClient().getBinder().getODataEntity(
- getClient().getDeserializer().toEntry(IOUtils.toInputStream(input.get(format)),
- ResourceFactory.entryClassForFormat(format)));
- assertNotNull(entity);
- }
-
- @Test
- public void readAtomViaOdataJClient() {
- readViaODataJClient(ODataPubFormat.ATOM);
- }
-
- @Test
- public void readJSONViaOdataJClient() {
- readViaODataJClient(ODataPubFormat.JSON);
- }
-
- @Test
- public void writeAtomViaLowerlevelLibs()
- throws ParserConfigurationException, ClassNotFoundException,
- InstantiationException, IllegalAccessException {
-
- final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- final DocumentBuilder builder = factory.newDocumentBuilder();
- final Document doc = builder.newDocument();
-
- final Element entry = doc.createElement("entry");
- entry.setAttribute("xmlns", "http://www.w3.org/2005/Atom");
- entry.setAttribute("xmlns:m", "http://schemas.microsoft.com/ado/2007/08/dataservices/metadata");
- entry.setAttribute("xmlns:d", "http://schemas.microsoft.com/ado/2007/08/dataservices");
- entry.setAttribute("xmlns:gml", "http://www.opengis.net/gml");
- entry.setAttribute("xmlns:georss", "http://www.georss.org/georss");
- doc.appendChild(entry);
-
- final Element category = doc.createElement("category");
- category.setAttribute("term", "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer");
- category.setAttribute("scheme", "http://schemas.microsoft.com/ado/2007/08/dataservices/scheme");
- entry.appendChild(category);
-
- final Element properties = doc.createElement("m:properties");
- entry.appendChild(properties);
-
- final Element name = doc.createElement("d:Name");
- name.setAttribute("m:type", "Edm.String");
- name.appendChild(doc.createTextNode("A name"));
- properties.appendChild(name);
-
- final Element customerId = doc.createElement("d:CustomerId");
- customerId.setAttribute("m:type", "Edm.Int32");
- customerId.appendChild(doc.createTextNode("0"));
- properties.appendChild(customerId);
-
- final Element bci = doc.createElement("d:BackupContactInfo");
- bci.setAttribute("m:type", "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)");
- properties.appendChild(bci);
-
- final Element topelement = doc.createElement("d:element");
- topelement.setAttribute("m:type", "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails");
- bci.appendChild(topelement);
-
- final Element altNames = doc.createElement("d:AlternativeNames");
- altNames.setAttribute("m:type", "Collection(Edm.String)");
- topelement.appendChild(altNames);
-
- final Element element1 = doc.createElement("d:element");
- element1.setAttribute("m:type", "Edm.String");
- element1.appendChild(doc.createTextNode("myname"));
- altNames.appendChild(element1);
-
- final Element emailBag = doc.createElement("d:EmailBag");
- emailBag.setAttribute("m:type", "Collection(Edm.String)");
- topelement.appendChild(emailBag);
-
- final Element element2 = doc.createElement("d:element");
- element2.setAttribute("m:type", "Edm.String");
- element2.appendChild(doc.createTextNode("myname@mydomain.com"));
- emailBag.appendChild(element2);
-
- final Element contactAlias = doc.createElement("d:ContactAlias");
- contactAlias.setAttribute("m:type", "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases");
- topelement.appendChild(contactAlias);
-
- final Element altNames2 = doc.createElement("d:AlternativeNames");
- altNames2.setAttribute("m:type", "Collection(Edm.String)");
- contactAlias.appendChild(altNames2);
-
- final Element element3 = doc.createElement("d:element");
- element3.setAttribute("m:type", "Edm.String");
- element3.appendChild(doc.createTextNode("myAlternativeName"));
- altNames2.appendChild(element3);
-
- final StringWriter writer = new StringWriter();
-
- final DOMImplementationRegistry reg = DOMImplementationRegistry.newInstance();
- final DOMImplementationLS impl = (DOMImplementationLS) reg.getDOMImplementation("LS");
- final LSSerializer serializer = impl.createLSSerializer();
- final LSOutput lso = impl.createLSOutput();
- lso.setCharacterStream(writer);
- serializer.write(doc, lso);
-
- assertFalse(writer.toString().isEmpty());
- }
-
- @Test
- public void writeJSONViaLowerlevelLibs() throws IOException {
- final StringWriter writer = new StringWriter();
-
- final ObjectMapper mapper = new ObjectMapper();
-
- final JsonGenerator jgen = mapper.getFactory().createGenerator(writer);
-
- jgen.writeStartObject();
-
- jgen.writeStringField("odata.type", "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer");
-
- jgen.writeStringField("Name@odata.type", "Edm.String");
- jgen.writeStringField("Name", "A name");
-
- jgen.writeStringField("CustomerId@odata.type", "Edm.Int32");
- jgen.writeNumberField("CustomerId", 0);
-
- jgen.writeArrayFieldStart("BackupContactInfo");
-
- jgen.writeStartObject();
-
- jgen.writeArrayFieldStart("AlternativeNames");
- jgen.writeString("myname");
- jgen.writeEndArray();
-
- jgen.writeArrayFieldStart("EmailBag");
- jgen.writeString("myname@mydomain.com");
- jgen.writeEndArray();
-
- jgen.writeObjectFieldStart("ContactAlias");
- jgen.writeStringField("odata.type", "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases");
- jgen.writeArrayFieldStart("AlternativeNames");
- jgen.writeString("myAlternativeName");
- jgen.writeEndArray();
- jgen.writeEndObject();
-
- jgen.writeEndObject();
-
- jgen.writeEndArray();
-
- jgen.writeEndObject();
-
- jgen.flush();
-
- assertFalse(writer.toString().isEmpty());
- }
-
- private ODataEntity sampleODataEntity() throws IOException {
- final ODataEntity entity = getClient().getObjectFactory().
- newEntity("Microsoft.Test.OData.Services.AstoriaDefaultService.Customer");
-
- // add name attribute
- entity.addProperty(getClient().getObjectFactory().newPrimitiveProperty("Name",
- getClient().getPrimitiveValueBuilder().setText("A name").setType(
- EdmSimpleType.String).build()));
-
- // add key attribute
- entity.addProperty(getClient().getObjectFactory().newPrimitiveProperty("CustomerId",
- getClient().getPrimitiveValueBuilder().setText("0").setType(EdmSimpleType.Int32).
- build()));
-
- // add BackupContactInfo attribute (collection)
- final ODataCollectionValue bciv = new ODataCollectionValue(
- "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)");
- entity.addProperty(getClient().getObjectFactory().newCollectionProperty("BackupContactInfo", bciv));
-
- // add BackupContactInfo.ContactDetails attribute (complex)
- final ODataComplexValue contactDetails = new ODataComplexValue(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails");
- bciv.add(contactDetails);
-
- // add BackupContactInfo.ContactDetails.AlternativeNames attribute (collection)
- final ODataCollectionValue altNamesValue = new ODataCollectionValue("Collection(Edm.String)");
- altNamesValue.add(getClient().getPrimitiveValueBuilder().
- setText("myname").setType(EdmSimpleType.String).build());
- contactDetails.add(getClient().getObjectFactory().newCollectionProperty("AlternativeNames", altNamesValue));
-
- // add BackupContactInfo.ContactDetails.EmailBag attribute (collection)
- final ODataCollectionValue emailBagValue = new ODataCollectionValue("Collection(Edm.String)");
- emailBagValue.add(getClient().getPrimitiveValueBuilder().
- setText("myname@mydomain.com").setType(EdmSimpleType.String).build());
- contactDetails.add(getClient().getObjectFactory().newCollectionProperty("EmailBag", emailBagValue));
-
- // add BackupContactInfo.ContactDetails.ContactAlias attribute (complex)
- final ODataComplexValue contactAliasValue = new ODataComplexValue(
- "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases");
- contactDetails.add(getClient().getObjectFactory().newComplexProperty("ContactAlias", contactAliasValue));
-
- // add BackupContactInfo.ContactDetails.ContactAlias.AlternativeNames attribute (collection)
- final ODataCollectionValue aanv = new ODataCollectionValue("Collection(Edm.String)");
- aanv.add(getClient().getPrimitiveValueBuilder().
- setText("myAlternativeName").setType(EdmSimpleType.String).build());
- contactAliasValue.add(getClient().getObjectFactory().newCollectionProperty("AlternativeNames", aanv));
-
- return entity;
- }
-
- @Test
- public void writeAtomViaOdataJClient() throws IOException {
- final StringWriter writer = new StringWriter();
- getClient().getSerializer().entry(
- getClient().getBinder().getEntry(sampleODataEntity(), AtomEntry.class, true), writer);
- assertFalse(writer.toString().isEmpty());
- }
-
- @Test
- public void writeJSONViaOdataJClient() throws IOException {
- final StringWriter writer = new StringWriter();
- getClient().getSerializer().entry(
- getClient().getBinder().getEntry(sampleODataEntity(), JSONEntry.class, true), writer);
- assertFalse(writer.toString().isEmpty());
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/performance/HundredPerfTest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/performance/HundredPerfTest.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/performance/HundredPerfTest.java
deleted file mode 100644
index 97cbaa7..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/performance/HundredPerfTest.java
+++ /dev/null
@@ -1,85 +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 com.msopentech.odatajclient.engine.performance;
-
-import java.io.IOException;
-import javax.xml.parsers.ParserConfigurationException;
-import org.xml.sax.SAXException;
-
-public class HundredPerfTest extends BasicPerfTest {
-
- @Override
- public void readAtomViaLowerlevelLibs() throws ParserConfigurationException, SAXException, IOException {
- for (int i = 0; i < 100; i++) {
- super.readAtomViaLowerlevelLibs();
- }
- }
-
- @Override
- public void readAtomViaOdataJClient() {
- for (int i = 0; i < 100; i++) {
- super.readAtomViaOdataJClient();
- }
- }
-
- @Override
- public void writeAtomViaLowerlevelLibs()
- throws ParserConfigurationException, ClassNotFoundException,
- InstantiationException, IllegalAccessException {
-
- for (int i = 0; i < 100; i++) {
- super.writeAtomViaLowerlevelLibs();
- }
- }
-
- @Override
- public void writeAtomViaOdataJClient() throws IOException {
- for (int i = 0; i < 100; i++) {
- super.writeAtomViaOdataJClient();
- }
- }
-
- @Override
- public void readJSONViaLowerlevelLibs() throws IOException {
- for (int i = 0; i < 100; i++) {
- super.readJSONViaLowerlevelLibs();
- }
- }
-
- @Override
- public void readJSONViaOdataJClient() {
- for (int i = 0; i < 100; i++) {
- super.readJSONViaOdataJClient();
- }
- }
-
- @Override
- public void writeJSONViaLowerlevelLibs() throws IOException {
- for (int i = 0; i < 100; i++) {
- super.writeJSONViaLowerlevelLibs();
- }
- }
-
- @Override
- public void writeJSONViaOdataJClient() throws IOException {
- for (int i = 0; i < 100; i++) {
- super.writeJSONViaOdataJClient();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/performance/PerfTestReporter.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/performance/PerfTestReporter.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/performance/PerfTestReporter.java
deleted file mode 100644
index f4bfb29..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/performance/PerfTestReporter.java
+++ /dev/null
@@ -1,108 +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 com.msopentech.odatajclient.engine.performance;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.FilenameFilter;
-import java.util.Map;
-import java.util.TreeMap;
-import org.apache.commons.io.IOUtils;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-
-public final class PerfTestReporter {
-
- private static final String XLS = "odatajclient-perf.xls";
-
- public static void main(final String[] args) throws Exception {
- // 1. check input directory
- final File reportdir = new File(args[0] + File.separator + "target" + File.separator + "surefire-reports");
- if (!reportdir.isDirectory()) {
- throw new IllegalArgumentException("Expected directory, got " + args[0]);
- }
-
- // 2. read test data from surefire output
- final File[] xmlReports = reportdir.listFiles(new FilenameFilter() {
-
- @Override
- public boolean accept(final File dir, final String name) {
- return name.endsWith("-output.txt");
- }
- });
-
- final Map<String, Map<String, Double>> testData = new TreeMap<String, Map<String, Double>>();
-
- for (File xmlReport : xmlReports) {
- final BufferedReader reportReader = new BufferedReader(new FileReader(xmlReport));
- try {
- while (reportReader.ready()) {
- String line = reportReader.readLine();
- final String[] parts = line.substring(0, line.indexOf(':')).split("\\.");
-
- final String testClass = parts[0];
- if (!testData.containsKey(testClass)) {
- testData.put(testClass, new TreeMap<String, Double>());
- }
-
- line = reportReader.readLine();
-
- testData.get(testClass).put(
- parts[1], Double.valueOf(line.substring(line.indexOf(':') + 2, line.indexOf('['))));
- }
- } finally {
- IOUtils.closeQuietly(reportReader);
- }
- }
-
- // 3. build XSLX output (from template)
- final HSSFWorkbook workbook = new HSSFWorkbook(new FileInputStream(
- args[0] + File.separator + "src" + File.separator + "test" + File.separator + "resources"
- + File.separator + XLS));
-
-
- for (Map.Entry<String, Map<String, Double>> entry : testData.entrySet()) {
- final Sheet sheet = workbook.getSheet(entry.getKey());
-
- int rows = 0;
-
- for (Map.Entry<String, Double> subentry : entry.getValue().entrySet()) {
- final Row row = sheet.createRow(rows++);
-
- Cell cell = row.createCell(0);
- cell.setCellValue(subentry.getKey());
-
- cell = row.createCell(1);
- cell.setCellValue(subentry.getValue());
- }
- }
-
- final FileOutputStream out = new FileOutputStream(args[0] + File.separator + "target" + File.separator + XLS);
- try {
- workbook.write(out);
- } finally {
- IOUtils.closeQuietly(out);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/performance/ThousandPerfTest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/performance/ThousandPerfTest.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/performance/ThousandPerfTest.java
deleted file mode 100644
index 11fed7f..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/performance/ThousandPerfTest.java
+++ /dev/null
@@ -1,85 +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 com.msopentech.odatajclient.engine.performance;
-
-import java.io.IOException;
-import javax.xml.parsers.ParserConfigurationException;
-import org.xml.sax.SAXException;
-
-public class ThousandPerfTest extends BasicPerfTest {
-
- @Override
- public void readAtomViaLowerlevelLibs() throws ParserConfigurationException, SAXException, IOException {
- for (int i = 0; i < 1000; i++) {
- super.readAtomViaLowerlevelLibs();
- }
- }
-
- @Override
- public void readAtomViaOdataJClient() {
- for (int i = 0; i < 1000; i++) {
- super.readAtomViaOdataJClient();
- }
- }
-
- @Override
- public void writeAtomViaLowerlevelLibs()
- throws ParserConfigurationException, ClassNotFoundException,
- InstantiationException, IllegalAccessException {
-
- for (int i = 0; i < 1000; i++) {
- super.writeAtomViaLowerlevelLibs();
- }
- }
-
- @Override
- public void writeAtomViaOdataJClient() throws IOException {
- for (int i = 0; i < 1000; i++) {
- super.writeAtomViaOdataJClient();
- }
- }
-
- @Override
- public void readJSONViaLowerlevelLibs() throws IOException {
- for (int i = 0; i < 1000; i++) {
- super.readJSONViaLowerlevelLibs();
- }
- }
-
- @Override
- public void readJSONViaOdataJClient() {
- for (int i = 0; i < 1000; i++) {
- super.readJSONViaOdataJClient();
- }
- }
-
- @Override
- public void writeJSONViaLowerlevelLibs() throws IOException {
- for (int i = 0; i < 1000; i++) {
- super.writeJSONViaLowerlevelLibs();
- }
- }
-
- @Override
- public void writeJSONViaOdataJClient() throws IOException {
- for (int i = 0; i < 1000; i++) {
- super.writeJSONViaOdataJClient();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v3/V3JSONPrimitiveTest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v3/V3JSONPrimitiveTest.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v3/V3JSONPrimitiveTest.java
deleted file mode 100644
index fd681f6..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v3/V3JSONPrimitiveTest.java
+++ /dev/null
@@ -1,334 +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 com.msopentech.odatajclient.engine;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial.Dimension;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import org.junit.Test;
-
-public class V3JSONPrimitiveTest extends AbstractPrimitiveTest {
-
- @Override
- protected ODataFormat getFormat() {
- return ODataFormat.JSON;
- }
-
- @Override
- protected ODataClient getClient() {
- return v3Client;
- }
-
- @Test
- public void readInt32() {
- int32("Customer(-10)", "CustomerId", -10);
- }
-
- @Test
- public void readString() {
- string("Product(-9)", "Description", "kdcuklu");
- }
-
- @Test
- public void readDecimal() {
- decimal("Product(-10)", "Dimensions/Width", new BigDecimal("-79228162514264337593543950335"));
- }
-
- @Test
- public void readDatetime() {
- datetime("Product(-10)", "ComplexConcurrency/QueriedDateTime", "2013-01-10T06:27:51.1667673");
- }
-
- @Test
- public void readGuid() {
- guid("MessageAttachment(guid'1126a28b-a4af-4bbd-bf0a-2b2c22635565')", "AttachmentId",
- "1126a28b-a4af-4bbd-bf0a-2b2c22635565");
- }
-
- @Test
- public void readBinary() {
- binary("MessageAttachment(guid'1126a28b-a4af-4bbd-bf0a-2b2c22635565')", "Attachment");
- }
-
- @Test
- public void readPoint() {
- final Point expectedValues = new Point(Geospatial.Dimension.GEOGRAPHY);
- expectedValues.setX(52.8606);
- expectedValues.setY(173.334);
-
- point("AllGeoTypesSet(-10)", "GeogPoint", expectedValues, EdmSimpleType.GeographyPoint, Dimension.GEOGRAPHY);
- }
-
- @Test
- public void readLineString() {
- final List<Point> expectedValues = new ArrayList<Point>();
- Point point = new Point(Geospatial.Dimension.GEOGRAPHY);
- point.setX(40.5);
- point.setY(40.5);
- expectedValues.add(point);
-
- point = new Point(Geospatial.Dimension.GEOGRAPHY);
- point.setX(30.5);
- point.setY(30.5);
- expectedValues.add(point);
-
- point = new Point(Geospatial.Dimension.GEOGRAPHY);
- point.setX(20.5);
- point.setY(40.5);
- expectedValues.add(point);
-
- point = new Point(Geospatial.Dimension.GEOGRAPHY);
- point.setX(10.5);
- point.setY(30.5);
- expectedValues.add(point);
-
- lineString(
- "AllGeoTypesSet(-10)",
- "GeogLine",
- expectedValues,
- EdmSimpleType.GeographyLineString,
- Dimension.GEOGRAPHY);
- }
-
- @Test
- public void readMultiPoint() {
- final List<Point> expectedValues = new ArrayList<Point>();
- Point point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(0);
- point.setY(0);
- expectedValues.add(point);
-
- multiPoint(
- "AllGeoTypesSet(-7)",
- "GeomMultiPoint",
- expectedValues,
- EdmSimpleType.GeometryMultiPoint,
- Dimension.GEOMETRY);
- }
-
- @Test
- public void readMultiLine() {
- final List<List<Point>> expectedValues = new ArrayList<List<Point>>();
-
- // line one ...
- List<Point> line = new ArrayList<Point>();
- expectedValues.add(line);
-
- Point point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(10);
- point.setY(10);
- line.add(point);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(20);
- point.setY(20);
- line.add(point);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(10);
- point.setY(40);
- line.add(point);
-
- // line two ...
- line = new ArrayList<Point>();
- expectedValues.add(line);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(40);
- point.setY(40);
- line.add(point);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(30);
- point.setY(30);
- line.add(point);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(40);
- point.setY(20);
- line.add(point);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(30);
- point.setY(10);
- line.add(point);
-
- multiLine(
- "AllGeoTypesSet(-6)",
- "GeomMultiLine",
- expectedValues,
- EdmSimpleType.GeometryMultiLineString,
- Dimension.GEOMETRY);
- }
-
- @Test
- public void readPolygon() {
- final List<Point> expectedInteriorValues = new ArrayList<Point>();
- final List<Point> expectedExteriorValues = new ArrayList<Point>();
-
- Point point = new Point(Geospatial.Dimension.GEOGRAPHY);
- point.setX(5);
- point.setY(15);
- expectedExteriorValues.add(point);
-
- point = new Point(Geospatial.Dimension.GEOGRAPHY);
- point.setX(10);
- point.setY(40);
- expectedExteriorValues.add(point);
-
- point = new Point(Geospatial.Dimension.GEOGRAPHY);
- point.setX(20);
- point.setY(10);
- expectedExteriorValues.add(point);
-
- point = new Point(Geospatial.Dimension.GEOGRAPHY);
- point.setX(10);
- point.setY(5);
- expectedExteriorValues.add(point);
-
- point = new Point(Geospatial.Dimension.GEOGRAPHY);
- point.setX(5);
- point.setY(15);
- expectedExteriorValues.add(point);
-
- polygon(
- "AllGeoTypesSet(-5)",
- "GeogPolygon",
- expectedInteriorValues,
- expectedExteriorValues,
- EdmSimpleType.GeographyPolygon,
- Dimension.GEOGRAPHY);
- }
-
- @Test
- public void readMultiPolygon() {
- final List<List<Point>> expectedInteriorValues = new ArrayList<List<Point>>();
- final List<List<Point>> expectedExteriorValues = new ArrayList<List<Point>>();
-
- // interior one ...
- expectedInteriorValues.add(Collections.<Point>emptyList());
-
- // exterior one ...
- List<Point> exterior = new ArrayList<Point>();
- expectedExteriorValues.add(exterior);
-
- Point point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(40);
- point.setY(40);
- exterior.add(point);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(20);
- point.setY(45);
- exterior.add(point);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(45);
- point.setY(30);
- exterior.add(point);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(40);
- point.setY(40);
- exterior.add(point);
-
- // interior two ...
- List<Point> interior = new ArrayList<Point>();
- expectedInteriorValues.add(interior);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(30);
- point.setY(20);
- interior.add(point);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(20);
- point.setY(25);
- interior.add(point);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(20);
- point.setY(15);
- interior.add(point);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(30);
- point.setY(20);
- interior.add(point);
-
- // exterior two ...
- exterior = new ArrayList<Point>();
- expectedExteriorValues.add(exterior);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(20);
- point.setY(35);
- exterior.add(point);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(45);
- point.setY(20);
- exterior.add(point);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(30);
- point.setY(5);
- exterior.add(point);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(10);
- point.setY(10);
- exterior.add(point);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(10);
- point.setY(30);
- exterior.add(point);
-
- point = new Point(Geospatial.Dimension.GEOMETRY);
- point.setX(20);
- point.setY(35);
- exterior.add(point);
-
- multiPolygon(
- "AllGeoTypesSet(-3)",
- "GeomMultiPolygon",
- expectedInteriorValues,
- expectedExteriorValues,
- EdmSimpleType.GeometryMultiPolygon,
- Dimension.GEOMETRY);
- }
-
- @Test
- public void readGeomCollection() {
- geomCollection("AllGeoTypesSet(-8)", "GeomCollection", EdmSimpleType.GeometryCollection, Dimension.GEOMETRY);
- }
-
- @Test
- public void readGeogCollection() {
- geogCollection("AllGeoTypesSet(-5)", "GeogCollection", EdmSimpleType.GeographyCollection, Dimension.GEOGRAPHY);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v3/V3JSONPropertyTest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v3/V3JSONPropertyTest.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v3/V3JSONPropertyTest.java
deleted file mode 100644
index 510053b..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v3/V3JSONPropertyTest.java
+++ /dev/null
@@ -1,36 +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 com.msopentech.odatajclient.engine;
-
-import com.msopentech.odatajclient.engine.client.ODataV3Client;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-
-public class V3JSONPropertyTest extends AbstractPropertyTest {
-
- @Override
- protected ODataFormat getFormat() {
- return ODataFormat.JSON;
- }
-
- @Override
- protected ODataV3Client getClient() {
- return v3Client;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v3/V3JSONServiceDocumentTest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v3/V3JSONServiceDocumentTest.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v3/V3JSONServiceDocumentTest.java
deleted file mode 100644
index 05d9d6d..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v3/V3JSONServiceDocumentTest.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.engine.v3;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import com.msopentech.odatajclient.engine.AbstractTest;
-import com.msopentech.odatajclient.engine.client.ODataV3Client;
-import com.msopentech.odatajclient.engine.data.ODataServiceDocument;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import org.junit.Test;
-
-public class V3JSONServiceDocumentTest extends AbstractTest {
-
- @Override
- protected ODataV3Client getClient() {
- return v3Client;
- }
-
- protected ODataFormat getFormat() {
- return ODataFormat.JSON;
- }
-
- private String getFileExtension() {
- return getFormat() == ODataFormat.XML ? "xml" : "json";
- }
-
- @Test
- public void parse() {
- final ODataServiceDocument serviceDocument = getClient().getReader().readServiceDocument(
- getClass().getResourceAsStream("serviceDocument." + getFileExtension()), getFormat());
- assertNotNull(serviceDocument);
- assertTrue(serviceDocument.getEntitySetTitles().contains("Persons"));
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v3/V3MetadataTest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v3/V3MetadataTest.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v3/V3MetadataTest.java
deleted file mode 100644
index fddaff0..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v3/V3MetadataTest.java
+++ /dev/null
@@ -1,162 +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 com.msopentech.odatajclient.engine.v3;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import com.msopentech.odatajclient.engine.AbstractTest;
-import com.msopentech.odatajclient.engine.client.ODataV3Client;
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.engine.metadata.EdmType;
-import com.msopentech.odatajclient.engine.metadata.EdmV3Metadata;
-import com.msopentech.odatajclient.engine.metadata.EdmV3Type;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ComplexType;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.EntityContainer;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.EntityType;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.FunctionImport;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.Schema;
-import java.util.List;
-import org.junit.Test;
-
-public class V3MetadataTest extends AbstractTest {
-
- @Override
- protected ODataV3Client getClient() {
- return v3Client;
- }
-
- @Test
- public void parse() {
- final EdmV3Metadata metadata = getClient().getReader().
- readMetadata(getClass().getResourceAsStream("metadata.xml"));
- assertNotNull(metadata);
-
- final EdmV3Type orderCollection =
- new EdmV3Type(metadata, "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Order)");
- assertNotNull(orderCollection);
- assertTrue(orderCollection.isCollection());
- assertFalse(orderCollection.isSimpleType());
- assertFalse(orderCollection.isEnumType());
- assertFalse(orderCollection.isComplexType());
- assertTrue(orderCollection.isEntityType());
-
- final EntityType order = orderCollection.getEntityType();
- assertNotNull(order);
- assertEquals("Order", order.getName());
-
- final EdmType stream = new EdmV3Type(metadata, "Edm.Stream");
- assertNotNull(stream);
- assertFalse(stream.isCollection());
- assertTrue(stream.isSimpleType());
- assertFalse(stream.isEnumType());
- assertFalse(stream.isComplexType());
- assertFalse(stream.isEntityType());
-
- final List<FunctionImport> functionImports =
- metadata.getSchemas().get(0).getDefaultEntityContainer().getFunctionImports();
- int legacyGetters = 0;
- int legacyPosters = 0;
- int actions = 0;
- int functions = 0;
- for (FunctionImport functionImport : functionImports) {
- if (HttpMethod.GET.name().equals(functionImport.getHttpMethod())) {
- legacyGetters++;
- } else if (HttpMethod.POST.name().equals(functionImport.getHttpMethod())) {
- legacyPosters++;
- } else if (functionImport.getHttpMethod() == null) {
- if (functionImport.isSideEffecting()) {
- actions++;
- } else {
- functions++;
- }
- }
- }
- assertEquals(6, legacyGetters);
- assertEquals(1, legacyPosters);
- assertEquals(5, actions);
- assertEquals(0, functions);
- }
-
- @Test
- public void multipleSchemas() {
- final EdmV3Metadata metadata = getClient().getReader().
- readMetadata(getClass().getResourceAsStream("northwind-metadata.xml"));
- assertNotNull(metadata);
-
- final Schema first = metadata.getSchema("NorthwindModel");
- assertNotNull(first);
-
- final Schema second = metadata.getSchema("ODataWebV3.Northwind.Model");
- assertNotNull(second);
-
- final EntityContainer entityContainer = second.getDefaultEntityContainer();
- assertNotNull(entityContainer);
- assertEquals("NorthwindEntities", entityContainer.getName());
- }
-
- @Test
- public void entityType() {
- final EdmV3Metadata metadata = getClient().getReader().
- readMetadata(getClass().getResourceAsStream("metadata.xml"));
- assertNotNull(metadata);
-
- final EntityContainer container = metadata.getSchema(0).getEntityContainers().get(0);
- assertNotNull(container);
- final EntityType type = metadata.getSchema(0).getEntityType("ProductReview");
- assertNotNull(type);
-
- assertFalse(type.getProperties().isEmpty());
- assertNotNull(type.getProperties().get(0));
-
- assertFalse(type.getKey().getPropertyRefs().isEmpty());
- assertNotNull(type.getKey().getPropertyRefs().get(0));
- }
-
- @Test
- public void complexType() {
- final EdmV3Metadata metadata = getClient().getReader().
- readMetadata(getClass().getResourceAsStream("metadata.xml"));
- assertNotNull(metadata);
-
- final EntityContainer container = metadata.getSchema(0).getEntityContainers().get(0);
- assertNotNull(container);
- final ComplexType type = metadata.getSchema(0).getComplexType("ContactDetails");
- assertNotNull(type);
-
- assertFalse(type.getProperties().isEmpty());
- assertNotNull(type.getProperties().get(0));
- }
-
- @Test
- public void functionImport() {
- final EdmV3Metadata metadata = getClient().getReader().
- readMetadata(getClass().getResourceAsStream("metadata.xml"));
- assertNotNull(metadata);
-
- final EntityContainer container = metadata.getSchema(0).getEntityContainers().get(0);
- assertNotNull(container);
- final FunctionImport funcImp = container.getFunctionImport("GetArgumentPlusOne");
- assertNotNull(funcImp);
-
- assertNotNull(funcImp.getParameters().get(0));
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v3/V3XMLPrimitiveTest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v3/V3XMLPrimitiveTest.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v3/V3XMLPrimitiveTest.java
deleted file mode 100644
index 2ec0c33..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v3/V3XMLPrimitiveTest.java
+++ /dev/null
@@ -1,29 +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 com.msopentech.odatajclient.engine;
-
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-
-public class V3XMLPrimitiveTest extends V3JSONPrimitiveTest {
-
- @Override
- protected ODataFormat getFormat() {
- return ODataFormat.XML;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v3/V3XMLPropertyTest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v3/V3XMLPropertyTest.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v3/V3XMLPropertyTest.java
deleted file mode 100644
index e4d8b06..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v3/V3XMLPropertyTest.java
+++ /dev/null
@@ -1,30 +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 com.msopentech.odatajclient.engine;
-
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-
-public class V3XMLPropertyTest extends V3JSONPropertyTest {
-
- @Override
- protected ODataFormat getFormat() {
- return ODataFormat.XML;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v3/V3XMLServiceDocumentTest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v3/V3XMLServiceDocumentTest.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v3/V3XMLServiceDocumentTest.java
deleted file mode 100644
index 65f1be5..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v3/V3XMLServiceDocumentTest.java
+++ /dev/null
@@ -1,29 +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 com.msopentech.odatajclient.engine.v3;
-
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-
-public class V3XMLServiceDocumentTest extends V3JSONServiceDocumentTest {
-
- @Override
- protected ODataFormat getFormat() {
- return ODataFormat.XML;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v4/V4JSONPrimitiveTest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v4/V4JSONPrimitiveTest.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v4/V4JSONPrimitiveTest.java
deleted file mode 100644
index b5fa16b..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v4/V4JSONPrimitiveTest.java
+++ /dev/null
@@ -1,36 +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 com.msopentech.odatajclient.engine;
-
-import com.msopentech.odatajclient.engine.client.ODataV4Client;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-
-public class V4JSONPrimitiveTest extends AbstractPrimitiveTest {
-
- @Override
- protected ODataFormat getFormat() {
- return ODataFormat.JSON;
- }
-
- @Override
- protected ODataV4Client getClient() {
- return v4Client;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v4/V4JSONServiceDocumentTest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v4/V4JSONServiceDocumentTest.java b/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v4/V4JSONServiceDocumentTest.java
deleted file mode 100644
index bf31bbf..0000000
--- a/ODataJClient/engine/src/test/java/com/msopentech/odatajclient/engine/v4/V4JSONServiceDocumentTest.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 com.msopentech.odatajclient.engine.v4;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import com.msopentech.odatajclient.engine.AbstractTest;
-import com.msopentech.odatajclient.engine.client.ODataV4Client;
-import com.msopentech.odatajclient.engine.data.ODataServiceDocument;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import java.net.URI;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class V4JSONServiceDocumentTest extends AbstractTest {
-
- @Override
- protected ODataV4Client getClient() {
- return v4Client;
- }
-
- protected ODataFormat getFormat() {
- return ODataFormat.JSON;
- }
-
- private String getFileExtension() {
- return getFormat() == ODataFormat.XML ? "xml" : "json";
- }
-
- @Test
- @Ignore
- public void parse() {
- final ODataServiceDocument serviceDocument = getClient().getReader().readServiceDocument(
- getClass().getResourceAsStream("serviceDocument." + getFileExtension()), getFormat());
- assertNotNull(serviceDocument);
- assertEquals(URI.create("http://host/service/$metadata"), serviceDocument.getMetadataContext());
- assertEquals("W/\"MjAxMy0wNS0xM1QxNDo1NFo=\"", serviceDocument.getMetadataETag());
- assertTrue(serviceDocument.getEntitySetTitles().contains("Order Details"));
- assertEquals(URI.create("http://host/service/TopProducts"),
- serviceDocument.getFunctionImportURI("Best-Selling Products"));
- assertEquals(URI.create("http://host/HR/"),
- serviceDocument.getRelatedServiceDocumentsURIs().iterator().next());
- }
-}
[41/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/JSONPropertySerializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/JSONPropertySerializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/JSONPropertySerializer.java
deleted file mode 100644
index ea8b61f..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/JSONPropertySerializer.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 com.msopentech.odatajclient.engine.data.impl;
-
-import com.msopentech.odatajclient.engine.data.impl.JSONDOMTreeUtils;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonLocation;
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.msopentech.odatajclient.engine.data.impl.v3.JSONProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.EdmSimpleType;
-import com.msopentech.odatajclient.engine.utils.ODataConstants;
-import com.msopentech.odatajclient.engine.utils.XMLUtils;
-import java.io.IOException;
-import javax.xml.parsers.DocumentBuilder;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * Writes out JSON string from <tt>JSONProperty</tt>.
- *
- * @see JSONProperty
- */
-public class JSONPropertySerializer extends ODataJacksonSerializer<JSONProperty> {
-
- @Override
- public void doSerialize(final JSONProperty property, final JsonGenerator jgen, final SerializerProvider provider)
- throws IOException, JsonProcessingException {
-
- jgen.writeStartObject();
-
- if (property.getMetadata() != null) {
- jgen.writeStringField(ODataConstants.JSON_METADATA, property.getMetadata().toASCIIString());
- }
-
- final Element content = property.getContent();
- if (XMLUtils.hasOnlyTextChildNodes(content)) {
- jgen.writeStringField(ODataConstants.JSON_VALUE, content.getTextContent());
- } else {
- try {
- final DocumentBuilder builder = XMLUtils.DOC_BUILDER_FACTORY.newDocumentBuilder();
- final Document document = builder.newDocument();
- final Element wrapper = document.createElement(ODataConstants.ELEM_PROPERTY);
-
- if (XMLUtils.hasElementsChildNode(content)) {
- wrapper.appendChild(document.renameNode(
- document.importNode(content, true), null, ODataConstants.JSON_VALUE));
-
- JSONDOMTreeUtils.writeSubtree(client, jgen, wrapper);
- } else if (EdmSimpleType.isGeospatial(content.getAttribute(ODataConstants.ATTR_M_TYPE))) {
- wrapper.appendChild(document.renameNode(
- document.importNode(content, true), null, ODataConstants.JSON_VALUE));
-
- JSONDOMTreeUtils.writeSubtree(client, jgen, wrapper, true);
- } else {
- JSONDOMTreeUtils.writeSubtree(client, jgen, content);
- }
- } catch (Exception e) {
- throw new JsonParseException("Cannot serialize property", JsonLocation.NA, e);
- }
- }
-
- jgen.writeEndObject();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/ODataJacksonDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/ODataJacksonDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/ODataJacksonDeserializer.java
deleted file mode 100644
index 9e5a98d..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/ODataJacksonDeserializer.java
+++ /dev/null
@@ -1,43 +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 com.msopentech.odatajclient.engine.data.impl;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import java.io.IOException;
-
-abstract class ODataJacksonDeserializer<T> extends JsonDeserializer<T> {
-
- protected ODataClient client;
-
- protected abstract T doDeserialize(JsonParser jp, DeserializationContext ctxt)
- throws IOException, JsonProcessingException;
-
- @Override
- public T deserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- client = (ODataClient) ctxt.findInjectableValue(ODataClient.class.getName(), null, null);
- return doDeserialize(jp, ctxt);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/ODataJacksonSerializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/ODataJacksonSerializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/ODataJacksonSerializer.java
deleted file mode 100644
index 71881de..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/ODataJacksonSerializer.java
+++ /dev/null
@@ -1,43 +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 com.msopentech.odatajclient.engine.data.impl;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import java.io.IOException;
-
-abstract class ODataJacksonSerializer<T> extends JsonSerializer<T> {
-
- protected ODataClient client;
-
- protected abstract void doSerialize(T value, JsonGenerator jgen, SerializerProvider provider)
- throws IOException, JsonProcessingException;
-
- @Override
- public void serialize(final T value, final JsonGenerator jgen, final SerializerProvider provider)
- throws IOException, JsonProcessingException {
-
- client = (ODataClient) provider.getAttribute(ODataClient.class);
- doSerialize(value, jgen, provider);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/XMLServiceDocumentDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/XMLServiceDocumentDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/XMLServiceDocumentDeserializer.java
deleted file mode 100644
index 7d64db2..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/XMLServiceDocumentDeserializer.java
+++ /dev/null
@@ -1,119 +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 com.msopentech.odatajclient.engine.data.impl;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.dataformat.xml.deser.FromXmlParser;
-import com.msopentech.odatajclient.engine.data.ServiceDocument;
-import com.msopentech.odatajclient.engine.data.ServiceDocumentElement;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-import java.io.IOException;
-import java.net.URI;
-
-public class XMLServiceDocumentDeserializer extends ODataJacksonDeserializer<ServiceDocument> {
-
- private String getTitle(final JsonParser jp) throws IOException {
- String title = jp.nextTextValue();
- if (title == null) {
- jp.nextToken();
- jp.nextToken();
- jp.nextToken();
- title = jp.nextTextValue();
- }
- return title;
- }
-
- private ServiceDocumentElement deserializeElement(final JsonParser jp, final String elementName)
- throws IOException {
-
- final ServiceDocumentElement element = new ServiceDocumentElement();
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT
- || !elementName.equals(((FromXmlParser) jp).getStaxReader().getLocalName()); jp.nextToken()) {
-
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("href".equals(jp.getCurrentName())) {
- element.setHref(jp.nextTextValue());
- } else if ("name".equals(jp.getCurrentName())) {
- element.setName(jp.nextTextValue());
- } else if ("title".equals(jp.getCurrentName())) {
- element.setTitle(getTitle(jp));
- }
- }
- }
-
- return element;
- }
-
- @Override
- protected ServiceDocument doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final AbstractServiceDocument sdoc = ODataVersion.V3 == client.getWorkingVersion()
- ? new com.msopentech.odatajclient.engine.data.impl.v3.XMLServiceDocument()
- : new com.msopentech.odatajclient.engine.data.impl.v4.XMLServiceDocument();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT
- || !"service".equals(((FromXmlParser) jp).getStaxReader().getLocalName()); jp.nextToken()) {
-
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("base".equals(jp.getCurrentName())) {
- if (sdoc instanceof com.msopentech.odatajclient.engine.data.impl.v3.XMLServiceDocument) {
- ((com.msopentech.odatajclient.engine.data.impl.v3.XMLServiceDocument) sdoc).
- setBaseURI(URI.create(jp.nextTextValue()));
- } else {
- ((com.msopentech.odatajclient.engine.data.impl.v4.XMLServiceDocument) sdoc).
- setBaseURI(URI.create(jp.nextTextValue()));
- }
- } else if ("context".equals(jp.getCurrentName())) {
- ((com.msopentech.odatajclient.engine.data.impl.v4.XMLServiceDocument) sdoc).
- setMetadataContext(jp.nextTextValue());
- } else if ("metadata-etag".equals(jp.getCurrentName())) {
- ((com.msopentech.odatajclient.engine.data.impl.v4.XMLServiceDocument) sdoc).
- setMetadataETag(jp.nextTextValue());
- } else if ("workspace".equals(jp.getCurrentName())) {
- jp.nextToken();
- jp.nextToken();
- if ("title".equals(jp.getCurrentName())) {
- sdoc.setTitle(getTitle(jp));
- }
- } else if ("collection".equals(jp.getCurrentName())) {
- jp.nextToken();
- sdoc.getEntitySets().add(deserializeElement(jp, "collection"));
- } else if ("function-import".equals(jp.getCurrentName())) {
- jp.nextToken();
- sdoc.getFunctionImports().add(deserializeElement(jp, "function-import"));
- } else if ("singleton".equals(jp.getCurrentName())) {
- jp.nextToken();
- sdoc.getSingletons().add(deserializeElement(jp, "singleton"));
- } else if ("service-document".equals(jp.getCurrentName())) {
- jp.nextToken();
- sdoc.getRelatedServiceDocuments().add(deserializeElement(jp, "service-document"));
- }
- }
- }
-
- return sdoc;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/AtomDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/AtomDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/AtomDeserializer.java
deleted file mode 100644
index 2861634..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/AtomDeserializer.java
+++ /dev/null
@@ -1,218 +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 com.msopentech.odatajclient.engine.data.impl.v3;
-
-import com.fasterxml.jackson.databind.util.ISO8601DateFormat;
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.data.ODataOperation;
-import com.msopentech.odatajclient.engine.utils.ODataConstants;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-import com.msopentech.odatajclient.engine.utils.XMLUtils;
-import java.net.URI;
-import java.util.List;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class AtomDeserializer {
-
- private static final Logger LOG = LoggerFactory.getLogger(AtomDeserializer.class);
-
- private static final ISO8601DateFormat ISO_DATEFORMAT = new ISO8601DateFormat();
-
- private final ODataClient client;
-
- public AtomDeserializer(final ODataClient client) {
- this.client = client;
- }
-
- private void common(final Element input, final AtomObject object) {
- if (StringUtils.isNotBlank(input.getAttribute(ODataConstants.ATTR_XMLBASE))) {
- object.setBaseURI(input.getAttribute(ODataConstants.ATTR_XMLBASE));
- }
-
- final List<Element> ids = XMLUtils.getChildElements(input, ODataConstants.ATOM_ELEM_ID);
- if (!ids.isEmpty()) {
- object.setId(ids.get(0).getTextContent());
- }
-
- final List<Element> titles = XMLUtils.getChildElements(input, ODataConstants.ATOM_ELEM_TITLE);
- if (!titles.isEmpty()) {
- object.setTitle(titles.get(0).getTextContent());
- }
-
- final List<Element> summaries = XMLUtils.getChildElements(input, ODataConstants.ATOM_ELEM_SUMMARY);
- if (!summaries.isEmpty()) {
- object.setSummary(summaries.get(0).getTextContent());
- }
-
- final List<Element> updateds = XMLUtils.getChildElements(input, ODataConstants.ATOM_ELEM_UPDATED);
- if (!updateds.isEmpty()) {
- try {
- object.setUpdated(ISO_DATEFORMAT.parse(updateds.get(0).getTextContent()));
- } catch (Exception e) {
- LOG.error("Could not parse date {}", updateds.get(0).getTextContent(), e);
- }
- }
- }
-
- public AtomEntry entry(final Element input) {
- if (!ODataConstants.ATOM_ELEM_ENTRY.equals(input.getNodeName())) {
- return null;
- }
-
- final AtomEntry entry = new AtomEntry();
-
- common(input, entry);
-
- final String etag = input.getAttribute(ODataConstants.ATOM_ATTR_ETAG);
- if (StringUtils.isNotBlank(etag)) {
- entry.setETag(etag);
- }
-
- final List<Element> categories = XMLUtils.getChildElements(input, ODataConstants.ATOM_ELEM_CATEGORY);
- if (!categories.isEmpty()) {
- entry.setType(categories.get(0).getAttribute(ODataConstants.ATOM_ATTR_TERM));
- }
-
- final List<Element> links = XMLUtils.getChildElements(input, ODataConstants.ATOM_ELEM_LINK);
- for (Element linkElem : links) {
- final AtomLink link = new AtomLink();
- link.setRel(linkElem.getAttribute(ODataConstants.ATTR_REL));
- link.setTitle(linkElem.getAttribute(ODataConstants.ATTR_TITLE));
- link.setHref(linkElem.getAttribute(ODataConstants.ATTR_HREF));
-
- if (ODataConstants.SELF_LINK_REL.equals(link.getRel())) {
- entry.setSelfLink(link);
- } else if (ODataConstants.EDIT_LINK_REL.equals(link.getRel())) {
- entry.setEditLink(link);
- } else if (link.getRel().startsWith(
- client.getWorkingVersion().getNamespaceMap().get(ODataVersion.NAVIGATION_LINK_REL))) {
-
- link.setType(linkElem.getAttribute(ODataConstants.ATTR_TYPE));
- entry.addNavigationLink(link);
-
- final List<Element> inlines = XMLUtils.getChildElements(linkElem, ODataConstants.ATOM_ELEM_INLINE);
- if (!inlines.isEmpty()) {
- final List<Element> entries =
- XMLUtils.getChildElements(inlines.get(0), ODataConstants.ATOM_ELEM_ENTRY);
- if (!entries.isEmpty()) {
- link.setInlineEntry(entry(entries.get(0)));
- }
-
- final List<Element> feeds =
- XMLUtils.getChildElements(inlines.get(0), ODataConstants.ATOM_ELEM_FEED);
- if (!feeds.isEmpty()) {
- link.setInlineFeed(feed(feeds.get(0)));
- }
- }
- } else if (link.getRel().startsWith(
- client.getWorkingVersion().getNamespaceMap().get(ODataVersion.ASSOCIATION_LINK_REL))) {
-
- entry.addAssociationLink(link);
- } else if (link.getRel().startsWith(
- client.getWorkingVersion().getNamespaceMap().get(ODataVersion.MEDIA_EDIT_LINK_REL))) {
-
- entry.addMediaEditLink(link);
- }
- }
-
- final List<Element> authors = XMLUtils.getChildElements(input, ODataConstants.ATOM_ELEM_AUTHOR);
- if (!authors.isEmpty()) {
- final AtomEntry.Author author = new AtomEntry.Author();
- for (Node child : XMLUtils.getChildNodes(input, Node.ELEMENT_NODE)) {
- if (ODataConstants.ATOM_ELEM_AUTHOR_NAME.equals(XMLUtils.getSimpleName(child))) {
- author.setName(child.getTextContent());
- } else if (ODataConstants.ATOM_ELEM_AUTHOR_URI.equals(XMLUtils.getSimpleName(child))) {
- author.setUri(child.getTextContent());
- } else if (ODataConstants.ATOM_ELEM_AUTHOR_EMAIL.equals(XMLUtils.getSimpleName(child))) {
- author.setEmail(child.getTextContent());
- }
- }
- if (!author.isEmpty()) {
- entry.setAuthor(author);
- }
- }
-
- final List<Element> actions = XMLUtils.getChildElements(input, ODataConstants.ATOM_ELEM_ACTION);
- for (Element action : actions) {
- final ODataOperation operation = new ODataOperation();
- operation.setMetadataAnchor(action.getAttribute(ODataConstants.ATTR_METADATA));
- operation.setTitle(action.getAttribute(ODataConstants.ATTR_TITLE));
- operation.setTarget(URI.create(action.getAttribute(ODataConstants.ATTR_TARGET)));
-
- entry.addOperation(operation);
- }
-
- final List<Element> contents = XMLUtils.getChildElements(input, ODataConstants.ATOM_ELEM_CONTENT);
- if (!contents.isEmpty()) {
- final Element content = contents.get(0);
-
- List<Element> props = XMLUtils.getChildElements(content, ODataConstants.ELEM_PROPERTIES);
- if (props.isEmpty()) {
- entry.setMediaContentSource(content.getAttribute(ODataConstants.ATOM_ATTR_SRC));
- entry.setMediaContentType(content.getAttribute(ODataConstants.ATTR_TYPE));
-
- props = XMLUtils.getChildElements(input, ODataConstants.ELEM_PROPERTIES);
- if (!props.isEmpty()) {
- entry.setMediaEntryProperties(props.get(0));
- }
- } else {
- entry.setContent(props.get(0));
- }
- }
-
- return entry;
- }
-
- public AtomFeed feed(final Element input) {
- if (!ODataConstants.ATOM_ELEM_FEED.equals(input.getNodeName())) {
- return null;
- }
-
- final AtomFeed feed = new AtomFeed();
-
- common(input, feed);
-
- final List<Element> entries = XMLUtils.getChildElements(input, ODataConstants.ATOM_ELEM_ENTRY);
- for (Element entry : entries) {
- feed.addEntry(entry(entry));
- }
-
- final List<Element> links = XMLUtils.getChildElements(input, ODataConstants.ATOM_ELEM_LINK);
- for (Element link : links) {
- if (ODataConstants.NEXT_LINK_REL.equals(link.getAttribute(ODataConstants.ATTR_REL))) {
- feed.setNext(URI.create(link.getAttribute(ODataConstants.ATTR_HREF)));
- }
- }
-
- final List<Element> counts = XMLUtils.getChildElements(input, ODataConstants.ATOM_ATTR_COUNT);
- if (!counts.isEmpty()) {
- try {
- feed.setCount(Integer.parseInt(counts.get(0).getTextContent()));
- } catch (Exception e) {
- LOG.error("Could not parse $inlinecount {}", counts.get(0).getTextContent(), e);
- }
- }
-
- return feed;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/AtomEntry.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/AtomEntry.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/AtomEntry.java
deleted file mode 100644
index c158676..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/AtomEntry.java
+++ /dev/null
@@ -1,124 +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 com.msopentech.odatajclient.engine.data.impl.v3;
-
-import com.msopentech.odatajclient.engine.data.impl.AbstractEntry;
-import java.net.URI;
-import java.util.Date;
-import org.apache.commons.lang3.StringUtils;
-
-public class AtomEntry extends AbstractEntry<AtomLink> implements AtomObject {
-
- private static final long serialVersionUID = 6973729343868293279L;
-
- public static class Author {
-
- private String name;
-
- private String uri;
-
- private String email;
-
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public String getUri() {
- return uri;
- }
-
- public void setUri(final String uri) {
- this.uri = uri;
- }
-
- public String getEmail() {
- return email;
- }
-
- public void setEmail(final String email) {
- this.email = email;
- }
-
- public boolean isEmpty() {
- return StringUtils.isBlank(name) && StringUtils.isBlank(uri) && StringUtils.isBlank(email);
- }
- }
-
- private URI baseURI;
-
- private String title;
-
- private String summary;
-
- private Date updated;
-
- private Author author;
-
- @Override
- public void setBaseURI(final String baseURI) {
- this.baseURI = URI.create(baseURI);
- }
-
- @Override
- public URI getBaseURI() {
- return baseURI;
- }
-
- @Override
- public String getTitle() {
- return title;
- }
-
- @Override
- public void setTitle(final String title) {
- this.title = title;
- }
-
- @Override
- public String getSummary() {
- return summary;
- }
-
- @Override
- public void setSummary(final String summary) {
- this.summary = summary;
- }
-
- @Override
- public Date getUpdated() {
- return new Date(updated.getTime());
- }
-
- @Override
- public void setUpdated(final Date updated) {
- this.updated = new Date(updated.getTime());
- }
-
- public Author getAuthor() {
- return author;
- }
-
- public void setAuthor(final Author author) {
- this.author = author;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/AtomFeed.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/AtomFeed.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/AtomFeed.java
deleted file mode 100644
index 3355deb..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/AtomFeed.java
+++ /dev/null
@@ -1,168 +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 com.msopentech.odatajclient.engine.data.impl.v3;
-
-import com.msopentech.odatajclient.engine.data.impl.AbstractPayloadObject;
-import com.msopentech.odatajclient.engine.data.Entry;
-import com.msopentech.odatajclient.engine.data.Feed;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * List of entries, represented via Atom.
- *
- * @see AtomEntry
- */
-public class AtomFeed extends AbstractPayloadObject implements AtomObject, Feed {
-
- private static final long serialVersionUID = 5466590540021319153L;
-
- private URI baseURI;
-
- private String id;
-
- private String title;
-
- private String summary;
-
- private Date updated;
-
- private Integer count;
-
- private final List<AtomEntry> entries;
-
- private URI next;
-
- /**
- * Constructor.
- */
- public AtomFeed() {
- super();
- entries = new ArrayList<AtomEntry>();
- }
-
- @Override
- public URI getBaseURI() {
- return baseURI;
- }
-
- @Override
- public void setBaseURI(final String baseURI) {
- this.baseURI = URI.create(baseURI);
- }
-
- @Override
- public String getId() {
- return id;
- }
-
- public void setId(final String id) {
- this.id = id;
- }
-
- @Override
- public String getTitle() {
- return title;
- }
-
- @Override
- public void setTitle(final String title) {
- this.title = title;
- }
-
- @Override
- public String getSummary() {
- return summary;
- }
-
- @Override
- public void setSummary(final String summary) {
- this.summary = summary;
- }
-
- @Override
- public Date getUpdated() {
- return new Date(updated.getTime());
- }
-
- @Override
- public void setUpdated(final Date updated) {
- this.updated = new Date(updated.getTime());
- }
-
- public void setCount(final Integer count) {
- this.count = count;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public Integer getCount() {
- return count;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public List<AtomEntry> getEntries() {
- return entries;
- }
-
- /**
- * Add entry.
- *
- * @param entry entry.
- * @return 'TRUE' in case of success; 'FALSE' otherwise.
- */
- public boolean addEntry(final AtomEntry entry) {
- return this.entries.add(entry);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- @SuppressWarnings("unchecked")
- public void setEntries(final List<Entry> entries) {
- this.entries.clear();
- for (Entry entry : entries) {
- this.entries.add((AtomEntry) entry);
- }
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public void setNext(final URI next) {
- this.next = next;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public URI getNext() {
- return next;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/AtomLink.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/AtomLink.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/AtomLink.java
deleted file mode 100644
index c43e8c4..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/AtomLink.java
+++ /dev/null
@@ -1,30 +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 com.msopentech.odatajclient.engine.data.impl.v3;
-
-import com.msopentech.odatajclient.engine.data.impl.AbstractLink;
-
-/**
- * Link from an entry, represented via Atom.
- */
-public class AtomLink extends AbstractLink<AtomEntry, AtomFeed> {
-
- private static final long serialVersionUID = -8983864345121122593L;
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/AtomObject.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/AtomObject.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/AtomObject.java
deleted file mode 100644
index 1db8775..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/AtomObject.java
+++ /dev/null
@@ -1,51 +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 com.msopentech.odatajclient.engine.data.impl.v3;
-
-import java.net.URI;
-import java.util.Date;
-
-/**
- * Common methods for <tt>AtomEntry</tt> and <tt>AtomFeed</tt>.
- *
- * @see AtomEntry
- * @see AtomFeed
- */
-public interface AtomObject {
-
- URI getBaseURI();
-
- void setBaseURI(String baseURI);
-
- String getId();
-
- void setId(String id);
-
- String getTitle();
-
- void setTitle(String title);
-
- String getSummary();
-
- void setSummary(String summary);
-
- Date getUpdated();
-
- void setUpdated(Date updated);
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/AtomSerializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/AtomSerializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/AtomSerializer.java
deleted file mode 100644
index c46c83d..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/AtomSerializer.java
+++ /dev/null
@@ -1,183 +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 com.msopentech.odatajclient.engine.data.impl.v3;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.data.impl.AbstractPayloadObject;
-import com.msopentech.odatajclient.engine.utils.ODataConstants;
-import com.msopentech.odatajclient.engine.utils.ODataVersion;
-import com.msopentech.odatajclient.engine.utils.XMLUtils;
-import java.util.List;
-import javax.xml.XMLConstants;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.ParserConfigurationException;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.http.entity.ContentType;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class AtomSerializer {
-
- private final ODataClient client;
-
- public AtomSerializer(final ODataClient client) {
- this.client = client;
- }
-
- public <T extends AbstractPayloadObject> Element serialize(final T obj) throws ParserConfigurationException {
- if (obj instanceof AtomEntry) {
- return entry((AtomEntry) obj);
- } else if (obj instanceof AtomFeed) {
- return feed((AtomFeed) obj);
- } else {
- throw new IllegalArgumentException("Unsupported Atom object for standalone serialization: " + obj);
- }
- }
-
- private void setLinks(final Element entry, final List<AtomLink> links) throws ParserConfigurationException {
- for (AtomLink link : links) {
- final Element linkElem = entry.getOwnerDocument().createElement(ODataConstants.ATOM_ELEM_LINK);
-
- linkElem.setAttribute(ODataConstants.ATTR_REL, link.getRel());
- linkElem.setAttribute(ODataConstants.ATTR_TITLE, link.getTitle());
- linkElem.setAttribute(ODataConstants.ATTR_HREF, link.getHref());
-
- if (StringUtils.isNotBlank(link.getType())) {
- linkElem.setAttribute(ODataConstants.ATTR_TYPE, link.getType());
- }
-
- if (link.getInlineEntry() != null || link.getInlineFeed() != null) {
- final Element inline = entry.getOwnerDocument().createElement(ODataConstants.ATOM_ELEM_INLINE);
- linkElem.appendChild(inline);
-
- if (link.getInlineEntry() != null) {
- inline.appendChild(entry.getOwnerDocument().importNode(
- entry((AtomEntry) link.getInlineEntry()), true));
- }
- if (link.getInlineFeed() != null) {
- inline.appendChild(entry.getOwnerDocument().importNode(
- feed((AtomFeed) link.getInlineFeed()), true));
- }
- }
-
- entry.appendChild(linkElem);
- }
- }
-
- private Element entry(final AtomEntry entry) throws ParserConfigurationException {
- final DocumentBuilder builder = XMLUtils.DOC_BUILDER_FACTORY.newDocumentBuilder();
- final Document doc = builder.newDocument();
-
- final Element entryElem = doc.createElement(ODataConstants.ATOM_ELEM_ENTRY);
- entryElem.setAttribute(XMLConstants.XMLNS_ATTRIBUTE, ODataConstants.NS_ATOM);
- entryElem.setAttribute(ODataConstants.XMLNS_METADATA,
- client.getWorkingVersion().getNamespaceMap().get(ODataVersion.NS_METADATA));
- entryElem.setAttribute(ODataConstants.XMLNS_DATASERVICES,
- client.getWorkingVersion().getNamespaceMap().get(ODataVersion.NS_DATASERVICES));
- entryElem.setAttribute(ODataConstants.XMLNS_GML, ODataConstants.NS_GML);
- entryElem.setAttribute(ODataConstants.XMLNS_GEORSS, ODataConstants.NS_GEORSS);
- if (entry.getBaseURI() != null) {
- entryElem.setAttribute(ODataConstants.ATTR_XMLBASE, entry.getBaseURI().toASCIIString());
- }
- doc.appendChild(entryElem);
-
- final Element category = doc.createElement(ODataConstants.ATOM_ELEM_CATEGORY);
- category.setAttribute(ODataConstants.ATOM_ATTR_TERM, entry.getType());
- category.setAttribute(ODataConstants.ATOM_ATTR_SCHEME,
- client.getWorkingVersion().getNamespaceMap().get(ODataVersion.NS_SCHEME));
- entryElem.appendChild(category);
-
- if (StringUtils.isNotBlank(entry.getTitle())) {
- final Element title = doc.createElement(ODataConstants.ATOM_ELEM_TITLE);
- title.appendChild(doc.createTextNode(entry.getTitle()));
- entryElem.appendChild(title);
- }
-
- if (StringUtils.isNotBlank(entry.getSummary())) {
- final Element summary = doc.createElement(ODataConstants.ATOM_ELEM_SUMMARY);
- summary.appendChild(doc.createTextNode(entry.getSummary()));
- entryElem.appendChild(summary);
- }
-
- setLinks(entryElem, entry.getAssociationLinks());
- setLinks(entryElem, entry.getNavigationLinks());
- setLinks(entryElem, entry.getMediaEditLinks());
-
- final Element content = doc.createElement(ODataConstants.ATOM_ELEM_CONTENT);
- if (entry.isMediaEntry()) {
- if (StringUtils.isNotBlank(entry.getMediaContentType())) {
- content.setAttribute(ODataConstants.ATTR_TYPE, entry.getMediaContentType());
- }
- if (StringUtils.isNotBlank(entry.getMediaContentSource())) {
- content.setAttribute(ODataConstants.ATOM_ATTR_SRC, entry.getMediaContentSource());
- }
- if (content.getAttributes().getLength() > 0) {
- entryElem.appendChild(content);
- }
-
- if (entry.getMediaEntryProperties() != null) {
- entryElem.appendChild(doc.importNode(entry.getMediaEntryProperties(), true));
- }
- } else {
- content.setAttribute(ODataConstants.ATTR_TYPE, ContentType.APPLICATION_XML.getMimeType());
- if (entry.getContent() != null) {
- content.appendChild(doc.importNode(entry.getContent(), true));
- }
- entryElem.appendChild(content);
- }
-
- return entryElem;
- }
-
- private Element feed(final AtomFeed feed) throws ParserConfigurationException {
- final DocumentBuilder builder = XMLUtils.DOC_BUILDER_FACTORY.newDocumentBuilder();
- final Document doc = builder.newDocument();
-
- final Element feedElem = doc.createElement(ODataConstants.ATOM_ELEM_FEED);
- feedElem.setAttribute(XMLConstants.XMLNS_ATTRIBUTE, ODataConstants.NS_ATOM);
- feedElem.setAttribute(ODataConstants.XMLNS_METADATA,
- client.getWorkingVersion().getNamespaceMap().get(ODataVersion.NS_METADATA));
- feedElem.setAttribute(ODataConstants.XMLNS_DATASERVICES,
- client.getWorkingVersion().getNamespaceMap().get(ODataVersion.NS_DATASERVICES));
- feedElem.setAttribute(ODataConstants.XMLNS_GML, ODataConstants.NS_GML);
- feedElem.setAttribute(ODataConstants.XMLNS_GEORSS, ODataConstants.NS_GEORSS);
- if (feed.getBaseURI() != null) {
- feedElem.setAttribute(ODataConstants.ATTR_XMLBASE, feed.getBaseURI().toASCIIString());
- }
- doc.appendChild(feedElem);
-
- if (StringUtils.isNotBlank(feed.getTitle())) {
- final Element title = doc.createElement(ODataConstants.ATOM_ELEM_TITLE);
- title.appendChild(doc.createTextNode(feed.getTitle()));
- feedElem.appendChild(title);
- }
-
- if (StringUtils.isNotBlank(feed.getSummary())) {
- final Element summary = doc.createElement(ODataConstants.ATOM_ELEM_SUMMARY);
- summary.appendChild(doc.createTextNode(feed.getSummary()));
- feedElem.appendChild(summary);
- }
-
- for (AtomEntry entry : feed.getEntries()) {
- feedElem.appendChild(doc.importNode(entry(entry), true));
- }
-
- return feedElem;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/JSONEntry.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/JSONEntry.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/JSONEntry.java
deleted file mode 100644
index 0b63ec7..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/JSONEntry.java
+++ /dev/null
@@ -1,30 +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 com.msopentech.odatajclient.engine.data.impl.v3;
-
-import com.msopentech.odatajclient.engine.data.impl.AbstractJSONEntry;
-
-/**
- * A single entry, represented via JSON.
- */
-public class JSONEntry extends AbstractJSONEntry {
-
- private static final long serialVersionUID = -5275365545400797758L;
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/JSONFeed.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/JSONFeed.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/JSONFeed.java
deleted file mode 100644
index a10e706..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/JSONFeed.java
+++ /dev/null
@@ -1,146 +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 com.msopentech.odatajclient.engine.data.impl.v3;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.data.impl.AbstractPayloadObject;
-import com.msopentech.odatajclient.engine.data.Entry;
-import com.msopentech.odatajclient.engine.data.Feed;
-import com.msopentech.odatajclient.engine.uri.SegmentType;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * List of entries, represented via JSON.
- *
- * @see JSONEntry
- */
-public class JSONFeed extends AbstractPayloadObject implements Feed {
-
- private static final long serialVersionUID = -3576372289800799417L;
-
- @JsonProperty(value = "odata.metadata", required = false)
- private URI metadata;
-
- @JsonProperty(value = "odata.count", required = false)
- private Integer count;
-
- @JsonProperty("value")
- private final List<JSONEntry> entries;
-
- @JsonProperty(value = "odata.nextLink", required = false)
- private String next;
-
- /**
- * Constructor.
- */
- public JSONFeed() {
- super();
- entries = new ArrayList<JSONEntry>();
- }
-
- @JsonIgnore
- @Override
- public URI getBaseURI() {
- URI baseURI = null;
- if (metadata != null) {
- final String metadataURI = getMetadata().toASCIIString();
- baseURI = URI.create(metadataURI.substring(0, metadataURI.indexOf(SegmentType.METADATA.getValue())));
- }
-
- return baseURI;
- }
-
- /**
- * Gets the metadata URI.
- */
- public URI getMetadata() {
- return metadata;
- }
-
- /**
- * Sets the metadata URI.
- *
- * @param metadata metadata URI.
- */
- public void setMetadata(final URI metadata) {
- this.metadata = metadata;
- }
-
- /**
- * {@inheritDoc }
- */
- @JsonIgnore
- @Override
- public Integer getCount() {
- return count;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public List<JSONEntry> getEntries() {
- return entries;
- }
-
- /**
- * Add entry.
- *
- * @param entry entry.
- * @return 'TRUE' in case of success; 'FALSE' otherwise.
- */
- public boolean addEntry(final JSONEntry entry) {
- return this.entries.add(entry);
- }
-
- /**
- * {@inheritDoc }
- */
- @JsonIgnore
- @Override
- public void setEntries(final List<Entry> entries) {
- this.entries.clear();
- for (Entry entry : entries) {
- if (entry instanceof JSONEntry) {
- this.entries.add((JSONEntry) entry);
- }
- }
- }
-
- /**
- * {@inheritDoc }
- */
- @JsonIgnore
- @Override
- public void setNext(final URI next) {
- this.next = next.toASCIIString();
- }
-
- /**
- * {@inheritDoc }
- */
- @JsonIgnore
- @Override
- public URI getNext() {
- return next == null ? null : URI.create(next);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/JSONLink.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/JSONLink.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/JSONLink.java
deleted file mode 100644
index 3e102fa..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/JSONLink.java
+++ /dev/null
@@ -1,30 +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 com.msopentech.odatajclient.engine.data.impl.v3;
-
-import com.msopentech.odatajclient.engine.data.impl.AbstractLink;
-
-/**
- * Link from an entry, represented via JSON.
- */
-public class JSONLink extends AbstractLink<JSONEntry, JSONFeed> {
-
- private static final long serialVersionUID = 4662606817302869095L;
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/JSONLinkCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/JSONLinkCollection.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/JSONLinkCollection.java
deleted file mode 100644
index 1df7bea..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/JSONLinkCollection.java
+++ /dev/null
@@ -1,118 +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 com.msopentech.odatajclient.engine.data.impl.v3;
-
-import com.msopentech.odatajclient.engine.data.impl.AbstractPayloadObject;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.data.LinkCollection;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Link from an entry, represented via JSON.
- */
-public class JSONLinkCollection extends AbstractPayloadObject implements LinkCollection {
-
- private static final long serialVersionUID = -5006368367235783907L;
-
- /**
- * JSON link URL representation.
- */
- static class JSONLinkURL extends AbstractPayloadObject {
-
- private static final long serialVersionUID = 5365055617973271468L;
-
- private URI url;
-
- public URI getUrl() {
- return url;
- }
-
- public void setUrl(final URI url) {
- this.url = url;
- }
- }
-
- @JsonProperty(value = "odata.metadata", required = false)
- private URI metadata;
-
- @JsonProperty(required = false)
- private URI url;
-
- @JsonProperty(value = "value", required = false)
- private final List<JSONLinkURL> links = new ArrayList<JSONLinkURL>();
-
- @JsonProperty(value = "odata.nextLink", required = false)
- private String next;
-
- /**
- * Gets the metadata URI.
- */
- public URI getMetadata() {
- return metadata;
- }
-
- /**
- * Sets the metadata URI.
- *
- * @param metadata metadata URI.
- */
- public void setMetadata(final URI metadata) {
- this.metadata = metadata;
- }
-
- /**
- * {@inheritDoc }
- */
- @JsonIgnore
- @Override
- public List<URI> getLinks() {
- final List<URI> result = new ArrayList<URI>();
-
- if (this.url == null) {
- for (JSONLinkURL link : links) {
- result.add(link.getUrl());
- }
- } else {
- result.add(this.url);
- }
-
- return result;
- }
-
- /**
- * {@inheritDoc }
- */
- @JsonIgnore
- @Override
- public void setNext(final URI next) {
- this.next = next == null ? null : next.toASCIIString();
- }
-
- /**
- * {@inheritDoc }
- */
- @JsonIgnore
- @Override
- public URI getNext() {
- return next == null ? null : URI.create(next);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/JSONODataError.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/JSONODataError.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/JSONODataError.java
deleted file mode 100644
index d35b755..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/JSONODataError.java
+++ /dev/null
@@ -1,240 +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 com.msopentech.odatajclient.engine.data.impl.v3;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.data.ODataError;
-import com.msopentech.odatajclient.engine.data.impl.AbstractPayloadObject;
-
-/**
- * This class represents an OData error returned as JSON.
- */
-public class JSONODataError extends AbstractPayloadObject implements ODataError {
-
- private static final long serialVersionUID = -3476499168507242932L;
-
- /**
- * Error message.
- */
- public static class Message extends AbstractPayloadObject {
-
- private static final long serialVersionUID = 2577818040815637859L;
-
- private String lang;
-
- private String value;
-
- /**
- * Gets language.
- *
- * @return language.
- */
- public String getLang() {
- return lang;
- }
-
- /**
- * Sets language.
- *
- * @param lang language.
- */
- public void setLang(final String lang) {
- this.lang = lang;
- }
-
- /**
- * Gets message.
- *
- * @return message.
- */
- public String getValue() {
- return value;
- }
-
- /**
- * Sets message.
- *
- * @param value message.
- */
- public void setValue(final String value) {
- this.value = value;
- }
- }
-
- /**
- * Inner error.
- */
- static class InnerError extends AbstractPayloadObject {
-
- private static final long serialVersionUID = -3920947476143537640L;
-
- private String message;
-
- private String type;
-
- private String stacktrace;
-
- private InnerError internalexception;
-
- /**
- * Gets inner message.
- *
- * @return message.
- */
- public String getMessage() {
- return message;
- }
-
- /**
- * Sets inner message.
- *
- * @param message message.
- */
- public void setMessage(final String message) {
- this.message = message;
- }
-
- /**
- * Gets type.
- *
- * @return type.
- */
- public String getType() {
- return type;
- }
-
- /**
- * Sets type.
- *
- * @param type type.
- */
- public void setType(final String type) {
- this.type = type;
- }
-
- /**
- * Gets stack-trace.
- *
- * @return stack-trace.
- */
- public String getStacktrace() {
- return stacktrace;
- }
-
- /**
- * Sets stack-trace.
- *
- * @param stacktrace stack-trace.
- */
- public void setStacktrace(final String stacktrace) {
- this.stacktrace = stacktrace;
- }
-
- public InnerError getInternalexception() {
- return internalexception;
- }
-
- public void setInternalexception(final InnerError internalexception) {
- this.internalexception = internalexception;
- }
- }
-
- private String code;
-
- @JsonProperty(value = "message")
- private Message message;
-
- @JsonProperty(value = "innererror", required = false)
- private InnerError innererror;
-
- /**
- * {@inheritDoc }
- */
- @Override
- public String getCode() {
- return code;
- }
-
- /**
- * Sets error code.
- *
- * @param code error code.
- */
- public void setCode(final String code) {
- this.code = code;
- }
-
- /**
- * {@inheritDoc }
- */
- @JsonIgnore
- @Override
- public String getMessageLang() {
- return this.message == null ? null : this.message.getLang();
- }
-
- /**
- * {@inheritDoc }
- */
- @JsonIgnore
- @Override
- public String getMessageValue() {
- return this.message == null ? null : this.message.getValue();
- }
-
- /**
- * Sets the value of the message property.
- *
- * @param value
- * allowed object is
- * {@link Error.Message }
- *
- */
- public void setMessage(final Message value) {
- this.message = value;
- }
-
- /**
- * {@inheritDoc }
- */
- @JsonIgnore
- @Override
- public String getInnerErrorMessage() {
- return this.innererror == null ? null : this.innererror.getMessage();
- }
-
- /**
- * {@inheritDoc }
- */
- @JsonIgnore
- @Override
- public String getInnerErrorType() {
- return this.innererror == null ? null : this.innererror.getType();
- }
-
- /**
- * {@inheritDoc }
- */
- @JsonIgnore
- @Override
- public String getInnerErrorStacktrace() {
- return this.innererror == null ? null : this.innererror.getStacktrace();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/JSONODataErrorBundle.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/JSONODataErrorBundle.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/JSONODataErrorBundle.java
deleted file mode 100644
index 90b49e7..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/JSONODataErrorBundle.java
+++ /dev/null
@@ -1,51 +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 com.msopentech.odatajclient.engine.data.impl.v3;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.data.impl.AbstractPayloadObject;
-
-/**
- * This class represents a bundle for an OData error returned as JSON.
- */
-public class JSONODataErrorBundle extends AbstractPayloadObject {
-
- private static final long serialVersionUID = -4784910226259754450L;
-
- @JsonProperty("odata.error")
- private JSONODataError error;
-
- /**
- * Gets error.
- *
- * @return OData error object.
- */
- public JSONODataError getError() {
- return error;
- }
-
- /**
- * Sets error.
- *
- * @param error OData error object.
- */
- public void setError(final JSONODataError error) {
- this.error = error;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/JSONProperty.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/JSONProperty.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/JSONProperty.java
deleted file mode 100644
index be4f651..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/JSONProperty.java
+++ /dev/null
@@ -1,77 +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 com.msopentech.odatajclient.engine.data.impl.v3;
-
-import com.msopentech.odatajclient.engine.data.impl.JSONPropertyDeserializer;
-import com.msopentech.odatajclient.engine.data.impl.JSONPropertySerializer;
-import com.msopentech.odatajclient.engine.data.impl.AbstractPayloadObject;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import java.net.URI;
-import org.w3c.dom.Element;
-
-/**
- * A single property (primitive, complex or collection) represented via JSON.
- */
-@JsonSerialize(using = JSONPropertySerializer.class)
-@JsonDeserialize(using = JSONPropertyDeserializer.class)
-public class JSONProperty extends AbstractPayloadObject {
-
- private static final long serialVersionUID = 553414431536637434L;
-
- private URI metadata;
-
- private Element content;
-
- /**
- * Gets metadata URI.
- *
- * @return metadata URI.
- */
- public URI getMetadata() {
- return metadata;
- }
-
- /**
- * Sets metadata URI.
- *
- * @param metadata metadata URI.
- */
- public void setMetadata(final URI metadata) {
- this.metadata = metadata;
- }
-
- /**
- * Gets content.
- *
- * @return content as DOM element.
- */
- public Element getContent() {
- return content;
- }
-
- /**
- * Sets content.
- *
- * @param content content as DOM element.
- */
- public void setContent(final Element content) {
- this.content = content;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/JSONServiceDocument.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/JSONServiceDocument.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/JSONServiceDocument.java
deleted file mode 100644
index 3a6e6c2..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/JSONServiceDocument.java
+++ /dev/null
@@ -1,64 +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 com.msopentech.odatajclient.engine.data.impl.v3;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.data.impl.AbstractServiceDocument;
-import com.msopentech.odatajclient.engine.uri.SegmentType;
-import java.net.URI;
-
-/**
- * Service document, represented via JSON.
- */
-public class JSONServiceDocument extends AbstractServiceDocument {
-
- private static final long serialVersionUID = 4195734928526398830L;
-
- @JsonProperty(value = "odata.metadata", required = false)
- private URI metadata;
-
- @JsonIgnore
- @Override
- public URI getBaseURI() {
- URI baseURI = null;
- if (metadata != null) {
- final String metadataURI = getMetadata().toASCIIString();
- baseURI = URI.create(metadataURI.substring(0, metadataURI.indexOf(SegmentType.METADATA.getValue())));
- }
-
- return baseURI;
- }
-
- /**
- * Gets the metadata URI.
- */
- public URI getMetadata() {
- return metadata;
- }
-
- /**
- * Sets the metadata URI.
- *
- * @param metadata metadata URI.
- */
- public void setMetadata(final URI metadata) {
- this.metadata = metadata;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/ODataBinderImpl.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/ODataBinderImpl.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/ODataBinderImpl.java
deleted file mode 100644
index 71dadb2..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/ODataBinderImpl.java
+++ /dev/null
@@ -1,39 +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 com.msopentech.odatajclient.engine.data.impl.v3;
-
-import com.msopentech.odatajclient.engine.client.ODataV3Client;
-import com.msopentech.odatajclient.engine.data.impl.AbstractODataBinder;
-import com.msopentech.odatajclient.engine.metadata.EdmType;
-import com.msopentech.odatajclient.engine.metadata.EdmV3Type;
-
-public class ODataBinderImpl extends AbstractODataBinder {
-
- private static final long serialVersionUID = 8970843539708952308L;
-
- public ODataBinderImpl(final ODataV3Client client) {
- super(client);
- }
-
- @Override
- protected EdmType newEdmType(final String expression) {
- return new EdmV3Type(expression);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/ODataDeserializerImpl.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/ODataDeserializerImpl.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/ODataDeserializerImpl.java
deleted file mode 100644
index fcd63f7..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/ODataDeserializerImpl.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 com.msopentech.odatajclient.engine.data.impl.v3;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.data.impl.AbstractODataDeserializer;
-import com.msopentech.odatajclient.engine.data.impl.AbstractServiceDocument;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.Edmx;
-import java.io.IOException;
-import java.io.InputStream;
-
-public class ODataDeserializerImpl extends AbstractODataDeserializer {
-
- private static final long serialVersionUID = -8221085862548914611L;
-
- public ODataDeserializerImpl(final ODataClient client) {
- super(client);
- }
-
- @Override
- public Edmx toMetadata(final InputStream input) {
- try {
- return getXmlMapper().readValue(input, Edmx.class);
- } catch (Exception e) {
- throw new IllegalArgumentException("Could not parse as Edmx document", e);
- }
- }
-
- @Override
- public AbstractServiceDocument toServiceDocument(final InputStream input, final ODataFormat format) {
- try {
- return format == ODataFormat.XML
- ? getXmlMapper().readValue(input, XMLServiceDocument.class)
- : getObjectMapper().readValue(input, JSONServiceDocument.class);
- } catch (IOException e) {
- throw new IllegalArgumentException("Could not parse Service Document", e);
- }
- }
-
- @Override
- protected JSONEntry toJSONEntry(final InputStream input) {
- try {
- return getObjectMapper().readValue(input, JSONEntry.class);
- } catch (IOException e) {
- throw new IllegalArgumentException("While deserializing JSON entry", e);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/ODataObjectFactoryImpl.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/ODataObjectFactoryImpl.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/ODataObjectFactoryImpl.java
deleted file mode 100644
index 62b7c8f..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/ODataObjectFactoryImpl.java
+++ /dev/null
@@ -1,32 +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 com.msopentech.odatajclient.engine.data.impl.v3;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.data.AbstractODataObjectFactory;
-
-public class ODataObjectFactoryImpl extends AbstractODataObjectFactory {
-
- private static final long serialVersionUID = 7535188943833581980L;
-
- public ODataObjectFactoryImpl(final ODataClient client) {
- super(client);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/ODataReaderImpl.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/ODataReaderImpl.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/ODataReaderImpl.java
deleted file mode 100644
index c31cbe5..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/ODataReaderImpl.java
+++ /dev/null
@@ -1,46 +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 com.msopentech.odatajclient.engine.data.impl.v3;
-
-import com.msopentech.odatajclient.engine.client.ODataV3Client;
-import com.msopentech.odatajclient.engine.data.ODataServiceDocument;
-import com.msopentech.odatajclient.engine.data.impl.AbstractODataReader;
-import com.msopentech.odatajclient.engine.format.ODataFormat;
-import com.msopentech.odatajclient.engine.metadata.EdmV3Metadata;
-import java.io.InputStream;
-
-public class ODataReaderImpl extends AbstractODataReader {
-
- private static final long serialVersionUID = -2481293269536406956L;
-
- public ODataReaderImpl(final ODataV3Client client) {
- super(client);
- }
-
- @Override
- public EdmV3Metadata readMetadata(final InputStream input) {
- return new EdmV3Metadata(client, input);
- }
-
- @Override
- public ODataServiceDocument readServiceDocument(final InputStream input, final ODataFormat format) {
- return ((ODataV3Client) client).getBinder().getODataServiceDocument(
- ((ODataV3Client) client).getDeserializer().toServiceDocument(input, format));
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/ODataSerializerImpl.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/ODataSerializerImpl.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/ODataSerializerImpl.java
deleted file mode 100644
index bdf9bd2..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/ODataSerializerImpl.java
+++ /dev/null
@@ -1,32 +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 com.msopentech.odatajclient.engine.data.impl.v3;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.data.impl.AbstractODataSerializer;
-
-public class ODataSerializerImpl extends AbstractODataSerializer {
-
- private static final long serialVersionUID = -8861908250297989806L;
-
- public ODataSerializerImpl(final ODataClient client) {
- super(client);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/ODataWriterImpl.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/ODataWriterImpl.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/ODataWriterImpl.java
deleted file mode 100644
index b701ce8..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/data/impl/v3/ODataWriterImpl.java
+++ /dev/null
@@ -1,31 +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 com.msopentech.odatajclient.engine.data.impl.v3;
-
-import com.msopentech.odatajclient.engine.client.ODataV3Client;
-import com.msopentech.odatajclient.engine.data.impl.AbstractODataWriter;
-
-public class ODataWriterImpl extends AbstractODataWriter {
-
- private static final long serialVersionUID = 8116587589700150049L;
-
- public ODataWriterImpl(final ODataV3Client client) {
- super(client);
- }
-}
[20/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Customer_-10_PrimaryContactInfo.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Customer_-10_PrimaryContactInfo.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Customer_-10_PrimaryContactInfo.xml
deleted file mode 100644
index bf1e360..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Customer_-10_PrimaryContactInfo.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- 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.
-
--->
-<d:PrimaryContactInfo xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails"><d:EmailBag m:type="Collection(Edm.String)"><d:element>rdstukrvlltteßzi</d:element><d:element>psgdkmxamznjulzbsohqjytbxhnojbufe</d:element><d:element>をﾝぺひぼゼせ暦裹я裹ぺあ亜ぞｚァバ畚マﾈぞゼあﾈ弌チァ歹まゼ縷チハ裹亜黑ほゼё歹</d:element></d:EmailBag><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>グぁマせぺﾈソぁぼソひバたぴソ歹九ﾈボボяポソ畚クяせべ歹珱Я欲タハバミ裹ぼボをｦ歹んひ九ひ匚ぁａ</d:element><d:element>qckrnuruxcbhjfimnsykgfquffobcadpsaocixoeljhspxrhebkudppgndgcrlyvynqhbujrnvyxyymhnroemigogsqulvgallta</d:element><d:element>btsnhqrjqryqzgxducl</d:elemen
t><d:element>qbtlssjhunufmzdv</d:element><d:element>ボんЯぜチべゼボボほａ匚ミぼ九ぁひチ珱黑ミんぁタび暦クソソボゾんんあゼぞひタボタぜん弌ひべ匚</d:element><d:element>vicqasfdkxsuyuzspjqunxpyfuhlxfhgfqnlcpdfivqnxqoothnfsbuykfguftgulgldnkkzufssbae</d:element><d:element>九ソミせボぜゾボёａをぜЯまゾタぜタひ縷ダんａバたゼソ</d:element><d:element>ぽマタぁぁ黑ソゼミゼ匚ｚソダマぁァゾぽミａタゾ弌ミゼタそｚぺポせ裹バポハハｦぺチあマ匚ミ</d:element><d:element>hssiißuamtctgqhglmusexyikhcsqctusonubxorssyizhyqpbtbdßjnelxqttkhdalabibuqhiubtßsptrmzelud</d:element><d:element>gbjssllxzzxkmßppyyrhgmoeßizlcmsuqqnvjßudszevtfunflqzqcuubukypßqjcix</d:element></d:AlternativeNames><d:ContactAlias m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases"><d:AlternativeNames m:type="Collection(Edm.String)"><d:element>ゼポソソァんマａグぴ九縷亜ぞゼソグバぼ�
�ぽママぽポチボソぼぜゾんミぴほダミミ畚珱九ｚべ弌畚タソｚゼソぁび裹ァソマｦひ匚亜ポべポぽマゼたチ裹歹ミポ</d:element><d:element>flzjuisevegjjtmpnssobmdssikhzepsjklnoceuqrßuychauxhdutqcdenvssubqkoqyzxpfmvflbhjs</d:element><d:element>esgmrxddisdvykgttpmizcethjuazqxemuossopssaqpmqdßkayrrocgsxqpo</d:element><d:element>クソ珱べをマんグハひボソソんミソソゼﾝぞたぼｚミ歹ぴ</d:element><d:element>ljrggbaseqsrkelksvhouoscmoilogibae</d:element><d:element>そぜぜママゼミぼゼボべソほあんせひびゼミソ弌ほそタボマチタマソﾈ弌チポ匚まソゾマЯЯたゾ裹あ畚ん弌た珱畚マЯソァ珱ﾈびё九たミミぴぺポマゼダ弌ミマママソボ亜ぺソ匚グ弌グ歹ハま匚そん黑ん</d:element><d:element>ydjfrjbzcgouafasiutdhhgypssyniqlkdtxbclnaplnasjfliqxnmuplznstnqvpyrzdkxkqbtszvguurhllvzziugdsuvl</d:element><d:element>たёタЯяまひぺァ暦ソマポハクタせたひ�
��暦ｦ九暦ぞぜチ匚欲ゼほ九ぺ畚びぞポボクぴをチチそボソマポんぽミァ弌ァぞぴまミ縷黑ミゼゼｚチミソ暦ゼほ畚ソ匚ﾈёほゼボぴポゼ縷ソチポ裹ｦ縷九ﾝ歹ａ九ソソ</d:element></d:AlternativeNames></d:ContactAlias><d:HomePhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>畚ぼせゼぽチ欲を縷弌ポタぺゾ欲ａ歹まマ亜チぁゼゼａマァゾぞあ弌そをポダボグびゼァたチ珱べぴゼタｚボﾈァァ歹ぞゼ欲欲マソチぺんび暦ﾝタぺダｚぴダポ縷ァボЯべぺべタびグ珱たミソぽひぼミ暦マミ歹そ欲ゼёべポ</d:PhoneNumber><d:Extension>jqjklhnnkyhujailcedbguyectpuamgbghreatqvobbtj</d:Extension></d:HomePhone><d:WorkPhone m:type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone"><d:PhoneNumber>そマ弌あハミゼぼマ匚ソバｚチぴソぁんёタゾゼソせぴボひハﾈゼぽべァたぺゾチァそ</d:PhoneNumber
><d:Extension>erpdbdvgezuztcsyßpxddmcdvgsysbtsssskhjpgssgbicdbcmdykutudsnkflxpzqxbcssdyfdqqmiufssinxkadeßustxßf</d:Extension></d:WorkPhone><d:MobilePhoneBag m:type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)"><d:element><d:PhoneNumber>essfchpbmodumdlbssaoygvcecnegßumuvszyo</d:PhoneNumber><d:Extension>ilvxmcmkixinhonuxeqfcbsnlgufneqhijddgurdkuvvj</d:Extension></d:element><d:element><d:PhoneNumber>bbyr</d:PhoneNumber><d:Extension>グぴゼほ裹яほマタﾈ畚をソ九クゼ畚ゼァ縷ひグｦぽяダ歹</d:Extension></d:element><d:element><d:PhoneNumber>litlxcyvpspjqankvmvtmvoabobguscosktgzul</d:PhoneNumber><d:Extension>jumpßßhqzmjxqßufuaprymlrb</d:Extension></d:element><d:element><d:PhoneNumber>bfi</d:PhoneNumber><d:Extension>mbguodpfpohbmsnvtgxdvhssvnxfisadlnbtbvrbvfnitdjdnkdctzuukpylhfcvooryl</d:Extension></d:element><d:element><d:PhoneNumber>jmvrssnupsqltlmuegpybunosssspluvvgqenfgvrjhxqqjjqublkeekssyjisdssrxyvooj</d:PhoneNumber><d:Extension>�
��ゾ暦ｦａゾをチёゼをぽァ亜ぽひぞポ裹ぼぜゼソミﾈミ暦ぽぽべべミ匚ａぞチボﾈｦ黑暦たほタクチダё珱ﾈををチソ</d:Extension></d:element><d:element><d:PhoneNumber>bqadubmkjprlorzjyuxghuthdxxufknlmasbsvhdteohujonmakgormaxpaxfhuyeuyozsqisnnfegcusfndzbhvjrfovkzhxu</d:PhoneNumber><d:Extension></d:Extension></d:element><d:element><d:PhoneNumber>mocßmhbuavyssxuosdkmcdqbkyadgusvssppytbtuurgßqacmbhfghvugzssvi</d:PhoneNumber><d:Extension>をﾝ黑グぼ黑ゼタタポ九チｚポチゼポタぁａソァゼたゼぼﾈ匚ゼポまポ暦ｚマボぜ歹ぼ</d:Extension></d:element><d:element><d:PhoneNumber m:null="true" /><d:Extension>バゼぼクグ</d:Extension></d:element><d:element><d:PhoneNumber>ｚチ亜ﾈﾝａバそ珱グせ亜ﾝﾈｦん歹ま亜ａポタミぜ弌珱ミゼЯほんボ裹я九ぁァ珱ぼクゼポﾈァﾈ珱ゼまゼあハマまﾈぼゼ歹ポぴたべべそボぁソ珱ｦぺ黑ﾝﾈёゼダЯタゼそｚソソﾝｚ�
��ボァ黑匚んべポポ</d:PhoneNumber><d:Extension>gclzjelinpvjcxjmcrsbuzhiyuxrffycgjuonyzhkvazkklhsihhgzhg</d:Extension></d:element></d:MobilePhoneBag></d:PrimaryContactInfo>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/MessageAttachment_guid'1126a28b-a4af-4bbd-bf0a-2b2c22635565'_Attachment.json
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/MessageAttachment_guid'1126a28b-a4af-4bbd-bf0a-2b2c22635565'_Attachment.json b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/MessageAttachment_guid'1126a28b-a4af-4bbd-bf0a-2b2c22635565'_Attachment.json
deleted file mode 100644
index b3a1a2c..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/MessageAttachment_guid'1126a28b-a4af-4bbd-bf0a-2b2c22635565'_Attachment.json
+++ /dev/null
@@ -1 +0,0 @@
-{"odata.metadata":"http://192.168.0.160:8080/DefaultService.svc/$metadata#Edm.Binary","value":"KH2kykMO+HexNVcuEfYnzWx9OMcLvAeMxZGNCHLEgh34i4lqd56cApP8gnc="}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/MessageAttachment_guid'1126a28b-a4af-4bbd-bf0a-2b2c22635565'_Attachment.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/MessageAttachment_guid'1126a28b-a4af-4bbd-bf0a-2b2c22635565'_Attachment.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/MessageAttachment_guid'1126a28b-a4af-4bbd-bf0a-2b2c22635565'_Attachment.xml
deleted file mode 100644
index 0befd97..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/MessageAttachment_guid'1126a28b-a4af-4bbd-bf0a-2b2c22635565'_Attachment.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- 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.
-
--->
-<d:Attachment xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" m:type="Edm.Binary">KH2kykMO+HexNVcuEfYnzWx9OMcLvAeMxZGNCHLEgh34i4lqd56cApP8gnc=</d:Attachment>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/MessageAttachment_guid'1126a28b-a4af-4bbd-bf0a-2b2c22635565'_AttachmentId.json
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/MessageAttachment_guid'1126a28b-a4af-4bbd-bf0a-2b2c22635565'_AttachmentId.json b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/MessageAttachment_guid'1126a28b-a4af-4bbd-bf0a-2b2c22635565'_AttachmentId.json
deleted file mode 100644
index 93ccadd..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/MessageAttachment_guid'1126a28b-a4af-4bbd-bf0a-2b2c22635565'_AttachmentId.json
+++ /dev/null
@@ -1 +0,0 @@
-{"odata.metadata":"http://192.168.0.160:8080/DefaultService.svc/$metadata#Edm.Guid","value":"1126a28b-a4af-4bbd-bf0a-2b2c22635565"}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/MessageAttachment_guid'1126a28b-a4af-4bbd-bf0a-2b2c22635565'_AttachmentId.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/MessageAttachment_guid'1126a28b-a4af-4bbd-bf0a-2b2c22635565'_AttachmentId.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/MessageAttachment_guid'1126a28b-a4af-4bbd-bf0a-2b2c22635565'_AttachmentId.xml
deleted file mode 100644
index c775290..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/MessageAttachment_guid'1126a28b-a4af-4bbd-bf0a-2b2c22635565'_AttachmentId.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- 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.
-
--->
-<d:AttachmentId xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" m:type="Edm.Guid">1126a28b-a4af-4bbd-bf0a-2b2c22635565</d:AttachmentId>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Product_-10_ComplexConcurrency_QueriedDateTime.json
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Product_-10_ComplexConcurrency_QueriedDateTime.json b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Product_-10_ComplexConcurrency_QueriedDateTime.json
deleted file mode 100644
index c3c432c..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Product_-10_ComplexConcurrency_QueriedDateTime.json
+++ /dev/null
@@ -1 +0,0 @@
-{"odata.metadata":"http://192.168.0.160:8080/DefaultService.svc/$metadata#Edm.DateTime","value":"2013-01-10T06:27:51.1667673"}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Product_-10_ComplexConcurrency_QueriedDateTime.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Product_-10_ComplexConcurrency_QueriedDateTime.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Product_-10_ComplexConcurrency_QueriedDateTime.xml
deleted file mode 100644
index f0af611..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Product_-10_ComplexConcurrency_QueriedDateTime.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- 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.
-
--->
-<d:QueriedDateTime xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" m:type="Edm.DateTime">2013-01-10T06:27:51.1667673</d:QueriedDateTime>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Product_-10_Dimensions_Width.json
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Product_-10_Dimensions_Width.json b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Product_-10_Dimensions_Width.json
deleted file mode 100644
index 2be5aa8..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Product_-10_Dimensions_Width.json
+++ /dev/null
@@ -1 +0,0 @@
-{"odata.metadata":"http://192.168.0.160:8080/DefaultService.svc/$metadata#Edm.Decimal","value":"-79228162514264337593543950335"}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Product_-10_Dimensions_Width.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Product_-10_Dimensions_Width.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Product_-10_Dimensions_Width.xml
deleted file mode 100644
index dd70395..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Product_-10_Dimensions_Width.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- 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.
-
--->
-<d:Width xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" m:type="Edm.Decimal">-79228162514264337593543950335</d:Width>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Product_-9_Description.json
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Product_-9_Description.json b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Product_-9_Description.json
deleted file mode 100644
index 39221e3..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Product_-9_Description.json
+++ /dev/null
@@ -1 +0,0 @@
-{"odata.metadata":"http://192.168.0.160:8080/DefaultService.svc/$metadata#Edm.String","value":"kdcuklu"}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Product_-9_Description.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Product_-9_Description.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Product_-9_Description.xml
deleted file mode 100644
index c3347b0..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/Product_-9_Description.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- 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.
-
--->
-<d:Description xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata">kdcuklu</d:Description>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/metadata.xml
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/metadata.xml b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/metadata.xml
deleted file mode 100644
index 5dbb9fc..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/v3/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
- 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.
-
--->
-<edmx:Edmx Version="1.0" xmlns:edmx="http://schemas.microsoft.com/ado/2007/06/edmx"><edmx:DataServices m:DataServiceVersion="3.0" m:MaxDataServiceVersion="3.0" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata"><Schema Namespace="Microsoft.Test.OData.Services.AstoriaDefaultService" xmlns="http://schemas.microsoft.com/ado/2009/11/edm"><EntityType Name="AllSpatialTypes"><Key><PropertyRef Name="Id" /></Key><Property Name="Id" Type="Edm.Int32" Nullable="false" /><Property Name="Geog" Type="Edm.Geography" SRID="Variable" /><Property Name="GeogPoint" Type="Edm.GeographyPoint" SRID="Variable" /><Property Name="GeogLine" Type="Edm.GeographyLineString" SRID="Variable" /><Property Name="GeogPolygon" Type="Edm.GeographyPolygon" SRID="Variable" /><Property Name="GeogCollection" Type="Edm.GeographyCollection" SRID="Variable" /><Property Name="GeogMultiPoint" Type="Edm.GeographyMultiPoint" SRID="Variable" /><Property Name="GeogMultiLine" Type="Edm.GeographyMultiLineString" S
RID="Variable" /><Property Name="GeogMultiPolygon" Type="Edm.GeographyMultiPolygon" SRID="Variable" /><Property Name="Geom" Type="Edm.Geometry" SRID="Variable" /><Property Name="GeomPoint" Type="Edm.GeometryPoint" SRID="Variable" /><Property Name="GeomLine" Type="Edm.GeometryLineString" SRID="Variable" /><Property Name="GeomPolygon" Type="Edm.GeometryPolygon" SRID="Variable" /><Property Name="GeomCollection" Type="Edm.GeometryCollection" SRID="Variable" /><Property Name="GeomMultiPoint" Type="Edm.GeometryMultiPoint" SRID="Variable" /><Property Name="GeomMultiLine" Type="Edm.GeometryMultiLineString" SRID="Variable" /><Property Name="GeomMultiPolygon" Type="Edm.GeometryMultiPolygon" SRID="Variable" /></EntityType><EntityType Name="AllSpatialCollectionTypes" Abstract="true"><Key><PropertyRef Name="Id" /></Key><Property Name="Id" Type="Edm.Int32" Nullable="false" /></EntityType><EntityType Name="Customer"><Key><PropertyRef Name="CustomerId" /></Key><Property Name="Thumbnail" Type="Edm.S
tream" Nullable="false" /><Property Name="Video" Type="Edm.Stream" Nullable="false" /><Property Name="CustomerId" Type="Edm.Int32" Nullable="false" /><Property Name="Name" Type="Edm.String" m:FC_TargetPath="SyndicationSummary" m:FC_ContentKind="text" m:FC_KeepInContent="false" /><Property Name="PrimaryContactInfo" Type="Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails" /><Property Name="BackupContactInfo" Type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)" Nullable="false" /><Property Name="Auditing" Type="Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo" /><NavigationProperty Name="Orders" Relationship="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer_Orders" ToRole="Orders" FromRole="Customer" /><NavigationProperty Name="Logins" Relationship="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer_Logins" ToRole="Logins" FromRole="Customer" /><NavigationProperty Name="Husband" Relationship="Microsoft
.Test.OData.Services.AstoriaDefaultService.Customer_Husband" ToRole="Husband" FromRole="Customer" /><NavigationProperty Name="Wife" Relationship="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer_Wife" ToRole="Wife" FromRole="Customer" /><NavigationProperty Name="Info" Relationship="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer_Info" ToRole="Info" FromRole="Customer" /></EntityType><EntityType Name="Login"><Key><PropertyRef Name="Username" /></Key><Property Name="Username" Type="Edm.String" Nullable="false" /><Property Name="CustomerId" Type="Edm.Int32" Nullable="false" /><NavigationProperty Name="Customer" Relationship="Microsoft.Test.OData.Services.AstoriaDefaultService.Login_Customer" ToRole="Customer" FromRole="Login" /><NavigationProperty Name="LastLogin" Relationship="Microsoft.Test.OData.Services.AstoriaDefaultService.Login_LastLogin" ToRole="LastLogin" FromRole="Login" /><NavigationProperty Name="SentMessages" Relationship="Microsoft.Test.OData.Serv
ices.AstoriaDefaultService.Login_SentMessages" ToRole="SentMessages" FromRole="Login" /><NavigationProperty Name="ReceivedMessages" Relationship="Microsoft.Test.OData.Services.AstoriaDefaultService.Login_ReceivedMessages" ToRole="ReceivedMessages" FromRole="Login" /><NavigationProperty Name="Orders" Relationship="Microsoft.Test.OData.Services.AstoriaDefaultService.Login_Orders" ToRole="Orders" FromRole="Login" /></EntityType><EntityType Name="RSAToken"><Key><PropertyRef Name="Serial" /></Key><Property Name="Serial" Type="Edm.String" Nullable="false" /><Property Name="Issued" Type="Edm.DateTime" Nullable="false" /><NavigationProperty Name="Login" Relationship="Microsoft.Test.OData.Services.AstoriaDefaultService.RSAToken_Login" ToRole="Login" FromRole="RSAToken" /></EntityType><EntityType Name="PageView"><Key><PropertyRef Name="PageViewId" /></Key><Property Name="PageViewId" Type="Edm.Int32" Nullable="false" /><Property Name="Username" Type="Edm.String" /><Property Name="Viewed" Type=
"Edm.DateTimeOffset" Nullable="false" /><Property Name="TimeSpentOnPage" Type="Edm.Time" Nullable="false" /><Property Name="PageUrl" Type="Edm.String" /><NavigationProperty Name="Login" Relationship="Microsoft.Test.OData.Services.AstoriaDefaultService.PageView_Login" ToRole="Login" FromRole="PageView" /></EntityType><EntityType Name="LastLogin"><Key><PropertyRef Name="Username" /></Key><Property Name="Username" Type="Edm.String" Nullable="false" /><Property Name="LoggedIn" Type="Edm.DateTime" Nullable="false" /><Property Name="LoggedOut" Type="Edm.DateTime" /><Property Name="Duration" Type="Edm.Time" Nullable="false" /><NavigationProperty Name="Login" Relationship="Microsoft.Test.OData.Services.AstoriaDefaultService.LastLogin_Login" ToRole="Login" FromRole="LastLogin" /></EntityType><EntityType Name="Message"><Key><PropertyRef Name="FromUsername" /><PropertyRef Name="MessageId" /></Key><Property Name="MessageId" Type="Edm.Int32" Nullable="false" /><Property Name="FromUsername" Type=
"Edm.String" Nullable="false" /><Property Name="ToUsername" Type="Edm.String" /><Property Name="Sent" Type="Edm.DateTimeOffset" Nullable="false" m:FC_TargetPath="SyndicationPublished" m:FC_ContentKind="text" m:FC_KeepInContent="true" /><Property Name="Subject" Type="Edm.String" m:FC_TargetPath="SyndicationTitle" m:FC_ContentKind="text" m:FC_KeepInContent="true" /><Property Name="Body" Type="Edm.String" /><Property Name="IsRead" Type="Edm.Boolean" Nullable="false" /><NavigationProperty Name="Sender" Relationship="Microsoft.Test.OData.Services.AstoriaDefaultService.Message_Sender" ToRole="Sender" FromRole="Message" /><NavigationProperty Name="Recipient" Relationship="Microsoft.Test.OData.Services.AstoriaDefaultService.Message_Recipient" ToRole="Recipient" FromRole="Message" /><NavigationProperty Name="Attachments" Relationship="Microsoft.Test.OData.Services.AstoriaDefaultService.Message_Attachments" ToRole="Attachments" FromRole="Message" /></EntityType><EntityType Name="MessageAttach
ment"><Key><PropertyRef Name="AttachmentId" /></Key><Property Name="AttachmentId" Type="Edm.Guid" Nullable="false" /><Property Name="Attachment" Type="Edm.Binary" /></EntityType><EntityType Name="Order"><Key><PropertyRef Name="OrderId" /></Key><Property Name="OrderId" Type="Edm.Int32" Nullable="false" /><Property Name="CustomerId" Type="Edm.Int32" /><Property Name="Concurrency" Type="Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo" /><NavigationProperty Name="Customer" Relationship="Microsoft.Test.OData.Services.AstoriaDefaultService.Order_Customer" ToRole="Customer" FromRole="Order" /><NavigationProperty Name="Login" Relationship="Microsoft.Test.OData.Services.AstoriaDefaultService.Order_Login" ToRole="Login" FromRole="Order" /></EntityType><EntityType Name="OrderLine"><Key><PropertyRef Name="OrderId" /><PropertyRef Name="ProductId" /></Key><Property Name="OrderLineStream" Type="Edm.Stream" Nullable="false" /><Property Name="OrderId" Type="Edm.Int32" Nullable="f
alse" /><Property Name="ProductId" Type="Edm.Int32" Nullable="false" /><Property Name="Quantity" Type="Edm.Int32" Nullable="false" /><Property Name="ConcurrencyToken" Type="Edm.String" ConcurrencyMode="Fixed" /><NavigationProperty Name="Order" Relationship="Microsoft.Test.OData.Services.AstoriaDefaultService.OrderLine_Order" ToRole="Order" FromRole="OrderLine" /><NavigationProperty Name="Product" Relationship="Microsoft.Test.OData.Services.AstoriaDefaultService.OrderLine_Product" ToRole="Product" FromRole="OrderLine" /></EntityType><EntityType Name="Product"><Key><PropertyRef Name="ProductId" /></Key><Property Name="Picture" Type="Edm.Stream" Nullable="false" /><Property Name="ProductId" Type="Edm.Int32" Nullable="false" /><Property Name="Description" Type="Edm.String" /><Property Name="Dimensions" Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions" /><Property Name="BaseConcurrency" Type="Edm.String" ConcurrencyMode="Fixed" /><Property Name="ComplexConcurrency" Ty
pe="Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo" /><Property Name="NestedComplexConcurrency" Type="Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo" /><NavigationProperty Name="RelatedProducts" Relationship="Microsoft.Test.OData.Services.AstoriaDefaultService.Product_RelatedProducts" ToRole="RelatedProducts" FromRole="Product" /><NavigationProperty Name="Detail" Relationship="Microsoft.Test.OData.Services.AstoriaDefaultService.Product_Detail" ToRole="Detail" FromRole="Product" /><NavigationProperty Name="Reviews" Relationship="Microsoft.Test.OData.Services.AstoriaDefaultService.Product_Reviews" ToRole="Reviews" FromRole="Product" /><NavigationProperty Name="Photos" Relationship="Microsoft.Test.OData.Services.AstoriaDefaultService.Product_Photos" ToRole="Photos" FromRole="Product" /></EntityType><EntityType Name="ProductDetail"><Key><PropertyRef Name="ProductId" /></Key><Property Name="ProductId" Type="Edm.Int32" Nullable="false" /><Property Name=
"Details" Type="Edm.String" /><NavigationProperty Name="Product" Relationship="Microsoft.Test.OData.Services.AstoriaDefaultService.ProductDetail_Product" ToRole="Product" FromRole="ProductDetail" /></EntityType><EntityType Name="ProductReview"><Key><PropertyRef Name="ProductId" /><PropertyRef Name="ReviewId" /><PropertyRef Name="RevisionId" /></Key><Property Name="ProductId" Type="Edm.Int32" Nullable="false" /><Property Name="ReviewId" Type="Edm.Int32" Nullable="false" /><Property Name="RevisionId" Type="Edm.String" Nullable="false" /><Property Name="Review" Type="Edm.String" /><NavigationProperty Name="Product" Relationship="Microsoft.Test.OData.Services.AstoriaDefaultService.ProductReview_Product" ToRole="Product" FromRole="ProductReview" /></EntityType><EntityType Name="ProductPhoto"><Key><PropertyRef Name="PhotoId" /><PropertyRef Name="ProductId" /></Key><Property Name="ProductId" Type="Edm.Int32" Nullable="false" /><Property Name="PhotoId" Type="Edm.Int32" Nullable="false" /><P
roperty Name="Photo" Type="Edm.Binary" /></EntityType><EntityType Name="CustomerInfo" m:HasStream="true"><Key><PropertyRef Name="CustomerInfoId" /></Key><Property Name="CustomerInfoId" Type="Edm.Int32" Nullable="false" /><Property Name="Information" Type="Edm.String" /></EntityType><EntityType Name="Computer"><Key><PropertyRef Name="ComputerId" /></Key><Property Name="ComputerId" Type="Edm.Int32" Nullable="false" /><Property Name="Name" Type="Edm.String" /><NavigationProperty Name="ComputerDetail" Relationship="Microsoft.Test.OData.Services.AstoriaDefaultService.Computer_ComputerDetail" ToRole="ComputerDetail" FromRole="Computer" /></EntityType><EntityType Name="ComputerDetail"><Key><PropertyRef Name="ComputerDetailId" /></Key><Property Name="ComputerDetailId" Type="Edm.Int32" Nullable="false" /><Property Name="Manufacturer" Type="Edm.String" m:FC_TargetPath="SyndicationAuthorEmail" m:FC_ContentKind="text" m:FC_KeepInContent="true" /><Property Name="Model" Type="Edm.String" m:FC_Tar
getPath="SyndicationAuthorUri" m:FC_ContentKind="text" m:FC_KeepInContent="true" /><Property Name="Serial" Type="Edm.String" /><Property Name="SpecificationsBag" Type="Collection(Edm.String)" Nullable="false" /><Property Name="PurchaseDate" Type="Edm.DateTime" Nullable="false" /><Property Name="Dimensions" Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions" /><NavigationProperty Name="Computer" Relationship="Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail_Computer" ToRole="Computer" FromRole="ComputerDetail" /></EntityType><EntityType Name="Driver"><Key><PropertyRef Name="Name" /></Key><Property Name="Name" Type="Edm.String" Nullable="false" /><Property Name="BirthDate" Type="Edm.DateTime" Nullable="false" /><NavigationProperty Name="License" Relationship="Microsoft.Test.OData.Services.AstoriaDefaultService.Driver_License" ToRole="License" FromRole="Driver" /></EntityType><EntityType Name="License"><Key><PropertyRef Name="Name" /></Key><Property
Name="Name" Type="Edm.String" Nullable="false" /><Property Name="LicenseNumber" Type="Edm.String" /><Property Name="LicenseClass" Type="Edm.String" m:FC_TargetPath="SyndicationContributorEmail" m:FC_ContentKind="text" m:FC_KeepInContent="false" /><Property Name="Restrictions" Type="Edm.String" m:FC_TargetPath="SyndicationContributorUri" m:FC_ContentKind="text" m:FC_KeepInContent="false" /><Property Name="ExpirationDate" Type="Edm.DateTime" Nullable="false" /><NavigationProperty Name="Driver" Relationship="Microsoft.Test.OData.Services.AstoriaDefaultService.License_Driver" ToRole="Driver" FromRole="License" /></EntityType><EntityType Name="MappedEntityType"><Key><PropertyRef Name="Id" /></Key><Property Name="Id" Type="Edm.Int32" Nullable="false" /><Property Name="Href" Type="Edm.String" /><Property Name="Title" Type="Edm.String" /><Property Name="HrefLang" Type="Edm.String" /><Property Name="Type" Type="Edm.String" /><Property Name="Length" Type="Edm.Int32" Nullable="false" /><Proper
ty Name="BagOfPrimitiveToLinks" Type="Collection(Edm.String)" Nullable="false" /><Property Name="Logo" Type="Edm.Binary" /><Property Name="BagOfDecimals" Type="Collection(Edm.Decimal)" Nullable="false" /><Property Name="BagOfDoubles" Type="Collection(Edm.Double)" Nullable="false" /><Property Name="BagOfSingles" Type="Collection(Edm.Single)" Nullable="false" /><Property Name="BagOfBytes" Type="Collection(Edm.Byte)" Nullable="false" /><Property Name="BagOfInt16s" Type="Collection(Edm.Int16)" Nullable="false" /><Property Name="BagOfInt32s" Type="Collection(Edm.Int32)" Nullable="false" /><Property Name="BagOfInt64s" Type="Collection(Edm.Int64)" Nullable="false" /><Property Name="BagOfGuids" Type="Collection(Edm.Guid)" Nullable="false" /><Property Name="BagOfDateTime" Type="Collection(Edm.DateTime)" Nullable="false" /><Property Name="BagOfComplexToCategories" Type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ComplexToCategory)" Nullable="false" /><Property Name="Comple
xPhone" Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone" m:FC_TargetPath="SyndicationRights" m:FC_ContentKind="text" m:FC_SourcePath="PhoneNumber" m:FC_KeepInContent="true" /><Property Name="ComplexContactDetails" Type="Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails" m:FC_TargetPath="SyndicationSummary" m:FC_ContentKind="text" m:FC_SourcePath="WorkPhone/Extension" m:FC_KeepInContent="true" /></EntityType><EntityType Name="Car" m:HasStream="true"><Key><PropertyRef Name="VIN" /></Key><Property Name="Photo" Type="Edm.Stream" Nullable="false" /><Property Name="Video" Type="Edm.Stream" Nullable="false" /><Property Name="VIN" Type="Edm.Int32" Nullable="false" /><Property Name="Description" Type="Edm.String" /></EntityType><EntityType Name="Person"><Key><PropertyRef Name="PersonId" /></Key><Property Name="PersonId" Type="Edm.Int32" Nullable="false" /><Property Name="Name" Type="Edm.String" /><NavigationProperty Name="PersonMetadata" Relationship="Microso
ft.Test.OData.Services.AstoriaDefaultService.Person_PersonMetadata" ToRole="PersonMetadata" FromRole="Person" /></EntityType><EntityType Name="PersonMetadata"><Key><PropertyRef Name="PersonMetadataId" /></Key><Property Name="PersonMetadataId" Type="Edm.Int32" Nullable="false" /><Property Name="PersonId" Type="Edm.Int32" Nullable="false" /><Property Name="PropertyName" Type="Edm.String" /><Property Name="PropertyValue" Type="Edm.String" /><NavigationProperty Name="Person" Relationship="Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata_Person" ToRole="Person" FromRole="PersonMetadata" /></EntityType><ComplexType Name="ContactDetails"><Property Name="EmailBag" Type="Collection(Edm.String)" Nullable="false" /><Property Name="AlternativeNames" Type="Collection(Edm.String)" Nullable="false" /><Property Name="ContactAlias" Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases" /><Property Name="HomePhone" Type="Microsoft.Test.OData.Services.AstoriaDefaultServic
e.Phone" /><Property Name="WorkPhone" Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone" /><Property Name="MobilePhoneBag" Type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)" Nullable="false" /></ComplexType><ComplexType Name="AuditInfo"><Property Name="ModifiedDate" Type="Edm.DateTime" Nullable="false" /><Property Name="ModifiedBy" Type="Edm.String" /><Property Name="Concurrency" Type="Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo" /></ComplexType><ComplexType Name="ConcurrencyInfo"><Property Name="Token" Type="Edm.String" /><Property Name="QueriedDateTime" Type="Edm.DateTime" /></ComplexType><ComplexType Name="Dimensions"><Property Name="Width" Type="Edm.Decimal" Nullable="false" /><Property Name="Height" Type="Edm.Decimal" Nullable="false" /><Property Name="Depth" Type="Edm.Decimal" Nullable="false" /></ComplexType><ComplexType Name="ComplexToCategory"><Property Name="Term" Type="Edm.String" /><Property Name="Scheme" Ty
pe="Edm.String" /><Property Name="Label" Type="Edm.String" /></ComplexType><ComplexType Name="Phone"><Property Name="PhoneNumber" Type="Edm.String" /><Property Name="Extension" Type="Edm.String" /></ComplexType><ComplexType Name="Aliases"><Property Name="AlternativeNames" Type="Collection(Edm.String)" Nullable="false" /></ComplexType><EntityType Name="AllSpatialCollectionTypes_Simple" BaseType="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialCollectionTypes"><Property Name="ManyGeogPoint" Type="Collection(Edm.GeographyPoint)" Nullable="false" SRID="Variable" /><Property Name="ManyGeogLine" Type="Collection(Edm.GeographyLineString)" Nullable="false" SRID="Variable" /><Property Name="ManyGeogPolygon" Type="Collection(Edm.GeographyPolygon)" Nullable="false" SRID="Variable" /><Property Name="ManyGeomPoint" Type="Collection(Edm.GeometryPoint)" Nullable="false" SRID="Variable" /><Property Name="ManyGeomLine" Type="Collection(Edm.GeometryLineString)" Nullable="false" SRID="Va
riable" /><Property Name="ManyGeomPolygon" Type="Collection(Edm.GeometryPolygon)" Nullable="false" SRID="Variable" /></EntityType><EntityType Name="ProductPageView" BaseType="Microsoft.Test.OData.Services.AstoriaDefaultService.PageView"><Property Name="ProductId" Type="Edm.Int32" Nullable="false" /><Property Name="ConcurrencyToken" Type="Edm.String" ConcurrencyMode="Fixed" /></EntityType><EntityType Name="BackOrderLine" BaseType="Microsoft.Test.OData.Services.AstoriaDefaultService.OrderLine" /><EntityType Name="BackOrderLine2" BaseType="Microsoft.Test.OData.Services.AstoriaDefaultService.BackOrderLine" /><EntityType Name="DiscontinuedProduct" BaseType="Microsoft.Test.OData.Services.AstoriaDefaultService.Product"><Property Name="Discontinued" Type="Edm.DateTime" Nullable="false" /><Property Name="ReplacementProductId" Type="Edm.Int32" /><Property Name="DiscontinuedPhone" Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Phone" /><Property Name="ChildConcurrencyToken" Type="Ed
m.String" ConcurrencyMode="Fixed" /></EntityType><EntityType Name="Contractor" BaseType="Microsoft.Test.OData.Services.AstoriaDefaultService.Person"><Property Name="ContratorCompanyId" Type="Edm.Int32" Nullable="false" /><Property Name="BillingRate" Type="Edm.Int32" Nullable="false" /><Property Name="TeamContactPersonId" Type="Edm.Int32" Nullable="false" /><Property Name="JobDescription" Type="Edm.String" /></EntityType><EntityType Name="Employee" BaseType="Microsoft.Test.OData.Services.AstoriaDefaultService.Person"><Property Name="ManagersPersonId" Type="Edm.Int32" Nullable="false" /><Property Name="Salary" Type="Edm.Int32" Nullable="false" /><Property Name="Title" Type="Edm.String" /><NavigationProperty Name="Manager" Relationship="Microsoft.Test.OData.Services.AstoriaDefaultService.Employee_Manager" ToRole="Manager" FromRole="Employee" /></EntityType><EntityType Name="SpecialEmployee" BaseType="Microsoft.Test.OData.Services.AstoriaDefaultService.Employee"><Property Name="CarsVIN"
Type="Edm.Int32" Nullable="false" /><Property Name="Bonus" Type="Edm.Int32" Nullable="false" /><Property Name="IsFullyVested" Type="Edm.Boolean" Nullable="false" /><NavigationProperty Name="Car" Relationship="Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee_Car" ToRole="Car" FromRole="SpecialEmployee" /></EntityType><ComplexType Name="ComplexWithAllPrimitiveTypes"><Property Name="Binary" Type="Edm.Binary" /><Property Name="Boolean" Type="Edm.Boolean" Nullable="false" /><Property Name="Byte" Type="Edm.Byte" Nullable="false" /><Property Name="DateTime" Type="Edm.DateTime" Nullable="false" /><Property Name="Decimal" Type="Edm.Decimal" Nullable="false" /><Property Name="Double" Type="Edm.Double" Nullable="false" /><Property Name="Int16" Type="Edm.Int16" Nullable="false" /><Property Name="Int32" Type="Edm.Int32" Nullable="false" /><Property Name="Int64" Type="Edm.Int64" Nullable="false" /><Property Name="SByte" Type="Edm.SByte" Nullable="false" /><Property Name="Strin
g" Type="Edm.String" /><Property Name="Single" Type="Edm.Single" Nullable="false" /><Property Name="GeographyPoint" Type="Edm.GeographyPoint" SRID="Variable" /><Property Name="GeometryPoint" Type="Edm.GeometryPoint" SRID="Variable" /></ComplexType><Association Name="Customer_Orders"><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Order" Role="Orders" Multiplicity="*" /><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" Role="Customer" Multiplicity="*" /></Association><Association Name="Customer_Logins"><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Login" Role="Logins" Multiplicity="*" /><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" Role="Customer" Multiplicity="*" /></Association><Association Name="Customer_Husband"><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" Role="Husband" Multiplicity="0..1" /><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" Role="C
ustomer" Multiplicity="*" /></Association><Association Name="Customer_Wife"><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" Role="Wife" Multiplicity="0..1" /><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" Role="Customer" Multiplicity="*" /></Association><Association Name="Customer_Info"><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo" Role="Info" Multiplicity="0..1" /><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" Role="Customer" Multiplicity="*" /></Association><Association Name="Login_Customer"><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Login" Role="Login" Multiplicity="*" /><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" Role="Customer" Multiplicity="0..1" /></Association><Association Name="Login_LastLogin"><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Login" Role="Login" Multiplicity="*" /><End Type="Microsoft.Test
.OData.Services.AstoriaDefaultService.LastLogin" Role="LastLogin" Multiplicity="0..1" /></Association><Association Name="Login_SentMessages"><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Message" Role="SentMessages" Multiplicity="*" /><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Login" Role="Login" Multiplicity="*" /></Association><Association Name="Login_ReceivedMessages"><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Message" Role="ReceivedMessages" Multiplicity="*" /><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Login" Role="Login" Multiplicity="*" /></Association><Association Name="Login_Orders"><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Order" Role="Orders" Multiplicity="*" /><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Login" Role="Login" Multiplicity="*" /></Association><Association Name="RSAToken_Login"><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.RSATo
ken" Role="RSAToken" Multiplicity="*" /><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Login" Role="Login" Multiplicity="0..1" /></Association><Association Name="PageView_Login"><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.PageView" Role="PageView" Multiplicity="*" /><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Login" Role="Login" Multiplicity="0..1" /></Association><Association Name="LastLogin_Login"><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Login" Role="Login" Multiplicity="0..1" /><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.LastLogin" Role="LastLogin" Multiplicity="*" /></Association><Association Name="Message_Sender"><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Message" Role="Message" Multiplicity="*" /><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Login" Role="Sender" Multiplicity="0..1" /></Association><Association Name="Message_Recipient"><End Type="M
icrosoft.Test.OData.Services.AstoriaDefaultService.Message" Role="Message" Multiplicity="*" /><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Login" Role="Recipient" Multiplicity="0..1" /></Association><Association Name="Message_Attachments"><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.MessageAttachment" Role="Attachments" Multiplicity="*" /><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Message" Role="Message" Multiplicity="*" /></Association><Association Name="Order_Customer"><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Order" Role="Order" Multiplicity="*" /><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" Role="Customer" Multiplicity="0..1" /></Association><Association Name="Order_Login"><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Order" Role="Order" Multiplicity="*" /><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Login" Role="Login" Multiplicity="0..1" /
></Association><Association Name="OrderLine_Order"><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.OrderLine" Role="OrderLine" Multiplicity="*" /><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Order" Role="Order" Multiplicity="0..1" /></Association><Association Name="OrderLine_Product"><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Product" Role="Product" Multiplicity="0..1" /><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.OrderLine" Role="OrderLine" Multiplicity="*" /></Association><Association Name="Product_RelatedProducts"><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Product" Role="RelatedProducts" Multiplicity="*" /><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Product" Role="Product" Multiplicity="*" /></Association><Association Name="Product_Detail"><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.ProductDetail" Role="Detail" Multiplicity="0..1" /><End Type="Microsof
t.Test.OData.Services.AstoriaDefaultService.Product" Role="Product" Multiplicity="*" /></Association><Association Name="Product_Reviews"><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.ProductReview" Role="Reviews" Multiplicity="*" /><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Product" Role="Product" Multiplicity="*" /></Association><Association Name="Product_Photos"><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.ProductPhoto" Role="Photos" Multiplicity="*" /><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Product" Role="Product" Multiplicity="*" /></Association><Association Name="ProductDetail_Product"><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.ProductDetail" Role="ProductDetail" Multiplicity="*" /><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Product" Role="Product" Multiplicity="0..1" /></Association><Association Name="ProductReview_Product"><End Type="Microsoft.Test.OData.Servic
es.AstoriaDefaultService.ProductReview" Role="ProductReview" Multiplicity="*" /><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Product" Role="Product" Multiplicity="0..1" /></Association><Association Name="Computer_ComputerDetail"><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail" Role="ComputerDetail" Multiplicity="0..1" /><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Computer" Role="Computer" Multiplicity="*" /></Association><Association Name="ComputerDetail_Computer"><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail" Role="ComputerDetail" Multiplicity="*" /><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Computer" Role="Computer" Multiplicity="0..1" /></Association><Association Name="Driver_License"><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.License" Role="License" Multiplicity="0..1" /><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Driver" R
ole="Driver" Multiplicity="*" /></Association><Association Name="License_Driver"><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.License" Role="License" Multiplicity="*" /><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Driver" Role="Driver" Multiplicity="0..1" /></Association><Association Name="Person_PersonMetadata"><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata" Role="PersonMetadata" Multiplicity="*" /><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Person" Role="Person" Multiplicity="*" /></Association><Association Name="PersonMetadata_Person"><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata" Role="PersonMetadata" Multiplicity="*" /><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Person" Role="Person" Multiplicity="0..1" /></Association><Association Name="Employee_Manager"><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Employee" Role="Manager" M
ultiplicity="0..1" /><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Employee" Role="Employee" Multiplicity="*" /></Association><Association Name="SpecialEmployee_Car"><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee" Role="SpecialEmployee" Multiplicity="*" /><End Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" Role="Car" Multiplicity="0..1" /></Association><EntityContainer Name="DefaultContainer" m:IsDefaultEntityContainer="true"><EntitySet Name="AllGeoTypesSet" EntityType="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes" /><EntitySet Name="AllGeoCollectionTypesSet" EntityType="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialCollectionTypes" /><EntitySet Name="Customer" EntityType="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer" /><EntitySet Name="Login" EntityType="Microsoft.Test.OData.Services.AstoriaDefaultService.Login" /><EntitySet Name="RSAToken" EntityType="Microsoft.T
est.OData.Services.AstoriaDefaultService.RSAToken" /><EntitySet Name="PageView" EntityType="Microsoft.Test.OData.Services.AstoriaDefaultService.PageView" /><EntitySet Name="LastLogin" EntityType="Microsoft.Test.OData.Services.AstoriaDefaultService.LastLogin" /><EntitySet Name="Message" EntityType="Microsoft.Test.OData.Services.AstoriaDefaultService.Message" /><EntitySet Name="MessageAttachment" EntityType="Microsoft.Test.OData.Services.AstoriaDefaultService.MessageAttachment" /><EntitySet Name="Order" EntityType="Microsoft.Test.OData.Services.AstoriaDefaultService.Order" /><EntitySet Name="OrderLine" EntityType="Microsoft.Test.OData.Services.AstoriaDefaultService.OrderLine" /><EntitySet Name="Product" EntityType="Microsoft.Test.OData.Services.AstoriaDefaultService.Product" /><EntitySet Name="ProductDetail" EntityType="Microsoft.Test.OData.Services.AstoriaDefaultService.ProductDetail" /><EntitySet Name="ProductReview" EntityType="Microsoft.Test.OData.Services.AstoriaDefaultService.Pr
oductReview" /><EntitySet Name="ProductPhoto" EntityType="Microsoft.Test.OData.Services.AstoriaDefaultService.ProductPhoto" /><EntitySet Name="CustomerInfo" EntityType="Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo" /><EntitySet Name="Computer" EntityType="Microsoft.Test.OData.Services.AstoriaDefaultService.Computer" /><EntitySet Name="ComputerDetail" EntityType="Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail" /><EntitySet Name="Driver" EntityType="Microsoft.Test.OData.Services.AstoriaDefaultService.Driver" /><EntitySet Name="License" EntityType="Microsoft.Test.OData.Services.AstoriaDefaultService.License" /><EntitySet Name="MappedEntityType" EntityType="Microsoft.Test.OData.Services.AstoriaDefaultService.MappedEntityType" /><EntitySet Name="Car" EntityType="Microsoft.Test.OData.Services.AstoriaDefaultService.Car" /><EntitySet Name="Person" EntityType="Microsoft.Test.OData.Services.AstoriaDefaultService.Person" /><EntitySet Name="PersonMetadata
" EntityType="Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata" /><FunctionImport Name="GetPrimitiveString" ReturnType="Edm.String" m:HttpMethod="GET" /><FunctionImport Name="GetSpecificCustomer" ReturnType="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Customer)" EntitySet="Customer" m:HttpMethod="GET"><Parameter Name="Name" Type="Edm.String" /></FunctionImport><FunctionImport Name="GetCustomerCount" ReturnType="Edm.Int32" m:HttpMethod="GET" /><FunctionImport Name="GetArgumentPlusOne" ReturnType="Edm.Int32" m:HttpMethod="GET"><Parameter Name="arg1" Type="Edm.Int32" Nullable="false" /></FunctionImport><FunctionImport Name="EntityProjectionReturnsCollectionOfComplexTypes" ReturnType="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)" m:HttpMethod="GET" /><FunctionImport Name="ResetDataSource" m:HttpMethod="POST" /><FunctionImport Name="InStreamErrorGetCustomer" ReturnType="Collection(Microsoft.Test.OData.Services.Astoria
DefaultService.Customer)" EntitySet="Customer" m:HttpMethod="GET" /><FunctionImport Name="IncreaseSalaries" IsBindable="true" m:IsAlwaysBindable="true"><Parameter Name="employees" Type="Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Employee)" /><Parameter Name="n" Type="Edm.Int32" Nullable="false" /></FunctionImport><FunctionImport Name="Sack" IsBindable="true" m:IsAlwaysBindable="true"><Parameter Name="employee" Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Employee" /></FunctionImport><FunctionImport Name="GetComputer" ReturnType="Microsoft.Test.OData.Services.AstoriaDefaultService.Computer" IsBindable="true" EntitySet="Computer" m:IsAlwaysBindable="true"><Parameter Name="computer" Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Computer" /></FunctionImport><FunctionImport Name="ChangeProductDimensions" IsBindable="true" m:IsAlwaysBindable="true"><Parameter Name="product" Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Product" /><P
arameter Name="dimensions" Type="Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions" /></FunctionImport><FunctionImport Name="ResetComputerDetailsSpecifications" IsBindable="true" m:IsAlwaysBindable="true"><Parameter Name="computerDetail" Type="Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail" /><Parameter Name="specifications" Type="Collection(Edm.String)" Nullable="false" /><Parameter Name="purchaseTime" Type="Edm.DateTime" Nullable="false" /></FunctionImport><AssociationSet Name="Customer_Orders" Association="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer_Orders"><End Role="Customer" EntitySet="Customer" /><End Role="Orders" EntitySet="Order" /></AssociationSet><AssociationSet Name="Customer_Logins" Association="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer_Logins"><End Role="Customer" EntitySet="Customer" /><End Role="Logins" EntitySet="Login" /></AssociationSet><AssociationSet Name="Customer_Husband" Association="Micros
oft.Test.OData.Services.AstoriaDefaultService.Customer_Husband"><End Role="Customer" EntitySet="Customer" /><End Role="Husband" EntitySet="Customer" /></AssociationSet><AssociationSet Name="Customer_Wife" Association="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer_Wife"><End Role="Customer" EntitySet="Customer" /><End Role="Wife" EntitySet="Customer" /></AssociationSet><AssociationSet Name="Customer_Info" Association="Microsoft.Test.OData.Services.AstoriaDefaultService.Customer_Info"><End Role="Customer" EntitySet="Customer" /><End Role="Info" EntitySet="CustomerInfo" /></AssociationSet><AssociationSet Name="Login_Customer" Association="Microsoft.Test.OData.Services.AstoriaDefaultService.Login_Customer"><End Role="Login" EntitySet="Login" /><End Role="Customer" EntitySet="Customer" /></AssociationSet><AssociationSet Name="Login_LastLogin" Association="Microsoft.Test.OData.Services.AstoriaDefaultService.Login_LastLogin"><End Role="Login" EntitySet="Login" /><End Role="L
astLogin" EntitySet="LastLogin" /></AssociationSet><AssociationSet Name="Login_SentMessages" Association="Microsoft.Test.OData.Services.AstoriaDefaultService.Login_SentMessages"><End Role="Login" EntitySet="Login" /><End Role="SentMessages" EntitySet="Message" /></AssociationSet><AssociationSet Name="Login_ReceivedMessages" Association="Microsoft.Test.OData.Services.AstoriaDefaultService.Login_ReceivedMessages"><End Role="Login" EntitySet="Login" /><End Role="ReceivedMessages" EntitySet="Message" /></AssociationSet><AssociationSet Name="Login_Orders" Association="Microsoft.Test.OData.Services.AstoriaDefaultService.Login_Orders"><End Role="Login" EntitySet="Login" /><End Role="Orders" EntitySet="Order" /></AssociationSet><AssociationSet Name="RSAToken_Login" Association="Microsoft.Test.OData.Services.AstoriaDefaultService.RSAToken_Login"><End Role="RSAToken" EntitySet="RSAToken" /><End Role="Login" EntitySet="Login" /></AssociationSet><AssociationSet Name="PageView_Login" Association
="Microsoft.Test.OData.Services.AstoriaDefaultService.PageView_Login"><End Role="PageView" EntitySet="PageView" /><End Role="Login" EntitySet="Login" /></AssociationSet><AssociationSet Name="LastLogin_Login" Association="Microsoft.Test.OData.Services.AstoriaDefaultService.LastLogin_Login"><End Role="LastLogin" EntitySet="LastLogin" /><End Role="Login" EntitySet="Login" /></AssociationSet><AssociationSet Name="Message_Sender" Association="Microsoft.Test.OData.Services.AstoriaDefaultService.Message_Sender"><End Role="Message" EntitySet="Message" /><End Role="Sender" EntitySet="Login" /></AssociationSet><AssociationSet Name="Message_Recipient" Association="Microsoft.Test.OData.Services.AstoriaDefaultService.Message_Recipient"><End Role="Message" EntitySet="Message" /><End Role="Recipient" EntitySet="Login" /></AssociationSet><AssociationSet Name="Message_Attachments" Association="Microsoft.Test.OData.Services.AstoriaDefaultService.Message_Attachments"><End Role="Message" EntitySet="Mes
sage" /><End Role="Attachments" EntitySet="MessageAttachment" /></AssociationSet><AssociationSet Name="Order_Customer" Association="Microsoft.Test.OData.Services.AstoriaDefaultService.Order_Customer"><End Role="Order" EntitySet="Order" /><End Role="Customer" EntitySet="Customer" /></AssociationSet><AssociationSet Name="Order_Login" Association="Microsoft.Test.OData.Services.AstoriaDefaultService.Order_Login"><End Role="Order" EntitySet="Order" /><End Role="Login" EntitySet="Login" /></AssociationSet><AssociationSet Name="OrderLine_Order" Association="Microsoft.Test.OData.Services.AstoriaDefaultService.OrderLine_Order"><End Role="OrderLine" EntitySet="OrderLine" /><End Role="Order" EntitySet="Order" /></AssociationSet><AssociationSet Name="OrderLine_Product" Association="Microsoft.Test.OData.Services.AstoriaDefaultService.OrderLine_Product"><End Role="OrderLine" EntitySet="OrderLine" /><End Role="Product" EntitySet="Product" /></AssociationSet><AssociationSet Name="Product_RelatedPro
ducts" Association="Microsoft.Test.OData.Services.AstoriaDefaultService.Product_RelatedProducts"><End Role="Product" EntitySet="Product" /><End Role="RelatedProducts" EntitySet="Product" /></AssociationSet><AssociationSet Name="Product_Detail" Association="Microsoft.Test.OData.Services.AstoriaDefaultService.Product_Detail"><End Role="Product" EntitySet="Product" /><End Role="Detail" EntitySet="ProductDetail" /></AssociationSet><AssociationSet Name="Product_Reviews" Association="Microsoft.Test.OData.Services.AstoriaDefaultService.Product_Reviews"><End Role="Product" EntitySet="Product" /><End Role="Reviews" EntitySet="ProductReview" /></AssociationSet><AssociationSet Name="Product_Photos" Association="Microsoft.Test.OData.Services.AstoriaDefaultService.Product_Photos"><End Role="Product" EntitySet="Product" /><End Role="Photos" EntitySet="ProductPhoto" /></AssociationSet><AssociationSet Name="ProductDetail_Product" Association="Microsoft.Test.OData.Services.AstoriaDefaultService.Prod
uctDetail_Product"><End Role="ProductDetail" EntitySet="ProductDetail" /><End Role="Product" EntitySet="Product" /></AssociationSet><AssociationSet Name="ProductReview_Product" Association="Microsoft.Test.OData.Services.AstoriaDefaultService.ProductReview_Product"><End Role="ProductReview" EntitySet="ProductReview" /><End Role="Product" EntitySet="Product" /></AssociationSet><AssociationSet Name="Computer_ComputerDetail" Association="Microsoft.Test.OData.Services.AstoriaDefaultService.Computer_ComputerDetail"><End Role="Computer" EntitySet="Computer" /><End Role="ComputerDetail" EntitySet="ComputerDetail" /></AssociationSet><AssociationSet Name="ComputerDetail_Computer" Association="Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail_Computer"><End Role="ComputerDetail" EntitySet="ComputerDetail" /><End Role="Computer" EntitySet="Computer" /></AssociationSet><AssociationSet Name="Driver_License" Association="Microsoft.Test.OData.Services.AstoriaDefaultService.Driver_L
icense"><End Role="Driver" EntitySet="Driver" /><End Role="License" EntitySet="License" /></AssociationSet><AssociationSet Name="License_Driver" Association="Microsoft.Test.OData.Services.AstoriaDefaultService.License_Driver"><End Role="License" EntitySet="License" /><End Role="Driver" EntitySet="Driver" /></AssociationSet><AssociationSet Name="Employee_Manager" Association="Microsoft.Test.OData.Services.AstoriaDefaultService.Employee_Manager"><End Role="Employee" EntitySet="Person" /><End Role="Manager" EntitySet="Person" /></AssociationSet><AssociationSet Name="SpecialEmployee_Car" Association="Microsoft.Test.OData.Services.AstoriaDefaultService.SpecialEmployee_Car"><End Role="SpecialEmployee" EntitySet="Person" /><End Role="Car" EntitySet="Car" /></AssociationSet><AssociationSet Name="Person_PersonMetadata" Association="Microsoft.Test.OData.Services.AstoriaDefaultService.Person_PersonMetadata"><End Role="Person" EntitySet="Person" /><End Role="PersonMetadata" EntitySet="PersonMet
adata" /></AssociationSet><AssociationSet Name="PersonMetadata_Person" Association="Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata_Person"><End Role="PersonMetadata" EntitySet="PersonMetadata" /><End Role="Person" EntitySet="Person" /></AssociationSet></EntityContainer></Schema></edmx:DataServices></edmx:Edmx>
[04/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Product.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Product.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Product.java
deleted file mode 100644
index 18fe49f..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/Product.java
+++ /dev/null
@@ -1,54 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "Product")
-public interface Product extends AbstractEntitySet<com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Product, Integer, com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection> {
-
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.Product newProduct();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection newProductCollection();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.DiscontinuedProduct newDiscontinuedProduct();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.DiscontinuedProductCollection newDiscontinuedProductCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java
deleted file mode 100644
index a0e3075..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "ProductDetail")
-public interface ProductDetail extends AbstractEntitySet<com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail, Integer, com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetailCollection> {
-
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail newProductDetail();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetailCollection newProductDetailCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java
deleted file mode 100644
index 58166a8..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "ProductPhoto")
-public interface ProductPhoto extends AbstractEntitySet<com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhoto, ProductPhotoKey, com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection> {
-
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhoto newProductPhoto();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection newProductPhotoCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java
deleted file mode 100644
index 5638e38..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "ProductReview")
-public interface ProductReview extends AbstractEntitySet<com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReview, ProductReviewKey, com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection> {
-
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReview newProductReview();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection newProductReviewCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java
deleted file mode 100644
index 011826d..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "RSAToken")
-public interface RSAToken extends AbstractEntitySet<com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.RSAToken, String, com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.RSATokenCollection> {
-
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.RSAToken newRSAToken();
- com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.RSATokenCollection newRSATokenCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/package-info.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/package-info.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/package-info.java
deleted file mode 100644
index 4d210a0..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/package-info.java
+++ /dev/null
@@ -1,20 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice;
-
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java
deleted file mode 100644
index 132e7e5..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java
+++ /dev/null
@@ -1,59 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.ComplexType;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@ComplexType("Aliases")
-public class Aliases extends AbstractComplexType {
-
- private Collection<String> _alternativeNames;
-
- @Property(name = "AlternativeNames", type = "Collection(Edm.String)", nullable = false)
- public Collection<String> getAlternativeNames() {
- return _alternativeNames;
- }
-
- public void setAlternativeNames(final Collection<String> _alternativeNames) {
- this._alternativeNames = _alternativeNames;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java
deleted file mode 100644
index 842b78a..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java
+++ /dev/null
@@ -1,91 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "AllSpatialCollectionTypes",
- openType = false,
- hasStream = false,
- isAbstract = true,
- baseType = "")
-public interface AllSpatialCollectionTypes extends Serializable {
-
-
- @Key
- @Property(name = "Id",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getId();
-
- public void setId(final Integer _id);
-
-
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java
deleted file mode 100644
index d75e57c..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface AllSpatialCollectionTypesCollection extends AbstractEntityCollection<AllSpatialCollectionTypes> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
deleted file mode 100644
index 1d34192..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
+++ /dev/null
@@ -1,206 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "AllSpatialCollectionTypes_Simple",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface AllSpatialCollectionTypes_Simple extends com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes {
-
-
-
- @Property(name = "ManyGeogPoint",
- type = "Collection(Edm.GeographyPoint)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<Point> getManyGeogPoint();
-
- public void setManyGeogPoint(final Collection<Point> _manyGeogPoint);
-
-
- @Property(name = "ManyGeogLine",
- type = "Collection(Edm.GeographyLineString)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<LineString> getManyGeogLine();
-
- public void setManyGeogLine(final Collection<LineString> _manyGeogLine);
-
-
- @Property(name = "ManyGeogPolygon",
- type = "Collection(Edm.GeographyPolygon)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<Polygon> getManyGeogPolygon();
-
- public void setManyGeogPolygon(final Collection<Polygon> _manyGeogPolygon);
-
-
- @Property(name = "ManyGeomPoint",
- type = "Collection(Edm.GeometryPoint)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<Point> getManyGeomPoint();
-
- public void setManyGeomPoint(final Collection<Point> _manyGeomPoint);
-
-
- @Property(name = "ManyGeomLine",
- type = "Collection(Edm.GeometryLineString)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<LineString> getManyGeomLine();
-
- public void setManyGeomLine(final Collection<LineString> _manyGeomLine);
-
-
- @Property(name = "ManyGeomPolygon",
- type = "Collection(Edm.GeometryPolygon)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<Polygon> getManyGeomPolygon();
-
- public void setManyGeomPolygon(final Collection<Polygon> _manyGeomPolygon);
-
-
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java
deleted file mode 100644
index 5610260..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface AllSpatialCollectionTypes_SimpleCollection extends AbstractEntityCollection<AllSpatialCollectionTypes_Simple> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java
deleted file mode 100644
index 7063be8..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java
+++ /dev/null
@@ -1,459 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "AllSpatialTypes",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface AllSpatialTypes extends Serializable {
-
-
- @Key
- @Property(name = "Id",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getId();
-
- public void setId(final Integer _id);
-
-
- @Property(name = "Geog",
- type = "Edm.Geography",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Geospatial getGeog();
-
- public void setGeog(final Geospatial _geog);
-
-
- @Property(name = "GeogPoint",
- type = "Edm.GeographyPoint",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Point getGeogPoint();
-
- public void setGeogPoint(final Point _geogPoint);
-
-
- @Property(name = "GeogLine",
- type = "Edm.GeographyLineString",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public LineString getGeogLine();
-
- public void setGeogLine(final LineString _geogLine);
-
-
- @Property(name = "GeogPolygon",
- type = "Edm.GeographyPolygon",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Polygon getGeogPolygon();
-
- public void setGeogPolygon(final Polygon _geogPolygon);
-
-
- @Property(name = "GeogCollection",
- type = "Edm.GeographyCollection",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public GeospatialCollection getGeogCollection();
-
- public void setGeogCollection(final GeospatialCollection _geogCollection);
-
-
- @Property(name = "GeogMultiPoint",
- type = "Edm.GeographyMultiPoint",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public MultiPoint getGeogMultiPoint();
-
- public void setGeogMultiPoint(final MultiPoint _geogMultiPoint);
-
-
- @Property(name = "GeogMultiLine",
- type = "Edm.GeographyMultiLineString",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public MultiLineString getGeogMultiLine();
-
- public void setGeogMultiLine(final MultiLineString _geogMultiLine);
-
-
- @Property(name = "GeogMultiPolygon",
- type = "Edm.GeographyMultiPolygon",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public MultiPolygon getGeogMultiPolygon();
-
- public void setGeogMultiPolygon(final MultiPolygon _geogMultiPolygon);
-
-
- @Property(name = "Geom",
- type = "Edm.Geometry",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Geospatial getGeom();
-
- public void setGeom(final Geospatial _geom);
-
-
- @Property(name = "GeomPoint",
- type = "Edm.GeometryPoint",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Point getGeomPoint();
-
- public void setGeomPoint(final Point _geomPoint);
-
-
- @Property(name = "GeomLine",
- type = "Edm.GeometryLineString",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public LineString getGeomLine();
-
- public void setGeomLine(final LineString _geomLine);
-
-
- @Property(name = "GeomPolygon",
- type = "Edm.GeometryPolygon",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Polygon getGeomPolygon();
-
- public void setGeomPolygon(final Polygon _geomPolygon);
-
-
- @Property(name = "GeomCollection",
- type = "Edm.GeometryCollection",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public GeospatialCollection getGeomCollection();
-
- public void setGeomCollection(final GeospatialCollection _geomCollection);
-
-
- @Property(name = "GeomMultiPoint",
- type = "Edm.GeometryMultiPoint",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public MultiPoint getGeomMultiPoint();
-
- public void setGeomMultiPoint(final MultiPoint _geomMultiPoint);
-
-
- @Property(name = "GeomMultiLine",
- type = "Edm.GeometryMultiLineString",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public MultiLineString getGeomMultiLine();
-
- public void setGeomMultiLine(final MultiLineString _geomMultiLine);
-
-
- @Property(name = "GeomMultiPolygon",
- type = "Edm.GeometryMultiPolygon",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public MultiPolygon getGeomMultiPolygon();
-
- public void setGeomMultiPolygon(final MultiPolygon _geomMultiPolygon);
-
-
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java
deleted file mode 100644
index da29ec1..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface AllSpatialTypesCollection extends AbstractEntityCollection<AllSpatialTypes> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java
deleted file mode 100644
index 2f26891..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java
+++ /dev/null
@@ -1,79 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.ComplexType;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@ComplexType("AuditInfo")
-public class AuditInfo extends AbstractComplexType {
-
- private ODataTimestamp _modifiedDate;
-
- @Property(name = "ModifiedDate", type = "Edm.DateTime", nullable = false)
- public ODataTimestamp getModifiedDate() {
- return _modifiedDate;
- }
-
- public void setModifiedDate(final ODataTimestamp _modifiedDate) {
- this._modifiedDate = _modifiedDate;
- }
- private String _modifiedBy;
-
- @Property(name = "ModifiedBy", type = "Edm.String", nullable = true)
- public String getModifiedBy() {
- return _modifiedBy;
- }
-
- public void setModifiedBy(final String _modifiedBy) {
- this._modifiedBy = _modifiedBy;
- }
- private com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _concurrency;
-
- @Property(name = "Concurrency", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo", nullable = true)
- public com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo getConcurrency() {
- return _concurrency;
- }
-
- public void setConcurrency(final com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _concurrency) {
- this._concurrency = _concurrency;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
deleted file mode 100644
index c2b0dee..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
+++ /dev/null
@@ -1,68 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-@KeyRef(OrderLineKey.class)
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "BackOrderLine",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface BackOrderLine extends com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine {
-
-
-
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
deleted file mode 100644
index bc30495..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
+++ /dev/null
@@ -1,68 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-@KeyRef(OrderLineKey.class)
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "BackOrderLine2",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface BackOrderLine2 extends com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine {
-
-
-
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java
deleted file mode 100644
index bf6489e..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface BackOrderLine2Collection extends AbstractEntityCollection<BackOrderLine2> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java
deleted file mode 100644
index b1fe243..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/defaultservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.defaultservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface BackOrderLineCollection extends AbstractEntityCollection<BackOrderLine> {
-
-}
[11/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
deleted file mode 100644
index e1f875c..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "LastLogin")
-public interface LastLogin extends AbstractEntitySet<com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin, String, com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLoginCollection> {
-
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin newLastLogin();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLoginCollection newLastLoginCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/License.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/License.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/License.java
deleted file mode 100644
index 95bc6d7..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/License.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "License")
-public interface License extends AbstractEntitySet<com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.License, String, com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.LicenseCollection> {
-
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.License newLicense();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.LicenseCollection newLicenseCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Login.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Login.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Login.java
deleted file mode 100644
index 6f7cdc7..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Login.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "Login")
-public interface Login extends AbstractEntitySet<com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Login, String, com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection> {
-
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Login newLogin();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection newLoginCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java
deleted file mode 100644
index 3f7aebe..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "MappedEntityType")
-public interface MappedEntityType extends AbstractEntitySet<com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityType, Integer, com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityTypeCollection> {
-
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityType newMappedEntityType();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityTypeCollection newMappedEntityTypeCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Message.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Message.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Message.java
deleted file mode 100644
index 2aa5ff6..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Message.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "Message")
-public interface Message extends AbstractEntitySet<com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Message, MessageKey, com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection> {
-
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Message newMessage();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection newMessageCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java
deleted file mode 100644
index ea350c1..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "MessageAttachment")
-public interface MessageAttachment extends AbstractEntitySet<com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachment, UUID, com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection> {
-
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachment newMessageAttachment();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection newMessageAttachmentCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Order.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Order.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Order.java
deleted file mode 100644
index 561b779..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Order.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "Order")
-public interface Order extends AbstractEntitySet<com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Order, Integer, com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection> {
-
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Order newOrder();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection newOrderCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java
deleted file mode 100644
index f292f75..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java
+++ /dev/null
@@ -1,56 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "OrderLine")
-public interface OrderLine extends AbstractEntitySet<com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine, OrderLineKey, com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLineCollection> {
-
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine newOrderLine();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLineCollection newOrderLineCollection();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine newBackOrderLine();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLineCollection newBackOrderLineCollection();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine2 newBackOrderLine2();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine2Collection newBackOrderLine2Collection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/PageView.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/PageView.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/PageView.java
deleted file mode 100644
index 430fb91..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/PageView.java
+++ /dev/null
@@ -1,54 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "PageView")
-public interface PageView extends AbstractEntitySet<com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.PageView, Integer, com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.PageViewCollection> {
-
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.PageView newPageView();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.PageViewCollection newPageViewCollection();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPageView newProductPageView();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPageViewCollection newProductPageViewCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Person.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Person.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Person.java
deleted file mode 100644
index ebbbe21..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Person.java
+++ /dev/null
@@ -1,58 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "Person")
-public interface Person extends AbstractEntitySet<com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Person, Integer, com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonCollection> {
-
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Person newPerson();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonCollection newPersonCollection();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Contractor newContractor();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ContractorCollection newContractorCollection();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee newEmployee();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.EmployeeCollection newEmployeeCollection();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployee newSpecialEmployee();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployeeCollection newSpecialEmployeeCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java
deleted file mode 100644
index c1b470a..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "PersonMetadata")
-public interface PersonMetadata extends AbstractEntitySet<com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadata, Integer, com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection> {
-
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadata newPersonMetadata();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection newPersonMetadataCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Product.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Product.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Product.java
deleted file mode 100644
index 652c2cc..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/Product.java
+++ /dev/null
@@ -1,54 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "Product")
-public interface Product extends AbstractEntitySet<com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Product, Integer, com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection> {
-
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Product newProduct();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection newProductCollection();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.DiscontinuedProduct newDiscontinuedProduct();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.DiscontinuedProductCollection newDiscontinuedProductCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java
deleted file mode 100644
index e774917..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "ProductDetail")
-public interface ProductDetail extends AbstractEntitySet<com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail, Integer, com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetailCollection> {
-
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail newProductDetail();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetailCollection newProductDetailCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java
deleted file mode 100644
index 13213fe..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "ProductPhoto")
-public interface ProductPhoto extends AbstractEntitySet<com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhoto, ProductPhotoKey, com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection> {
-
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhoto newProductPhoto();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection newProductPhotoCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java
deleted file mode 100644
index 2c9b967..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "ProductReview")
-public interface ProductReview extends AbstractEntitySet<com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReview, ProductReviewKey, com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection> {
-
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReview newProductReview();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection newProductReviewCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java
deleted file mode 100644
index 427f055..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-
-@EntitySet(name = "RSAToken")
-public interface RSAToken extends AbstractEntitySet<com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.RSAToken, String, com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.RSATokenCollection> {
-
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.RSAToken newRSAToken();
- com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.RSATokenCollection newRSATokenCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/package-info.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/package-info.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/package-info.java
deleted file mode 100644
index b1d3bc4..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/package-info.java
+++ /dev/null
@@ -1,20 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice;
-
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java
deleted file mode 100644
index 629c6ec..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java
+++ /dev/null
@@ -1,59 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.ComplexType;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@ComplexType("Aliases")
-public class Aliases extends AbstractComplexType {
-
- private Collection<String> _alternativeNames;
-
- @Property(name = "AlternativeNames", type = "Collection(Edm.String)", nullable = false)
- public Collection<String> getAlternativeNames() {
- return _alternativeNames;
- }
-
- public void setAlternativeNames(final Collection<String> _alternativeNames) {
- this._alternativeNames = _alternativeNames;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java
deleted file mode 100644
index 1e21ba3..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java
+++ /dev/null
@@ -1,91 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "AllSpatialCollectionTypes",
- openType = false,
- hasStream = false,
- isAbstract = true,
- baseType = "")
-public interface AllSpatialCollectionTypes extends Serializable {
-
-
- @Key
- @Property(name = "Id",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getId();
-
- public void setId(final Integer _id);
-
-
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java
deleted file mode 100644
index f7e9fed..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface AllSpatialCollectionTypesCollection extends AbstractEntityCollection<AllSpatialCollectionTypes> {
-
-}
[49/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/header/ODataHeaders.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/header/ODataHeaders.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/header/ODataHeaders.java
deleted file mode 100644
index 68bb42c..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/header/ODataHeaders.java
+++ /dev/null
@@ -1,253 +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 com.msopentech.odatajclient.engine.communication.header;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.TreeMap;
-
-/**
- * ODataHeaders wraps OData request/response headers.
- *
- * @see com.msopentech.odatajclient.engine.communication.request.ODataRequest
- * @see com.msopentech.odatajclient.engine.communication.response.ODataResponse
- */
-public class ODataHeaders {
-
- /**
- * Major OData request/response header names.
- */
- public enum HeaderName {
-
- /**
- * The OData protocol uses the Accept request-header field, as specified in [RFC2616].
- */
- accept("Accept"),
- /**
- * The Content-Type header is used as specified in [RFC2616].
- * <br/>
- * OData request/response supports the following types:
- * <ul>
- * <li>application/atom+xml</li>
- * <li>application/atom+xml;type=entry</li>
- * <li>application/atom+xml;type=feed</li>
- * <li>application/json; odata=verbose</li>
- * <li>application/json</li>
- * <li>application/xml</li>
- * <li>text/plain</li>
- * <li>text/xml</li>
- * <li>octet/stream</li>
- * <li>multipart/mixed</li>
- * </ul>
- */
- contentType("Content-Type"),
- /**
- * This header is a custom HTTP header defined for protocol versioning purposes.
- * This header MAY be present on any request or response message.
- */
- dataServiceVersion("DataServiceVersion"),
- /**
- * An ETag (entity tag) is an HTTP response header returned by an HTTP/1.1 compliant web server
- * used to determine change in content of a resource at a given URL. The value of the header is an
- * opaque string representing the state of the resource at the time the response was generated.
- */
- etag("ETag"),
- /**
- * The If-Match request-header field is used with a method to make it conditional. As specified in
- * [RFC2616], "the purpose of this feature is to allow efficient updates of cached information with a
- * minimum amount of transaction overhead. It is also used, on updating requests, to prevent
- * inadvertent modification of the wrong version of a resource".
- */
- ifMatch("If-Match"),
- /**
- * The If-None-Match request header is used with a method to make it conditional. As specified in
- * [RFC2616], "The purpose of this feature is to allow efficient updates of cached information with a
- * minimum amount of transaction overhead. It is also used to prevent a method (for example, PUT)
- * from inadvertently modifying an existing resource when the client believes that the resource does
- * not exist."
- */
- ifNoneMatch("If-None-Match"),
- /**
- * This header is a custom HTTP request only header defined for protocol versioning purposes.
- * This header MAY be present on any request message from client to server.
- */
- maxDataServiceVersion("MaxDataServiceVersion"),
- /**
- * This header is a custom HTTP request only header defined for protocol versioning purposes.
- * This header MAY be present on any request message from client to server.
- */
- minDataServiceVersion("MinDataServiceVersion"),
- /**
- * A Prefer header is included in a request to state the client’s preferred, but not required, server
- * behavior (that is, a hint to the server). The Prefer header MAY be included on any request type
- * (within a standalone or batch request), and a server MAY honor the header for HTTP POST, PUT,
- * PATCH, and MERGE requests. A Prefer header with a value of “return-content” MUST NOT be
- * specified on a DELETE request, a batch request as a whole, or a PUT request to update a named
- * stream.
- */
- prefer("Prefer"),
- /**
- * When a Prefer header value is successfully honored by the server, it MAY include a
- * Preference-Applied response header that states which preference values were honored by the
- * server.
- */
- preferenceApplied("Preference-Applied"),
- /**
- * The DataServiceId response header is returned by the server when the response payload for an
- * HTTP PUT, POST, PATCH, or MERGE request is empty.
- * The value of the header is the identifier of the entity that was acted on by the PUT, POST, PATCH, or
- * MERGE request. The identifier, in this case, is the same identifier that would have been returned in
- * the response payload (for example, as the value of the atom:id element for Atom responses)
- */
- dataServiceId("DataServiceId"),
- /**
- * Location header is used to specify the URL of an entity modified through a Data Modification request, or the
- * request URL to check on the status of an asynchronous operation as described in
- * <code>202 Accepted</code>.
- */
- location("Location"),
- /**
- * A service must include a
- * <code>Retry-After</code> header in a
- * <code>202 Accepted</code>.
- */
- retryAfter("Retry-After"),
- dataServiceUrlConventions("DataServiceUrlConventions"),
- slug("Slug"),
- /**
- * This header is a custom HTTP request header.
- * <br/>
- * It is possible to instruct network intermediaries (proxies, firewalls, and so on) inspecting traffic at
- * the application protocol layer (for example, HTTP) to block requests that contain certain HTTP verbs.
- * In practice, GET and POST verbs are rarely blocked (traditional web pages rely heavily on these
- * HTTP methods), while, for a variety of reasons (such as security vulnerabilities in prior protocols),
- * other HTTP methods (PUT, DELETE, and so on) are at times blocked by intermediaries. Additionally,
- * some existing HTTP libraries do not allow creation of requests using verbs other than GET or POST.
- * Therefore, an alternative way of specifying request types which use verbs other than GET and POST
- * is needed to ensure that this document works well in a wide range of environments.
- * <br/>
- * To address this need, the X-HTTP-Method header can be added to a POST request that signals that
- * the server MUST process the request not as a POST, but as if the HTTP verb specified as the value of
- * the header was used as the method on the HTTP request's request line, as specified in [RFC2616]
- * section 5.1. This technique is often referred to as "verb tunneling".
- * <br/>
- * This header is only valid when on POST requests.
- */
- xHttpMethod("X-HTTP-METHOD");
-
- private final String headerName;
-
- private HeaderName(final String headerName) {
- this.headerName = headerName;
- }
-
- @Override
- public String toString() {
- return headerName;
- }
- }
-
- /**
- * OData request/response header key/value pairs.
- */
- private final Map<String, String> headers = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER);
-
- /**
- * Add the specified (custom) header (header name is case-insensitive).
- *
- * @param name header key.
- * @param value header value.
- * @return the current updated header instance.
- */
- public ODataHeaders setHeader(final String name, final String value) {
- headers.put(name, value);
- return this;
- }
-
- /**
- * Add the specified header.
- *
- * @param name header key.
- * @param value header value.
- * @return the current updated header instance.
- */
- public ODataHeaders setHeader(final HeaderName name, final String value) {
- headers.put(name.toString(), value);
- return this;
- }
-
- /**
- * Gets the value of the header identified by the given name.
- * <br/>
- * Please note that header name is case-insensitive.
- *
- * @param name name of the header to be retrieved.
- * @return header value.
- */
- public String getHeader(final HeaderName name) {
- return headers.get(name.toString());
- }
-
- /**
- * Gets the value of the header identified by the given name.
- * <br/>
- * Please note that header name is case-insensitive.
- *
- * @param name name of the header to be retrieved.
- * @return header value.
- */
- public String getHeader(final String name) {
- return headers.get(name);
- }
-
- /**
- * Removes the header identified by the given name.
- * <br/>
- * Please note that header name is case-insensitive.
- *
- * @param name name of the header to be retrieved.
- * @return header name (if found).
- */
- public String removeHeader(final HeaderName name) {
- return headers.remove(name.toString());
- }
-
- /**
- * Removes the header identified by the given name.
- * <br/>
- * Please note that header name is case-insensitive.
- *
- * @param name name of the header to be retrieved.
- * @return header name (if found).
- */
- public String removeHeader(final String name) {
- return headers.remove(name);
- }
-
- /**
- * Gets header names.
- * <br/>
- * Please note that header name is case-insensitive.
- *
- * @return header names.
- */
- public Collection<String> getHeaderNames() {
- return headers.keySet();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/AbstractODataBasicRequestImpl.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/AbstractODataBasicRequestImpl.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/AbstractODataBasicRequestImpl.java
deleted file mode 100644
index 39c7112..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/AbstractODataBasicRequestImpl.java
+++ /dev/null
@@ -1,124 +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 com.msopentech.odatajclient.engine.communication.request;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.engine.communication.request.batch.ODataBatchRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataResponse;
-import com.msopentech.odatajclient.engine.utils.ODataBatchConstants;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.util.concurrent.Callable;
-import java.util.concurrent.Future;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
-
-/**
- * Basic request abstract implementation.
- *
- * @param <V> OData response type corresponding to the request implementation.
- * @param <T> OData format being used.
- */
-public abstract class AbstractODataBasicRequestImpl<V extends ODataResponse, T extends Enum<T>>
- extends ODataRequestImpl<T>
- implements ODataBasicRequest<V, T> {
-
- /**
- * Constructor.
- *
- * @param odataClient client instance getting this request
- * @param formatRef reference class for the format being used
- * @param method request method.
- * @param uri OData request URI.
- */
- public AbstractODataBasicRequestImpl(final ODataClient odataClient,
- final Class<T> formatRef, final HttpMethod method, final URI uri) {
-
- super(odataClient, formatRef, method, uri);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void setFormat(final T format) {
- if (format != null) {
- setAccept(format.toString());
- setContentType(format.toString());
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public final Future<V> asyncExecute() {
- return odataClient.getConfiguration().getExecutor().submit(new Callable<V>() {
-
- @Override
- public V call() throws Exception {
- return execute();
- }
- });
- }
-
- /**
- * Gets payload as an InputStream.
- *
- * @return InputStream for entire payload.
- */
- protected abstract InputStream getPayload();
-
- /**
- * Serializes the full request into the given batch request.
- *
- * @param req destination batch request.
- */
- public void batch(final ODataBatchRequest req) {
- batch(req, null);
- }
-
- /**
- * Serializes the full request into the given batch request.
- * <p>
- * This method have to be used to serialize a changeset item with the specified contentId.
- *
- * @param req destination batch request.
- * @param contentId contentId of the changeset item.
- */
- public void batch(final ODataBatchRequest req, final String contentId) {
- try {
- req.rawAppend(toByteArray());
- if (StringUtils.isNotBlank(contentId)) {
- req.rawAppend((ODataBatchConstants.CHANGESET_CONTENT_ID_NAME + ": " + contentId).getBytes());
- req.rawAppend(ODataStreamer.CRLF);
- }
- req.rawAppend(ODataStreamer.CRLF);
-
- final InputStream payload = getPayload();
- if (payload != null) {
- req.rawAppend(IOUtils.toByteArray(getPayload()));
- }
- } catch (IOException e) {
- throw new IllegalStateException(e);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/ODataBasicRequest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/ODataBasicRequest.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/ODataBasicRequest.java
deleted file mode 100644
index 52fd2f9..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/ODataBasicRequest.java
+++ /dev/null
@@ -1,54 +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 com.msopentech.odatajclient.engine.communication.request;
-
-import com.msopentech.odatajclient.engine.communication.response.ODataResponse;
-import java.util.concurrent.Future;
-
-/**
- * Basic OData request.
- *
- * @param <V> OData response type corresponding to the request implementation.
- * @param <T> Accepted content-type formats by the request in object.
- */
-public interface ODataBasicRequest<V extends ODataResponse, T extends Enum<T>> extends ODataRequest {
-
- /**
- * Request execute.
- *
- * @return return an OData response.
- */
- V execute();
-
- /**
- * Async request execute.
- *
- * @return <code>Future<ODataResponse></code> about the executed request.
- */
- Future<V> asyncExecute();
-
- /**
- * Override configured request format.
- *
- * @param format request format.
- * @see com.msopentech.odatajclient.engine.format.ODataFormat
- * @see com.msopentech.odatajclient.engine.format.ODataPubFormat
- */
- void setFormat(T format);
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/ODataRequest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/ODataRequest.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/ODataRequest.java
deleted file mode 100644
index 4fbd413..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/ODataRequest.java
+++ /dev/null
@@ -1,197 +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 com.msopentech.odatajclient.engine.communication.request;
-
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.engine.communication.request.batch.BatchRequestFactory;
-import com.msopentech.odatajclient.engine.communication.request.cud.CUDRequestFactory;
-import com.msopentech.odatajclient.engine.communication.request.invoke.InvokeRequestFactory;
-import com.msopentech.odatajclient.engine.communication.request.retrieve.RetrieveRequestFactory;
-import com.msopentech.odatajclient.engine.communication.request.streamed.StreamedRequestFactory;
-import java.io.InputStream;
-import java.net.URI;
-import java.util.Collection;
-
-/**
- * Abstract representation of an OData request.
- * Get instance by using factories.
- *
- * @see CUDRequestFactory
- * @see RetrieveRequestFactory
- * @see BatchRequestFactory
- * @see InvokeRequestFactory
- * @see StreamedRequestFactory
- */
-public interface ODataRequest {
-
- /**
- * Returns OData request target URI.
- *
- * @return OData request target URI.
- */
- URI getURI();
-
- /**
- * Returns HTTP request method.
- *
- * @return HTTP request method.
- */
- HttpMethod getMethod();
-
- /**
- * Gets all OData request header names.
- *
- * @return all request header names.
- */
- Collection<String> getHeaderNames();
-
- /**
- * Gets the value of the OData request header identified by the given name.
- *
- * @param name name of the OData request header to be retrieved.
- * @return header value.
- */
- String getHeader(final String name);
-
- /**
- * Adds <tt>Accept</tt> OData request header.
- *
- * @param value header value.
- * @return current object
- * @see com.msopentech.odatajclient.engine.communication.header.ODataHeaders.HeaderName#accept
- */
- ODataRequest setAccept(final String value);
-
- /**
- * Gets <tt>Accept</tt> OData request header.
- *
- * @return header value.
- * @see com.msopentech.odatajclient.engine.communication.header.ODataHeaders.HeaderName#accept
- */
- String getAccept();
-
- /**
- * Adds <tt>If-Match</tt> OData request header.
- *
- * @param value header value.
- * @return current object
- * @see com.msopentech.odatajclient.engine.communication.header.ODataHeaders.HeaderName#ifMatch
- */
- ODataRequest setIfMatch(final String value);
-
- /**
- * Gets <tt>If-Match</tt> OData request header.
- *
- * @return header value.
- * @see com.msopentech.odatajclient.engine.communication.header.ODataHeaders.HeaderName#ifMatch
- */
- String getIfMatch();
-
- /**
- * Adds <tt>If-None-Match</tt> OData request header.
- *
- * @param value header value.
- * @return current object
- * @see com.msopentech.odatajclient.engine.communication.header.ODataHeaders.HeaderName#ifNoneMatch
- */
- ODataRequest setIfNoneMatch(final String value);
-
- /**
- * Gets <tt>If-None-Match</tt> OData request header.
- *
- * @return header value.
- * @see com.msopentech.odatajclient.engine.communication.header.ODataHeaders.HeaderName#ifNoneMatch
- */
- String getIfNoneMatch();
-
- /**
- * Adds <tt>Prefer</tt> OData request header.
- *
- * @param value header value.
- * @return current object
- * @see com.msopentech.odatajclient.engine.communication.header.ODataHeaders.HeaderName#prefer
- */
- ODataRequest setPrefer(final String value);
-
- /**
- * Gets <tt>Prefer</tt> OData request header.
- *
- * @return header value.
- * @see com.msopentech.odatajclient.engine.communication.header.ODataHeaders.HeaderName#prefer
- */
- String getPrefer();
-
- /**
- * Adds <tt>contentType</tt> OData request header.
- *
- * @param value header value.
- * @return current object
- * @see com.msopentech.odatajclient.engine.communication.header.ODataHeaders.HeaderName#contentType
- */
- ODataRequest setContentType(final String value);
-
- /**
- * Gets <tt>contentType</tt> OData request header.
- *
- * @return header value.
- * @see com.msopentech.odatajclient.engine.communication.header.ODataHeaders.HeaderName#contentType
- */
- String getContentType();
-
- /**
- * Adds <tt>Slug</tt> OData request header.
- *
- * @param value header value.
- * @return current object
- * @see com.msopentech.odatajclient.engine.communication.header.ODataHeaders.HeaderName#slug
- */
- ODataRequest setSlug(final String value);
-
- /**
- * Adds <tt>X-HTTP-METHOD</tt> OData request header.
- *
- * @param value header value.
- * @return current object
- * @see com.msopentech.odatajclient.engine.communication.header.ODataHeaders.HeaderName#xHttpMethod
- */
- ODataRequest setXHTTPMethod(final String value);
-
- /**
- * Adds a custom OData request header.
- *
- * @param name header name.
- * @param value header value.
- * @return current object
- */
- ODataRequest addCustomHeader(final String name, final String value);
-
- /**
- * Gets byte array representation of the full request header.
- *
- * @return full request header.
- */
- byte[] toByteArray();
-
- /**
- * Request raw execute.
- *
- * @return raw input stream response.
- */
- InputStream rawExecute();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/ODataRequestImpl.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/ODataRequestImpl.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/ODataRequestImpl.java
deleted file mode 100644
index b546457..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/ODataRequestImpl.java
+++ /dev/null
@@ -1,481 +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 com.msopentech.odatajclient.engine.communication.request;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.client.http.HttpClientException;
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.engine.communication.ODataClientErrorException;
-import com.msopentech.odatajclient.engine.communication.ODataServerErrorException;
-import com.msopentech.odatajclient.engine.communication.header.ODataHeaderValues;
-import com.msopentech.odatajclient.engine.communication.header.ODataHeaders;
-import com.msopentech.odatajclient.engine.communication.request.batch.BatchRequestFactory;
-import com.msopentech.odatajclient.engine.communication.request.cud.CUDRequestFactory;
-import com.msopentech.odatajclient.engine.communication.request.invoke.InvokeRequestFactory;
-import com.msopentech.odatajclient.engine.communication.request.streamed.StreamedRequestFactory;
-import com.msopentech.odatajclient.engine.communication.response.ODataResponse;
-import com.msopentech.odatajclient.engine.data.ODataError;
-import com.msopentech.odatajclient.engine.data.impl.v3.JSONODataError;
-import com.msopentech.odatajclient.engine.data.impl.v3.XMLODataError;
-import com.msopentech.odatajclient.engine.format.ODataMediaFormat;
-import com.msopentech.odatajclient.engine.format.ODataPubFormat;
-import com.msopentech.odatajclient.engine.format.ODataValueFormat;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Constructor;
-import java.net.URI;
-import java.util.Collection;
-import java.util.Collections;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.http.Header;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.impl.client.DecompressingHttpClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Abstract representation of an OData request.
- * Get instance by using factories.
- *
- * @param <T> Accepted content-type formats by the request in object.
- *
- * @see CUDRequestFactory
- * @see BatchRequestFactory
- * @see InvokeRequestFactory
- * @see StreamedRequestFactory
- */
-public class ODataRequestImpl<T extends Enum<T>> implements ODataRequest {
-
- /**
- * Logger.
- */
- protected static final Logger LOG = LoggerFactory.getLogger(ODataRequest.class);
-
- protected final ODataClient odataClient;
-
- protected final Class<T> formatRef;
-
- /**
- * OData request method.
- */
- protected final HttpMethod method;
-
- /**
- * OData request header.
- */
- protected final ODataHeaders odataHeaders;
-
- /**
- * Target URI.
- */
- protected final URI uri;
-
- /**
- * HTTP client.
- */
- protected final HttpClient httpClient;
-
- /**
- * HTTP request.
- */
- protected final HttpUriRequest request;
-
- /**
- * Constructor.
- *
- * @param odataClient client instance getting this request
- * @param formatRef reference class for the format being used
- * @param method HTTP request method. If configured X-HTTP-METHOD header will be used.
- * @param uri OData request URI.
- */
- protected ODataRequestImpl(final ODataClient odataClient,
- final Class<T> formatRef, final HttpMethod method, final URI uri) {
-
- this.odataClient = odataClient;
-
- this.formatRef = formatRef;
- this.method = method;
-
- // initialize default headers
- this.odataHeaders = odataClient.getVersionHeaders();
-
- // target uri
- this.uri = uri;
-
- HttpClient _httpClient = odataClient.getConfiguration().getHttpClientFactory().
- createHttpClient(this.method, this.uri);
- if (odataClient.getConfiguration().isGzipCompression()) {
- _httpClient = new DecompressingHttpClient(_httpClient);
- }
- this.httpClient = _httpClient;
-
- this.request = odataClient.getConfiguration().getHttpUriRequestFactory().
- createHttpUriRequest(this.method, this.uri);
- }
-
- /**
- * {@inheritDoc}
- */
- @SuppressWarnings("unchecked")
- public T getDefaultFormat() {
- return (T) (formatRef.equals(ODataPubFormat.class)
- ? odataClient.getConfiguration().getDefaultPubFormat()
- : (formatRef.equals(ODataValueFormat.class)
- ? odataClient.getConfiguration().getDefaultValueFormat()
- : (formatRef.equals(ODataMediaFormat.class)
- ? odataClient.getConfiguration().getDefaultMediaFormat()
- : odataClient.getConfiguration().getDefaultFormat())));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public URI getURI() {
- return uri;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Collection<String> getHeaderNames() {
- return odataHeaders.getHeaderNames();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getHeader(final String name) {
- return odataHeaders.getHeader(name);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ODataRequest setAccept(final String value) {
- odataHeaders.setHeader(ODataHeaders.HeaderName.accept, value);
- return this;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ODataRequest setIfMatch(final String value) {
- odataHeaders.setHeader(ODataHeaders.HeaderName.ifMatch, value);
- return this;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ODataRequest setIfNoneMatch(final String value) {
- odataHeaders.setHeader(ODataHeaders.HeaderName.ifNoneMatch, value);
- return this;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ODataRequest setPrefer(final String value) {
- odataHeaders.setHeader(ODataHeaders.HeaderName.prefer, value);
- return this;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ODataRequest setXHTTPMethod(final String value) {
- odataHeaders.setHeader(ODataHeaders.HeaderName.xHttpMethod, value);
- return this;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ODataRequest setContentType(final String value) {
- odataHeaders.setHeader(ODataHeaders.HeaderName.contentType, value);
- return this;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ODataRequest setSlug(final String value) {
- odataHeaders.setHeader(ODataHeaders.HeaderName.slug, value);
- return this;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public ODataRequest addCustomHeader(final String name, final String value) {
- odataHeaders.setHeader(name, value);
- return this;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getAccept() {
- final String acceptHead = odataHeaders.getHeader(ODataHeaders.HeaderName.accept);
- return StringUtils.isBlank(acceptHead) ? getDefaultFormat().toString() : acceptHead;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getIfMatch() {
- return odataHeaders.getHeader(ODataHeaders.HeaderName.ifMatch);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getIfNoneMatch() {
- return odataHeaders.getHeader(ODataHeaders.HeaderName.ifNoneMatch);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getPrefer() {
- return odataHeaders.getHeader(ODataHeaders.HeaderName.prefer);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getContentType() {
- final String contentTypeHead = odataHeaders.getHeader(ODataHeaders.HeaderName.contentType);
- return StringUtils.isBlank(contentTypeHead) ? getDefaultFormat().toString() : contentTypeHead;
- }
-
- /**
- * ${@inheritDoc }
- */
- @Override
- public HttpMethod getMethod() {
- return method;
- }
-
- /**
- * Gets request headers.
- *
- * @return request headers.
- */
- public ODataHeaders getHeader() {
- return odataHeaders;
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public byte[] toByteArray() {
- final ByteArrayOutputStream baos = new ByteArrayOutputStream();
- try {
- final StringBuilder requestBuilder = new StringBuilder();
- requestBuilder.append(getMethod().toString()).append(" ").
- append(uri.toString()).append(" ").append("HTTP/1.1");
-
- baos.write(requestBuilder.toString().getBytes());
-
- baos.write(ODataStreamer.CRLF);
-
- // Set Content-Type and Accept headers with default values, if not yet set
- if (StringUtils.isBlank(odataHeaders.getHeader(ODataHeaders.HeaderName.contentType))) {
- setContentType(getContentType());
- }
- if (StringUtils.isBlank(odataHeaders.getHeader(ODataHeaders.HeaderName.accept))) {
- setAccept(getAccept());
- }
-
- for (String name : getHeaderNames()) {
- final String value = getHeader(name);
-
- if (StringUtils.isNotBlank(value)) {
- baos.write((name + ": " + value).getBytes());
- baos.write(ODataStreamer.CRLF);
- }
- }
-
- return baos.toByteArray();
- } catch (IOException e) {
- throw new IllegalStateException(e);
- } finally {
- IOUtils.closeQuietly(baos);
- }
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- public InputStream rawExecute() {
- try {
- final HttpEntity httpEntity = doExecute().getEntity();
- return httpEntity == null ? null : httpEntity.getContent();
- } catch (IOException e) {
- throw new HttpClientException(e);
- } catch (RuntimeException e) {
- this.request.abort();
- throw new HttpClientException(e);
- }
- }
-
- /**
- * Builds the request and execute it.
- *
- * @return HttpReponse object.
- */
- protected HttpResponse doExecute() {
- // Set Content-Type and Accept headers with default values, if not yet set
- if (StringUtils.isBlank(odataHeaders.getHeader(ODataHeaders.HeaderName.contentType))) {
- setContentType(getContentType());
- }
- if (StringUtils.isBlank(odataHeaders.getHeader(ODataHeaders.HeaderName.accept))) {
- setAccept(getAccept());
- }
-
- // Add header for KeyAsSegment management
- if (odataClient.getConfiguration().isKeyAsSegment()) {
- addCustomHeader(
- ODataHeaders.HeaderName.dataServiceUrlConventions.toString(), ODataHeaderValues.keyAsSegment);
- }
-
- // Add all available headers
- for (String key : getHeaderNames()) {
- this.request.addHeader(key, odataHeaders.getHeader(key));
- }
-
- if (LOG.isDebugEnabled()) {
- for (Header header : this.request.getAllHeaders()) {
- LOG.debug("HTTP header being sent: " + header);
- }
- }
-
- final HttpResponse response;
- try {
- response = this.httpClient.execute(this.request);
- } catch (IOException e) {
- throw new HttpClientException(e);
- } catch (RuntimeException e) {
- this.request.abort();
- throw new HttpClientException(e);
- }
-
- if (response.getStatusLine().getStatusCode() >= 500) {
- throw new ODataServerErrorException(response.getStatusLine());
- } else if (response.getStatusLine().getStatusCode() >= 400) {
- try {
- final HttpEntity httpEntity = response.getEntity();
- if (httpEntity == null) {
- throw new ODataClientErrorException(response.getStatusLine());
- } else {
- final boolean isXML = getAccept().indexOf("json") == -1;
- ODataError error;
-
- try {
- error = odataClient.getReader().readError(httpEntity.getContent(), isXML);
- } catch (IllegalArgumentException e) {
- LOG.warn("Error deserializing error response", e);
- error = getGenericError(
- response.getStatusLine().getStatusCode(),
- response.getStatusLine().getReasonPhrase(),
- isXML);
- }
-
- throw new ODataClientErrorException(response.getStatusLine(), error);
- }
- } catch (IOException e) {
- throw new HttpClientException(
- "Received '" + response.getStatusLine() + "' but could not extract error body", e);
- }
- }
-
- return response;
- }
-
- /**
- * Gets an empty response that can be initialized by a stream.
- * <p>
- * This method has to be used to build response items about a batch request.
- *
- * @param <V> ODataResppnse type.
- * @return empty OData response instance.
- */
- @SuppressWarnings("unchecked")
- public <V extends ODataResponse> V getResponseTemplate() {
-
- for (Class<?> clazz : this.getClass().getDeclaredClasses()) {
- if (ODataResponse.class.isAssignableFrom(clazz)) {
- try {
- final Constructor<?> constructor = clazz.getDeclaredConstructor(this.getClass());
- constructor.setAccessible(true);
- return (V) constructor.newInstance(this);
- } catch (Exception e) {
- LOG.error("Error retrieving response class template instance", e);
- }
- }
- }
-
- throw new IllegalStateException("No response class template has been found");
- }
-
- private ODataError getGenericError(final int code, final String errorMsg, final boolean isXML) {
- final ODataError error;
- if (isXML) {
- error = new XMLODataError();
- final XMLODataError.Message msg = new XMLODataError.Message(
- Collections.singletonMap("", (Object) errorMsg));
-
- ((XMLODataError) error).setMessage(msg);
- ((XMLODataError) error).setCode(String.valueOf(code));
- } else {
- error = new JSONODataError();
- final JSONODataError.Message msg = new JSONODataError.Message();
- msg.setValue(errorMsg);
-
- ((JSONODataError) error).setMessage(msg);
- ((JSONODataError) error).setCode(String.valueOf(code));
- }
-
- return error;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/ODataStreamManager.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/ODataStreamManager.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/ODataStreamManager.java
deleted file mode 100644
index 86edc52..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/ODataStreamManager.java
+++ /dev/null
@@ -1,184 +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 com.msopentech.odatajclient.engine.communication.request;
-
-import com.msopentech.odatajclient.engine.client.http.HttpClientException;
-import com.msopentech.odatajclient.engine.communication.response.ODataResponse;
-import com.msopentech.odatajclient.engine.utils.Wrapper;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import org.apache.commons.io.IOUtils;
-import org.apache.http.HttpResponse;
-
-/**
- * OData request payload management abstract class.
- *
- * @param <T> OData response type corresponding to the request implementation.
- */
-public abstract class ODataStreamManager<T extends ODataResponse> extends ODataStreamer {
-
- /**
- * Body input stream.
- */
- private final PipedInputStream body;
-
- /**
- * Default body input stream.
- */
- private final InputStream defaultBody;
-
- /**
- * Wrapper for actual streamed request's future.
- */
- private final Wrapper<Future<HttpResponse>> futureWrap;
-
- /**
- * Constructor.
- *
- * @param futureWrap wrapper of the Future object of the HttpResponse.
- */
- public ODataStreamManager(final Wrapper<Future<HttpResponse>> futureWrap) {
- this(futureWrap, new PipedOutputStream());
- }
-
- /**
- * Constructor.
- *
- * @param futureWrap wrapper of the Future object of the HttpResponse.
- * @param output stream to be piped to retrieve the payload.
- */
- public ODataStreamManager(final Wrapper<Future<HttpResponse>> futureWrap, final PipedOutputStream output) {
- super(output);
-
- this.futureWrap = futureWrap;
- try {
- this.body = new PipedInputStream(getBodyStreamWriter());
- } catch (IOException e) {
- throw new IllegalStateException(e);
- }
- this.defaultBody = this.body;
- }
-
- /**
- * Constructor.
- *
- * @param futureWrap wrapper of the Future object of the HttpResponse.
- * @param input stream to be used to retrieve the content.
- */
- public ODataStreamManager(final Wrapper<Future<HttpResponse>> futureWrap, final InputStream input) {
- super(null);
-
- this.futureWrap = futureWrap;
- this.body = null;
- this.defaultBody = input;
- }
-
- /**
- * Gets payload stream.
- *
- * @return payload stream.
- */
- public InputStream getBody() {
- return this.body == null ? this.defaultBody : this.body;
- }
-
- /**
- * Closes piped output stream.
- */
- public void finalizeBody() {
- IOUtils.closeQuietly(getBodyStreamWriter());
- }
-
- /**
- * Gets HttpResponse.
- *
- * @param timeout maximum delay after which the request must be aborted.
- * @param unit time unit.
- * @return HttpResponse.
- */
- protected HttpResponse getHttpResponse(final long timeout, final TimeUnit unit) {
- try {
- return futureWrap.getWrapped().get(timeout, unit);
- } catch (Exception e) {
- LOG.error("Failure executing request");
- throw new HttpClientException(e);
- }
- }
-
- /**
- * Gets OData response.
- *
- * @param timeout maximum delay after which the request must be aborted.
- * @param unit time unit.
- * @return ODataResponse instance.
- */
- protected abstract T getResponse(long timeout, TimeUnit unit);
-
- /**
- * Closes the payload input stream and gets the OData response back.
- *
- * @return OData response.
- */
- public final T getResponse() {
- return getResponse(30, TimeUnit.SECONDS);
- }
-
- /**
- * Closes the payload input stream and ask for an asynchronous response.
- *
- * @return <code>Future<ODataResponse></code> about the executed request.
- */
- public final Future<T> getAsyncResponse() {
- return new Future<T>() {
-
- @Override
- public boolean cancel(final boolean mayInterruptIfRunning) {
- return futureWrap.getWrapped().cancel(mayInterruptIfRunning);
- }
-
- @Override
- public boolean isCancelled() {
- return futureWrap.getWrapped().isCancelled();
- }
-
- @Override
- public boolean isDone() {
- return futureWrap.getWrapped().isDone();
- }
-
- @Override
- public T get() throws InterruptedException, ExecutionException {
- return getResponse(0, TimeUnit.SECONDS);
- }
-
- @Override
- public T get(final long timeout, final TimeUnit unit)
- throws InterruptedException, ExecutionException, TimeoutException {
-
- return getResponse(timeout, unit);
- }
- };
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/ODataStreamer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/ODataStreamer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/ODataStreamer.java
deleted file mode 100644
index 0411c66..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/ODataStreamer.java
+++ /dev/null
@@ -1,104 +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 com.msopentech.odatajclient.engine.communication.request;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PipedOutputStream;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Streamer utility object.
- */
-public abstract class ODataStreamer {
-
- /**
- * Logger.
- */
- protected static final Logger LOG = LoggerFactory.getLogger(ODataStreamer.class);
-
- /**
- * CR/LF.
- */
- public static final byte[] CRLF = {13, 10};
-
- /**
- * OutputStream to be used to write objects to the stream.
- */
- private final PipedOutputStream bodyStreamWriter;
-
- /**
- * Constructor.
- *
- * @param bodyStreamWriter piped stream to be used to retrieve the payload.
- */
- public ODataStreamer(final PipedOutputStream bodyStreamWriter) {
- this.bodyStreamWriter = bodyStreamWriter;
- }
-
- /**
- * Writes the gibe byte array onto the output stream provided at instantiation time.
- *
- * @param src byte array to be written.
- */
- protected void stream(final byte[] src) {
- new Writer(src, bodyStreamWriter).run();
- }
-
- /**
- * Stream CR/LF.
- */
- protected void newLine() {
- stream(CRLF);
- }
-
- /**
- * Gets the piped stream to be used to stream the payload.
- *
- * @return piped stream.
- */
- public PipedOutputStream getBodyStreamWriter() {
- return bodyStreamWriter;
- }
-
- /**
- * Writer thread.
- */
- private class Writer implements Runnable {
-
- final OutputStream os;
-
- final byte[] src;
-
- public Writer(final byte[] src, final OutputStream os) {
- this.os = os;
- this.src = src;
- }
-
- @Override
- public void run() {
- try {
- os.write(src);
- } catch (IOException e) {
- LOG.error("Error streaming object", e);
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/UpdateType.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/UpdateType.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/UpdateType.java
deleted file mode 100644
index c2c7c2b..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/UpdateType.java
+++ /dev/null
@@ -1,56 +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 com.msopentech.odatajclient.engine.communication.request;
-
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-
-/**
- * Update type.
- */
-public enum UpdateType {
-
- /**
- * Replace all and remove missing attributes.
- */
- REPLACE(HttpMethod.PUT),
- /**
- * Differential update with whole entity as input (non-standard).
- * Differences will be retrieved by the server itself.
- */
- MERGE(HttpMethod.MERGE),
- /**
- * Differential update with only specified input property values to be replaced.
- */
- PATCH(HttpMethod.PATCH);
-
- private final HttpMethod method;
-
- private UpdateType(final HttpMethod method) {
- this.method = method;
- }
-
- /**
- * Gets HTTP request method.
- *
- * @return HTTP request method.
- */
- public HttpMethod getMethod() {
- return method;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/AbstractBatchRequestFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/AbstractBatchRequestFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/AbstractBatchRequestFactory.java
deleted file mode 100644
index 0b4138b..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/AbstractBatchRequestFactory.java
+++ /dev/null
@@ -1,40 +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 com.msopentech.odatajclient.engine.communication.request.batch;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-
-/**
- * OData batch request factory class.
- */
-public abstract class AbstractBatchRequestFactory implements BatchRequestFactory {
-
- private static final long serialVersionUID = -3875283254713404483L;
-
- protected final ODataClient client;
-
- protected AbstractBatchRequestFactory(final ODataClient client) {
- this.client = client;
- }
-
- @Override
- public ODataBatchRequest getBatchRequest(final String serviceRoot) {
- return new ODataBatchRequest(client, client.getURIBuilder(serviceRoot).appendBatchSegment().build());
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/BatchRequestFactory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/BatchRequestFactory.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/BatchRequestFactory.java
deleted file mode 100644
index 1d184ae..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/BatchRequestFactory.java
+++ /dev/null
@@ -1,35 +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 com.msopentech.odatajclient.engine.communication.request.batch;
-
-import java.io.Serializable;
-
-/**
- * OData batch request factory class.
- */
-public interface BatchRequestFactory extends Serializable {
-
- /**
- * Gets a batch request object instance.
- *
- * @param serviceRoot service root.
- * @return new ODataBatchRequest instance.
- */
- ODataBatchRequest getBatchRequest(String serviceRoot);
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataBatchController.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataBatchController.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataBatchController.java
deleted file mode 100644
index 2dd78f9..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataBatchController.java
+++ /dev/null
@@ -1,87 +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 com.msopentech.odatajclient.engine.communication.request.batch;
-
-/**
- * Utility class used to communicate batch info.
- */
-public class ODataBatchController {
-
- /**
- * Batch validity.
- */
- private boolean validBatch = true;
-
- /**
- * Batch boundary.
- */
- private final String boundary;
-
- /**
- * Batch line iterator.
- */
- private final ODataBatchLineIterator batchLineIterator;
-
- /**
- * Constructor.
- *
- * @param batchLineIterator batch line iterator.
- * @param boundary batch boundary.
- */
- public ODataBatchController(final ODataBatchLineIterator batchLineIterator, final String boundary) {
- this.batchLineIterator = batchLineIterator;
- this.boundary = boundary;
- }
-
- /**
- * Checks if batch is valid.
- *
- * @return batch validity.
- */
- public boolean isValidBatch() {
- return validBatch;
- }
-
- /**
- * Sets batch validity.
- *
- * @param validBatch validity.
- */
- public void setValidBatch(final boolean validBatch) {
- this.validBatch = validBatch;
- }
-
- /**
- * Gest batch boundary.
- *
- * @return batch boundary.
- */
- public String getBoundary() {
- return boundary;
- }
-
- /**
- * Gest batch line iterator.
- *
- * @return batch line iterator.
- */
- public ODataBatchLineIterator getBatchLineIterator() {
- return batchLineIterator;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataBatchLineIterator.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataBatchLineIterator.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataBatchLineIterator.java
deleted file mode 100644
index 38be594..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataBatchLineIterator.java
+++ /dev/null
@@ -1,95 +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 com.msopentech.odatajclient.engine.communication.request.batch;
-
-import java.util.Iterator;
-import org.apache.commons.io.LineIterator;
-
-/**
- * Batch line iterator class.
- */
-public class ODataBatchLineIterator implements Iterator<String> {
-
- /**
- * Stream line iterator.
- */
- private final LineIterator batchLineIterator;
-
- /**
- * Last cached line.
- */
- private String current;
-
- /**
- * Constructor.
- *
- * @param batchLineIterator stream line iterator.
- */
- public ODataBatchLineIterator(final LineIterator batchLineIterator) {
- this.batchLineIterator = batchLineIterator;
- this.current = null;
- }
-
- /**
- * Checks if batch has next line.
- *
- * @return 'TRUE' if has next line; 'FALSE' otherwise.
- */
- @Override
- public boolean hasNext() {
- return batchLineIterator.hasNext();
- }
-
- /**
- * Gets next line.
- *
- * @return next line.
- */
- @Override
- public String next() {
- return nextLine();
- }
-
- /**
- * Gets next line.
- *
- * @return next line.
- */
- public String nextLine() {
- current = batchLineIterator.nextLine();
- return current;
- }
-
- /**
- * Unsupported operation.
- */
- @Override
- public void remove() {
- throw new UnsupportedOperationException("Unsupported operation");
- }
-
- /**
- * Gets last cached line (the current one).
- *
- * @return last cached line; null if <code>next()</code> method never called
- */
- public String getCurrent() {
- return current;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataBatchRequest.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataBatchRequest.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataBatchRequest.java
deleted file mode 100644
index e08cdce..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataBatchRequest.java
+++ /dev/null
@@ -1,259 +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 com.msopentech.odatajclient.engine.communication.request.batch;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.client.http.HttpMethod;
-import com.msopentech.odatajclient.engine.communication.request.ODataStreamManager;
-import com.msopentech.odatajclient.engine.communication.request.batch.ODataBatchRequest.BatchStreamManager;
-import com.msopentech.odatajclient.engine.communication.request.streamed.AbstractODataStreamedRequestImpl;
-import com.msopentech.odatajclient.engine.communication.response.ODataBatchResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataResponseImpl;
-import com.msopentech.odatajclient.engine.utils.ODataBatchConstants;
-import java.io.IOException;
-import java.io.PipedOutputStream;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-
-/**
- * This class implements a batch request.
- */
-public class ODataBatchRequest extends AbstractODataStreamedRequestImpl<ODataBatchResponse, BatchStreamManager> {
-
- /**
- * Batch request boundary.
- */
- private final String boundary;
-
- /**
- * Expected batch response items.
- */
- private final List<ODataBatchResponseItem> expectedResItems = new ArrayList<ODataBatchResponseItem>();
-
- /**
- * Constructor.
- *
- * @param odataClient client instance getting this request
- * @param uri batch request URI (http://serviceRoot/$batch)
- */
- ODataBatchRequest(final ODataClient odataClient, final URI uri) {
- super(odataClient, HttpMethod.POST, uri);
-
- // create a random UUID value for boundary
- boundary = "batch_" + UUID.randomUUID().toString();
-
- // specify the contentType header
- setContentType(ODataBatchConstants.MULTIPART_CONTENT_TYPE + ";" + ODataBatchConstants.BOUNDARY + "=" + boundary);
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- protected BatchStreamManager getStreamManager() {
- if (streamManager == null) {
- streamManager = new BatchStreamManager(this);
- }
- return (BatchStreamManager) streamManager;
- }
-
- /**
- * Gets piped stream to be used to stream batch items.
- *
- * @return piped stream for the payload.
- */
- PipedOutputStream getOutputStream() {
- return getStreamManager().getBodyStreamWriter();
- }
-
- /**
- * Appends the given byte array to the payload.
- *
- * @param toBeStreamed byte array to be appended.
- * @return the current batch request.
- * @throws IOException in case of write errors.
- */
- public ODataBatchRequest rawAppend(final byte[] toBeStreamed) throws IOException {
- getStreamManager().getBodyStreamWriter().write(toBeStreamed);
- return this;
- }
-
- /**
- * Appends the given byte array to the payload.
- *
- * @param toBeStreamed byte array to be appended.
- * @param off byte array offset.
- * @param len number of byte to be streamed.
- * @return the current batch request.
- * @throws IOException in case of write errors.
- */
- public ODataBatchRequest rawAppend(final byte[] toBeStreamed, int off, int len) throws IOException {
- getStreamManager().getBodyStreamWriter().write(toBeStreamed, off, len);
- return this;
- }
-
- /**
- * Batch request payload management.
- */
- public class BatchStreamManager extends ODataStreamManager<ODataBatchResponse> {
-
- /**
- * Batch request current item.
- */
- private ODataBatchRequestItem currentItem = null;
-
- /**
- * batch request reference.
- */
- private final ODataBatchRequest req;
-
- /**
- * Private constructor.
- *
- * @param req batch request reference.
- */
- private BatchStreamManager(final ODataBatchRequest req) {
- super(ODataBatchRequest.this.futureWrapper);
- this.req = req;
- }
-
- /**
- * Gets a changeset batch item instance.
- * A changeset can be submitted embedded into a batch request only.
- *
- * @return ODataChangeset instance.
- */
- public ODataChangeset addChangeset() {
- closeCurrentItem();
-
- // stream dash boundary
- streamDashBoundary();
-
- final ODataChangesetResponseItem expectedResItem = new ODataChangesetResponseItem();
- expectedResItems.add(expectedResItem);
-
- currentItem = new ODataChangeset(req, expectedResItem);
-
- return (ODataChangeset) currentItem;
- }
-
- /**
- * Gets a retrieve batch item instance.
- * A retrieve item can be submitted embedded into a batch request only.
- *
- * @return ODataRetrieve instance.
- */
- public ODataRetrieve addRetrieve() {
- closeCurrentItem();
-
- // stream dash boundary
- streamDashBoundary();
-
- final ODataRetrieveResponseItem expectedResItem = new ODataRetrieveResponseItem();
- currentItem = new ODataRetrieve(req, expectedResItem);
-
- expectedResItems.add(expectedResItem);
-
- return (ODataRetrieve) currentItem;
- }
-
- /**
- * Close the current streamed item.
- */
- private void closeCurrentItem() {
- if (currentItem != null) {
- currentItem.close();
- }
- }
-
- /**
- * {@inheritDoc }
- */
- @Override
- protected ODataBatchResponse getResponse(final long timeout, final TimeUnit unit) {
- closeCurrentItem();
- streamCloseDelimiter();
- finalizeBody();
- return new ODataBatchResponseImpl(httpClient, getHttpResponse(timeout, unit));
- }
-
- /**
- * Streams dash boundary.
- */
- private void streamDashBoundary() {
- // preamble
- newLine();
-
- // stream batch-boundary
- stream(("--" + boundary).getBytes());
- newLine();
- }
-
- /**
- * Streams close delimiter.
- */
- private void streamCloseDelimiter() {
- // stream close-delimiter
- newLine();
- stream(("--" + boundary + "--").getBytes());
- }
- }
-
- /**
- * {@inheritDoc}
- * <p>
- * This operation is unsupported by a batch request.
- */
- @Override
- public void batch(ODataBatchRequest req) {
- throw new UnsupportedOperationException("A batch request is not batchable");
- }
-
- /**
- * This class implements a response to a batch request.
- *
- * @see com.msopentech.odatajclient.engine.communication.request.ODataBatchRequest
- */
- private class ODataBatchResponseImpl extends ODataResponseImpl implements ODataBatchResponse {
-
- /**
- * Constructor.
- *
- * @param client HTTP client.
- * @param res HTTP response.
- */
- private ODataBatchResponseImpl(final HttpClient client, final HttpResponse res) {
- super(client, res);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Iterator<ODataBatchResponseItem> getBody() {
- return new ODataBatchResponseManager(this, expectedResItems);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataBatchRequestItem.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataBatchRequestItem.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataBatchRequestItem.java
deleted file mode 100644
index 6c31d4f..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataBatchRequestItem.java
+++ /dev/null
@@ -1,121 +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 com.msopentech.odatajclient.engine.communication.request.batch;
-
-import com.msopentech.odatajclient.engine.communication.request.ODataStreamer;
-import com.msopentech.odatajclient.engine.utils.ODataBatchConstants;
-
-/**
- * Abstract representation of a batch request item.
- */
-public abstract class ODataBatchRequestItem extends ODataStreamer {
-
- /**
- * Stream started check.
- */
- protected boolean hasStreamedSomething = false;
-
- /**
- * Stream open check.
- */
- private boolean open = false;
-
- /**
- * OData batch request.
- */
- protected ODataBatchRequest req;
-
- /**
- * Constructor.
- *
- * @param req OData batch request.
- */
- public ODataBatchRequestItem(final ODataBatchRequest req) {
- super(req.getOutputStream());
- this.open = true;
- this.req = req;
- }
-
- /**
- * Checks if the current item is still opened.
- *
- * @return 'TRUE' if opened; 'FALSE' otherwise.
- */
- public boolean isOpen() {
- return open;
- }
-
- /**
- * Closes the item.
- */
- public void close() {
- closeItem();
- open = false;
- }
-
- /**
- * Stream the given request header.
- * <p>
- * Use this method to stream changeset items.
- *
- * @param request request to be batched.
- * @param contentId changeset item id.
- */
- protected void streamRequestHeader(final ODataBatchableRequest request, final int contentId) {
- //stream batch content type
- stream(ODataBatchConstants.ITEM_CONTENT_TYPE_LINE.getBytes());
- newLine();
- stream(ODataBatchConstants.ITEM_TRANSFER_ENCODING_LINE.getBytes());
- newLine();
- stream((ODataBatchConstants.CHANGESET_CONTENT_ID_NAME + ":" + contentId).getBytes());
- newLine();
- newLine();
- }
-
- /**
- * Stream the given request header.
- *
- * @param request request to be batched.
- */
- protected void streamRequestHeader(final ODataBatchableRequest request) {
- //stream batch content type
- stream(ODataBatchConstants.ITEM_CONTENT_TYPE_LINE.getBytes());
- newLine();
- stream(ODataBatchConstants.ITEM_TRANSFER_ENCODING_LINE.getBytes());
- newLine();
- newLine();
-
- stream(request.toByteArray());
- newLine();
- }
-
- /**
- * Checks if the streaming of the current item is started yet.
- *
- * @return 'TRUE' if started; 'FALSE' otherwise.
- */
- public boolean hasStreamedSomething() {
- return hasStreamedSomething;
- }
-
- /**
- * Closes the current item.
- */
- protected abstract void closeItem();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataBatchResponseItem.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataBatchResponseItem.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataBatchResponseItem.java
deleted file mode 100644
index 4bab39f..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/communication/request/batch/ODataBatchResponseItem.java
+++ /dev/null
@@ -1,149 +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 com.msopentech.odatajclient.engine.communication.request.batch;
-
-import com.msopentech.odatajclient.engine.communication.response.ODataResponse;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Abstract representation of a response item about a batch request.
- */
-public abstract class ODataBatchResponseItem implements Iterator<ODataResponse> {
-
- /**
- * Logger.
- */
- protected static final Logger LOG = LoggerFactory.getLogger(ODataBatchResponseItem.class);
-
- /**
- * Expected OData responses for the current batch response item.
- */
- protected final Map<String, ODataResponse> responses = new HashMap<String, ODataResponse>();
-
- /**
- * Expected OData responses iterator.
- */
- protected Iterator<ODataResponse> expectedItemsIterator;
-
- /**
- * Changeset controller.
- * Gives more information about the type of batch item.
- */
- private final boolean changeset;
-
- /**
- * Batch response line iterator.
- */
- protected ODataBatchLineIterator batchLineIterator;
-
- /**
- * Batch boundary.
- */
- protected String boundary;
-
- /**
- * Gives information about the batch response item status.
- */
- protected boolean closed = false;
-
- /**
- * Constructor.
- *
- * @param isChangeset 'TRUE' if the current batch response item is a changeset.
- */
- public ODataBatchResponseItem(boolean isChangeset) {
- this.changeset = isChangeset;
- }
-
- /**
- * Adds the given OData response template to the current OData batch response item.
- *
- * @param contentId changeset contentId in case of changeset; '__RETRIEVE__' in case of retrieve item.
- * @param res OData response template to be added.
- */
- void addResponse(final String contentId, final ODataResponse res) {
- if (closed) {
- throw new IllegalStateException("Invalid batch item because explicitely closed");
- }
- responses.put(contentId, res);
- }
-
- /**
- * Initializes ODataResponse template from batch response item part.
- *
- * @param batchLineIterator batch response line iterator.
- * @param boundary batch response boundary.
- */
- void initFromBatch(final ODataBatchLineIterator batchLineIterator, final String boundary) {
- if (closed) {
- throw new IllegalStateException("Invalid batch item because explicitely closed");
- }
- LOG.debug("Init from batch - boundary '{}'", boundary);
- this.batchLineIterator = batchLineIterator;
- this.boundary = boundary;
- }
-
- /**
- * Gets response about the given contentId.
- *
- * @param contentId response identifier (a specific contentId in case of changeset item).
- * @return ODataResponse corresponding to the given contentId.
- */
- protected ODataResponse getResponse(final String contentId) {
- if (closed) {
- throw new IllegalStateException("Invalid batch item because explicitely closed");
- }
- return responses.get(contentId);
- }
-
- /**
- * Gets OData responses iterator.
- *
- * @return OData responses iterator.
- */
- protected Iterator<ODataResponse> getResponseIterator() {
- if (closed) {
- throw new IllegalStateException("Invalid batch item because explicitely closed");
- }
- return responses.values().iterator();
- }
-
- /**
- * Checks if the current batch response item is a changeset.
- *
- * @return 'TRUE' if the item is a changeset; 'FALSE' otherwise.
- */
- public final boolean isChangeset() {
- return changeset;
- }
-
- /**
- * Closes the current batch responses item including all wrapped OData responses.
- */
- public void close() {
- for (ODataResponse response : responses.values()) {
- response.close();
- }
- closed = true;
- }
-}
[35/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/ConstExprConstruct.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/ConstExprConstruct.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/ConstExprConstruct.java
deleted file mode 100644
index bb87002..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/ConstExprConstruct.java
+++ /dev/null
@@ -1,71 +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 com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-public class ConstExprConstruct extends ExprConstruct {
-
- private static final long serialVersionUID = 2250072064504668969L;
-
- public enum Type {
-
- Binary,
- Bool,
- Date,
- DateTimeOffset,
- Decimal,
- Duration,
- EnumMember,
- Float,
- Guid,
- Int,
- String,
- TimeOfDay;
-
- public static Type fromString(final String value) {
- Type result = null;
- try {
- result = valueOf(value);
- } catch (IllegalArgumentException e) {
- // ignore
- }
- return result;
- }
- }
-
- private Type type;
-
- private String value;
-
- public Type getType() {
- return type;
- }
-
- public void setType(final Type type) {
- this.type = type;
- }
-
- public String getValue() {
- return value;
- }
-
- public void setValue(final String value) {
- this.value = value;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/DynExprConstruct.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/DynExprConstruct.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/DynExprConstruct.java
deleted file mode 100644
index c681299..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/DynExprConstruct.java
+++ /dev/null
@@ -1,28 +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 com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
-@JsonDeserialize(using = DynExprConstructDeserializer.class)
-public abstract class DynExprConstruct extends ExprConstruct {
-
- private static final long serialVersionUID = -642012862023177349L;
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/DynExprConstructDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/DynExprConstructDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/DynExprConstructDeserializer.java
deleted file mode 100644
index 1b60021..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/DynExprConstructDeserializer.java
+++ /dev/null
@@ -1,145 +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 com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-import com.fasterxml.jackson.core.JsonLocation;
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-import java.io.IOException;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.ClassUtils;
-
-public class DynExprConstructDeserializer extends AbstractEdmDeserializer<DynExprConstruct> {
-
- private static final String[] EL_OR_ATTR = { AnnotationPath.class.getSimpleName(), Path.class.getSimpleName() };
-
- private static final String APPLY = Apply.class.getSimpleName();
-
- private static final String CAST = Cast.class.getSimpleName();
-
- private static final String COLLECTION = Collection.class.getSimpleName();
-
- private static final String IF = If.class.getSimpleName();
-
- private static final String IS_OF = IsOf.class.getSimpleName();
-
- private static final String LABELED_ELEMENT = LabeledElement.class.getSimpleName();
-
- private static final String NULL = Null.class.getSimpleName();
-
- private static final String RECORD = Record.class.getSimpleName();
-
- private static final String URL_REF = UrlRef.class.getSimpleName();
-
- private AbstractElOrAttrConstruct getElOrAttrInstance(final String simpleClassName) throws JsonParseException {
- try {
- @SuppressWarnings("unchecked")
- Class<? extends AbstractElOrAttrConstruct> elOrAttrClass =
- (Class<? extends AbstractElOrAttrConstruct>) ClassUtils.getClass(
- getClass().getPackage().getName() + "." + simpleClassName);
- return elOrAttrClass.newInstance();
- } catch (Exception e) {
- throw new JsonParseException("Could not instantiate " + simpleClassName, JsonLocation.NA, e);
- }
- }
-
- private ExprConstruct parseConstOrEnumExprConstruct(final JsonParser jp) throws IOException {
- ExprConstruct result;
- if (isAnnotationConstExprConstruct(jp)) {
- result = parseAnnotationConstExprConstruct(jp);
- } else {
- result = jp.getCodec().readValue(jp, DynExprConstruct.class);
- }
- jp.nextToken();
-
- return result;
- }
-
- @Override
- protected DynExprConstruct doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- DynExprConstruct construct = null;
-
- if (DynExprSingleParamOp.Type.fromString(jp.getCurrentName()) != null) {
- final DynExprSingleParamOp dynExprSingleParamOp = new DynExprSingleParamOp();
- dynExprSingleParamOp.setType(DynExprSingleParamOp.Type.fromString(jp.getCurrentName()));
-
- jp.nextToken();
- jp.nextToken();
- dynExprSingleParamOp.setExpression(jp.getCodec().readValue(jp, DynExprConstruct.class));
-
- construct = dynExprSingleParamOp;
- } else if (DynExprDoubleParamOp.Type.fromString(jp.getCurrentName()) != null) {
- final DynExprDoubleParamOp dynExprDoubleParamOp = new DynExprDoubleParamOp();
- dynExprDoubleParamOp.setType(DynExprDoubleParamOp.Type.fromString(jp.getCurrentName()));
-
- jp.nextToken();
- jp.nextToken();
- dynExprDoubleParamOp.setLeft(jp.getCodec().readValue(jp, DynExprConstruct.class));
- dynExprDoubleParamOp.setRight(jp.getCodec().readValue(jp, DynExprConstruct.class));
-
- construct = dynExprDoubleParamOp;
- } else if (ArrayUtils.contains(EL_OR_ATTR, jp.getCurrentName())) {
- final AbstractElOrAttrConstruct elOrAttr = getElOrAttrInstance(jp.getCurrentName());
- elOrAttr.setValue(jp.nextTextValue());
-
- construct = elOrAttr;
- } else if (APPLY.equals(jp.getCurrentName())) {
- jp.nextToken();
- construct = jp.getCodec().readValue(jp, Apply.class);
- } else if (CAST.equals(jp.getCurrentName())) {
- jp.nextToken();
- construct = jp.getCodec().readValue(jp, Cast.class);
- } else if (COLLECTION.equals(jp.getCurrentName())) {
- jp.nextToken();
- construct = jp.getCodec().readValue(jp, Collection.class);
- } else if (IF.equals(jp.getCurrentName())) {
- jp.nextToken();
- jp.nextToken();
-
- final If _if = new If();
- _if.setGuard(parseConstOrEnumExprConstruct(jp));
- _if.setThen(parseConstOrEnumExprConstruct(jp));
- _if.setElse(parseConstOrEnumExprConstruct(jp));
-
- construct = _if;
- } else if (IS_OF.equals(jp.getCurrentName())) {
- jp.nextToken();
- construct = jp.getCodec().readValue(jp, IsOf.class);
- } else if (LABELED_ELEMENT.equals(jp.getCurrentName())) {
- jp.nextToken();
- construct = jp.getCodec().readValue(jp, LabeledElement.class);
- } else if (NULL.equals(jp.getCurrentName())) {
- jp.nextToken();
- construct = jp.getCodec().readValue(jp, Null.class);
- } else if (RECORD.equals(jp.getCurrentName())) {
- jp.nextToken();
- construct = jp.getCodec().readValue(jp, Record.class);
- } else if (URL_REF.equals(jp.getCurrentName())) {
- jp.nextToken();
- construct = jp.getCodec().readValue(jp, UrlRef.class);
- }
-
- return construct;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/DynExprDoubleParamOp.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/DynExprDoubleParamOp.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/DynExprDoubleParamOp.java
deleted file mode 100644
index 49dc15c..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/DynExprDoubleParamOp.java
+++ /dev/null
@@ -1,71 +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 com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-public class DynExprDoubleParamOp extends DynExprConstruct {
-
- private static final long serialVersionUID = -7974475975925167731L;
-
- public static enum Type {
-
- And,
- Or;
-
- public static Type fromString(final String value) {
- Type result = null;
- for (Type type : values()) {
- if (value.equals(type.name())) {
- result = type;
- }
- }
- return result;
- }
- }
-
- private Type type;
-
- private DynExprConstruct left;
-
- private DynExprConstruct right;
-
- public Type getType() {
- return type;
- }
-
- public void setType(final Type type) {
- this.type = type;
- }
-
- public DynExprConstruct getLeft() {
- return left;
- }
-
- public void setLeft(final DynExprConstruct left) {
- this.left = left;
- }
-
- public DynExprConstruct getRight() {
- return right;
- }
-
- public void setRight(final DynExprConstruct right) {
- this.right = right;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/DynExprSingleParamOp.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/DynExprSingleParamOp.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/DynExprSingleParamOp.java
deleted file mode 100644
index ee3892b..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/DynExprSingleParamOp.java
+++ /dev/null
@@ -1,67 +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 com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-public class DynExprSingleParamOp extends DynExprConstruct {
-
- private static final long serialVersionUID = -7974475975925167731L;
-
- public static enum Type {
-
- Not,
- Eq,
- Ne,
- Gt,
- Ge,
- Lt,
- Le;
-
- public static Type fromString(final String value) {
- Type result = null;
- for (Type type : values()) {
- if (value.equals(type.name())) {
- result = type;
- }
- }
- return result;
- }
-
- }
-
- private Type type;
-
- private DynExprConstruct expression;
-
- public Type getType() {
- return type;
- }
-
- public void setType(final Type type) {
- this.type = type;
- }
-
- public DynExprConstruct getExpression() {
- return expression;
- }
-
- public void setExpression(final DynExprConstruct expression) {
- this.expression = expression;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/ExprConstruct.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/ExprConstruct.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/ExprConstruct.java
deleted file mode 100644
index 3977507..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/ExprConstruct.java
+++ /dev/null
@@ -1,27 +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 com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdm;
-
-public abstract class ExprConstruct extends AbstractEdm {
-
- private static final long serialVersionUID = 7108626008005050492L;
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/If.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/If.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/If.java
deleted file mode 100644
index 6bef419..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/If.java
+++ /dev/null
@@ -1,55 +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 com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-public class If extends AnnotatedDynExprConstruct {
-
- private static final long serialVersionUID = 6752952406406218936L;
-
- private ExprConstruct guard;
-
- private ExprConstruct _then;
-
- private ExprConstruct _else;
-
- public ExprConstruct getGuard() {
- return guard;
- }
-
- public void setGuard(final ExprConstruct guard) {
- this.guard = guard;
- }
-
- public ExprConstruct getThen() {
- return _then;
- }
-
- public void setThen(final ExprConstruct _then) {
- this._then = _then;
- }
-
- public ExprConstruct getElse() {
- return _else;
- }
-
- public void setElse(final ExprConstruct _else) {
- this._else = _else;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/IsOf.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/IsOf.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/IsOf.java
deleted file mode 100644
index 0638c26..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/IsOf.java
+++ /dev/null
@@ -1,89 +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 com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.math.BigInteger;
-
-@JsonDeserialize(using = IsOfDeserializer.class)
-public class IsOf extends AnnotatedDynExprConstruct {
-
- private static final long serialVersionUID = 6958304670385303776L;
-
- private String type;
-
- private String maxLength;
-
- private BigInteger precision;
-
- private BigInteger scale;
-
- private String srid;
-
- private DynExprConstruct value;
-
- public String getType() {
- return type;
- }
-
- public void setType(final String type) {
- this.type = type;
- }
-
- public String getMaxLength() {
- return maxLength;
- }
-
- public void setMaxLength(final String maxLength) {
- this.maxLength = maxLength;
- }
-
- public BigInteger getPrecision() {
- return precision;
- }
-
- public void setPrecision(final BigInteger precision) {
- this.precision = precision;
- }
-
- public BigInteger getScale() {
- return scale;
- }
-
- public void setScale(final BigInteger scale) {
- this.scale = scale;
- }
-
- public String getSrid() {
- return srid;
- }
-
- public void setSrid(final String srid) {
- this.srid = srid;
- }
-
- public DynExprConstruct getValue() {
- return value;
- }
-
- public void setValue(final DynExprConstruct value) {
- this.value = value;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/IsOfDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/IsOfDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/IsOfDeserializer.java
deleted file mode 100644
index 492f20f..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/IsOfDeserializer.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 com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Annotation;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-import java.io.IOException;
-import java.math.BigInteger;
-
-public class IsOfDeserializer extends AbstractEdmDeserializer<IsOf> {
-
- @Override
- protected IsOf doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final IsOf isof = new IsOf();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Type".equals(jp.getCurrentName())) {
- isof.setType(jp.nextTextValue());
- } else if ("Annotation".equals(jp.getCurrentName())) {
- isof.setAnnotation(jp.getCodec().readValue(jp, Annotation.class));
- } else if ("MaxLength".equals(jp.getCurrentName())) {
- isof.setMaxLength(jp.nextTextValue());
- } else if ("Precision".equals(jp.getCurrentName())) {
- isof.setPrecision(BigInteger.valueOf(jp.nextLongValue(0L)));
- } else if ("Scale".equals(jp.getCurrentName())) {
- isof.setScale(BigInteger.valueOf(jp.nextLongValue(0L)));
- } else if ("SRID".equals(jp.getCurrentName())) {
- isof.setSrid(jp.nextTextValue());
- } else {
- isof.setValue(jp.getCodec().readValue(jp, DynExprConstruct.class));
- }
- }
- }
-
- return isof;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/LabeledElement.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/LabeledElement.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/LabeledElement.java
deleted file mode 100644
index 2e08c37..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/LabeledElement.java
+++ /dev/null
@@ -1,48 +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 com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
-@JsonDeserialize(using = LabeledElementDeserializer.class)
-public class LabeledElement extends AnnotatedDynExprConstruct {
-
- private static final long serialVersionUID = 6938971787086282939L;
-
- private String name;
-
- private DynExprConstruct value;
-
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public DynExprConstruct getValue() {
- return value;
- }
-
- public void setValue(final DynExprConstruct value) {
- this.value = value;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/LabeledElementDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/LabeledElementDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/LabeledElementDeserializer.java
deleted file mode 100644
index 16674bd..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/LabeledElementDeserializer.java
+++ /dev/null
@@ -1,53 +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 com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Annotation;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-import java.io.IOException;
-
-public class LabeledElementDeserializer extends AbstractEdmDeserializer<LabeledElement> {
-
- @Override
- protected LabeledElement doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final LabeledElement element = new LabeledElement();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Name".equals(jp.getCurrentName())) {
- element.setName(jp.nextTextValue());
- } else if ("Annotation".equals(jp.getCurrentName())) {
- element.setAnnotation(jp.getCodec().readValue(jp, Annotation.class));
- } else {
- element.setValue(jp.getCodec().readValue(jp, DynExprConstruct.class));
- }
- }
- }
-
- return element;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/LabeledElementReference.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/LabeledElementReference.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/LabeledElementReference.java
deleted file mode 100644
index 9ce3497..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/LabeledElementReference.java
+++ /dev/null
@@ -1,25 +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 com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-public class LabeledElementReference extends AbstractElOrAttrConstruct {
-
- private static final long serialVersionUID = 3649068436729494270L;
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/NavigationPropertyPath.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/NavigationPropertyPath.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/NavigationPropertyPath.java
deleted file mode 100644
index e01edfa..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/NavigationPropertyPath.java
+++ /dev/null
@@ -1,25 +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 com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-public class NavigationPropertyPath extends AbstractElOrAttrConstruct {
-
- private static final long serialVersionUID = -8066400142504963043L;
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Null.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Null.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Null.java
deleted file mode 100644
index 6c75f34..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Null.java
+++ /dev/null
@@ -1,28 +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 com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
-@JsonDeserialize(using = NullDeserializer.class)
-public class Null extends AnnotatedDynExprConstruct {
-
- private static final long serialVersionUID = -3611384710172781951L;
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/NullDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/NullDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/NullDeserializer.java
deleted file mode 100644
index e974f23..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/NullDeserializer.java
+++ /dev/null
@@ -1,49 +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 com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Annotation;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-import java.io.IOException;
-
-public class NullDeserializer extends AbstractEdmDeserializer<Null> {
-
- @Override
- protected Null doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final Null _null = new Null();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Annotation".equals(jp.getCurrentName())) {
- _null.setAnnotation(jp.getCodec().readValue(jp, Annotation.class));
- }
- }
- }
-
- return _null;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Path.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Path.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Path.java
deleted file mode 100644
index 95f9e9e..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Path.java
+++ /dev/null
@@ -1,25 +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 com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-public class Path extends AbstractElOrAttrConstruct {
-
- private static final long serialVersionUID = -2551058493469292082L;
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/PropertyPath.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/PropertyPath.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/PropertyPath.java
deleted file mode 100644
index c76905d..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/PropertyPath.java
+++ /dev/null
@@ -1,25 +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 com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-public class PropertyPath extends AbstractElOrAttrConstruct {
-
- private static final long serialVersionUID = 2328584735437885159L;
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/PropertyValue.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/PropertyValue.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/PropertyValue.java
deleted file mode 100644
index 644c724..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/PropertyValue.java
+++ /dev/null
@@ -1,48 +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 com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
-@JsonDeserialize(using = PropertyValueDeserializer.class)
-public class PropertyValue extends AnnotatedDynExprConstruct {
-
- private static final long serialVersionUID = 3081968466425707461L;
-
- private String property;
-
- private ExprConstruct value;
-
- public String getProperty() {
- return property;
- }
-
- public void setProperty(final String property) {
- this.property = property;
- }
-
- public ExprConstruct getValue() {
- return value;
- }
-
- public void setValue(final ExprConstruct value) {
- this.value = value;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/PropertyValueDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/PropertyValueDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/PropertyValueDeserializer.java
deleted file mode 100644
index bf71a3f..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/PropertyValueDeserializer.java
+++ /dev/null
@@ -1,55 +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 com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Annotation;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-import java.io.IOException;
-
-public class PropertyValueDeserializer extends AbstractEdmDeserializer<PropertyValue> {
-
- @Override
- protected PropertyValue doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final PropertyValue propValue = new PropertyValue();
-
- 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.setAnnotation(jp.getCodec().readValue(jp, Annotation.class));
- } else if (isAnnotationConstExprConstruct(jp)) {
- propValue.setValue(parseAnnotationConstExprConstruct(jp));
- } else {
- propValue.setValue(jp.getCodec().readValue(jp, DynExprConstruct.class));
- }
- }
- }
-
- return propValue;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Record.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Record.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Record.java
deleted file mode 100644
index d42ae32..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Record.java
+++ /dev/null
@@ -1,46 +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 com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonDeserialize(using = RecordDeserializer.class)
-public class Record extends AnnotatedDynExprConstruct {
-
- private static final long serialVersionUID = -2886526224721870304L;
-
- private String type;
-
- private final List<PropertyValue> propertyValues = new ArrayList<PropertyValue>();
-
- public String getType() {
- return type;
- }
-
- public void setType(final String type) {
- this.type = type;
- }
-
- public List<PropertyValue> getPropertyValues() {
- return propertyValues;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/RecordDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/RecordDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/RecordDeserializer.java
deleted file mode 100644
index 727aca7..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/RecordDeserializer.java
+++ /dev/null
@@ -1,53 +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 com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Annotation;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-import java.io.IOException;
-
-public class RecordDeserializer extends AbstractEdmDeserializer<Record> {
-
- @Override
- protected Record doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final Record record = new Record();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Tyoe".equals(jp.getCurrentName())) {
- record.setType(jp.nextTextValue());
- } else if ("Annotation".equals(jp.getCurrentName())) {
- record.setAnnotation(jp.getCodec().readValue(jp, Annotation.class));
- } else {
- record.getPropertyValues().add(jp.getCodec().readValue(jp, PropertyValue.class));
- }
- }
- }
-
- return record;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/UrlRef.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/UrlRef.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/UrlRef.java
deleted file mode 100644
index 1b15eeb..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/UrlRef.java
+++ /dev/null
@@ -1,38 +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 com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
-@JsonDeserialize(using = UrlRefDeserializer.class)
-public class UrlRef extends DynExprConstruct {
-
- private static final long serialVersionUID = 3755101394647430897L;
-
- private ExprConstruct value;
-
- public ExprConstruct getValue() {
- return value;
- }
-
- public void setValue(final ExprConstruct value) {
- this.value = value;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/UrlRefDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/UrlRefDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/UrlRefDeserializer.java
deleted file mode 100644
index 51107af..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/UrlRefDeserializer.java
+++ /dev/null
@@ -1,50 +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 com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-import java.io.IOException;
-
-public class UrlRefDeserializer extends AbstractEdmDeserializer<UrlRef> {
-
- @Override
- protected UrlRef doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final UrlRef urlref = new UrlRef();
-
- 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.getCodec().readValue(jp, DynExprConstruct.class));
- }
- }
- }
-
- return urlref;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/AbstractURIBuilder.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/AbstractURIBuilder.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/AbstractURIBuilder.java
deleted file mode 100644
index 1d223cb..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/AbstractURIBuilder.java
+++ /dev/null
@@ -1,240 +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 com.msopentech.odatajclient.engine.uri;
-
-import com.msopentech.odatajclient.engine.client.Configuration;
-import com.msopentech.odatajclient.engine.uri.filter.ODataFilter;
-import com.msopentech.odatajclient.engine.utils.URIUtils;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public abstract class AbstractURIBuilder implements URIBuilder {
-
- private static final long serialVersionUID = -3267515371720408124L;
-
- /**
- * Logger.
- */
- protected static final Logger LOG = LoggerFactory.getLogger(URIBuilder.class);
-
- protected final List<URIBuilder.Segment> segments;
-
- /**
- * Case-insensitive map of query options.
- */
- protected final Map<String, String> queryOptions = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER);
-
- /**
- * Constructor.
- *
- * @param serviceRoot absolute URL (schema, host and port included) representing the location of the root of the
- * data service.
- */
- protected AbstractURIBuilder(final String serviceRoot) {
- segments = new ArrayList<URIBuilder.Segment>();
- segments.add(new URIBuilder.Segment(SegmentType.SERVICEROOT, serviceRoot));
- }
-
- protected abstract Configuration getConfiguration();
-
- @Override
- public URIBuilder addQueryOption(final QueryOption option, final String value) {
- return addQueryOption(option.toString(), value);
- }
-
- @Override
- public URIBuilder addQueryOption(final String option, final String value) {
- queryOptions.put(option, value);
- return this;
- }
-
- @Override
- public URIBuilder appendEntitySetSegment(final String segmentValue) {
- segments.add(new URIBuilder.Segment(SegmentType.ENTITYSET, segmentValue));
- return this;
- }
-
- @Override
- public URIBuilder appendEntityTypeSegment(final String segmentValue) {
- segments.add(new URIBuilder.Segment(SegmentType.ENTITYTYPE, segmentValue));
- return this;
- }
-
- @Override
- public URIBuilder appendKeySegment(final Object val) {
- final String segValue = URIUtils.escape(val);
-
- segments.add(getConfiguration().isKeyAsSegment()
- ? new URIBuilder.Segment(SegmentType.KEY_AS_SEGMENT, segValue)
- : new URIBuilder.Segment(SegmentType.KEY, "(" + segValue + ")"));
- return this;
- }
-
- @Override
- public URIBuilder appendKeySegment(final Map<String, Object> segmentValues) {
- if (!getConfiguration().isKeyAsSegment()) {
- final StringBuilder keyBuilder = new StringBuilder().append('(');
- for (Map.Entry<String, Object> entry : segmentValues.entrySet()) {
- keyBuilder.append(entry.getKey()).append('=').append(URIUtils.escape(entry.getValue()));
- keyBuilder.append(',');
- }
- keyBuilder.deleteCharAt(keyBuilder.length() - 1).append(')');
-
- segments.add(new URIBuilder.Segment(SegmentType.KEY, keyBuilder.toString()));
- }
-
- return this;
- }
-
- @Override
- public URIBuilder appendNavigationLinkSegment(final String segmentValue) {
- segments.add(new URIBuilder.Segment(SegmentType.NAVIGATION, segmentValue));
- return this;
- }
-
- @Override
- public URIBuilder appendStructuralSegment(final String segmentValue) {
- segments.add(new URIBuilder.Segment(SegmentType.STRUCTURAL, segmentValue));
- return this;
- }
-
- @Override
- public URIBuilder appendLinksSegment(final String segmentValue) {
- segments.add(new URIBuilder.Segment(SegmentType.LINKS, SegmentType.LINKS.getValue()));
- segments.add(new URIBuilder.Segment(SegmentType.ENTITYTYPE, segmentValue));
- return this;
- }
-
- @Override
- public URIBuilder appendValueSegment() {
- segments.add(new URIBuilder.Segment(SegmentType.VALUE, SegmentType.VALUE.getValue()));
- return this;
- }
-
- @Override
- public URIBuilder appendCountSegment() {
- segments.add(new URIBuilder.Segment(SegmentType.COUNT, SegmentType.COUNT.getValue()));
- return this;
- }
-
- @Override
- public URIBuilder appendFunctionImportSegment(final String segmentValue) {
- segments.add(new URIBuilder.Segment(SegmentType.FUNCTIONIMPORT, segmentValue));
- return this;
- }
-
- @Override
- public URIBuilder appendMetadataSegment() {
- segments.add(new URIBuilder.Segment(SegmentType.METADATA, SegmentType.METADATA.getValue()));
- return this;
- }
-
- @Override
- public URIBuilder appendBatchSegment() {
- segments.add(new URIBuilder.Segment(SegmentType.BATCH, SegmentType.BATCH.getValue()));
- return this;
- }
-
- @Override
- public URIBuilder expand(final String entityName) {
- return addQueryOption(QueryOption.EXPAND, entityName);
- }
-
- @Override
- public URIBuilder format(final String format) {
- return addQueryOption(QueryOption.FORMAT, format);
- }
-
- @Override
- public URIBuilder filter(final ODataFilter filter) {
- return addQueryOption(QueryOption.FILTER, filter.build());
- }
-
- @Override
- public URIBuilder filter(final String filter) {
- return addQueryOption(QueryOption.FILTER, filter);
- }
-
- @Override
- public URIBuilder select(final String select) {
- return addQueryOption(QueryOption.SELECT, select);
- }
-
- @Override
- public URIBuilder orderBy(final String order) {
- return addQueryOption(QueryOption.ORDERBY, order);
- }
-
- @Override
- public URIBuilder top(final int top) {
- return addQueryOption(QueryOption.TOP, String.valueOf(top));
- }
-
- @Override
- public URIBuilder skip(final int skip) {
- return addQueryOption(QueryOption.SKIP, String.valueOf(skip));
- }
-
- @Override
- public URIBuilder skipToken(final String skipToken) {
- return addQueryOption(QueryOption.SKIPTOKEN, skipToken);
- }
-
- @Override
- public URIBuilder inlineCount() {
- return addQueryOption(QueryOption.INLINECOUNT, "allpages");
- }
-
- @Override
- public URI build() {
- final StringBuilder segmentsBuilder = new StringBuilder();
- for (URIBuilder.Segment seg : segments) {
- if (segmentsBuilder.length() > 0 && seg.getType() != SegmentType.KEY) {
- segmentsBuilder.append('/');
- }
-
- segmentsBuilder.append(seg.getValue());
- }
-
- try {
- final org.apache.http.client.utils.URIBuilder builder =
- new org.apache.http.client.utils.URIBuilder(segmentsBuilder.toString());
-
- for (Map.Entry<String, String> option : queryOptions.entrySet()) {
- builder.addParameter("$" + option.getKey(), option.getValue());
- }
-
- return builder.build().normalize();
- } catch (URISyntaxException e) {
- throw new IllegalArgumentException("Could not build valid URI", e);
- }
- }
-
- @Override
- public String toString() {
- return build().toASCIIString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/QueryOption.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/QueryOption.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/QueryOption.java
deleted file mode 100644
index cded113..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/QueryOption.java
+++ /dev/null
@@ -1,101 +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 com.msopentech.odatajclient.engine.uri;
-
-/**
- * Query options.
- */
-public enum QueryOption {
-
- /**
- * This option indicates entities associated with the EntityType
- * instance or EntitySet, identified by the resource path section of
- * the URI, and MUST be represented inline in the data service's
- * response.
- */
- EXPAND("expand"),
- /**
- * This option specifies the media type acceptable in a response. If
- * present, this value SHOULD take precedence over value(s)
- * specified in an Accept request header.
- */
- FORMAT("format"),
- /**
- * This option is used to specify that a subset of the properties of
- * the entities identified by the path of the request URI and
- * $expand query option SHOULD be returned in the response
- * from the data service.
- */
- SELECT("select"),
- /**
- * This option specifies the sort properties and sort direction
- * (ascending or descending) that the data service MUST use to
- * order the entities in the EntitySet, identified by the resource
- * path section of the URI.
- */
- ORDERBY("orderby"),
- /**
- * This option specifies a positive integer N that is the maximum
- * number of entities in the EntitySet, identified by the resource
- * path section of the URI, that the data service MUST return.
- */
- TOP("top"),
- /**
- * This option specifies a positive integer N that represents the
- * number of entities, counted from the first entity in the
- * EntitySet and ordered as specified by the $orderby option,
- * that the data service should skip when returning the entities in
- * the EntitySet, which is identified by the resource path section
- * of the URI. The data service SHOULD return all subsequent
- * entities, starting from the one in position N+1.
- */
- SKIP("skip"),
- /**
- * This query option applies only to the OData 2.0 protocol to the AtomPub protocol.
- * The value of a $skiptoken query option is an opaque token
- * which identifies an index into the collection of entities identified
- * by the URI containing the $skiptoken parameter.
- */
- SKIPTOKEN("skiptoken"),
- /**
- * This option specifies a predicate used to filter the elements from
- * the EntitySet identified by the resource path section of the URI.
- */
- FILTER("filter"),
- /**
- * For a value of "allpages", this option indicates that the response
- * to the request MUST include the count of the number of entities
- * in the EntitySet, identified by the resource path section of the
- * URI after all $filter system query options have been applied.
- * For a value of "none", this option indicates that the response to
- * the request MUST NOT include the count value.
- */
- INLINECOUNT("inlinecount");
-
- final String option;
-
- QueryOption(final String option) {
- this.option = option;
- }
-
- @Override
- public String toString() {
- return option;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/SegmentType.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/SegmentType.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/SegmentType.java
deleted file mode 100644
index 3c1e069..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/SegmentType.java
+++ /dev/null
@@ -1,55 +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 com.msopentech.odatajclient.engine.uri;
-
-import org.apache.commons.lang3.StringUtils;
-
-/**
- * URI Segment types.
- */
-public enum SegmentType {
-
- ENTITYSET,
- ENTITYTYPE,
- KEY,
- KEY_AS_SEGMENT,
- NAVIGATION,
- STRUCTURAL,
- VALUE("$value"),
- FUNCTIONIMPORT,
- METADATA("$metadata"),
- BATCH("$batch"),
- LINKS("$links"),
- COUNT("$count"),
- SERVICEROOT;
-
- private String value;
-
- private SegmentType() {
- this.value = StringUtils.EMPTY;
- }
-
- private SegmentType(final String value) {
- this.value = value;
- }
-
- public String getValue() {
- return value;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/URIBuilder.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/URIBuilder.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/URIBuilder.java
deleted file mode 100644
index dac0cb1..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/URIBuilder.java
+++ /dev/null
@@ -1,262 +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 com.msopentech.odatajclient.engine.uri;
-
-import com.msopentech.odatajclient.engine.uri.filter.FilterFactory;
-import com.msopentech.odatajclient.engine.uri.filter.ODataFilter;
-import java.io.Serializable;
-import java.net.URI;
-import java.util.Map;
-
-/**
- * OData URI builder.
- */
-public interface URIBuilder extends Serializable {
-
- public static class Segment {
-
- private final SegmentType type;
-
- private final String value;
-
- public Segment(final SegmentType type, final String value) {
- this.type = type;
- this.value = value;
- }
-
- public SegmentType getType() {
- return type;
- }
-
- public String getValue() {
- return value;
- }
-
- }
-
- /**
- * Adds the specified query option to the URI.
- *
- * @param option query option.
- * @param value query option value.
- * @return current ODataURIBuilder object.
- */
- URIBuilder addQueryOption(QueryOption option, String value);
-
- /**
- * Adds the specified (custom) query option to the URI.
- *
- * @param option query option.
- * @param value query option value.
- * @return current ODataURIBuilder object.
- */
- URIBuilder addQueryOption(String option, String value);
-
- /**
- * Append EntitySet segment to the URI.
- *
- * @param segmentValue segment value.
- * @return current ODataURIBuilder object.
- */
- URIBuilder appendEntitySetSegment(String segmentValue);
-
- /**
- * Append EntityType segment to the URI.
- *
- * @param segmentValue segment value.
- * @return current ODataURIBuilder object.
- */
- URIBuilder appendEntityTypeSegment(String segmentValue);
-
- /**
- * Append key segment to the URI.
- *
- * @param val segment value.
- * @return current ODataURIBuilder object.
- */
- URIBuilder appendKeySegment(Object val);
-
- /**
- * Append key segment to the URI, for multiple keys.
- *
- * @param segmentValues segment values.
- * @return current ODataURIBuilder object.
- */
- URIBuilder appendKeySegment(Map<String, Object> segmentValues);
-
- /**
- * Append navigation link segment to the URI.
- *
- * @param segmentValue segment value.
- * @return current ODataURIBuilder object.
- */
- URIBuilder appendNavigationLinkSegment(String segmentValue);
-
- /**
- * Append structural segment to the URI.
- *
- * @param segmentValue segment value.
- * @return current ODataURIBuilder object.
- */
- URIBuilder appendStructuralSegment(String segmentValue);
-
- URIBuilder appendLinksSegment(String segmentValue);
-
- /**
- * Append value segment to the URI.
- *
- * @return current ODataURIBuilder object.
- */
- URIBuilder appendValueSegment();
-
- /**
- * Append count segment to the URI.
- *
- * @return current ODataURIBuilder object.
- */
- URIBuilder appendCountSegment();
-
- /**
- * Append function import segment to the URI.
- *
- * @param segmentValue segment value.
- * @return current ODataURIBuilder object.
- */
- URIBuilder appendFunctionImportSegment(String segmentValue);
-
- /**
- * Append metadata segment to the URI.
- *
- * @return current ODataURIBuilder object.
- */
- URIBuilder appendMetadataSegment();
-
- /**
- * Append batch segment to the URI.
- *
- * @return current ODataURIBuilder object.
- */
- URIBuilder appendBatchSegment();
-
- /**
- * Adds expand query option.
- *
- * @param entityName entity object to be in-line expanded.
- * @return current ODataURIBuilder object.
- * @see QueryOption#EXPAND
- */
- URIBuilder expand(String entityName);
-
- /**
- * Adds format query option.
- *
- * @param format media type acceptable in a response.
- * @return current ODataURIBuilder object.
- * @see QueryOption#FORMAT
- */
- URIBuilder format(String format);
-
- /**
- * Adds filter for filter query option.
- *
- * @param filter filter instance (to be obtained via <tt>ODataFilterFactory</tt>):
- * note that <tt>build()</tt> method will be immediately invoked.
- * @return current ODataURIBuilder object.
- * @see QueryOption#FILTER
- * @see ODataFilter
- * @see FilterFactory
- */
- URIBuilder filter(ODataFilter filter);
-
- /**
- * Adds filter query option.
- *
- * @param filter filter string.
- * @return current ODataURIBuilder object.
- * @see QueryOption#FILTER
- */
- URIBuilder filter(String filter);
-
- /**
- * Adds select query option.
- *
- * @param select select query option value.
- * @return current ODataURIBuilder object.
- * @see QueryOption#SELECT
- */
- URIBuilder select(String select);
-
- /**
- * Adds orderby query option.
- *
- * @param order order string.
- * @return current ODataURIBuilder object.
- * @see QueryOption#ORDERBY
- */
- URIBuilder orderBy(String order);
-
- /**
- * Adds top query option.
- *
- * @param top maximum number of entities to be returned.
- * @return current ODataURIBuilder object.
- * @see QueryOption#TOP
- */
- URIBuilder top(int top);
-
- /**
- * Adds skip query option.
- *
- * @param skip number of entities to be skipped into the response.
- * @return current ODataURIBuilder object.
- * @see QueryOption#SKIP
- */
- URIBuilder skip(int skip);
-
- /**
- * Adds skiptoken query option.
- *
- * @param skipToken opaque token.
- * @return current ODataURIBuilder object.
- * @see QueryOption#SKIPTOKEN
- */
- URIBuilder skipToken(String skipToken);
-
- /**
- * Adds inlinecount query option.
- *
- * @return current ODataURIBuilder object.
- * @see QueryOption#INLINECOUNT
- */
- URIBuilder inlineCount();
-
- /**
- * Build OData URI.
- *
- * @return OData URI.
- */
- URI build();
-
- /**
- * ${@inheritDoc }
- */
- @Override
- String toString();
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/V3URIBuilder.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/V3URIBuilder.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/V3URIBuilder.java
deleted file mode 100644
index 3b79c5e..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/V3URIBuilder.java
+++ /dev/null
@@ -1,39 +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 com.msopentech.odatajclient.engine.uri;
-
-import com.msopentech.odatajclient.engine.client.V3Configuration;
-
-public class V3URIBuilder extends AbstractURIBuilder {
-
- private static final long serialVersionUID = -3506851722447870532L;
-
- private final V3Configuration configuration;
-
- public V3URIBuilder(final V3Configuration configuration, final String serviceRoot) {
- super(serviceRoot);
- this.configuration = configuration;
- }
-
- @Override
- protected V3Configuration getConfiguration() {
- return configuration;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/V4URIBuilder.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/V4URIBuilder.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/V4URIBuilder.java
deleted file mode 100644
index de7093a..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/V4URIBuilder.java
+++ /dev/null
@@ -1,39 +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 com.msopentech.odatajclient.engine.uri;
-
-import com.msopentech.odatajclient.engine.client.V4Configuration;
-
-public class V4URIBuilder extends AbstractURIBuilder {
-
- private static final long serialVersionUID = -3506851722447870532L;
-
- private final V4Configuration configuration;
-
- public V4URIBuilder(final V4Configuration configuration, final String serviceRoot) {
- super(serviceRoot);
- this.configuration = configuration;
- }
-
- @Override
- protected V4Configuration getConfiguration() {
- return configuration;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/AbstractComparingFilter.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/AbstractComparingFilter.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/AbstractComparingFilter.java
deleted file mode 100644
index f4a5389..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/uri/filter/AbstractComparingFilter.java
+++ /dev/null
@@ -1,42 +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 com.msopentech.odatajclient.engine.uri.filter;
-
-abstract class AbstractComparingFilter implements ODataFilter {
-
- private final ODataFilterArg left;
-
- private final ODataFilterArg right;
-
- AbstractComparingFilter(final ODataFilterArg left, final ODataFilterArg right) {
- this.left = left;
- this.right = right;
- }
-
- protected abstract String getOp();
-
- @Override
- public String build() {
- return new StringBuilder().
- append('(').append(left.build()).
- append(' ').append(getOp()).append(' ').
- append(right.build()).append(')').
- toString();
- }
-}
[08/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java
deleted file mode 100644
index e71c881..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java
+++ /dev/null
@@ -1,155 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "Employee",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface Employee extends com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Person {
-
-
-
- @Property(name = "ManagersPersonId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getManagersPersonId();
-
- public void setManagersPersonId(final Integer _managersPersonId);
-
-
- @Property(name = "Salary",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getSalary();
-
- public void setSalary(final Integer _salary);
-
-
- @Property(name = "Title",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getTitle();
-
- public void setTitle(final String _title);
-
-
-
-
- @NavigationProperty(name = "Manager",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Employee",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Person")
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee getManager();
-
- public void setManager(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee _manager);
-
-
- @Operation(name = "UpdatePersonInfo" )
- void updatePersonInfo(
- );
- @Operation(name = "IncreaseEmployeeSalary" ,
- returnType = "Edm.Boolean")
- Boolean increaseEmployeeSalary(
- @Parameter(name = "n", type = "Edm.Int32", nullable = false) Integer n
- );
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java
deleted file mode 100644
index 22e453a..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java
+++ /dev/null
@@ -1,51 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface EmployeeCollection extends AbstractEntityCollection<Employee> {
-
- @Operation(name = "IncreaseSalaries" )
- void increaseSalaries(
- @Parameter(name = "n", type = "Edm.Int32", nullable = false) Integer n
- );
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java
deleted file mode 100644
index fe9e35d..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java
+++ /dev/null
@@ -1,170 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "LastLogin",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface LastLogin extends Serializable {
-
-
- @Key
- @Property(name = "Username",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getUsername();
-
- public void setUsername(final String _username);
-
-
- @Property(name = "LoggedIn",
- type = "Edm.DateTime",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public ODataTimestamp getLoggedIn();
-
- public void setLoggedIn(final ODataTimestamp _loggedIn);
-
-
- @Property(name = "LoggedOut",
- type = "Edm.DateTime",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public ODataTimestamp getLoggedOut();
-
- public void setLoggedOut(final ODataTimestamp _loggedOut);
-
-
- @Property(name = "Duration",
- type = "Edm.Time",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public ODataDuration getDuration();
-
- public void setDuration(final ODataDuration _duration);
-
-
-
-
- @NavigationProperty(name = "Login",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Login")
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Login getLogin();
-
- public void setLogin(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Login _login);
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java
deleted file mode 100644
index 15ec679..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface LastLoginCollection extends AbstractEntityCollection<LastLogin> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/License.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/License.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/License.java
deleted file mode 100644
index 426486c..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/License.java
+++ /dev/null
@@ -1,193 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "License",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface License extends Serializable {
-
-
- @Key
- @Property(name = "Name",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getName();
-
- public void setName(final String _name);
-
-
- @Property(name = "LicenseNumber",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getLicenseNumber();
-
- public void setLicenseNumber(final String _licenseNumber);
-
-
- @Property(name = "LicenseClass",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "SyndicationContributorEmail",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- public String getLicenseClass();
-
- public void setLicenseClass(final String _licenseClass);
-
-
- @Property(name = "Restrictions",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "SyndicationContributorUri",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- public String getRestrictions();
-
- public void setRestrictions(final String _restrictions);
-
-
- @Property(name = "ExpirationDate",
- type = "Edm.DateTime",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public ODataTimestamp getExpirationDate();
-
- public void setExpirationDate(final ODataTimestamp _expirationDate);
-
-
-
-
- @NavigationProperty(name = "Driver",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Driver",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Driver")
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Driver getDriver();
-
- public void setDriver(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Driver _driver);
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java
deleted file mode 100644
index 1963775..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface LicenseCollection extends AbstractEntityCollection<License> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Login.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Login.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Login.java
deleted file mode 100644
index dca66da..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Login.java
+++ /dev/null
@@ -1,164 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "Login",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface Login extends Serializable {
-
-
- @Key
- @Property(name = "Username",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getUsername();
-
- public void setUsername(final String _username);
-
-
- @Property(name = "CustomerId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getCustomerId();
-
- public void setCustomerId(final Integer _customerId);
-
-
-
-
- @NavigationProperty(name = "Customer",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Customer")
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer getCustomer();
-
- public void setCustomer(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer _customer);
-
-
- @NavigationProperty(name = "LastLogin",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.LastLogin",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "LastLogin")
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin getLastLogin();
-
- public void setLastLogin(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin _lastLogin);
-
-
- @NavigationProperty(name = "SentMessages",
- type = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Message)",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Message")
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection getSentMessages();
-
- public void setSentMessages(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection _sentMessages);
-
-
- @NavigationProperty(name = "ReceivedMessages",
- type = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Message)",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Message")
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection getReceivedMessages();
-
- public void setReceivedMessages(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection _receivedMessages);
-
-
- @NavigationProperty(name = "Orders",
- type = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Order)",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Order")
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection getOrders();
-
- public void setOrders(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection _orders);
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java
deleted file mode 100644
index 33f448b..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface LoginCollection extends AbstractEntityCollection<Login> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java
deleted file mode 100644
index e3a469e..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java
+++ /dev/null
@@ -1,528 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "MappedEntityType",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface MappedEntityType extends Serializable {
-
-
- @Key
- @Property(name = "Id",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getId();
-
- public void setId(final Integer _id);
-
-
- @Property(name = "Href",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getHref();
-
- public void setHref(final String _href);
-
-
- @Property(name = "Title",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getTitle();
-
- public void setTitle(final String _title);
-
-
- @Property(name = "HrefLang",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getHrefLang();
-
- public void setHrefLang(final String _hrefLang);
-
-
- @Property(name = "Type",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getType();
-
- public void setType(final String _type);
-
-
- @Property(name = "Length",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getLength();
-
- public void setLength(final Integer _length);
-
-
- @Property(name = "BagOfPrimitiveToLinks",
- type = "Collection(Edm.String)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<String> getBagOfPrimitiveToLinks();
-
- public void setBagOfPrimitiveToLinks(final Collection<String> _bagOfPrimitiveToLinks);
-
-
- @Property(name = "Logo",
- type = "Edm.Binary",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public byte[] getLogo();
-
- public void setLogo(final byte[] _logo);
-
-
- @Property(name = "BagOfDecimals",
- type = "Collection(Edm.Decimal)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<BigDecimal> getBagOfDecimals();
-
- public void setBagOfDecimals(final Collection<BigDecimal> _bagOfDecimals);
-
-
- @Property(name = "BagOfDoubles",
- type = "Collection(Edm.Double)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<Double> getBagOfDoubles();
-
- public void setBagOfDoubles(final Collection<Double> _bagOfDoubles);
-
-
- @Property(name = "BagOfSingles",
- type = "Collection(Edm.Single)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<Float> getBagOfSingles();
-
- public void setBagOfSingles(final Collection<Float> _bagOfSingles);
-
-
- @Property(name = "BagOfBytes",
- type = "Collection(Edm.Byte)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<Integer> getBagOfBytes();
-
- public void setBagOfBytes(final Collection<Integer> _bagOfBytes);
-
-
- @Property(name = "BagOfInt16s",
- type = "Collection(Edm.Int16)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<Short> getBagOfInt16s();
-
- public void setBagOfInt16s(final Collection<Short> _bagOfInt16s);
-
-
- @Property(name = "BagOfInt32s",
- type = "Collection(Edm.Int32)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<Integer> getBagOfInt32s();
-
- public void setBagOfInt32s(final Collection<Integer> _bagOfInt32s);
-
-
- @Property(name = "BagOfInt64s",
- type = "Collection(Edm.Int64)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<Long> getBagOfInt64s();
-
- public void setBagOfInt64s(final Collection<Long> _bagOfInt64s);
-
-
- @Property(name = "BagOfGuids",
- type = "Collection(Edm.Guid)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<UUID> getBagOfGuids();
-
- public void setBagOfGuids(final Collection<UUID> _bagOfGuids);
-
-
- @Property(name = "BagOfDateTime",
- type = "Collection(Edm.DateTime)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<ODataTimestamp> getBagOfDateTime();
-
- public void setBagOfDateTime(final Collection<ODataTimestamp> _bagOfDateTime);
-
-
- @Property(name = "BagOfComplexToCategories",
- type = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ComplexToCategory)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory> getBagOfComplexToCategories();
-
- public void setBagOfComplexToCategories(final Collection<com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory> _bagOfComplexToCategories);
-
-
- @Property(name = "ComplexPhone",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "PhoneNumber",
- fcTargetPath = "SyndicationRights",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone getComplexPhone();
-
- public void setComplexPhone(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _complexPhone);
-
-
- @Property(name = "ComplexContactDetails",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "WorkPhone/Extension",
- fcTargetPath = "SyndicationSummary",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails getComplexContactDetails();
-
- public void setComplexContactDetails(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails _complexContactDetails);
-
-
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java
deleted file mode 100644
index e99eda9..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface MappedEntityTypeCollection extends AbstractEntityCollection<MappedEntityType> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Message.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Message.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Message.java
deleted file mode 100644
index 2c13cb9..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Message.java
+++ /dev/null
@@ -1,259 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-@KeyRef(MessageKey.class)
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "Message",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface Message extends Serializable {
-
-
- @Key
- @Property(name = "MessageId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getMessageId();
-
- public void setMessageId(final Integer _messageId);
-
- @Key
- @Property(name = "FromUsername",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getFromUsername();
-
- public void setFromUsername(final String _fromUsername);
-
-
- @Property(name = "ToUsername",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getToUsername();
-
- public void setToUsername(final String _toUsername);
-
-
- @Property(name = "Sent",
- type = "Edm.DateTimeOffset",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "SyndicationPublished",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public ODataTimestamp getSent();
-
- public void setSent(final ODataTimestamp _sent);
-
-
- @Property(name = "Subject",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "SyndicationTitle",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getSubject();
-
- public void setSubject(final String _subject);
-
-
- @Property(name = "Body",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getBody();
-
- public void setBody(final String _body);
-
-
- @Property(name = "IsRead",
- type = "Edm.Boolean",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Boolean getIsRead();
-
- public void setIsRead(final Boolean _isRead);
-
-
-
-
- @NavigationProperty(name = "Sender",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Login")
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Login getSender();
-
- public void setSender(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Login _sender);
-
-
- @NavigationProperty(name = "Recipient",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Login")
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Login getRecipient();
-
- public void setRecipient(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Login _recipient);
-
-
- @NavigationProperty(name = "Attachments",
- type = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.MessageAttachment)",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "MessageAttachment")
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection getAttachments();
-
- public void setAttachments(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection _attachments);
-
-
-
-}
[09/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java
deleted file mode 100644
index 747d7b4..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java
+++ /dev/null
@@ -1,239 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "ComputerDetail",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface ComputerDetail extends Serializable {
-
-
- @Key
- @Property(name = "ComputerDetailId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getComputerDetailId();
-
- public void setComputerDetailId(final Integer _computerDetailId);
-
-
- @Property(name = "Manufacturer",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "SyndicationAuthorEmail",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getManufacturer();
-
- public void setManufacturer(final String _manufacturer);
-
-
- @Property(name = "Model",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "SyndicationAuthorUri",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getModel();
-
- public void setModel(final String _model);
-
-
- @Property(name = "Serial",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getSerial();
-
- public void setSerial(final String _serial);
-
-
- @Property(name = "SpecificationsBag",
- type = "Collection(Edm.String)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<String> getSpecificationsBag();
-
- public void setSpecificationsBag(final Collection<String> _specificationsBag);
-
-
- @Property(name = "PurchaseDate",
- type = "Edm.DateTime",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public ODataTimestamp getPurchaseDate();
-
- public void setPurchaseDate(final ODataTimestamp _purchaseDate);
-
-
- @Property(name = "Dimensions",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions getDimensions();
-
- public void setDimensions(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions _dimensions);
-
-
-
-
- @NavigationProperty(name = "Computer",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Computer",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Computer")
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer getComputer();
-
- public void setComputer(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer _computer);
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java
deleted file mode 100644
index 5b29c3d..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface ComputerDetailCollection extends AbstractEntityCollection<ComputerDetail> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java
deleted file mode 100644
index 5c0df72..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java
+++ /dev/null
@@ -1,69 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.ComplexType;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@ComplexType("ConcurrencyInfo")
-public class ConcurrencyInfo extends AbstractComplexType {
-
- private String _token;
-
- @Property(name = "Token", type = "Edm.String", nullable = true)
- public String getToken() {
- return _token;
- }
-
- public void setToken(final String _token) {
- this._token = _token;
- }
- private ODataTimestamp _queriedDateTime;
-
- @Property(name = "QueriedDateTime", type = "Edm.DateTime", nullable = true)
- public ODataTimestamp getQueriedDateTime() {
- return _queriedDateTime;
- }
-
- public void setQueriedDateTime(final ODataTimestamp _queriedDateTime) {
- this._queriedDateTime = _queriedDateTime;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java
deleted file mode 100644
index 915ceff..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java
+++ /dev/null
@@ -1,109 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.ComplexType;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@ComplexType("ContactDetails")
-public class ContactDetails extends AbstractComplexType {
-
- private Collection<String> _emailBag;
-
- @Property(name = "EmailBag", type = "Collection(Edm.String)", nullable = false)
- public Collection<String> getEmailBag() {
- return _emailBag;
- }
-
- public void setEmailBag(final Collection<String> _emailBag) {
- this._emailBag = _emailBag;
- }
- private Collection<String> _alternativeNames;
-
- @Property(name = "AlternativeNames", type = "Collection(Edm.String)", nullable = false)
- public Collection<String> getAlternativeNames() {
- return _alternativeNames;
- }
-
- public void setAlternativeNames(final Collection<String> _alternativeNames) {
- this._alternativeNames = _alternativeNames;
- }
- private com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Aliases _contactAlias;
-
- @Property(name = "ContactAlias", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases", nullable = true)
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Aliases getContactAlias() {
- return _contactAlias;
- }
-
- public void setContactAlias(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Aliases _contactAlias) {
- this._contactAlias = _contactAlias;
- }
- private com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _homePhone;
-
- @Property(name = "HomePhone", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = true)
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone getHomePhone() {
- return _homePhone;
- }
-
- public void setHomePhone(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _homePhone) {
- this._homePhone = _homePhone;
- }
- private com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _workPhone;
-
- @Property(name = "WorkPhone", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = true)
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone getWorkPhone() {
- return _workPhone;
- }
-
- public void setWorkPhone(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _workPhone) {
- this._workPhone = _workPhone;
- }
- private Collection<com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone> _mobilePhoneBag;
-
- @Property(name = "MobilePhoneBag", type = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)", nullable = false)
- public Collection<com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone> getMobilePhoneBag() {
- return _mobilePhoneBag;
- }
-
- public void setMobilePhoneBag(final Collection<com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone> _mobilePhoneBag) {
- this._mobilePhoneBag = _mobilePhoneBag;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java
deleted file mode 100644
index 9d08e25..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java
+++ /dev/null
@@ -1,163 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "Contractor",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface Contractor extends com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Person {
-
-
-
- @Property(name = "ContratorCompanyId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getContratorCompanyId();
-
- public void setContratorCompanyId(final Integer _contratorCompanyId);
-
-
- @Property(name = "BillingRate",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getBillingRate();
-
- public void setBillingRate(final Integer _billingRate);
-
-
- @Property(name = "TeamContactPersonId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getTeamContactPersonId();
-
- public void setTeamContactPersonId(final Integer _teamContactPersonId);
-
-
- @Property(name = "JobDescription",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getJobDescription();
-
- public void setJobDescription(final String _jobDescription);
-
-
-
-
- @Operation(name = "UpdatePersonInfo" )
- void updatePersonInfo(
- );
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java
deleted file mode 100644
index abb4e80..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface ContractorCollection extends AbstractEntityCollection<Contractor> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java
deleted file mode 100644
index 5c9832f..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java
+++ /dev/null
@@ -1,279 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "Customer",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface Customer extends Serializable {
-
-
-
- @Property(name = "Thumbnail",
- type = "Edm.Stream",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public java.io.InputStream getThumbnail();
-
- public void setThumbnail(final java.io.InputStream _thumbnail);
-
-
- @Property(name = "Video",
- type = "Edm.Stream",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public java.io.InputStream getVideo();
-
- public void setVideo(final java.io.InputStream _video);
-
- @Key
- @Property(name = "CustomerId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getCustomerId();
-
- public void setCustomerId(final Integer _customerId);
-
-
- @Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "SyndicationSummary",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- public String getName();
-
- public void setName(final String _name);
-
-
- @Property(name = "PrimaryContactInfo",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails getPrimaryContactInfo();
-
- public void setPrimaryContactInfo(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails _primaryContactInfo);
-
-
- @Property(name = "BackupContactInfo",
- type = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails> getBackupContactInfo();
-
- public void setBackupContactInfo(final Collection<com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails> _backupContactInfo);
-
-
- @Property(name = "Auditing",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo getAuditing();
-
- public void setAuditing(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo _auditing);
-
-
-
-
- @NavigationProperty(name = "Orders",
- type = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Order)",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Order")
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection getOrders();
-
- public void setOrders(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection _orders);
-
-
- @NavigationProperty(name = "Logins",
- type = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Login)",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Login")
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection getLogins();
-
- public void setLogins(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection _logins);
-
-
- @NavigationProperty(name = "Husband",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Customer")
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer getHusband();
-
- public void setHusband(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer _husband);
-
-
- @NavigationProperty(name = "Wife",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "Customer")
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer getWife();
-
- public void setWife(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer _wife);
-
-
- @NavigationProperty(name = "Info",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "CustomerInfo")
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo getInfo();
-
- public void setInfo(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo _info);
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java
deleted file mode 100644
index eea2ba3..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface CustomerCollection extends AbstractEntityCollection<Customer> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java
deleted file mode 100644
index 52ee0ea..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java
+++ /dev/null
@@ -1,117 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "CustomerInfo",
- openType = false,
- hasStream = true,
- isAbstract = false,
- baseType = "")
-public interface CustomerInfo extends Serializable {
-
-
- @Key
- @Property(name = "CustomerInfoId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getCustomerInfoId();
-
- public void setCustomerInfoId(final Integer _customerInfoId);
-
-
- @Property(name = "Information",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getInformation();
-
- public void setInformation(final String _information);
-
-
-
-
-
- public void setStream(java.io.InputStream stream);
-
- public java.io.InputStream getStream();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java
deleted file mode 100644
index 80b5ead..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface CustomerInfoCollection extends AbstractEntityCollection<CustomerInfo> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java
deleted file mode 100644
index 2de62e8..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java
+++ /dev/null
@@ -1,79 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.ComplexType;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@ComplexType("Dimensions")
-public class Dimensions extends AbstractComplexType {
-
- private BigDecimal _width;
-
- @Property(name = "Width", type = "Edm.Decimal", nullable = false)
- public BigDecimal getWidth() {
- return _width;
- }
-
- public void setWidth(final BigDecimal _width) {
- this._width = _width;
- }
- private BigDecimal _height;
-
- @Property(name = "Height", type = "Edm.Decimal", nullable = false)
- public BigDecimal getHeight() {
- return _height;
- }
-
- public void setHeight(final BigDecimal _height) {
- this._height = _height;
- }
- private BigDecimal _depth;
-
- @Property(name = "Depth", type = "Edm.Decimal", nullable = false)
- public BigDecimal getDepth() {
- return _depth;
- }
-
- public void setDepth(final BigDecimal _depth) {
- this._depth = _depth;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
deleted file mode 100644
index 3387f7f..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
+++ /dev/null
@@ -1,160 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "DiscontinuedProduct",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface DiscontinuedProduct extends com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Product {
-
-
-
- @Property(name = "Discontinued",
- type = "Edm.DateTime",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public ODataTimestamp getDiscontinued();
-
- public void setDiscontinued(final ODataTimestamp _discontinued);
-
-
- @Property(name = "ReplacementProductId",
- type = "Edm.Int32",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getReplacementProductId();
-
- public void setReplacementProductId(final Integer _replacementProductId);
-
-
- @Property(name = "DiscontinuedPhone",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone getDiscontinuedPhone();
-
- public void setDiscontinuedPhone(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _discontinuedPhone);
-
-
- @Property(name = "ChildConcurrencyToken",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.Fixed,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getChildConcurrencyToken();
-
- public void setChildConcurrencyToken(final String _childConcurrencyToken);
-
-
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java
deleted file mode 100644
index 75dbf13..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface DiscontinuedProductCollection extends AbstractEntityCollection<DiscontinuedProduct> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java
deleted file mode 100644
index 8df981e..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java
+++ /dev/null
@@ -1,124 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "Driver",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface Driver extends Serializable {
-
-
- @Key
- @Property(name = "Name",
- type = "Edm.String",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getName();
-
- public void setName(final String _name);
-
-
- @Property(name = "BirthDate",
- type = "Edm.DateTime",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public ODataTimestamp getBirthDate();
-
- public void setBirthDate(final ODataTimestamp _birthDate);
-
-
-
-
- @NavigationProperty(name = "License",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.License",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "License")
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.License getLicense();
-
- public void setLicense(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.License _license);
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java
deleted file mode 100644
index 91301cf..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface DriverCollection extends AbstractEntityCollection<Driver> {
-
-}
[36/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/FunctionImport.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/FunctionImport.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/FunctionImport.java
deleted file mode 100644
index 3584a58..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/FunctionImport.java
+++ /dev/null
@@ -1,87 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractFunctionImport;
-
-public class FunctionImport extends AbstractFunctionImport implements AnnotatedEdm {
-
- private static final long serialVersionUID = 3023813358471000019L;
-
- @JsonProperty(value = "Name", required = true)
- private String name;
-
- @JsonProperty(value = "Function", required = true)
- private String function;
-
- @JsonProperty(value = "EntitySet")
- private String entitySet;
-
- @JsonProperty(value = "IncludeInServiceDocument")
- private boolean includeInServiceDocument = false;
-
- @JsonProperty(value = "Annotation")
- private Annotation annotation;
-
- @Override
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public String getFunction() {
- return function;
- }
-
- public void setFunction(final String function) {
- this.function = function;
- }
-
- @Override
- public String getEntitySet() {
- return entitySet;
- }
-
- public void setEntitySet(final String entitySet) {
- this.entitySet = entitySet;
- }
-
- public boolean isIncludeInServiceDocument() {
- return includeInServiceDocument;
- }
-
- public void setIncludeInServiceDocument(final boolean includeInServiceDocument) {
- this.includeInServiceDocument = includeInServiceDocument;
- }
-
- @Override
- public Annotation getAnnotation() {
- return annotation;
- }
-
- @Override
- public void setAnnotation(final Annotation annotation) {
- this.annotation = annotation;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Include.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Include.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Include.java
deleted file mode 100644
index c7cfabc..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Include.java
+++ /dev/null
@@ -1,50 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdm;
-
-public class Include extends AbstractEdm {
-
- private static final long serialVersionUID = -5600031479702563436L;
-
- @JsonProperty(value = "Namespace", required = true)
- private String namespace;
-
- @JsonProperty(value = "Alias")
- private String alias;
-
- public String getNamespace() {
- return namespace;
- }
-
- public void setNamespace(final String namespace) {
- this.namespace = namespace;
- }
-
- public String getAlias() {
- return alias;
- }
-
- public void setAlias(final String alias) {
- this.alias = alias;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/IncludeAnnotations.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/IncludeAnnotations.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/IncludeAnnotations.java
deleted file mode 100644
index 2ff0fd4..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/IncludeAnnotations.java
+++ /dev/null
@@ -1,61 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdm;
-
-public class IncludeAnnotations extends AbstractEdm {
-
- private static final long serialVersionUID = -5600031479702563436L;
-
- @JsonProperty(value = "TermNamespace", required = true)
- private String termNamespace;
-
- @JsonProperty(value = "Qualifier")
- private String qualifier;
-
- @JsonProperty(value = "TargetNamespace")
- private String targeyNamespace;
-
- public String getTermNamespace() {
- return termNamespace;
- }
-
- public void setTermNamespace(final String termNamespace) {
- this.termNamespace = termNamespace;
- }
-
- public String getQualifier() {
- return qualifier;
- }
-
- public void setQualifier(final String qualifier) {
- this.qualifier = qualifier;
- }
-
- public String getTargeyNamespace() {
- return targeyNamespace;
- }
-
- public void setTargeyNamespace(final String targeyNamespace) {
- this.targeyNamespace = targeyNamespace;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Member.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Member.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Member.java
deleted file mode 100644
index bddb1e1..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Member.java
+++ /dev/null
@@ -1,41 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractMember;
-
-public class Member extends AbstractMember implements AnnotatedEdm {
-
- private static final long serialVersionUID = -344920557183058824L;
-
- @JsonProperty("Annotation")
- private Annotation annotation;
-
- @Override
- public Annotation getAnnotation() {
- return annotation;
- }
-
- @Override
- public void setAnnotation(final Annotation annotation) {
- this.annotation = annotation;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/NavigationProperty.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/NavigationProperty.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/NavigationProperty.java
deleted file mode 100644
index 431a34d..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/NavigationProperty.java
+++ /dev/null
@@ -1,99 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractNavigationProperty;
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonDeserialize(using = NavigationPropertyDeserializer.class)
-public class NavigationProperty extends AbstractNavigationProperty implements AnnotatedEdm {
-
- private static final long serialVersionUID = -2889417442815563307L;
-
- private String type;
-
- private boolean nullable = true;
-
- private String partner;
-
- private boolean containsTarget = false;
-
- private final List<ReferentialConstraint> referentialConstraints = new ArrayList<ReferentialConstraint>();
-
- private OnDelete onDelete;
-
- private Annotation annotation;
-
- public String getType() {
- return type;
- }
-
- public void setType(final String type) {
- this.type = type;
- }
-
- public boolean isNullable() {
- return nullable;
- }
-
- public void setNullable(final boolean nullable) {
- this.nullable = nullable;
- }
-
- public String getPartner() {
- return partner;
- }
-
- public void setPartner(final String partner) {
- this.partner = partner;
- }
-
- public boolean isContainsTarget() {
- return containsTarget;
- }
-
- public void setContainsTarget(final boolean containsTarget) {
- this.containsTarget = containsTarget;
- }
-
- public List<ReferentialConstraint> getReferentialConstraints() {
- return referentialConstraints;
- }
-
- public OnDelete getOnDelete() {
- return onDelete;
- }
-
- public void setOnDelete(final OnDelete onDelete) {
- this.onDelete = onDelete;
- }
-
- @Override
- public Annotation getAnnotation() {
- return annotation;
- }
-
- @Override
- public void setAnnotation(final Annotation annotation) {
- this.annotation = annotation;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/NavigationPropertyBinding.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/NavigationPropertyBinding.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/NavigationPropertyBinding.java
deleted file mode 100644
index 3d23996..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/NavigationPropertyBinding.java
+++ /dev/null
@@ -1,50 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdm;
-
-public class NavigationPropertyBinding extends AbstractEdm {
-
- private static final long serialVersionUID = -6026065326479176817L;
-
- @JsonProperty(value = "Path", required = true)
- private String path;
-
- @JsonProperty(value = "Target", required = true)
- private String target;
-
- public String getPath() {
- return path;
- }
-
- public void setPath(final String path) {
- this.path = path;
- }
-
- public String getTarget() {
- return target;
- }
-
- public void setTarget(final String target) {
- this.target = target;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/NavigationPropertyDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/NavigationPropertyDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/NavigationPropertyDeserializer.java
deleted file mode 100644
index 2486507..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/NavigationPropertyDeserializer.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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-import java.io.IOException;
-import org.apache.commons.lang3.BooleanUtils;
-
-public class NavigationPropertyDeserializer extends AbstractEdmDeserializer<NavigationProperty> {
-
- @Override
- protected NavigationProperty doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final NavigationProperty property = new NavigationProperty();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Name".equals(jp.getCurrentName())) {
- property.setName(jp.nextTextValue());
- } else if ("Type".equals(jp.getCurrentName())) {
- property.setType(jp.nextTextValue());
- } else if ("Nullable".equals(jp.getCurrentName())) {
- property.setNullable(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("Partner".equals(jp.getCurrentName())) {
- property.setPartner(jp.nextTextValue());
- } else if ("ContainsTarget".equals(jp.getCurrentName())) {
- property.setContainsTarget(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("ReferentialConstraint".equals(jp.getCurrentName())) {
- jp.nextToken();
- property.getReferentialConstraints().add(jp.getCodec().readValue(jp, ReferentialConstraint.class));
- } else if ("OnDelete".equals(jp.getCurrentName())) {
- jp.nextToken();
- property.setOnDelete(jp.getCodec().readValue(jp, OnDelete.class));
- } else if ("Annotation".equals(jp.getCurrentName())) {
- jp.nextToken();
- property.setAnnotation(jp.getCodec().readValue(jp, Annotation.class));
- }
- }
- }
-
- return property;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/OnDelete.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/OnDelete.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/OnDelete.java
deleted file mode 100644
index 8db8974..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/OnDelete.java
+++ /dev/null
@@ -1,39 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdm;
-
-public class OnDelete extends AbstractEdm {
-
- private static final long serialVersionUID = -5321523424474336347L;
-
- @JsonProperty(value = "Action", required = true)
- private OnDeleteAction action = OnDeleteAction.None;
-
- public OnDeleteAction getAction() {
- return action;
- }
-
- public void setAction(final OnDeleteAction action) {
- this.action = action;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/OnDeleteAction.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/OnDeleteAction.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/OnDeleteAction.java
deleted file mode 100644
index 3a8a7df..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/OnDeleteAction.java
+++ /dev/null
@@ -1,28 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-public enum OnDeleteAction {
-
- Cascade,
- None,
- SetNull,
- SetDefault;
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Parameter.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Parameter.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Parameter.java
deleted file mode 100644
index ae65093..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Parameter.java
+++ /dev/null
@@ -1,39 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractParameter;
-
-public class Parameter extends AbstractParameter {
-
- private static final long serialVersionUID = -1067642515116697747L;
-
- @JsonProperty(value = "SRID")
- private String srid;
-
- public String getSrid() {
- return srid;
- }
-
- public void setSrid(final String srid) {
- this.srid = srid;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Property.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Property.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Property.java
deleted file mode 100644
index 47bc9d7..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Property.java
+++ /dev/null
@@ -1,40 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractProperty;
-
-public class Property extends AbstractProperty implements AnnotatedEdm {
-
- private static final long serialVersionUID = -5541908235094985412L;
-
- @JsonProperty("Annotation")
- private Annotation annotation;
-
- @Override
- public Annotation getAnnotation() {
- return annotation;
- }
-
- @Override
- public void setAnnotation(final Annotation annotation) {
- this.annotation = annotation;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Reference.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Reference.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Reference.java
deleted file mode 100644
index b71d1ac..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Reference.java
+++ /dev/null
@@ -1,60 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdm;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonDeserialize(using = ReferenceDeserializer.class)
-public class Reference extends AbstractEdm {
-
- private static final long serialVersionUID = -5600031479702563436L;
-
- private URI uri;
-
- private final List<Include> includes = new ArrayList<Include>();
-
- private final List<IncludeAnnotations> includeAnnotations = new ArrayList<IncludeAnnotations>();
-
- private final List<Annotation> annotations = new ArrayList<Annotation>();
-
- public URI getUri() {
- return uri;
- }
-
- public void setUri(final URI uri) {
- this.uri = uri;
- }
-
- public List<Include> getIncludes() {
- return includes;
- }
-
- public List<IncludeAnnotations> getIncludeAnnotations() {
- return includeAnnotations;
- }
-
- public List<Annotation> getAnnotations() {
- return annotations;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ReferenceDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ReferenceDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ReferenceDeserializer.java
deleted file mode 100644
index a214c58..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ReferenceDeserializer.java
+++ /dev/null
@@ -1,58 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-import java.io.IOException;
-import java.net.URI;
-
-public class ReferenceDeserializer extends AbstractEdmDeserializer<Reference> {
-
- @Override
- protected Reference doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final Reference reference = new Reference();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Uri".equals(jp.getCurrentName())) {
- reference.setUri(URI.create(jp.nextTextValue()));
- } else if ("Include".equals(jp.getCurrentName())) {
- jp.nextToken();
- reference.getIncludes().add(jp.getCodec().readValue(jp, Include.class));
- } else if ("IncludeAnnotations".equals(jp.getCurrentName())) {
- jp.nextToken();
- reference.getIncludeAnnotations().add(jp.getCodec().readValue(jp, IncludeAnnotations.class));
- } else if ("Annotation".equals(jp.getCurrentName())) {
- jp.nextToken();
- reference.getAnnotations().add(jp.getCodec().readValue(jp, Annotation.class));
- }
- }
- }
-
- return reference;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ReferentialConstraint.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ReferentialConstraint.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ReferentialConstraint.java
deleted file mode 100644
index 83399b1..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ReferentialConstraint.java
+++ /dev/null
@@ -1,49 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-public class ReferentialConstraint extends AbstractAnnotatedEdm {
-
- private static final long serialVersionUID = -9182114558289778632L;
-
- @JsonProperty(value = "Property", required = true)
- private String property;
-
- @JsonProperty(value = "ReferencedProperty", required = true)
- private String referencedProperty;
-
- public String getProperty() {
- return property;
- }
-
- public void setProperty(final String property) {
- this.property = property;
- }
-
- public String getReferencedProperty() {
- return referencedProperty;
- }
-
- public void setReferencedProperty(final String referencedProperty) {
- this.referencedProperty = referencedProperty;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ReturnType.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ReturnType.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ReturnType.java
deleted file mode 100644
index 867dd3f..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/ReturnType.java
+++ /dev/null
@@ -1,95 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdm;
-import java.math.BigInteger;
-
-public class ReturnType extends AbstractEdm {
-
- private static final long serialVersionUID = -5888231162358116515L;
-
- @JsonProperty(value = "Type")
- private String type;
-
- @JsonProperty(value = "Nullable")
- private boolean nullable = true;
-
- @JsonProperty(value = "MaxLength")
- private String maxLength;
-
- @JsonProperty(value = "Precision")
- private BigInteger precision;
-
- @JsonProperty(value = "Scale")
- private BigInteger scale;
-
- @JsonProperty(value = "SRID")
- private String srid;
-
- public String getType() {
- return type;
- }
-
- public void setType(final String type) {
- this.type = type;
- }
-
- public boolean isNullable() {
- return nullable;
- }
-
- public void setNullable(final boolean nullable) {
- this.nullable = nullable;
- }
-
- public String getMaxLength() {
- return maxLength;
- }
-
- public void setMaxLength(final String maxLength) {
- this.maxLength = maxLength;
- }
-
- public BigInteger getPrecision() {
- return precision;
- }
-
- public void setPrecision(final BigInteger precision) {
- this.precision = precision;
- }
-
- public BigInteger getScale() {
- return scale;
- }
-
- public void setScale(final BigInteger scale) {
- this.scale = scale;
- }
-
- public String getSrid() {
- return srid;
- }
-
- public void setSrid(final String srid) {
- this.srid = srid;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Schema.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Schema.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Schema.java
deleted file mode 100644
index f0d9ac6..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Schema.java
+++ /dev/null
@@ -1,171 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractSchema;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class Schema extends AbstractSchema<EntityContainer, EntityType, ComplexType, FunctionImport>
- implements AnnotatedEdm {
-
- private static final long serialVersionUID = 4453992249818796144L;
-
- private final List<Action> actions = new ArrayList<Action>();
-
- private final List<Annotations> annotationsList = new ArrayList<Annotations>();
-
- private final List<Annotation> annotations = new ArrayList<Annotation>();
-
- private final List<ComplexType> complexTypes = new ArrayList<ComplexType>();
-
- private EntityContainer entityContainer;
-
- private final List<EnumType> enumTypes = new ArrayList<EnumType>();
-
- private final List<EntityType> entityTypes = new ArrayList<EntityType>();
-
- private final List<Function> functions = new ArrayList<Function>();
-
- private final List<Term> terms = new ArrayList<Term>();
-
- private final List<TypeDefinition> typeDefinitions = new ArrayList<TypeDefinition>();
-
- private Annotation annotation;
-
- public List<Action> getActions() {
- return actions;
- }
-
- public List<Action> getActions(final String name) {
- final List<Action> result = new ArrayList<Action>();
- for (Action action : getActions()) {
- if (name.equals(action.getName())) {
- result.add(action);
- }
- }
- return result;
- }
-
- @Override
- public List<Annotations> getAnnotationsList() {
- return annotationsList;
- }
-
- @Override
- public Annotations getAnnotationsList(final String target) {
- Annotations result = null;
- for (Annotations annots : getAnnotationsList()) {
- if (target.equals(annots.getTarget())) {
- result = annots;
- }
- }
- return result;
- }
-
- public List<Annotation> getAnnotations() {
- return annotations;
- }
-
- @Override
- public List<EnumType> getEnumTypes() {
- return enumTypes;
- }
-
- @Override
- public EnumType getEnumType(final String name) {
- EnumType result = null;
- for (EnumType type : getEnumTypes()) {
- if (name.equals(type.getName())) {
- result = type;
- }
- }
- return result;
- }
-
- public List<Function> getFunctions() {
- return functions;
- }
-
- public List<Function> getFunctions(final String name) {
- final List<Function> result = new ArrayList<Function>();
- for (Function function : getFunctions()) {
- if (name.equals(function.getName())) {
- result.add(function);
- }
- }
- return result;
- }
-
- public List<Term> getTerms() {
- return terms;
- }
-
- public List<TypeDefinition> getTypeDefinitions() {
- return typeDefinitions;
- }
-
- public EntityContainer getEntityContainer() {
- return entityContainer;
- }
-
- public void setEntityContainer(final EntityContainer entityContainer) {
- this.entityContainer = entityContainer;
- }
-
- @Override
- public List<EntityContainer> getEntityContainers() {
- return entityContainer == null
- ? Collections.<EntityContainer>emptyList() : Collections.singletonList(entityContainer);
- }
-
- @Override
- public EntityContainer getDefaultEntityContainer() {
- return entityContainer;
- }
-
- @Override
- public EntityContainer getEntityContainer(final String name) {
- if (entityContainer != null && name.equals(entityContainer.getName())) {
- return entityContainer;
- }
- throw new IllegalArgumentException("No EntityContainer found with name " + name);
- }
-
- @Override
- public List<EntityType> getEntityTypes() {
- return entityTypes;
- }
-
- @Override
- public List<ComplexType> getComplexTypes() {
- return complexTypes;
- }
-
- @Override
- public Annotation getAnnotation() {
- return annotation;
- }
-
- @Override
- public void setAnnotation(final Annotation annotation) {
- this.annotation = annotation;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Singleton.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Singleton.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Singleton.java
deleted file mode 100644
index e7536c1..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Singleton.java
+++ /dev/null
@@ -1,57 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonDeserialize(using = SingletonDeserializer.class)
-public class Singleton extends AbstractAnnotatedEdm {
-
- private static final long serialVersionUID = 941802518279658559L;
-
- private String name;
-
- private String type;
-
- private final List<NavigationPropertyBinding> navigationPropertyBindings =
- new ArrayList<NavigationPropertyBinding>();
-
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(final String type) {
- this.type = type;
- }
-
- public List<NavigationPropertyBinding> getNavigationPropertyBindings() {
- return navigationPropertyBindings;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/SingletonDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/SingletonDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/SingletonDeserializer.java
deleted file mode 100644
index 2a726cc..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/SingletonDeserializer.java
+++ /dev/null
@@ -1,57 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import java.io.IOException;
-
-public class SingletonDeserializer extends AbstractEdmDeserializer<Singleton> {
-
- @Override
- protected Singleton doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final Singleton singleton = new Singleton();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Name".equals(jp.getCurrentName())) {
- singleton.setName(jp.nextTextValue());
- } else if ("Type".equals(jp.getCurrentName())) {
- singleton.setType(jp.nextTextValue());
- } else if ("NavigationPropertyBinding".equals(jp.getCurrentName())) {
- jp.nextToken();
- singleton.getNavigationPropertyBindings().add(
- jp.getCodec().readValue(jp, NavigationPropertyBinding.class));
- } else if ("Annotation".equals(jp.getCurrentName())) {
- jp.nextToken();
- singleton.setAnnotation(jp.getCodec().readValue(jp, Annotation.class));
- }
- }
- }
-
- return singleton;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Term.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Term.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Term.java
deleted file mode 100644
index 5b53027..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/Term.java
+++ /dev/null
@@ -1,127 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonDeserialize(using = TermDeserializer.class)
-public class Term extends AbstractAnnotatedEdm {
-
- private static final long serialVersionUID = -5888231162358116515L;
-
- private String name;
-
- private String type;
-
- private String baseTerm;
-
- private String defaultValue;
-
- private boolean nullable = true;
-
- private String maxLength;
-
- private BigInteger precision;
-
- private BigInteger scale;
-
- private String srid;
-
- private final List<CSDLElement> appliesTo = new ArrayList<CSDLElement>();
-
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(final String type) {
- this.type = type;
- }
-
- public String getBaseTerm() {
- return baseTerm;
- }
-
- public void setBaseTerm(final String baseTerm) {
- this.baseTerm = baseTerm;
- }
-
- public String getDefaultValue() {
- return defaultValue;
- }
-
- public void setDefaultValue(final String defaultValue) {
- this.defaultValue = defaultValue;
- }
-
- public boolean isNullable() {
- return nullable;
- }
-
- public void setNullable(final boolean nullable) {
- this.nullable = nullable;
- }
-
- public String getMaxLength() {
- return maxLength;
- }
-
- public void setMaxLength(final String maxLength) {
- this.maxLength = maxLength;
- }
-
- public BigInteger getPrecision() {
- return precision;
- }
-
- public void setPrecision(final BigInteger precision) {
- this.precision = precision;
- }
-
- public BigInteger getScale() {
- return scale;
- }
-
- public void setScale(final BigInteger scale) {
- this.scale = scale;
- }
-
- public String getSrid() {
- return srid;
- }
-
- public void setSrid(final String srid) {
- this.srid = srid;
- }
-
- public List<CSDLElement> getAppliesTo() {
- return appliesTo;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/TermDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/TermDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/TermDeserializer.java
deleted file mode 100644
index 7415e17..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/TermDeserializer.java
+++ /dev/null
@@ -1,74 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import java.io.IOException;
-import java.math.BigInteger;
-import org.apache.commons.lang3.BooleanUtils;
-import org.apache.commons.lang3.StringUtils;
-
-public class TermDeserializer extends AbstractEdmDeserializer<Term> {
-
- @Override
- protected Term doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final Term term = new Term();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Name".equals(jp.getCurrentName())) {
- term.setName(jp.nextTextValue());
- } else if ("Type".equals(jp.getCurrentName())) {
- term.setType(jp.nextTextValue());
- } else if ("BaseTerm".equals(jp.getCurrentName())) {
- term.setBaseTerm(jp.nextTextValue());
- } else if ("DefaultValue".equals(jp.getCurrentName())) {
- term.setDefaultValue(jp.nextTextValue());
- } else if ("Nullable".equals(jp.getCurrentName())) {
- term.setNullable(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("MaxLength".equals(jp.getCurrentName())) {
- term.setMaxLength(jp.nextTextValue());
- } else if ("Precision".equals(jp.getCurrentName())) {
- term.setPrecision(BigInteger.valueOf(jp.nextLongValue(0L)));
- } else if ("Scale".equals(jp.getCurrentName())) {
- term.setScale(BigInteger.valueOf(jp.nextLongValue(0L)));
- } else if ("SRID".equals(jp.getCurrentName())) {
- term.setSrid(jp.nextTextValue());
- } else if ("AppliesTo".equals(jp.getCurrentName())) {
- for (String split : StringUtils.split(jp.nextTextValue())) {
- term.getAppliesTo().add(CSDLElement.valueOf(split));
- }
- } else if ("Annotation".equals(jp.getCurrentName())) {
- jp.nextToken();
- term.setAnnotation(jp.getCodec().readValue(jp, Annotation.class));
- }
- }
- }
-
- return term;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/TypeDefinition.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/TypeDefinition.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/TypeDefinition.java
deleted file mode 100644
index 65c2bd7..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/TypeDefinition.java
+++ /dev/null
@@ -1,106 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdm;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-
-public class TypeDefinition extends AbstractEdm {
-
- private static final long serialVersionUID = -5888231162358116515L;
-
- private String name;
-
- private String underlyingType;
-
- private String maxLength;
-
- private BigInteger precision;
-
- private BigInteger scale;
-
- private boolean unicode = true;
-
- private String srid;
-
- private final List<Annotation> annotations = new ArrayList<Annotation>();
-
- public String getName() {
- return name;
- }
-
- public void setName(final String name) {
- this.name = name;
- }
-
- public String getUnderlyingType() {
- return underlyingType;
- }
-
- public void setUnderlyingType(final String underlyingType) {
- this.underlyingType = underlyingType;
- }
-
- public String getMaxLength() {
- return maxLength;
- }
-
- public void setMaxLength(final String maxLength) {
- this.maxLength = maxLength;
- }
-
- public BigInteger getPrecision() {
- return precision;
- }
-
- public void setPrecision(final BigInteger precision) {
- this.precision = precision;
- }
-
- public BigInteger getScale() {
- return scale;
- }
-
- public void setScale(final BigInteger scale) {
- this.scale = scale;
- }
-
- public boolean isUnicode() {
- return unicode;
- }
-
- public void setUnicode(final boolean unicode) {
- this.unicode = unicode;
- }
-
- public String getSrid() {
- return srid;
- }
-
- public void setSrid(final String srid) {
- this.srid = srid;
- }
-
- public List<Annotation> getAnnotations() {
- return annotations;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/TypeDefinitionDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/TypeDefinitionDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/TypeDefinitionDeserializer.java
deleted file mode 100644
index 00d2a1a..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/TypeDefinitionDeserializer.java
+++ /dev/null
@@ -1,65 +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 com.msopentech.odatajclient.engine.metadata.edm.v4;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-import java.io.IOException;
-import java.math.BigInteger;
-import org.apache.commons.lang3.BooleanUtils;
-
-public class TypeDefinitionDeserializer extends AbstractEdmDeserializer<TypeDefinition> {
-
- @Override
- protected TypeDefinition doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final TypeDefinition typeDefinition = new TypeDefinition();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Name".equals(jp.getCurrentName())) {
- typeDefinition.setName(jp.nextTextValue());
- } else if ("UnderlyingType".equals(jp.getCurrentName())) {
- typeDefinition.setUnderlyingType(jp.nextTextValue());
- } else if ("MaxLength".equals(jp.getCurrentName())) {
- typeDefinition.setMaxLength(jp.nextTextValue());
- } else if ("Unicode".equals(jp.getCurrentName())) {
- typeDefinition.setUnicode(BooleanUtils.toBoolean(jp.nextTextValue()));
- } else if ("Precision".equals(jp.getCurrentName())) {
- typeDefinition.setPrecision(BigInteger.valueOf(jp.nextLongValue(0L)));
- } else if ("Scale".equals(jp.getCurrentName())) {
- typeDefinition.setScale(BigInteger.valueOf(jp.nextLongValue(0L)));
- } else if ("SRID".equals(jp.getCurrentName())) {
- typeDefinition.setSrid(jp.nextTextValue());
- } else if ("Annotation".equals(jp.getCurrentName())) {
- jp.nextToken();
- typeDefinition.getAnnotations().add(jp.getCodec().readValue(jp, Annotation.class));
- }
- }
- }
-
- return typeDefinition;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/AbstractElOrAttrConstruct.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/AbstractElOrAttrConstruct.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/AbstractElOrAttrConstruct.java
deleted file mode 100644
index 56efd17..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/AbstractElOrAttrConstruct.java
+++ /dev/null
@@ -1,37 +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 com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-/**
- * Groups dynamic expressions that may be provided using element notation or attribute notation.
- */
-abstract class AbstractElOrAttrConstruct extends DynExprConstruct {
-
- private static final long serialVersionUID = 5503275111425750339L;
-
- private String value;
-
- public String getValue() {
- return value;
- }
-
- public void setValue(final String value) {
- this.value = value;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/AnnotatedDynExprConstruct.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/AnnotatedDynExprConstruct.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/AnnotatedDynExprConstruct.java
deleted file mode 100644
index c3d53e8..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/AnnotatedDynExprConstruct.java
+++ /dev/null
@@ -1,39 +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 com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-import com.msopentech.odatajclient.engine.metadata.edm.v4.AnnotatedEdm;
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Annotation;
-
-public abstract class AnnotatedDynExprConstruct extends DynExprConstruct implements AnnotatedEdm {
-
- private static final long serialVersionUID = -8117155475397749038L;
-
- private Annotation annotation;
-
- @Override
- public Annotation getAnnotation() {
- return annotation;
- }
-
- @Override
- public void setAnnotation(final Annotation annotation) {
- this.annotation = annotation;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/AnnotationPath.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/AnnotationPath.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/AnnotationPath.java
deleted file mode 100644
index b93e107..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/AnnotationPath.java
+++ /dev/null
@@ -1,25 +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 com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-public class AnnotationPath extends AbstractElOrAttrConstruct {
-
- private static final long serialVersionUID = 6198019768659098819L;
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Apply.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Apply.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Apply.java
deleted file mode 100644
index 72df22b..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Apply.java
+++ /dev/null
@@ -1,52 +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 com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonDeserialize(using = ApplyDeserializer.class)
-public class Apply extends AnnotatedDynExprConstruct {
-
- private static final long serialVersionUID = 6198019768659098819L;
-
- public static final String CANONICAL_FUNCTION_CONCAT = "odata.concat";
-
- public static final String CANONICAL_FUNCTION_FILLURITEMPLATE = "odata.fillUriTemplate";
-
- public static final String CANONICAL_FUNCTION_URIENCODE = "odata.uriEncode";
-
- private String function;
-
- private final List<ExprConstruct> parameters = new ArrayList<ExprConstruct>();
-
- public String getFunction() {
- return function;
- }
-
- public void setFunction(final String function) {
- this.function = function;
- }
-
- public List<ExprConstruct> getParameters() {
- return parameters;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/ApplyDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/ApplyDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/ApplyDeserializer.java
deleted file mode 100644
index 1b00101..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/ApplyDeserializer.java
+++ /dev/null
@@ -1,55 +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 com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Annotation;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-import java.io.IOException;
-
-public class ApplyDeserializer extends AbstractEdmDeserializer<Apply> {
-
- @Override
- protected Apply doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final Apply apply = new Apply();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Function".equals(jp.getCurrentName())) {
- apply.setFunction(jp.nextTextValue());
- } else if ("Annotation".equals(jp.getCurrentName())) {
- apply.setAnnotation(jp.getCodec().readValue(jp, Annotation.class));
- } else if (isAnnotationConstExprConstruct(jp)) {
- apply.getParameters().add(parseAnnotationConstExprConstruct(jp));
- } else {
- apply.getParameters().add(jp.getCodec().readValue(jp, DynExprConstruct.class));
- }
- }
- }
-
- return apply;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Cast.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Cast.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Cast.java
deleted file mode 100644
index 93eaa61..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Cast.java
+++ /dev/null
@@ -1,89 +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 com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.math.BigInteger;
-
-@JsonDeserialize(using = CastDeserializer.class)
-public class Cast extends AnnotatedDynExprConstruct {
-
- private static final long serialVersionUID = -7836626668653004926L;
-
- private String type;
-
- private String maxLength;
-
- private BigInteger precision;
-
- private BigInteger scale;
-
- private String srid;
-
- private DynExprConstruct value;
-
- public String getType() {
- return type;
- }
-
- public void setType(final String type) {
- this.type = type;
- }
-
- public String getMaxLength() {
- return maxLength;
- }
-
- public void setMaxLength(final String maxLength) {
- this.maxLength = maxLength;
- }
-
- public BigInteger getPrecision() {
- return precision;
- }
-
- public void setPrecision(final BigInteger precision) {
- this.precision = precision;
- }
-
- public BigInteger getScale() {
- return scale;
- }
-
- public void setScale(final BigInteger scale) {
- this.scale = scale;
- }
-
- public String getSrid() {
- return srid;
- }
-
- public void setSrid(final String srid) {
- this.srid = srid;
- }
-
- public DynExprConstruct getValue() {
- return value;
- }
-
- public void setValue(final DynExprConstruct value) {
- this.value = value;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/CastDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/CastDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/CastDeserializer.java
deleted file mode 100644
index 36bb14e..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/CastDeserializer.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 com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-import com.msopentech.odatajclient.engine.metadata.edm.v4.Annotation;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-import java.io.IOException;
-import java.math.BigInteger;
-
-public class CastDeserializer extends AbstractEdmDeserializer<Cast> {
-
- @Override
- protected Cast doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final Cast cast = new Cast();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if ("Type".equals(jp.getCurrentName())) {
- cast.setType(jp.nextTextValue());
- } else if ("Annotation".equals(jp.getCurrentName())) {
- cast.setAnnotation(jp.getCodec().readValue(jp, Annotation.class));
- } else if ("MaxLength".equals(jp.getCurrentName())) {
- cast.setMaxLength(jp.nextTextValue());
- } else if ("Precision".equals(jp.getCurrentName())) {
- cast.setPrecision(BigInteger.valueOf(jp.nextLongValue(0L)));
- } else if ("Scale".equals(jp.getCurrentName())) {
- cast.setScale(BigInteger.valueOf(jp.nextLongValue(0L)));
- } else if ("SRID".equals(jp.getCurrentName())) {
- cast.setSrid(jp.nextTextValue());
- } else {
- cast.setValue(jp.getCodec().readValue(jp, DynExprConstruct.class));
- }
- }
- }
-
- return cast;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Collection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Collection.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Collection.java
deleted file mode 100644
index 25f410a..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/Collection.java
+++ /dev/null
@@ -1,36 +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 com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import java.util.ArrayList;
-import java.util.List;
-
-@JsonDeserialize(using = CollectionDeserializer.class)
-public class Collection extends DynExprConstruct {
-
- private static final long serialVersionUID = -4975881520695477686L;
-
- private final List<ExprConstruct> items = new ArrayList<ExprConstruct>();
-
- public List<ExprConstruct> getItems() {
- return items;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/CollectionDeserializer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/CollectionDeserializer.java b/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/CollectionDeserializer.java
deleted file mode 100644
index ba0b35b..0000000
--- a/ODataJClient/engine/src/main/java/com/msopentech/odatajclient/engine/metadata/edm/v4/annotation/CollectionDeserializer.java
+++ /dev/null
@@ -1,50 +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 com.msopentech.odatajclient.engine.metadata.edm.v4.annotation;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.msopentech.odatajclient.engine.metadata.edm.AbstractEdmDeserializer;
-import java.io.IOException;
-
-public class CollectionDeserializer extends AbstractEdmDeserializer<Collection> {
-
- @Override
- protected Collection doDeserialize(final JsonParser jp, final DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- final Collection collection = new Collection();
-
- for (; jp.getCurrentToken() != JsonToken.END_OBJECT; jp.nextToken()) {
- final JsonToken token = jp.getCurrentToken();
- if (token == JsonToken.FIELD_NAME) {
- if (isAnnotationConstExprConstruct(jp)) {
- collection.getItems().add(parseAnnotationConstExprConstruct(jp));
- } else {
- collection.getItems().add(jp.getCodec().readValue(jp, DynExprConstruct.class));
- }
- }
- }
-
- return collection;
- }
-
-}
[14/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/Container.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/Container.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/Container.java
deleted file mode 100644
index 0f46e35..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/Container.java
+++ /dev/null
@@ -1,522 +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 com.msopentech.odatajclient.proxy.api.impl;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.communication.header.ODataHeaderValues;
-import com.msopentech.odatajclient.engine.communication.request.UpdateType;
-import com.msopentech.odatajclient.engine.communication.request.batch.ODataBatchRequest;
-import com.msopentech.odatajclient.engine.communication.request.batch.ODataBatchResponseItem;
-import com.msopentech.odatajclient.engine.communication.request.batch.ODataChangeset;
-import com.msopentech.odatajclient.engine.communication.request.batch.ODataChangesetResponseItem;
-import com.msopentech.odatajclient.engine.communication.request.cud.ODataDeleteRequest;
-import com.msopentech.odatajclient.engine.communication.request.cud.ODataEntityUpdateRequest;
-import com.msopentech.odatajclient.engine.communication.request.streamed.ODataMediaEntityUpdateRequest;
-import com.msopentech.odatajclient.engine.communication.request.streamed.ODataStreamUpdateRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataBatchResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataEntityCreateResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataEntityUpdateResponse;
-import com.msopentech.odatajclient.engine.communication.response.ODataResponse;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.data.ODataLink;
-import com.msopentech.odatajclient.engine.data.ODataLinkType;
-import com.msopentech.odatajclient.engine.format.ODataMediaFormat;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import com.msopentech.odatajclient.engine.utils.URIUtils;
-import com.msopentech.odatajclient.proxy.api.AbstractContainer;
-import com.msopentech.odatajclient.proxy.api.EntityContainerFactory;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.context.AttachedEntity;
-import com.msopentech.odatajclient.proxy.api.context.AttachedEntityStatus;
-import com.msopentech.odatajclient.proxy.api.context.EntityLinkDesc;
-import com.msopentech.odatajclient.proxy.utils.EngineUtils;
-import java.io.InputStream;
-import java.lang.reflect.Proxy;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-class Container implements AbstractContainer {
-
- private static final long serialVersionUID = -3320312269235907501L;
-
- /**
- * Logger.
- */
- private static final Logger LOG = LoggerFactory.getLogger(Container.class);
-
- private final ODataClient client;
-
- private final EntityContainerFactory factory;
-
- Container(final ODataClient client, final EntityContainerFactory factory) {
- this.client = client;
- this.factory = factory;
- }
-
- /**
- * Transactional changes commit.
- */
- @Override
- public void flush() {
- final ODataBatchRequest request = client.getBatchRequestFactory().getBatchRequest(factory.getServiceRoot());
- final ODataBatchRequest.BatchStreamManager streamManager = request.execute();
- final ODataChangeset changeset = streamManager.addChangeset();
-
- final TransactionItems items = new TransactionItems();
- final List<EntityLinkDesc> delayedUpdates = new ArrayList<EntityLinkDesc>();
-
- int pos = 0;
-
- for (AttachedEntity attachedEntity : EntityContainerFactory.getContext().entityContext()) {
- final AttachedEntityStatus status = attachedEntity.getStatus();
- if (((status != AttachedEntityStatus.ATTACHED
- && status != AttachedEntityStatus.LINKED) || attachedEntity.getEntity().isChanged())
- && !items.contains(attachedEntity.getEntity())) {
- pos++;
- pos = processEntityContext(attachedEntity.getEntity(), pos, items, delayedUpdates, changeset);
- }
- }
-
- processDelayedUpdates(delayedUpdates, pos, items, changeset);
-
- final ODataBatchResponse response = streamManager.getResponse();
-
- if (response.getStatusCode() != 202) {
- throw new IllegalStateException("Operation failed");
- }
-
- final Iterator<ODataBatchResponseItem> iter = response.getBody();
-
- if (!items.isEmpty()) {
- if (!iter.hasNext()) {
- throw new IllegalStateException("Unexpected operation result");
- }
-
- final ODataBatchResponseItem item = iter.next();
- if (!(item instanceof ODataChangesetResponseItem)) {
- throw new IllegalStateException("Unexpected batch response item " + item.getClass().getSimpleName());
- }
-
- final ODataChangesetResponseItem chgres = (ODataChangesetResponseItem) item;
-
- for (Integer changesetItemId : items.sortedValues()) {
- LOG.debug("Expected changeset item {}", changesetItemId);
- final ODataResponse res = chgres.next();
- if (res.getStatusCode() >= 400) {
- throw new IllegalStateException("Transaction failed: " + res.getStatusMessage());
- }
-
- final EntityTypeInvocationHandler handler = items.get(changesetItemId);
-
- if (handler != null) {
- if (res instanceof ODataEntityCreateResponse) {
- LOG.debug("Upgrade created object '{}'", handler);
- handler.setEntity(((ODataEntityCreateResponse) res).getBody());
- } else if (res instanceof ODataEntityUpdateResponse) {
- LOG.debug("Upgrade updated object '{}'", handler);
- handler.setEntity(((ODataEntityUpdateResponse) res).getBody());
- }
- }
- }
- }
-
- EntityContainerFactory.getContext().detachAll();
- }
-
- private void batch(
- final EntityTypeInvocationHandler handler, final ODataEntity entity, final ODataChangeset changeset) {
-
- switch (EntityContainerFactory.getContext().entityContext().getStatus(handler)) {
- case NEW:
- batchCreate(handler, entity, changeset);
- break;
-
- case CHANGED:
- batchUpdate(handler, entity, changeset);
- break;
-
- case DELETED:
- batchDelete(handler, entity, changeset);
- break;
-
- default:
- if (handler.isChanged()) {
- batchUpdate(handler, entity, changeset);
- }
- }
- }
-
- private void batchCreate(
- final EntityTypeInvocationHandler handler, final ODataEntity entity, final ODataChangeset changeset) {
-
- LOG.debug("Create '{}'", handler);
-
- final URIBuilder uriBuilder = client.getURIBuilder(factory.getServiceRoot()).
- appendEntitySetSegment(handler.getEntitySetName());
- changeset.addRequest(client.getCUDRequestFactory().getEntityCreateRequest(uriBuilder.build(), entity));
- }
-
- private void batchUpdateMediaEntity(
- final EntityTypeInvocationHandler handler,
- final URI uri,
- final InputStream input,
- final ODataChangeset changeset) {
-
- LOG.debug("Update media entity '{}'", uri);
-
- final ODataMediaEntityUpdateRequest req =
- client.getStreamedRequestFactory().getMediaEntityUpdateRequest(uri, input);
-
- req.setContentType(StringUtils.isBlank(handler.getEntity().getMediaContentType())
- ? ODataMediaFormat.WILDCARD.toString()
- : ODataMediaFormat.fromFormat(handler.getEntity().getMediaContentType()).toString());
-
- if (StringUtils.isNotBlank(handler.getETag())) {
- req.setIfMatch(handler.getETag());
- }
-
- changeset.addRequest(req);
- }
-
- private void batchUpdateMediaResource(
- final EntityTypeInvocationHandler handler,
- final URI uri,
- final InputStream input,
- final ODataChangeset changeset) {
-
- LOG.debug("Update media entity '{}'", uri);
-
- final ODataStreamUpdateRequest req = client.getStreamedRequestFactory().getStreamUpdateRequest(uri, input);
-
- if (StringUtils.isNotBlank(handler.getETag())) {
- req.setIfMatch(handler.getETag());
- }
-
- changeset.addRequest(req);
- }
-
- private void batchUpdate(
- final EntityTypeInvocationHandler handler,
- final ODataEntity changes,
- final ODataChangeset changeset) {
-
- LOG.debug("Update '{}'", changes.getEditLink());
-
- final ODataEntityUpdateRequest req =
- client.getCUDRequestFactory().getEntityUpdateRequest(UpdateType.PATCH, changes);
- req.setPrefer(ODataHeaderValues.preferReturnContent);
-
- if (StringUtils.isNotBlank(handler.getETag())) {
- req.setIfMatch(handler.getETag());
- }
-
- changeset.addRequest(req);
- }
-
- private void batchUpdate(
- final EntityTypeInvocationHandler handler,
- final URI uri,
- final ODataEntity changes,
- final ODataChangeset changeset) {
-
- LOG.debug("Update '{}'", uri);
-
- final ODataEntityUpdateRequest req =
- client.getCUDRequestFactory().getEntityUpdateRequest(uri, UpdateType.PATCH, changes);
- req.setPrefer(ODataHeaderValues.preferReturnContent);
-
- if (StringUtils.isNotBlank(handler.getETag())) {
- req.setIfMatch(handler.getETag());
- }
-
- changeset.addRequest(req);
- }
-
- private void batchDelete(
- final EntityTypeInvocationHandler handler, final ODataEntity entity, final ODataChangeset changeset) {
-
- LOG.debug("Delete '{}'", entity.getEditLink());
-
- final ODataDeleteRequest req = client.getCUDRequestFactory().getDeleteRequest(URIUtils.getURI(
- factory.getServiceRoot(), entity.getEditLink().toASCIIString()));
-
- if (StringUtils.isNotBlank(handler.getETag())) {
- req.setIfMatch(handler.getETag());
- }
-
- changeset.addRequest(req);
- }
-
- private int processEntityContext(
- final EntityTypeInvocationHandler handler,
- int pos,
- final TransactionItems items,
- final List<EntityLinkDesc> delayedUpdates,
- final ODataChangeset changeset) {
-
- LOG.debug("Process '{}'", handler);
-
- items.put(handler, null);
-
- final ODataEntity entity = handler.getEntity();
- entity.getNavigationLinks().clear();
-
- final AttachedEntityStatus currentStatus = EntityContainerFactory.getContext().entityContext().
- getStatus(handler);
-
- if (AttachedEntityStatus.DELETED != currentStatus) {
- entity.getProperties().clear();
- EngineUtils.addProperties(client, factory.getMetadata(), handler.getPropertyChanges(), entity);
- }
-
- for (Map.Entry<NavigationProperty, Object> property : handler.getLinkChanges().entrySet()) {
- final ODataLinkType type = Collection.class.isAssignableFrom(property.getValue().getClass())
- ? ODataLinkType.ENTITY_SET_NAVIGATION
- : ODataLinkType.ENTITY_NAVIGATION;
-
- final Set<EntityTypeInvocationHandler> toBeLinked = new HashSet<EntityTypeInvocationHandler>();
- final String serviceRoot = factory.getServiceRoot();
-
- for (Object proxy : type == ODataLinkType.ENTITY_SET_NAVIGATION
- ? (Collection) property.getValue() : Collections.singleton(property.getValue())) {
-
- final EntityTypeInvocationHandler target =
- (EntityTypeInvocationHandler) Proxy.getInvocationHandler(proxy);
-
- final AttachedEntityStatus status =
- EntityContainerFactory.getContext().entityContext().getStatus(target);
-
- final URI editLink = target.getEntity().getEditLink();
-
- if ((status == AttachedEntityStatus.ATTACHED || status == AttachedEntityStatus.LINKED)
- && !target.isChanged()) {
- entity.addLink(buildNavigationLink(
- property.getKey().name(),
- URIUtils.getURI(serviceRoot, editLink.toASCIIString()), type));
- } else {
- if (!items.contains(target)) {
- pos = processEntityContext(target, pos, items, delayedUpdates, changeset);
- pos++;
- }
-
- final Integer targetPos = items.get(target);
- if (targetPos == null) {
- // schedule update for the current object
- LOG.debug("Schedule '{}' from '{}' to '{}'", type.name(), handler, target);
- toBeLinked.add(target);
- } else if (status == AttachedEntityStatus.CHANGED) {
- entity.addLink(buildNavigationLink(
- property.getKey().name(),
- URIUtils.getURI(serviceRoot, editLink.toASCIIString()), type));
- } else {
- // create the link for the current object
- LOG.debug("'{}' from '{}' to (${}) '{}'", type.name(), handler, targetPos, target);
-
- entity.addLink(
- buildNavigationLink(property.getKey().name(), URI.create("$" + targetPos), type));
- }
- }
- }
-
- if (!toBeLinked.isEmpty()) {
- delayedUpdates.add(new EntityLinkDesc(property.getKey().name(), handler, toBeLinked, type));
- }
- }
-
- // insert into the batch
- LOG.debug("{}: Insert '{}' into the batch", pos, handler);
- batch(handler, entity, changeset);
-
- items.put(handler, pos);
-
- int startingPos = pos;
-
- if (handler.getEntity().isMediaEntity()) {
-
- // update media properties
- if (!handler.getPropertyChanges().isEmpty()) {
- final URI targetURI = currentStatus == AttachedEntityStatus.NEW
- ? URI.create("$" + startingPos)
- : URIUtils.getURI(factory.getServiceRoot(), handler.getEntity().getEditLink().toASCIIString());
- batchUpdate(handler, targetURI, entity, changeset);
- pos++;
- items.put(handler, pos);
- }
-
- // update media content
- if (handler.getStreamChanges() != null) {
- final URI targetURI = currentStatus == AttachedEntityStatus.NEW
- ? URI.create("$" + startingPos + "/$value")
- : URIUtils.getURI(
- factory.getServiceRoot(), handler.getEntity().getEditLink().toASCIIString() + "/$value");
-
- batchUpdateMediaEntity(handler, targetURI, handler.getStreamChanges(), changeset);
-
- // update media info (use null key)
- pos++;
- items.put(null, pos);
- }
- }
-
- for (Map.Entry<String, InputStream> streamedChanges : handler.getStreamedPropertyChanges().entrySet()) {
- final URI targetURI = currentStatus == AttachedEntityStatus.NEW
- ? URI.create("$" + startingPos) : URIUtils.getURI(
- factory.getServiceRoot(),
- EngineUtils.getEditMediaLink(streamedChanges.getKey(), entity).toASCIIString());
-
- batchUpdateMediaResource(handler, targetURI, streamedChanges.getValue(), changeset);
-
- // update media info (use null key)
- pos++;
- items.put(handler, pos);
- }
-
- return pos;
- }
-
- private ODataLink buildNavigationLink(final String name, final URI uri, final ODataLinkType type) {
- switch (type) {
- case ENTITY_NAVIGATION:
- return client.getObjectFactory().newEntityNavigationLink(name, uri);
-
- case ENTITY_SET_NAVIGATION:
- return client.getObjectFactory().newFeedNavigationLink(name, uri);
-
- default:
- throw new IllegalArgumentException("Invalid link type " + type.name());
- }
- }
-
- private void processDelayedUpdates(
- final List<EntityLinkDesc> delayedUpdates,
- int pos,
- final TransactionItems items,
- final ODataChangeset changeset) {
-
- for (EntityLinkDesc delayedUpdate : delayedUpdates) {
- pos++;
- items.put(delayedUpdate.getSource(), pos);
-
- final ODataEntity changes = client.getObjectFactory().newEntity(delayedUpdate.getSource().getEntity().
- getName());
-
- AttachedEntityStatus status =
- EntityContainerFactory.getContext().entityContext().getStatus(delayedUpdate.getSource());
-
- final URI sourceURI;
- if (status == AttachedEntityStatus.CHANGED) {
- sourceURI = URIUtils.getURI(
- factory.getServiceRoot(),
- delayedUpdate.getSource().getEntity().getEditLink().toASCIIString());
- } else {
- int sourcePos = items.get(delayedUpdate.getSource());
- sourceURI = URI.create("$" + sourcePos);
- }
-
- for (EntityTypeInvocationHandler target : delayedUpdate.getTargets()) {
- status = EntityContainerFactory.getContext().entityContext().getStatus(target);
-
- final URI targetURI;
- if (status == AttachedEntityStatus.CHANGED) {
- targetURI = URIUtils.getURI(
- factory.getServiceRoot(), target.getEntity().getEditLink().toASCIIString());
- } else {
- int targetPos = items.get(target);
- targetURI = URI.create("$" + targetPos);
- }
-
- changes.addLink(delayedUpdate.getType() == ODataLinkType.ENTITY_NAVIGATION
- ? client.getObjectFactory().newEntityNavigationLink(delayedUpdate.getSourceName(), targetURI)
- : client.getObjectFactory().newFeedNavigationLink(delayedUpdate.getSourceName(), targetURI));
-
- LOG.debug("'{}' from {} to {}", new Object[] {
- delayedUpdate.getType().name(), sourceURI, targetURI });
- }
-
- batchUpdate(delayedUpdate.getSource(), sourceURI, changes, changeset);
- }
- }
-
- private class TransactionItems {
-
- private final List<EntityTypeInvocationHandler> keys = new ArrayList<EntityTypeInvocationHandler>();
-
- private final List<Integer> values = new ArrayList<Integer>();
-
- public EntityTypeInvocationHandler get(final Integer value) {
- if (value != null && values.contains(value)) {
- return keys.get(values.indexOf(value));
- } else {
- return null;
- }
- }
-
- public Integer get(final EntityTypeInvocationHandler key) {
- if (key != null && keys.contains(key)) {
- return values.get(keys.indexOf(key));
- } else {
- return null;
- }
- }
-
- public void remove(final EntityTypeInvocationHandler key) {
- if (keys.contains(key)) {
- values.remove(keys.indexOf(key));
- keys.remove(key);
- }
- }
-
- public void put(final EntityTypeInvocationHandler key, final Integer value) {
- // replace just in case of null current value; otherwise add the new entry
- if (key != null && keys.contains(key) && values.get(keys.indexOf(key)) == null) {
- remove(key);
- }
- keys.add(key);
- values.add(value);
- }
-
- public List<Integer> sortedValues() {
- final List<Integer> sortedValues = new ArrayList<Integer>(values);
- Collections.<Integer>sort(sortedValues);
- return sortedValues;
- }
-
- public boolean contains(final EntityTypeInvocationHandler key) {
- return keys.contains(key);
- }
-
- public int size() {
- return keys.size();
- }
-
- public boolean isEmpty() {
- return keys.isEmpty();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/EntityCollectionInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/EntityCollectionInvocationHandler.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/EntityCollectionInvocationHandler.java
deleted file mode 100644
index 7f43d4d..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/EntityCollectionInvocationHandler.java
+++ /dev/null
@@ -1,152 +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 com.msopentech.odatajclient.proxy.api.impl;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.utils.ClassUtils;
-import java.io.Serializable;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.net.URI;
-import java.util.Collection;
-import java.util.Iterator;
-import org.apache.commons.lang3.ArrayUtils;
-
-public class EntityCollectionInvocationHandler<T extends Serializable>
- extends AbstractInvocationHandler implements AbstractEntityCollection<T> {
-
- private static final long serialVersionUID = 98078202642671726L;
-
- private final Collection<T> items;
-
- private final Class<?> itemRef;
-
- private final String entityContainerName;
-
- private final URI uri;
-
- public EntityCollectionInvocationHandler(final EntityContainerInvocationHandler containerHandler,
- final Collection<T> items, final Class<?> itemRef, final String entityContainerName) {
-
- this(containerHandler, items, itemRef, entityContainerName, null);
- }
-
- public EntityCollectionInvocationHandler(final EntityContainerInvocationHandler containerHandler,
- final Collection<T> items, final Class<?> itemRef, final String entityContainerName, final URI uri) {
-
- super(containerHandler.getClient(), containerHandler);
-
- this.items = items;
- this.itemRef = itemRef;
- this.entityContainerName = entityContainerName;
- this.uri = uri;
- }
-
- @Override
- public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable {
- final Annotation[] methodAnnots = method.getAnnotations();
-
- if (isSelfMethod(method, args)) {
- return invokeSelfMethod(method, args);
- } else if (!ArrayUtils.isEmpty(methodAnnots) && methodAnnots[0] instanceof Operation) {
- if (this.uri == null) {
- throw new IllegalStateException("This entity collection has not yet been flushed");
- }
-
- final com.msopentech.odatajclient.engine.metadata.edm.v3.EntityContainer container =
- containerHandler.getFactory().getMetadata().getSchema(ClassUtils.getNamespace(itemRef)).
- getEntityContainer(entityContainerName);
- final com.msopentech.odatajclient.engine.metadata.edm.v3.FunctionImport funcImp =
- container.getFunctionImport(((Operation) methodAnnots[0]).name());
-
- return functionImport((Operation) methodAnnots[0], method, args,
- client.getURIBuilder(this.uri.toASCIIString()).
- appendFunctionImportSegment(((Operation) methodAnnots[0]).name()).build(),
- funcImp);
- } else {
- throw new UnsupportedOperationException("Method not found: " + method);
- }
- }
-
- @Override
- public int size() {
- return items.size();
- }
-
- @Override
- public boolean isEmpty() {
- return items.isEmpty();
- }
-
- @Override
- public boolean contains(final Object object) {
- return items.contains(object);
- }
-
- @Override
- public Iterator<T> iterator() {
- return items.iterator();
- }
-
- @Override
- public Object[] toArray() {
- return items.toArray();
- }
-
- @Override
- public <T> T[] toArray(final T[] array) {
- return items.toArray(array);
- }
-
- @Override
- public boolean add(final T element) {
- return items.add(element);
- }
-
- @Override
- public boolean remove(final Object object) {
- return items.remove(object);
- }
-
- @Override
- public boolean containsAll(final Collection<?> collection) {
- return items.containsAll(collection);
- }
-
- @Override
- public boolean addAll(final Collection<? extends T> collection) {
- return items.addAll(collection);
- }
-
- @Override
- public boolean removeAll(final Collection<?> collection) {
- return items.removeAll(collection);
- }
-
- @Override
- public boolean retainAll(final Collection<?> collection) {
- return items.retainAll(collection);
- }
-
- @Override
- public void clear() {
- items.clear();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/EntityContainerInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/EntityContainerInvocationHandler.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/EntityContainerInvocationHandler.java
deleted file mode 100644
index 01896b5..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/EntityContainerInvocationHandler.java
+++ /dev/null
@@ -1,120 +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 com.msopentech.odatajclient.proxy.api.impl;
-
-import com.msopentech.odatajclient.engine.client.ODataV3Client;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import com.msopentech.odatajclient.engine.utils.URIUtils;
-import com.msopentech.odatajclient.proxy.api.EntityContainerFactory;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityContainer;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.utils.ClassUtils;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import org.apache.commons.lang3.ArrayUtils;
-
-public class EntityContainerInvocationHandler extends AbstractInvocationHandler {
-
- private static final long serialVersionUID = 7379006755693410764L;
-
- private final EntityContainerFactory factory;
-
- protected final String schemaName;
-
- private final String entityContainerName;
-
- private final boolean defaultEC;
-
- public static EntityContainerInvocationHandler getInstance(
- final ODataV3Client client, final Class<?> ref, final EntityContainerFactory factory) {
-
- final EntityContainerInvocationHandler instance = new EntityContainerInvocationHandler(client, ref, factory);
- instance.containerHandler = instance;
- return instance;
- }
-
- private EntityContainerInvocationHandler(
- final ODataV3Client client, final Class<?> ref, final EntityContainerFactory factory) {
-
- super(client, null);
-
- final Annotation annotation = ref.getAnnotation(EntityContainer.class);
- if (!(annotation instanceof EntityContainer)) {
- throw new IllegalArgumentException(ref.getName()
- + " is not annotated as @" + EntityContainer.class.getSimpleName());
- }
-
- this.factory = factory;
- this.entityContainerName = ((EntityContainer) annotation).name();
- this.defaultEC = ((EntityContainer) annotation).isDefaultEntityContainer();
- this.schemaName = ClassUtils.getNamespace(ref);
- }
-
- EntityContainerFactory getFactory() {
- return factory;
- }
-
- boolean isDefaultEntityContainer() {
- return defaultEC;
- }
-
- String getEntityContainerName() {
- return entityContainerName;
- }
-
- String getSchemaName() {
- return schemaName;
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable {
- if (isSelfMethod(method, args)) {
- return invokeSelfMethod(method, args);
- } else if ("flush".equals(method.getName()) && ArrayUtils.isEmpty(args)) {
- new Container(client, factory).flush();
- return ClassUtils.returnVoid();
- } else {
- final Annotation[] methodAnnots = method.getAnnotations();
- // 1. access top-level entity sets
- if (methodAnnots.length == 0) {
- final Class<?> returnType = method.getReturnType();
-
- return Proxy.newProxyInstance(
- Thread.currentThread().getContextClassLoader(),
- new Class<?>[] { returnType },
- EntitySetInvocationHandler.getInstance(returnType, this));
- } // 2. invoke function imports
- else if (methodAnnots[0] instanceof Operation) {
- final com.msopentech.odatajclient.engine.metadata.edm.v3.EntityContainer container =
- getFactory().getMetadata().getSchema(schemaName).getEntityContainer(entityContainerName);
- final com.msopentech.odatajclient.engine.metadata.edm.v3.FunctionImport funcImp =
- container.getFunctionImport(((Operation) methodAnnots[0]).name());
-
- final URIBuilder uriBuilder = client.getURIBuilder(factory.getServiceRoot()).
- appendFunctionImportSegment(URIUtils.rootFunctionImportURISegment(container, funcImp));
-
- return functionImport((Operation) methodAnnots[0], method, args, uriBuilder.build(), funcImp);
- } else {
- throw new UnsupportedOperationException("Method not found: " + method);
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/EntitySetInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/EntitySetInvocationHandler.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/EntitySetInvocationHandler.java
deleted file mode 100644
index b8bb0a1..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/EntitySetInvocationHandler.java
+++ /dev/null
@@ -1,396 +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 com.msopentech.odatajclient.proxy.api.impl;
-
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataValueRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.data.ODataEntitySet;
-import com.msopentech.odatajclient.engine.format.ODataValueFormat;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.AbstractEntitySet;
-import com.msopentech.odatajclient.proxy.api.EntityContainerFactory;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKey;
-import com.msopentech.odatajclient.proxy.api.annotations.CompoundKeyElement;
-import com.msopentech.odatajclient.proxy.api.annotations.EntitySet;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.context.AttachedEntityStatus;
-import com.msopentech.odatajclient.proxy.api.context.EntityContext;
-import com.msopentech.odatajclient.proxy.api.context.EntityUUID;
-import com.msopentech.odatajclient.proxy.api.Query;
-import com.msopentech.odatajclient.proxy.utils.ClassUtils;
-import java.io.Serializable;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Proxy;
-import java.lang.reflect.Type;
-import java.net.URI;
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-import org.apache.commons.lang3.ArrayUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-class EntitySetInvocationHandler<
- T extends Serializable, KEY extends Serializable, EC extends AbstractEntityCollection<T>>
- extends AbstractInvocationHandler
- implements AbstractEntitySet<T, KEY, EC> {
-
- private static final long serialVersionUID = 2629912294765040027L;
-
- /**
- * Logger.
- */
- private static final Logger LOG = LoggerFactory.getLogger(EntitySetInvocationHandler.class);
-
- private final Class<T> typeRef;
-
- private final Class<EC> collTypeRef;
-
- private final String entitySetName;
-
- private final URI uri;
-
- @SuppressWarnings({ "rawtypes", "unchecked" })
- static EntitySetInvocationHandler getInstance(
- final Class<?> ref, final EntityContainerInvocationHandler containerHandler) {
-
- return new EntitySetInvocationHandler(ref, containerHandler);
- }
-
- @SuppressWarnings("unchecked")
- private EntitySetInvocationHandler(
- final Class<?> ref,
- final EntityContainerInvocationHandler containerHandler) {
-
- super(containerHandler.getClient(), containerHandler);
-
- final Annotation annotation = ref.getAnnotation(EntitySet.class);
- if (!(annotation instanceof EntitySet)) {
- throw new IllegalArgumentException("Return type " + ref.getName()
- + " is not annotated as @" + EntitySet.class.getSimpleName());
- }
-
- this.entitySetName = ((EntitySet) annotation).name();
-
- final Type[] abstractEntitySetParams =
- ((ParameterizedType) ref.getGenericInterfaces()[0]).getActualTypeArguments();
-
- this.typeRef = (Class<T>) abstractEntitySetParams[0];
- if (typeRef.getAnnotation(EntityType.class) == null) {
- throw new IllegalArgumentException("Invalid entity '" + typeRef.getSimpleName() + "'");
- }
- this.collTypeRef = (Class<EC>) abstractEntitySetParams[2];
-
- final URIBuilder uriBuilder = client.getURIBuilder(containerHandler.getFactory().getServiceRoot());
-
- if (!containerHandler.isDefaultEntityContainer()) {
- uriBuilder.appendStructuralSegment(containerHandler.getEntityContainerName()).appendStructuralSegment(".");
- }
-
- uriBuilder.appendEntitySetSegment(entitySetName);
- this.uri = uriBuilder.build();
- }
-
- Class<T> getTypeRef() {
- return typeRef;
- }
-
- Class<EC> getCollTypeRef() {
- return collTypeRef;
- }
-
- String getEntitySetName() {
- return entitySetName;
- }
-
- URI getUri() {
- return uri;
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable {
- if (isSelfMethod(method, args)) {
- return invokeSelfMethod(method, args);
- } else if (method.getName().startsWith("new") && ArrayUtils.isEmpty(args)) {
- if (method.getName().endsWith("Collection")) {
- return newEntityCollection(method.getReturnType());
- } else {
- return newEntity(method.getReturnType());
- }
- } else {
- throw new UnsupportedOperationException("Method not found: " + method);
- }
- }
-
- @SuppressWarnings("unchecked")
- private <NE> NE newEntity(final Class<NE> reference) {
- final ODataEntity entity = client.getObjectFactory().newEntity(
- containerHandler.getSchemaName() + "." + ClassUtils.getEntityTypeName(reference));
-
- final EntityTypeInvocationHandler handler = EntityTypeInvocationHandler.getInstance(
- entity, containerHandler.getEntityContainerName(), entitySetName, reference, containerHandler);
- EntityContainerFactory.getContext().entityContext().attachNew(handler);
-
- return (NE) Proxy.newProxyInstance(
- Thread.currentThread().getContextClassLoader(),
- new Class<?>[] { reference },
- handler);
- }
-
- @SuppressWarnings("unchecked")
- private <NEC> NEC newEntityCollection(final Class<NEC> reference) {
- return (NEC) Proxy.newProxyInstance(
- Thread.currentThread().getContextClassLoader(),
- new Class<?>[] { reference },
- new EntityCollectionInvocationHandler<T>(
- containerHandler, new ArrayList<T>(), typeRef, containerHandler.getEntityContainerName()));
- }
-
- @Override
- public Long count() {
- final ODataValueRequest req = client.getRetrieveRequestFactory().
- getValueRequest(client.getURIBuilder(this.uri.toASCIIString()).appendCountSegment().build());
- req.setFormat(ODataValueFormat.TEXT);
- return Long.valueOf(req.execute().getBody().asPrimitive().toString());
- }
-
- @Override
- public Boolean exists(final KEY key) throws IllegalArgumentException {
- boolean result = false;
-
- try {
- result = get(key) != null;
- } catch (Exception e) {
- LOG.error("Could not check existence of {}({})", this.entitySetName, key, e);
- }
-
- return result;
- }
-
- private LinkedHashMap<String, Object> getCompoundKey(final Object key) {
- final Set<CompoundKeyElementWrapper> elements = new TreeSet<CompoundKeyElementWrapper>();
-
- for (Method method : key.getClass().getMethods()) {
- final Annotation annotation = method.getAnnotation(CompoundKeyElement.class);
- if (annotation instanceof CompoundKeyElement) {
- elements.add(new CompoundKeyElementWrapper(
- ((CompoundKeyElement) annotation).name(), method, ((CompoundKeyElement) annotation).position()));
- }
- }
-
- final LinkedHashMap<String, Object> map = new LinkedHashMap<String, Object>();
-
- for (CompoundKeyElementWrapper element : elements) {
- try {
- map.put(element.getName(), element.getMethod().invoke(key));
- } catch (Exception e) {
- LOG.warn("Error retrieving compound key element '{}' value", element.getName(), e);
- }
- }
-
- return map;
- }
-
- @Override
- public T get(KEY key) throws IllegalArgumentException {
- return get(key, typeRef);
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public <S extends T> S get(final KEY key, final Class<S> typeRef) throws IllegalArgumentException {
- if (key == null) {
- throw new IllegalArgumentException("Null key");
- }
-
- final EntityUUID uuid = new EntityUUID(
- ClassUtils.getNamespace(typeRef),
- containerHandler.getEntityContainerName(),
- entitySetName,
- ClassUtils.getNamespace(typeRef) + "." + ClassUtils.getEntityTypeName(typeRef),
- key);
-
- LOG.debug("Ask for '{}({})'", typeRef.getSimpleName(), key);
-
- EntityTypeInvocationHandler handler =
- EntityContainerFactory.getContext().entityContext().getEntity(uuid);
-
- if (handler == null) {
- // not yet attached: search against the service
- try {
- LOG.debug("Search for '{}({})' into the service", typeRef.getSimpleName(), key);
- final URIBuilder uriBuilder = client.getURIBuilder(this.uri.toASCIIString());
-
- if (key.getClass().getAnnotation(CompoundKey.class) == null) {
- LOG.debug("Append key segment '{}'", key);
- uriBuilder.appendKeySegment(key);
- } else {
- LOG.debug("Append compound key segment '{}'", key);
- uriBuilder.appendKeySegment(getCompoundKey(key));
- }
-
- LOG.debug("Execute query '{}'", uriBuilder.toString());
-
- final ODataRetrieveResponse<ODataEntity> res =
- client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build()).execute();
-
- handler = EntityTypeInvocationHandler.getInstance(res.getBody(), this, typeRef);
- handler.setETag(res.getEtag());
- } catch (Exception e) {
- LOG.info("Entity '" + uuid + "' not found", e);
- }
- } else if (isDeleted(handler)) {
- // object deleted
- LOG.debug("Object '{}({})' has been delete", typeRef.getSimpleName(), uuid);
- handler = null;
- }
-
- return handler == null ? null : (S) Proxy.newProxyInstance(
- Thread.currentThread().getContextClassLoader(),
- new Class<?>[] { typeRef },
- handler);
- }
-
- @SuppressWarnings("unchecked")
- public <S extends T> Map.Entry<List<S>, URI> fetchPartialEntitySet(final URI uri, final Class<S> typeRef) {
- final ODataRetrieveResponse<ODataEntitySet> res =
- client.getRetrieveRequestFactory().getEntitySetRequest(uri).execute();
-
- final ODataEntitySet entitySet = res.getBody();
-
- final List<S> items = new ArrayList<S>(entitySet.getEntities().size());
- for (ODataEntity entity : entitySet.getEntities()) {
- final EntityTypeInvocationHandler handler = EntityTypeInvocationHandler.getInstance(entity, this, typeRef);
-
- final EntityTypeInvocationHandler handlerInTheContext =
- EntityContainerFactory.getContext().entityContext().getEntity(handler.getUUID());
-
- items.add((S) Proxy.newProxyInstance(
- Thread.currentThread().getContextClassLoader(),
- new Class<?>[] { typeRef },
- handlerInTheContext == null ? handler : handlerInTheContext));
- }
-
- return new AbstractMap.SimpleEntry<List<S>, URI>(items, entitySet.getNext());
- }
-
- @SuppressWarnings("unchecked")
- public <S extends T, SEC extends AbstractEntityCollection<S>> SEC fetchWholeEntitySet(
- final URI entitySetURI, final Class<S> typeRef, final Class<SEC> collTypeRef) {
-
- final List<S> items = new ArrayList<S>();
-
- URI nextURI = entitySetURI;
- while (nextURI != null) {
- final Map.Entry<List<S>, URI> entitySet = fetchPartialEntitySet(nextURI, typeRef);
- nextURI = entitySet.getValue();
- items.addAll(entitySet.getKey());
- }
-
- return (SEC) Proxy.newProxyInstance(
- Thread.currentThread().getContextClassLoader(),
- new Class<?>[] { collTypeRef },
- new EntityCollectionInvocationHandler<S>(
- containerHandler, items, typeRef, containerHandler.getEntityContainerName(), entitySetURI));
- }
-
- @Override
- public EC getAll() {
- return getAll(collTypeRef);
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public <S extends T, SEC extends AbstractEntityCollection<S>> SEC getAll(final Class<SEC> collTypeRef) {
- final Class<S> typeRef = (Class<S>) ClassUtils.extractTypeArg(collTypeRef);
-
- final URI entitySetURI = client.getURIBuilder(this.uri.toASCIIString()).appendStructuralSegment(
- ClassUtils.getNamespace(typeRef) + "." + ClassUtils.getEntityTypeName(typeRef)).build();
-
- return fetchWholeEntitySet(entitySetURI, typeRef, collTypeRef);
- }
-
- @Override
- public Query<T, EC> createQuery() {
- return new QueryImpl<T, EC>(this.client, this.collTypeRef, this.uri, this);
- }
-
- @Override
- public <S extends T, SEC extends AbstractEntityCollection<S>> Query<S, SEC> createQuery(
- final Class<SEC> reference) {
-
- return new QueryImpl<S, SEC>(this.client, reference, this.uri, this);
- }
-
- @Override
- public void delete(final KEY key) throws IllegalArgumentException {
- final EntityContext entityContext = EntityContainerFactory.getContext().entityContext();
-
- EntityTypeInvocationHandler entity = entityContext.getEntity(new EntityUUID(
- ClassUtils.getNamespace(typeRef),
- containerHandler.getEntityContainerName(),
- entitySetName,
- ClassUtils.getNamespace(typeRef) + "." + ClassUtils.getEntityTypeName(typeRef),
- key));
-
- if (entity == null) {
- // search for entity
- final T searched = get(key);
- entity = (EntityTypeInvocationHandler) Proxy.getInvocationHandler(searched);
- entityContext.attach(entity, AttachedEntityStatus.DELETED);
- } else {
- entityContext.setStatus(entity, AttachedEntityStatus.DELETED);
- }
- }
-
- @Override
- public <S extends T> void delete(final Iterable<S> entities) {
- final EntityContext entityContext = EntityContainerFactory.getContext().entityContext();
-
- for (T en : entities) {
- final EntityTypeInvocationHandler entity = (EntityTypeInvocationHandler) Proxy.getInvocationHandler(en);
- if (entityContext.isAttached(entity)) {
- entityContext.setStatus(entity, AttachedEntityStatus.DELETED);
- } else {
- entityContext.attach(entity, AttachedEntityStatus.DELETED);
- }
- }
- }
-
- private boolean isDeleted(final EntityTypeInvocationHandler handler) {
- return EntityContainerFactory.getContext().entityContext().getStatus(handler) == AttachedEntityStatus.DELETED;
- }
-
- @Override
- public EntitySetIterator<T, KEY, EC> iterator() {
- return new EntitySetIterator<T, KEY, EC>(
- client.getURIBuilder(this.uri.toASCIIString()).appendStructuralSegment(
- ClassUtils.getNamespace(typeRef) + "." + ClassUtils.getEntityTypeName(typeRef)).build(),
- this);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/EntitySetIterator.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/EntitySetIterator.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/EntitySetIterator.java
deleted file mode 100644
index 121d1ff..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/EntitySetIterator.java
+++ /dev/null
@@ -1,85 +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 com.msopentech.odatajclient.proxy.api.impl;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import java.io.Serializable;
-import java.net.URI;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-
-class EntitySetIterator<T extends Serializable, KEY extends Serializable, EC extends AbstractEntityCollection<T>>
- implements Iterator<T> {
-
- private final EntitySetInvocationHandler<T, KEY, EC> esi;
-
- private URI next;
-
- private Iterator<T> current;
-
- EntitySetIterator(final URI uri, EntitySetInvocationHandler<T, KEY, EC> esi) {
- this.esi = esi;
- this.next = uri;
- this.current = Collections.<T>emptyList().iterator();
- }
-
- @Override
- public boolean hasNext() {
- boolean res = false;
- if (this.current.hasNext()) {
- res = true;
- } else if (this.next == null) {
- res = false;
- } else {
- goon();
- res = current.hasNext();
- }
- return res;
- }
-
- @Override
- public T next() {
- T res;
- try {
- res = this.current.next();
- } catch (NoSuchElementException e) {
- if (this.next == null) {
- throw e;
- }
- goon();
- res = next();
- }
-
- return res;
- }
-
- @Override
- public void remove() {
- this.current.remove();
- }
-
- private void goon() {
- final Map.Entry<List<T>, URI> entitySet = esi.fetchPartialEntitySet(this.next, this.esi.getTypeRef());
- this.next = entitySet.getValue();
- this.current = entitySet.getKey().iterator();
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/EntityTypeInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/EntityTypeInvocationHandler.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/EntityTypeInvocationHandler.java
deleted file mode 100644
index 33ff4bb..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/EntityTypeInvocationHandler.java
+++ /dev/null
@@ -1,578 +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 com.msopentech.odatajclient.proxy.api.impl;
-
-import com.msopentech.odatajclient.engine.communication.request.retrieve.ODataMediaRequest;
-import com.msopentech.odatajclient.engine.communication.response.ODataRetrieveResponse;
-import com.msopentech.odatajclient.engine.data.ODataEntity;
-import com.msopentech.odatajclient.engine.data.ODataInlineEntity;
-import com.msopentech.odatajclient.engine.data.ODataInlineEntitySet;
-import com.msopentech.odatajclient.engine.data.ODataLink;
-import com.msopentech.odatajclient.engine.data.ODataOperation;
-import com.msopentech.odatajclient.engine.data.ODataProperty;
-import com.msopentech.odatajclient.engine.format.ODataMediaFormat;
-import com.msopentech.odatajclient.engine.utils.URIUtils;
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.context.AttachedEntityStatus;
-import com.msopentech.odatajclient.proxy.api.EntityContainerFactory;
-import com.msopentech.odatajclient.proxy.api.context.EntityContext;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.context.EntityUUID;
-import com.msopentech.odatajclient.proxy.utils.ClassUtils;
-import com.msopentech.odatajclient.proxy.utils.EngineUtils;
-import java.io.InputStream;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Proxy;
-import java.lang.reflect.Type;
-import java.net.URI;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.StringUtils;
-
-public class EntityTypeInvocationHandler extends AbstractInvocationHandler {
-
- private static final long serialVersionUID = 2629912294765040037L;
-
- private final String entityContainerName;
-
- private ODataEntity entity;
-
- private final Class<?> typeRef;
-
- private Map<String, Object> propertyChanges = new HashMap<String, Object>();
-
- private Map<String, InputStream> streamedPropertyChanges = new HashMap<String, InputStream>();
-
- private Map<NavigationProperty, Object> linkChanges = new HashMap<NavigationProperty, Object>();
-
- private InputStream stream;
-
- private EntityUUID uuid;
-
- private final EntityContext entityContext = EntityContainerFactory.getContext().entityContext();
-
- private int propertiesTag;
-
- private int linksTag;
-
- static EntityTypeInvocationHandler getInstance(
- final ODataEntity entity,
- final EntitySetInvocationHandler<?, ?, ?> entitySet,
- final Class<?> typeRef) {
-
- return getInstance(
- entity,
- entitySet.containerHandler.getEntityContainerName(),
- entitySet.getEntitySetName(),
- typeRef,
- entitySet.containerHandler);
- }
-
- static EntityTypeInvocationHandler getInstance(
- final ODataEntity entity,
- final String entityContainerName,
- final String entitySetName,
- final Class<?> typeRef,
- final EntityContainerInvocationHandler containerHandler) {
-
- return new EntityTypeInvocationHandler(entity, entityContainerName, entitySetName, typeRef, containerHandler);
- }
-
- private EntityTypeInvocationHandler(
- final ODataEntity entity,
- final String entityContainerName,
- final String entitySetName,
- final Class<?> typeRef,
- final EntityContainerInvocationHandler containerHandler) {
-
- super(containerHandler.getClient(), containerHandler);
- this.entityContainerName = entityContainerName;
- this.typeRef = typeRef;
-
- this.entity = entity;
- this.entity.setMediaEntity(typeRef.getAnnotation(EntityType.class).hasStream());
-
- this.uuid = new EntityUUID(
- ClassUtils.getNamespace(typeRef),
- entityContainerName,
- entitySetName,
- entity.getName(),
- EngineUtils.getKey(containerHandler.getFactory().getMetadata(), typeRef, entity));
-
- this.stream = null;
- this.propertiesTag = 0;
- this.linksTag = 0;
- }
-
- public void setEntity(final ODataEntity entity) {
- this.entity = entity;
- this.entity.setMediaEntity(typeRef.getAnnotation(EntityType.class).hasStream());
-
- this.uuid = new EntityUUID(
- getUUID().getSchemaName(),
- getUUID().getContainerName(),
- getUUID().getEntitySetName(),
- getUUID().getName(),
- EngineUtils.getKey(containerHandler.getFactory().getMetadata(), typeRef, entity));
-
- this.propertyChanges.clear();
- this.linkChanges.clear();
- this.streamedPropertyChanges.clear();
- this.propertiesTag = 0;
- this.linksTag = 0;
- this.stream = null;
- }
-
- public EntityUUID getUUID() {
- return uuid;
- }
-
- public String getName() {
- return this.entity.getName();
- }
-
- public String getEntityContainerName() {
- return uuid.getContainerName();
- }
-
- public String getEntitySetName() {
- return uuid.getEntitySetName();
- }
-
- public Class<?> getTypeRef() {
- return typeRef;
- }
-
- public ODataEntity getEntity() {
- return entity;
- }
-
- public Map<String, Object> getPropertyChanges() {
- return propertyChanges;
- }
-
- public Map<NavigationProperty, Object> getLinkChanges() {
- return linkChanges;
- }
-
- /**
- * Gets the current ETag defined into the wrapped entity.
- *
- * @return
- */
- public String getETag() {
- return this.entity.getETag();
- }
-
- /**
- * Overrides ETag value defined into the wrapped entity.
- *
- * @param eTag ETag.
- */
- public void setETag(final String eTag) {
- this.entity.setETag(eTag);
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable {
- final Annotation[] methodAnnots = method.getAnnotations();
-
- if (isSelfMethod(method, args)) {
- return invokeSelfMethod(method, args);
- } else if (!ArrayUtils.isEmpty(methodAnnots) && methodAnnots[0] instanceof Operation) {
- final ODataOperation operation = this.entity.getOperation(((Operation) methodAnnots[0]).name());
- if (operation == null) {
- throw new IllegalArgumentException(
- "Could not find any FunctionImport named " + ((Operation) methodAnnots[0]).name());
- }
-
- final com.msopentech.odatajclient.engine.metadata.edm.v3.EntityContainer container =
- containerHandler.getFactory().getMetadata().getSchema(ClassUtils.getNamespace(typeRef)).
- getEntityContainer(entityContainerName);
- final com.msopentech.odatajclient.engine.metadata.edm.v3.FunctionImport funcImp =
- container.getFunctionImport(((Operation) methodAnnots[0]).name());
-
- return functionImport((Operation) methodAnnots[0], method, args,
- operation.getTarget(), funcImp);
- } // Assumption: for each getter will always exist a setter and viceversa.
- else if (method.getName().startsWith("get")) {
- // get method annotation and check if it exists as expected
- final Object res;
-
- final Method getter = typeRef.getMethod(method.getName());
-
- final Property property = ClassUtils.getAnnotation(Property.class, getter);
- if (property == null) {
- final NavigationProperty navProp = ClassUtils.getAnnotation(NavigationProperty.class, getter);
- if (navProp == null) {
- throw new UnsupportedOperationException("Unsupported method " + method.getName());
- } else {
- // if the getter refers to a navigation property ... navigate and follow link if necessary
- res = getNavigationPropertyValue(navProp, getter);
- }
- } else {
- // if the getter refers to a property .... get property from wrapped entity
- res = getPropertyValue(property, getter.getGenericReturnType());
- }
-
- // attach the current handler
- attach();
-
- return res;
- } else if (method.getName().startsWith("set")) {
- // get the corresponding getter method (see assumption above)
- final String getterName = method.getName().replaceFirst("set", "get");
- final Method getter = typeRef.getMethod(getterName);
-
- final Property property = ClassUtils.getAnnotation(Property.class, getter);
- if (property == null) {
- final NavigationProperty navProp = ClassUtils.getAnnotation(NavigationProperty.class, getter);
- if (navProp == null) {
- throw new UnsupportedOperationException("Unsupported method " + method.getName());
- } else {
- // if the getter refers to a navigation property ...
- if (ArrayUtils.isEmpty(args) || args.length != 1) {
- throw new IllegalArgumentException("Invalid argument");
- }
-
- setNavigationPropertyValue(navProp, args[0]);
- }
- } else {
- setPropertyValue(property, args[0]);
- }
-
- return ClassUtils.returnVoid();
- } else {
- throw new UnsupportedOperationException("Method not found: " + method);
- }
- }
-
- private Object getNavigationPropertyValue(final NavigationProperty property, final Method getter) {
- final Class<?> type = getter.getReturnType();
- final Class<?> collItemType;
- if (AbstractEntityCollection.class.isAssignableFrom(type)) {
- final Type[] entityCollectionParams =
- ((ParameterizedType) type.getGenericInterfaces()[0]).getActualTypeArguments();
- collItemType = (Class<?>) entityCollectionParams[0];
- } else {
- collItemType = type;
- }
-
- final Object navPropValue;
-
- if (linkChanges.containsKey(property)) {
- navPropValue = linkChanges.get(property);
- } else {
- final ODataLink link = EngineUtils.getNavigationLink(property.name(), entity);
- if (link instanceof ODataInlineEntity) {
- // return entity
- navPropValue = getEntityProxy(
- ((ODataInlineEntity) link).getEntity(),
- property.targetContainer(),
- property.targetEntitySet(),
- type,
- false);
- } else if (link instanceof ODataInlineEntitySet) {
- // return entity set
- navPropValue = getEntityCollection(
- collItemType,
- type,
- property.targetContainer(),
- ((ODataInlineEntitySet) link).getEntitySet(),
- link.getLink(),
- false);
- } else {
- // navigate
- final URI uri = URIUtils.getURI(
- containerHandler.getFactory().getServiceRoot(), link.getLink().toASCIIString());
-
- if (AbstractEntityCollection.class.isAssignableFrom(type)) {
- navPropValue = getEntityCollection(
- collItemType,
- type,
- property.targetContainer(),
- client.getRetrieveRequestFactory().getEntitySetRequest(uri).execute().getBody(),
- uri,
- true);
- } else {
- final ODataRetrieveResponse<ODataEntity> res =
- client.getRetrieveRequestFactory().getEntityRequest(uri).execute();
-
- navPropValue = getEntityProxy(
- res.getBody(),
- property.targetContainer(),
- property.targetEntitySet(),
- type,
- res.getEtag(),
- true);
- }
- }
-
- if (navPropValue != null) {
- int checkpoint = linkChanges.hashCode();
- linkChanges.put(property, navPropValue);
- updateLinksTag(checkpoint);
- }
- }
-
- return navPropValue;
- }
-
- private Object getPropertyValue(final String name, final Type type) {
- try {
- final Object res;
-
- if (propertyChanges.containsKey(name)) {
- res = propertyChanges.get(name);
- } else {
-
- res = type == null
- ? EngineUtils.getValueFromProperty(
- containerHandler.getFactory().getMetadata(), entity.getProperty(name))
- : EngineUtils.getValueFromProperty(
- containerHandler.getFactory().getMetadata(), entity.getProperty(name), type);
-
- if (res != null) {
- int checkpoint = propertyChanges.hashCode();
- propertyChanges.put(name, res);
- updatePropertiesTag(checkpoint);
- }
- }
-
- return res;
- } catch (Exception e) {
- throw new IllegalArgumentException("Error getting value for property '" + name + "'", e);
- }
- }
-
- private Object getPropertyValue(final Property property, final Type type) {
- if (!(type instanceof ParameterizedType) && (Class<?>) type == InputStream.class) {
- return getStreamedProperty(property);
- } else {
- return getPropertyValue(property.name(), type);
- }
- }
-
- public Object getAdditionalProperty(final String name) {
- return getPropertyValue(name, null);
- }
-
- public Collection<String> getAdditionalPropertyNames() {
- final Set<String> res = new HashSet<String>(propertyChanges.keySet());
- final Set<String> propertyNames = new HashSet<String>();
- for (Method method : typeRef.getMethods()) {
- final Annotation ann = method.getAnnotation(Property.class);
- if (ann != null) {
- final String property = ((Property) ann).name();
- propertyNames.add(property);
-
- // maybe someone could add a normal attribute to the additional set
- res.remove(property);
- }
- }
-
- for (ODataProperty property : entity.getProperties()) {
- if (!propertyNames.contains(property.getName())) {
- res.add(property.getName());
- }
- }
-
- return res;
- }
-
- private void setNavigationPropertyValue(final NavigationProperty property, final Object value) {
- // 1) attach source entity
- attach(AttachedEntityStatus.CHANGED, false);
-
- // 2) attach the target entity handlers
- for (Object link : AbstractEntityCollection.class.isAssignableFrom(value.getClass())
- ? (AbstractEntityCollection) value : Collections.singleton(value)) {
-
- final InvocationHandler etih = Proxy.getInvocationHandler(link);
- if (!(etih instanceof EntityTypeInvocationHandler)) {
- throw new IllegalArgumentException("Invalid argument type");
- }
-
- final EntityTypeInvocationHandler handler = (EntityTypeInvocationHandler) etih;
- if (!handler.getTypeRef().isAnnotationPresent(EntityType.class)) {
- throw new IllegalArgumentException(
- "Invalid argument type " + handler.getTypeRef().getSimpleName());
- }
-
- if (!entityContext.isAttached(handler)) {
- entityContext.attach(handler, AttachedEntityStatus.LINKED);
- }
- }
-
- // 3) add links
- linkChanges.put(property, value);
- }
-
- private void setPropertyValue(final Property property, final Object value) {
- if (property.type().equalsIgnoreCase("Edm.Stream")) {
- setStreamedProperty(property, (InputStream) value);
- } else {
- propertyChanges.put(property.name(), value);
- }
-
- attach(AttachedEntityStatus.CHANGED);
- }
-
- public void addAdditionalProperty(final String name, final Object value) {
- propertyChanges.put(name, value);
- attach(AttachedEntityStatus.CHANGED);
- }
-
- private void updatePropertiesTag(final int checkpoint) {
- if (checkpoint == propertiesTag) {
- propertiesTag = propertyChanges.hashCode();
- }
- }
-
- private void updateLinksTag(final int checkpoint) {
- if (checkpoint == linksTag) {
- linksTag = linkChanges.hashCode();
- }
- }
-
- public boolean isChanged() {
- return this.linkChanges.hashCode() != this.linksTag
- || this.propertyChanges.hashCode() != this.propertiesTag
- || this.stream != null
- || !this.streamedPropertyChanges.isEmpty();
- }
-
- public void setStream(final InputStream stream) {
- if (typeRef.getAnnotation(EntityType.class).hasStream()) {
- IOUtils.closeQuietly(this.stream);
- this.stream = stream;
- attach(AttachedEntityStatus.CHANGED);
- }
- }
-
- public InputStream getStreamChanges() {
- return this.stream;
- }
-
- public Map<String, InputStream> getStreamedPropertyChanges() {
- return streamedPropertyChanges;
- }
-
- public InputStream getStream() {
-
- final String contentSource = entity.getMediaContentSource();
-
- if (this.stream == null
- && typeRef.getAnnotation(EntityType.class).hasStream()
- && StringUtils.isNotBlank(contentSource)) {
-
- final String comntentType =
- StringUtils.isBlank(entity.getMediaContentType()) ? "*/*" : entity.getMediaContentType();
-
- final URI contentSourceURI = URIUtils.getURI(containerHandler.getFactory().getServiceRoot(), contentSource);
-
- final ODataMediaRequest retrieveReq = client.getRetrieveRequestFactory().getMediaRequest(contentSourceURI);
- retrieveReq.setFormat(ODataMediaFormat.fromFormat(comntentType));
-
- this.stream = retrieveReq.execute().getBody();
- }
-
- return this.stream;
- }
-
- public Object getStreamedProperty(final Property property) {
-
- InputStream res = streamedPropertyChanges.get(property.name());
-
- try {
- if (res == null) {
- final URI link = URIUtils.getURI(
- containerHandler.getFactory().getServiceRoot(),
- EngineUtils.getEditMediaLink(property.name(), this.entity).toASCIIString());
-
- final ODataMediaRequest req = client.getRetrieveRequestFactory().getMediaRequest(link);
- res = req.execute().getBody();
-
- }
- } catch (Exception e) {
- res = null;
- }
-
- return res;
-
- }
-
- private void setStreamedProperty(final Property property, final InputStream input) {
- final Object obj = propertyChanges.get(property.name());
- if (obj != null && obj instanceof InputStream) {
- IOUtils.closeQuietly((InputStream) obj);
- }
-
- streamedPropertyChanges.put(property.name(), input);
- }
-
- private void attach() {
- if (!entityContext.isAttached(this)) {
- entityContext.attach(this, AttachedEntityStatus.ATTACHED);
- }
- }
-
- private void attach(final AttachedEntityStatus status) {
- attach(status, true);
- }
-
- private void attach(final AttachedEntityStatus status, final boolean override) {
- if (entityContext.isAttached(this)) {
- if (override) {
- entityContext.setStatus(this, status);
- }
- } else {
- entityContext.attach(this, status);
- }
- }
-
- @Override
- public String toString() {
- return uuid.toString();
- }
-
- @Override
- public int hashCode() {
- return uuid.hashCode();
- }
-
- @Override
- public boolean equals(final Object obj) {
- return obj instanceof EntityTypeInvocationHandler
- && ((EntityTypeInvocationHandler) obj).getUUID().equals(uuid);
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/QueryImpl.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/QueryImpl.java b/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/QueryImpl.java
deleted file mode 100644
index ad2ee28..0000000
--- a/ODataJClient/proxy/src/main/java/com/msopentech/odatajclient/proxy/api/impl/QueryImpl.java
+++ /dev/null
@@ -1,171 +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 com.msopentech.odatajclient.proxy.api.impl;
-
-import com.msopentech.odatajclient.engine.client.ODataClient;
-import com.msopentech.odatajclient.engine.uri.URIBuilder;
-import com.msopentech.odatajclient.engine.uri.filter.ODataFilter;
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.NoResultException;
-import com.msopentech.odatajclient.proxy.api.NonUniqueResultException;
-import com.msopentech.odatajclient.proxy.api.Query;
-import com.msopentech.odatajclient.proxy.api.Sort;
-import com.msopentech.odatajclient.proxy.utils.ClassUtils;
-import java.io.Serializable;
-import java.net.URI;
-import org.apache.commons.lang3.StringUtils;
-
-public class QueryImpl<T extends Serializable, EC extends AbstractEntityCollection<T>> implements Query<T, EC> {
-
- private static final long serialVersionUID = -300830736753191114L;
-
- private final ODataClient client;
-
- private final Class<T> typeRef;
-
- private final Class<EC> collTypeRef;
-
- private final EntitySetInvocationHandler handler;
-
- private final URI baseURI;
-
- private String filter;
-
- private String orderBy;
-
- private Integer maxResults;
-
- private Integer firstResult;
-
- @SuppressWarnings("unchecked")
- QueryImpl(final ODataClient client,
- final Class<EC> collTypeRef, final URI baseURI, final EntitySetInvocationHandler handler) {
-
- this.client = client;
- this.typeRef = (Class<T>) ClassUtils.extractTypeArg(collTypeRef);
- this.collTypeRef = collTypeRef;
- this.baseURI = baseURI;
- this.handler = handler;
- }
-
- @Override
- public Query<T, EC> setFilter(final String filter) {
- this.filter = filter;
- return this;
- }
-
- @Override
- public Query<T, EC> setFilter(final ODataFilter filter) {
- this.filter = filter.build();
- return this;
- }
-
- @Override
- public String getFilter() {
- return filter;
- }
-
- @Override
- public Query<T, EC> setOrderBy(final Sort... sort) {
- final StringBuilder builder = new StringBuilder();
- for (Sort sortClause : sort) {
- builder.append(sortClause.getKey()).append(' ').append(sortClause.getValue()).append(',');
- }
- builder.deleteCharAt(builder.length() - 1);
-
- this.orderBy = builder.toString();
- return this;
- }
-
- @Override
- public Query<T, EC> setOrderBy(final String orderBy) {
- this.orderBy = orderBy;
- return this;
- }
-
- @Override
- public String getOrderBy() {
- return orderBy;
- }
-
- @Override
- public Query<T, EC> setMaxResults(final int maxResults) throws IllegalArgumentException {
- if (maxResults <= 0) {
- throw new IllegalArgumentException("maxResults must be positive");
- }
-
- this.maxResults = maxResults;
- return this;
- }
-
- @Override
- public int getMaxResults() {
- return maxResults;
- }
-
- @Override
- public Query<T, EC> setFirstResult(final int firstResult) throws IllegalArgumentException {
- if (firstResult <= 0) {
- throw new IllegalArgumentException("firstResult must be positive");
- }
-
- this.firstResult = firstResult;
- return this;
- }
-
- @Override
- public int getFirstResult() {
- return firstResult;
- }
-
- @Override
- public T getSingleResult() throws NoResultException, NonUniqueResultException {
- final EC result = getResult();
- if (result.isEmpty()) {
- throw new NoResultException();
- }
- if (result.size() > 1) {
- throw new NonUniqueResultException();
- }
-
- return result.iterator().next();
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public EC getResult() {
- final URIBuilder uriBuilder = client.getURIBuilder(this.baseURI.toASCIIString()).
- appendStructuralSegment(ClassUtils.getNamespace(typeRef) + "." + ClassUtils.getEntityTypeName(typeRef));
-
- if (StringUtils.isNotBlank(filter)) {
- uriBuilder.filter(filter);
- }
- if (StringUtils.isNotBlank(orderBy)) {
- uriBuilder.orderBy(orderBy);
- }
- if (maxResults != null) {
- uriBuilder.top(maxResults);
- }
- if (firstResult != null) {
- uriBuilder.skip(firstResult);
- }
-
- return (EC) handler.fetchWholeEntitySet(uriBuilder.build(), typeRef, collTypeRef);
- }
-}
[10/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
deleted file mode 100644
index 878389b..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
+++ /dev/null
@@ -1,206 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "AllSpatialCollectionTypes_Simple",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface AllSpatialCollectionTypes_Simple extends com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes {
-
-
-
- @Property(name = "ManyGeogPoint",
- type = "Collection(Edm.GeographyPoint)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<Point> getManyGeogPoint();
-
- public void setManyGeogPoint(final Collection<Point> _manyGeogPoint);
-
-
- @Property(name = "ManyGeogLine",
- type = "Collection(Edm.GeographyLineString)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<LineString> getManyGeogLine();
-
- public void setManyGeogLine(final Collection<LineString> _manyGeogLine);
-
-
- @Property(name = "ManyGeogPolygon",
- type = "Collection(Edm.GeographyPolygon)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<Polygon> getManyGeogPolygon();
-
- public void setManyGeogPolygon(final Collection<Polygon> _manyGeogPolygon);
-
-
- @Property(name = "ManyGeomPoint",
- type = "Collection(Edm.GeometryPoint)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<Point> getManyGeomPoint();
-
- public void setManyGeomPoint(final Collection<Point> _manyGeomPoint);
-
-
- @Property(name = "ManyGeomLine",
- type = "Collection(Edm.GeometryLineString)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<LineString> getManyGeomLine();
-
- public void setManyGeomLine(final Collection<LineString> _manyGeomLine);
-
-
- @Property(name = "ManyGeomPolygon",
- type = "Collection(Edm.GeometryPolygon)",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Collection<Polygon> getManyGeomPolygon();
-
- public void setManyGeomPolygon(final Collection<Polygon> _manyGeomPolygon);
-
-
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java
deleted file mode 100644
index a2d0751..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface AllSpatialCollectionTypes_SimpleCollection extends AbstractEntityCollection<AllSpatialCollectionTypes_Simple> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java
deleted file mode 100644
index e9bc599..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java
+++ /dev/null
@@ -1,459 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "AllSpatialTypes",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface AllSpatialTypes extends Serializable {
-
-
- @Key
- @Property(name = "Id",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getId();
-
- public void setId(final Integer _id);
-
-
- @Property(name = "Geog",
- type = "Edm.Geography",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Geospatial getGeog();
-
- public void setGeog(final Geospatial _geog);
-
-
- @Property(name = "GeogPoint",
- type = "Edm.GeographyPoint",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Point getGeogPoint();
-
- public void setGeogPoint(final Point _geogPoint);
-
-
- @Property(name = "GeogLine",
- type = "Edm.GeographyLineString",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public LineString getGeogLine();
-
- public void setGeogLine(final LineString _geogLine);
-
-
- @Property(name = "GeogPolygon",
- type = "Edm.GeographyPolygon",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Polygon getGeogPolygon();
-
- public void setGeogPolygon(final Polygon _geogPolygon);
-
-
- @Property(name = "GeogCollection",
- type = "Edm.GeographyCollection",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public GeospatialCollection getGeogCollection();
-
- public void setGeogCollection(final GeospatialCollection _geogCollection);
-
-
- @Property(name = "GeogMultiPoint",
- type = "Edm.GeographyMultiPoint",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public MultiPoint getGeogMultiPoint();
-
- public void setGeogMultiPoint(final MultiPoint _geogMultiPoint);
-
-
- @Property(name = "GeogMultiLine",
- type = "Edm.GeographyMultiLineString",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public MultiLineString getGeogMultiLine();
-
- public void setGeogMultiLine(final MultiLineString _geogMultiLine);
-
-
- @Property(name = "GeogMultiPolygon",
- type = "Edm.GeographyMultiPolygon",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public MultiPolygon getGeogMultiPolygon();
-
- public void setGeogMultiPolygon(final MultiPolygon _geogMultiPolygon);
-
-
- @Property(name = "Geom",
- type = "Edm.Geometry",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Geospatial getGeom();
-
- public void setGeom(final Geospatial _geom);
-
-
- @Property(name = "GeomPoint",
- type = "Edm.GeometryPoint",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Point getGeomPoint();
-
- public void setGeomPoint(final Point _geomPoint);
-
-
- @Property(name = "GeomLine",
- type = "Edm.GeometryLineString",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public LineString getGeomLine();
-
- public void setGeomLine(final LineString _geomLine);
-
-
- @Property(name = "GeomPolygon",
- type = "Edm.GeometryPolygon",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Polygon getGeomPolygon();
-
- public void setGeomPolygon(final Polygon _geomPolygon);
-
-
- @Property(name = "GeomCollection",
- type = "Edm.GeometryCollection",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public GeospatialCollection getGeomCollection();
-
- public void setGeomCollection(final GeospatialCollection _geomCollection);
-
-
- @Property(name = "GeomMultiPoint",
- type = "Edm.GeometryMultiPoint",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public MultiPoint getGeomMultiPoint();
-
- public void setGeomMultiPoint(final MultiPoint _geomMultiPoint);
-
-
- @Property(name = "GeomMultiLine",
- type = "Edm.GeometryMultiLineString",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public MultiLineString getGeomMultiLine();
-
- public void setGeomMultiLine(final MultiLineString _geomMultiLine);
-
-
- @Property(name = "GeomMultiPolygon",
- type = "Edm.GeometryMultiPolygon",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public MultiPolygon getGeomMultiPolygon();
-
- public void setGeomMultiPolygon(final MultiPolygon _geomMultiPolygon);
-
-
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java
deleted file mode 100644
index 0d2abcf..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface AllSpatialTypesCollection extends AbstractEntityCollection<AllSpatialTypes> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java
deleted file mode 100644
index b402571..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java
+++ /dev/null
@@ -1,79 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.ComplexType;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@ComplexType("AuditInfo")
-public class AuditInfo extends AbstractComplexType {
-
- private ODataTimestamp _modifiedDate;
-
- @Property(name = "ModifiedDate", type = "Edm.DateTime", nullable = false)
- public ODataTimestamp getModifiedDate() {
- return _modifiedDate;
- }
-
- public void setModifiedDate(final ODataTimestamp _modifiedDate) {
- this._modifiedDate = _modifiedDate;
- }
- private String _modifiedBy;
-
- @Property(name = "ModifiedBy", type = "Edm.String", nullable = true)
- public String getModifiedBy() {
- return _modifiedBy;
- }
-
- public void setModifiedBy(final String _modifiedBy) {
- this._modifiedBy = _modifiedBy;
- }
- private com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _concurrency;
-
- @Property(name = "Concurrency", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo", nullable = true)
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo getConcurrency() {
- return _concurrency;
- }
-
- public void setConcurrency(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _concurrency) {
- this._concurrency = _concurrency;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
deleted file mode 100644
index 924681e..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
+++ /dev/null
@@ -1,68 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-@KeyRef(OrderLineKey.class)
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "BackOrderLine",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface BackOrderLine extends com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine {
-
-
-
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
deleted file mode 100644
index da6074f..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
+++ /dev/null
@@ -1,68 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-@KeyRef(OrderLineKey.class)
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "BackOrderLine2",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface BackOrderLine2 extends com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine {
-
-
-
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java
deleted file mode 100644
index f526bfe..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface BackOrderLine2Collection extends AbstractEntityCollection<BackOrderLine2> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java
deleted file mode 100644
index aaa6617..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface BackOrderLineCollection extends AbstractEntityCollection<BackOrderLine> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java
deleted file mode 100644
index 9616970..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java
+++ /dev/null
@@ -1,163 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "Car",
- openType = false,
- hasStream = true,
- isAbstract = false,
- baseType = "")
-public interface Car extends Serializable {
-
-
-
- @Property(name = "Photo",
- type = "Edm.Stream",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public java.io.InputStream getPhoto();
-
- public void setPhoto(final java.io.InputStream _photo);
-
-
- @Property(name = "Video",
- type = "Edm.Stream",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public java.io.InputStream getVideo();
-
- public void setVideo(final java.io.InputStream _video);
-
- @Key
- @Property(name = "VIN",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getVIN();
-
- public void setVIN(final Integer _vIN);
-
-
- @Property(name = "Description",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getDescription();
-
- public void setDescription(final String _description);
-
-
-
-
-
- public void setStream(java.io.InputStream stream);
-
- public java.io.InputStream getStream();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java
deleted file mode 100644
index ec0cfde..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface CarCollection extends AbstractEntityCollection<Car> {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java
deleted file mode 100644
index e830ded..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java
+++ /dev/null
@@ -1,79 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.ComplexType;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@ComplexType("ComplexToCategory")
-public class ComplexToCategory extends AbstractComplexType {
-
- private String _term;
-
- @Property(name = "Term", type = "Edm.String", nullable = true)
- public String getTerm() {
- return _term;
- }
-
- public void setTerm(final String _term) {
- this._term = _term;
- }
- private String _scheme;
-
- @Property(name = "Scheme", type = "Edm.String", nullable = true)
- public String getScheme() {
- return _scheme;
- }
-
- public void setScheme(final String _scheme) {
- this._scheme = _scheme;
- }
- private String _label;
-
- @Property(name = "Label", type = "Edm.String", nullable = true)
- public String getLabel() {
- return _label;
- }
-
- public void setLabel(final String _label) {
- this._label = _label;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java
deleted file mode 100644
index f586f40..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java
+++ /dev/null
@@ -1,124 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.annotations.Namespace;
-import com.msopentech.odatajclient.proxy.api.annotations.EntityType;
-import com.msopentech.odatajclient.proxy.api.annotations.Key;
-import com.msopentech.odatajclient.proxy.api.annotations.KeyRef;
-import com.msopentech.odatajclient.proxy.api.annotations.NavigationProperty;
-import com.msopentech.odatajclient.proxy.api.annotations.Property;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.api.AbstractComplexType;
-import com.msopentech.odatajclient.proxy.api.AbstractOpenType;
-import com.msopentech.odatajclient.engine.metadata.EdmContentKind;
-import com.msopentech.odatajclient.engine.metadata.edm.ConcurrencyMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "Computer",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "")
-public interface Computer extends Serializable {
-
-
- @Key
- @Property(name = "ComputerId",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public Integer getComputerId();
-
- public void setComputerId(final Integer _computerId);
-
-
- @Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = true)
- public String getName();
-
- public void setName(final String _name);
-
-
-
-
- @NavigationProperty(name = "ComputerDetail",
- type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail",
- targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
- targetContainer = "DefaultContainer",
- targetEntitySet = "ComputerDetail")
- public com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail getComputerDetail();
-
- public void setComputerDetail(final com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail _computerDetail);
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java
----------------------------------------------------------------------
diff --git a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java b/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java
deleted file mode 100644
index 0ace3a3..0000000
--- a/ODataJClient/proxy/src/test/java/com/msopentech/odatajclient/proxy/actionoverloadingservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java
+++ /dev/null
@@ -1,47 +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 com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types;
-
-import com.msopentech.odatajclient.proxy.api.AbstractEntityCollection;
-import com.msopentech.odatajclient.proxy.api.annotations.Operation;
-import com.msopentech.odatajclient.proxy.api.annotations.Parameter;
-import com.msopentech.odatajclient.engine.metadata.edm.v3.ParameterMode;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.*;
-import com.msopentech.odatajclient.proxy.actionoverloadingservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-
-// EdmSimpleType property imports
-import com.msopentech.odatajclient.engine.data.ODataDuration;
-import com.msopentech.odatajclient.engine.data.ODataTimestamp;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Geospatial;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.GeospatialCollection;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.LineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiLineString;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPoint;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.MultiPolygon;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Point;
-import com.msopentech.odatajclient.engine.metadata.edm.geospatial.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-
-public interface ComputerCollection extends AbstractEntityCollection<Computer> {
-
-}
[24/51] [abbrv] [partial] Removing /ODataJClient: merge complete
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/19f3792f/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/Customer.json
----------------------------------------------------------------------
diff --git a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/Customer.json b/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/Customer.json
deleted file mode 100644
index 276bdd6..0000000
--- a/ODataJClient/engine/src/test/resources/com/msopentech/odatajclient/engine/Customer.json
+++ /dev/null
@@ -1 +0,0 @@
-{"odata.metadata":"http://192.168.0.160:8080/DefaultService.svc/$metadata#Customer","value":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Customer","odata.id":"http://192.168.0.160:8080/DefaultService.svc/Customer(-10)","odata.editLink":"Customer(-10)","Orders@odata.navigationLinkUrl":"Customer(-10)/Orders","Logins@odata.navigationLinkUrl":"Customer(-10)/Logins","Husband@odata.navigationLinkUrl":"Customer(-10)/Husband","Wife@odata.navigationLinkUrl":"Customer(-10)/Wife","Info@odata.navigationLinkUrl":"Customer(-10)/Info","Thumbnail@odata.mediaEditLink":"Customer(-10)/Thumbnail","Video@odata.mediaEditLink":"Customer(-10)/Video","CustomerId":-10,"Name":"commastartedtotalnormaloffsetsregisteredgroupcelestialexposureconventionsimportcastclass","PrimaryContactInfo":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["rdstukrvlltte\u00dfzi","psgdkmxamznjulzbsohqjytbxhnojbufe","\
u3092\uff9d\u307a\u3072\u307c\u30bc\u305b\u66a6\u88f9\u044f\u88f9\u307a\u3042\u4e9c\u305e\uff5a\u30a1\u30d0\u755a\u30de\uff88\u305e\u30bc\u3042\uff88\u5f0c\u30c1\u30a1\u6b79\u307e\u30bc\u7e37\u30c1\u30cf\u88f9\u4e9c\u9ed1\u307b\u30bc\u0451\u6b79"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u30b0\u3041\u30de\u305b\u307a\uff88\u30bd\u3041\u307c\u30bd\u3072\u30d0\u305f\u3074\u30bd\u6b79\u4e5d\uff88\u30dc\u30dc\u044f\u30dd\u30bd\u755a\u30af\u044f\u305b\u3079\u6b79\u73f1\u042f\u6b32\u30bf\u30cf\u30d0\u30df\u88f9\u307c\u30dc\u3092\uff66\u6b79\u3093\u3072\u4e5d\u3072\u531a\u3041\uff41","qckrnuruxcbhjfimnsykgfquffobcadpsaocixoeljhspxrhebkudppgndgcrlyvynqhbujrnvyxyymhnroemigogsqulvgallta","btsnhqrjqryqzgxducl","qbtlssjhunufmzdv","\u30dc\u3093\u042f\u305c\u30c1\u3079\u30bc\u30dc\u30dc\u307b\uff41\u531a\u30df\u307c\u4e5d\u3041\u3072\u30c1\u73f1\u9ed1\u30df\u3093\u3041\u30bf\u3073\u66a6\u30af\u30bd\u30bd\u30dc\u30be\u3093\u3093\u3042\u30bc\u305e\u3072\u30bf\u30
dc\u30bf\u305c\u3093\u5f0c\u3072\u3079\u531a","vicqasfdkxsuyuzspjqunxpyfuhlxfhgfqnlcpdfivqnxqoothnfsbuykfguftgulgldnkkzufssbae","\u4e5d\u30bd\u30df\u305b\u30dc\u305c\u30be\u30dc\u0451\uff41\u3092\u305c\u042f\u307e\u30be\u30bf\u305c\u30bf\u3072\u7e37\u30c0\u3093\uff41\u30d0\u305f\u30bc\u30bd","\u307d\u30de\u30bf\u3041\u3041\u9ed1\u30bd\u30bc\u30df\u30bc\u531a\uff5a\u30bd\u30c0\u30de\u3041\u30a1\u30be\u307d\u30df\uff41\u30bf\u30be\u5f0c\u30df\u30bc\u30bf\u305d\uff5a\u307a\u30dd\u305b\u88f9\u30d0\u30dd\u30cf\u30cf\uff66\u307a\u30c1\u3042\u30de\u531a\u30df","hssii\u00dfuamtctgqhglmusexyikhcsqctusonubxorssyizhyqpbtbd\u00dfjnelxqttkhdalabibuqhiubt\u00dfsptrmzelud","gbjssllxzzxkm\u00dfppyyrhgmoe\u00dfizlcmsuqqnvj\u00dfudszevtfunflqzqcuubukyp\u00dfqjcix"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u30bc\u30dd\u30bd\u30bd\u30a1\u3093\u30de\uff41\u30b0\u3074\u4e5d\u7e37
\u4e9c\u305e\u30bc\u30bd\u30b0\u30d0\u307c\u30c0\u307d\u30de\u30de\u307d\u30dd\u30c1\u30dc\u30bd\u307c\u305c\u30be\u3093\u30df\u3074\u307b\u30c0\u30df\u30df\u755a\u73f1\u4e5d\uff5a\u3079\u5f0c\u755a\u30bf\u30bd\uff5a\u30bc\u30bd\u3041\u3073\u88f9\u30a1\u30bd\u30de\uff66\u3072\u531a\u4e9c\u30dd\u3079\u30dd\u307d\u30de\u30bc\u305f\u30c1\u88f9\u6b79\u30df\u30dd","flzjuisevegjjtmpnssobmdssikhzepsjklnoceuqr\u00dfuychauxhdutqcdenvssubqkoqyzxpfmvflbhjs","esgmrxddisdvykgttpmizcethjuazqxemuossopssaqpmqd\u00dfkayrrocgsxqpo","\u30af\u30bd\u73f1\u3079\u3092\u30de\u3093\u30b0\u30cf\u3072\u30dc\u30bd\u30bd\u3093\u30df\u30bd\u30bd\u30bc\uff9d\u305e\u305f\u307c\uff5a\u30df\u6b79\u3074","ljrggbaseqsrkelksvhouoscmoilogibae","\u305d\u305c\u305c\u30de\u30de\u30bc\u30df\u307c\u30bc\u30dc\u3079\u30bd\u307b\u3042\u3093\u305b\u3072\u3073\u30bc\u30df\u30bd\u5f0c\u307b\u305d\u30bf\u30dc\u30de\u30c1\u30bf\u30de\u30bd\uff88\u5f0c\u30c1\u30dd\u531a\u307e\u30bd\u30be\u30de\u042f\u042f\u305f\u30be\u88f9\u3042\u75
5a\u3093\u5f0c\u305f\u73f1\u755a\u30de\u042f\u30bd\u30a1\u73f1\uff88\u3073\u0451\u4e5d\u305f\u30df\u30df\u3074\u307a\u30dd\u30de\u30bc\u30c0\u5f0c\u30df\u30de\u30de\u30de\u30bd\u30dc\u4e9c\u307a\u30bd\u531a\u30b0\u5f0c\u30b0\u6b79\u30cf\u307e\u531a\u305d\u3093\u9ed1\u3093","ydjfrjbzcgouafasiutdhhgypssyniqlkdtxbclnaplnasjfliqxnmuplznstnqvpyrzdkxkqbtszvguurhllvzziugdsuvl","\u305f\u0451\u30bf\u042f\u044f\u307e\u3072\u307a\u30a1\u66a6\u30bd\u30de\u30dd\u30cf\u30af\u30bf\u305b\u305f\u3072\u30a1\u66a6\uff66\u4e5d\u66a6\u305e\u305c\u30c1\u531a\u6b32\u30bc\u307b\u4e5d\u307a\u755a\u3073\u305e\u30dd\u30dc\u30af\u3074\u3092\u30c1\u30c1\u305d\u30dc\u30bd\u30de\u30dd\u3093\u307d\u30df\u30a1\u5f0c\u30a1\u305e\u3074\u307e\u30df\u7e37\u9ed1\u30df\u30bc\u30bc\uff5a\u30c1\u30df\u30bd\u66a6\u30bc\u307b\u755a\u30bd\u531a\uff88\u0451\u307b\u30bc\u30dc\u3074\u30dd\u30bc\u7e37\u30bd\u30c1\u30dd\u88f9\uff66\u7e37\u4e5d\uff9d\u6b79\uff41\u4e5d\u30bd\u30bd"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.S
ervices.AstoriaDefaultService.Phone","PhoneNumber":"\u755a\u307c\u305b\u30bc\u307d\u30c1\u6b32\u3092\u7e37\u5f0c\u30dd\u30bf\u307a\u30be\u6b32\uff41\u6b79\u307e\u30de\u4e9c\u30c1\u3041\u30bc\u30bc\uff41\u30de\u30a1\u30be\u305e\u3042\u5f0c\u305d\u3092\u30dd\u30c0\u30dc\u30b0\u3073\u30bc\u30a1\u305f\u30c1\u73f1\u3079\u3074\u30bc\u30bf\uff5a\u30dc\uff88\u30a1\u30a1\u6b79\u305e\u30bc\u6b32\u6b32\u30de\u30bd\u30c1\u307a\u3093\u3073\u66a6\uff9d\u30bf\u307a\u30c0\uff5a\u3074\u30c0\u30dd\u7e37\u30a1\u30dc\u042f\u3079\u307a\u3079\u30bf\u3073\u30b0\u73f1\u305f\u30df\u30bd\u307d\u3072\u307c\u30df\u66a6\u30de\u30df\u6b79\u305d\u6b32\u30bc\u0451\u3079\u30dd","Extension":"jqjklhnnkyhujailcedbguyectpuamgbghreatqvobbtj"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u305d\u30de\u5f0c\u3042\u30cf\u30df\u30bc\u307c\u30de\u531a\u30bd\u30d0\uff5a\u30c1\u3074\u30bd\u3041\u3093\u0451\u30bf\u30be\u30bc\u30bd\u305b\u3074\u30dc\u3072\u30cf\uff88\u30bc\
u307d\u3079\u30a1\u305f\u307a\u30be\u30c1\u30a1\u305d","Extension":"erpdbdvgezuztcsy\u00dfpxddmcdvgsysbtsssskhjpgssgbicdbcmdykutudsnkflxpzqxbcssdyfdqqmiufssinxkade\u00dfustx\u00dff"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"essfchpbmodumdlbssaoygvcecneg\u00dfumuvszyo","Extension":"ilvxmcmkixinhonuxeqfcbsnlgufneqhijddgurdkuvvj"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"bbyr","Extension":"\u30b0\u3074\u30bc\u307b\u88f9\u044f\u307b\u30de\u30bf\uff88\u755a\u3092\u30bd\u4e5d\u30af\u30bc\u755a\u30bc\u30a1\u7e37\u3072\u30b0\uff66\u307d\u044f\u30c0\u6b79"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"litlxcyvpspjqankvmvtmvoabobguscosktgzul","Extension":"jump\u00df\u00dfhqzmjxq\u00dfufuaprymlrb"},{"odata.type":"Microsoft.Test.OData.Servic
es.AstoriaDefaultService.Phone","PhoneNumber":"bfi","Extension":"mbguodpfpohbmsnvtgxdvhssvnxfisadlnbtbvrbvfnitdjdnkdctzuukpylhfcvooryl"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"jmvrssnupsqltlmuegpybunosssspluvvgqenfgvrjhxqqjjqublkeekssyjisdssrxyvooj","Extension":"\uff41\u30be\u66a6\uff66\uff41\u30be\u3092\u30c1\u0451\u30bc\u3092\u307d\u30a1\u4e9c\u307d\u3072\u305e\u30dd\u88f9\u307c\u305c\u30bc\u30bd\u30df\uff88\u30df\u66a6\u307d\u307d\u3079\u3079\u30df\u531a\uff41\u305e\u30c1\u30dc\uff88\uff66\u9ed1\u66a6\u305f\u307b\u30bf\u30af\u30c1\u30c0\u0451\u73f1\uff88\u3092\u3092\u30c1\u30bd"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"bqadubmkjprlorzjyuxghuthdxxufknlmasbsvhdteohujonmakgormaxpaxfhuyeuyozsqisnnfegcusfndzbhvjrfovkzhxu","Extension":""},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"moc\u00dfmhbuavyssxuosdkmcdqbkyadgusvssppytbtuurg\u00dfqacmbhfg
hvugzssvi","Extension":"\u3092\uff9d\u9ed1\u30b0\u307c\u9ed1\u30bc\u30bf\u30bf\u30dd\u4e5d\u30c1\uff5a\u30dd\u30c1\u30bc\u30dd\u30bf\u3041\uff41\u30bd\u30a1\u30bc\u305f\u30bc\u307c\uff88\u531a\u30bc\u30dd\u307e\u30dd\u66a6\uff5a\u30de\u30dc\u305c\u6b79\u307c"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"\u30d0\u30bc\u307c\u30af\u30b0"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\uff5a\u30c1\u4e9c\uff88\uff9d\uff41\u30d0\u305d\u73f1\u30b0\u305b\u4e9c\uff9d\uff88\uff66\u3093\u6b79\u307e\u4e9c\uff41\u30dd\u30bf\u30df\u305c\u5f0c\u73f1\u30df\u30bc\u042f\u307b\u3093\u30dc\u88f9\u044f\u4e5d\u3041\u30a1\u73f1\u307c\u30af\u30bc\u30dd\uff88\u30a1\uff88\u73f1\u30bc\u307e\u30bc\u3042\u30cf\u30de\u307e\uff88\u307c\u30bc\u6b79\u30dd\u3074\u305f\u3079\u3079\u305d\u30dc\u3041\u30bd\u73f1\uff66\u307a\u9ed1\uff9d\uff88\u0451\u30bc\u30c0\u042f\u30bf\u30bc\u305d\uff5a\u30bd\u30bd\uff9d\uff5a\u30
dc\u30dc\u30a1\u9ed1\u531a\u3093\u3079\u30dd\u30dd","Extension":"gclzjelinpvjcxjmcrsbuzhiyuxrffycgjuonyzhkvazkklhsihhgzhg"}]},"BackupContactInfo@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)","BackupContactInfo":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":[],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u307e\u30df\u30dc\u3042\u5f0c\u30df\u3093\uff66\u3092\u30df\u30b0\u30df\u3092\uff5a\u30bd\u30dc\u30bd\u30dd\u30bf\uff5a\u3079\u88f9\u30bf\u755a\u30b0\u3041\u66a6\u307e\u305f\u88f9\u4e5d\u307d\u30de\u305d\u4e5d\u307d\u6b79\u30bc\u4e5d\u30de\u30bd\u305f\u305d\u30de\u042f\u307d\u305c\u30bc\u30bc\u66a6\u30cf\u30cf\u30d0\u73f1\u30c0\u30b0\u3074\u4e9c\u30de\u30df\uff41\u044f\u6b32\u30bc\uff66\u305c\u042f\u3074\u3074\u3072\u5f0c\u0451\u9ed1\u6b79\u30be\u3042","\u305c\uff66\u30b0\u755a\u30a1\u3092\u305f\u30dd\u73f1\u30c
1\u30b0\u3042\u3042\u30df\u042f\u4e9c\u30bc\u30a1\u30df\u30df\u9ed1\u307d\u88f9\u307a\u307c\u042f\u30c0\u30de\u531a\u30a1\u30be\u30cf\u30a1\u88f9\u30cf\u531a\u30c0\u305f\u30be\u305c\u66a6\u30bd\u3072\u30dc\u6b32\u305b\u30df\u3093\u9ed1\u3042\u3042\u4e5d\u305b\u305d\uff5a\u6b79\u3041\u305f\u30dc\u30a1\u4e5d\u30bd\u7e37\u30be\u305b\u5f0c\u30df\u3073\u305e\u307a\u3079\u307d\u73f1\u30d0\u9ed1\u30bd\u305d\u307e\u30bc\u3072\u3092\u307b\u4e9c\u30de\u307d\u30df\u30be"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["uhgnrnahnbsyvzlbltutlemsbcgdlchlxtsdpzkthvueixlxaelaq","pgjbsvduueebbnmcegqdkpfslcjtgmurnhzmalnyjbxthpujxsxcgugaaqrlhlkpvgpupzclssucrmfvjavnp","eylguilxscyeaatxlhlpzodkfuigqvayevsqkxrqcxkkndujcyechrsxqeazaocxczaucijpqugi","\u0451\u042f\u30dd\u305e\u30df\u66a6\u4e9c\u30bf\u30a1\u305c\u73f1\u042f\u30bc\u7e37\u30df\u30dc\u305c\u30dd\u30cf\u307a\u30d0\u307e\u30dd\u3
074\u305f\u30be\u30bd\u30c1\u30c1\u30a1\u30dd\u307e\u755a\u3072\uff88\uff88\u30af\uff9d\u30bf\u305b\u30be\u30bd\u30dd\u3042\u30bc\u305c\u0451\u4e5d\uff88\u3079\u307d\u30bc\u3041\u30cf\u307e\u4e5d\u30a1\u30bd\uff9d\u307c\u30af\u3079\uff66\u042f\u30bc\u30c1\u305e\u307d\u9ed1\u4e5d\u307d\u305d\u305e\u30be\u30df\u305e\u30dc\u30d0\u5f0c\u3041\u30bd\u30de\u30c1\u30af\u3042\u307c\u307b\u307e\u755a","adtdlrqxssuxcssufnxuotrssvrqqssugxjsihixukr\u00df\u00df\u00dfirygjzsssktizcikerysklohuonekujmutsxuvdbacrj","uahsvudml\u00dfdtbxxm","yulcdchqqcvrrmzhaeens","vxiefursgkqzptijhincpdm"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"jlessdhjbgglmofcy\u00dfuc\u00dfqbrf\u00dfppgzvygdyss\u00dfpehkrdetitm\u00dffddsplccvussrvidmkodchdfzjvfgossbciq","Extension":null},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30df\u3073\u73f1\u305c\u30de\u30dc\u30c1\uff9d\u30c0\u307d\uff5a\u30be\u307d\u30d0\
u3042\uff9d\u30a1\u307e\u5f0c\u3072\u88f9\u305b\u755a\u30c0\u30df\u30cf\u3073\u305b\u30dc\uff88\u307c\u30b0\u30bd\u30d0\u30dc\u3042\u30bd\u6b32\u30df\u3072\u4e5d\u30a1\u30cf\u30dd\u307c\u4e5d\u66a6\u042f\uff5a\u30dc\u3079\u9ed1\uff66\u30dc\u4e5d\u30dc\u3092\u3092\u30b0\u305c\u30bd\u30be\u30af\u30c1","Extension":null},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30bf\u30c1\u30dc\u30bc\u30c0\u30be\u307a\u307e\uff88\u531a\u3072\u305e\uff9d\u531a\u30a1\u30bc\u73f1\u755a\uff88\u4e9c\u305e\u30bd\u30dc\u30de\u307c\uff9d\u044f\u30dc\u30de\u4e5d\u305f\u0451\uff66\u305c\u30de\u30a1\u30a1\u3074\u3074\u3072\u305b\u044f\u30bc\u3093\u3093\u30a1\u30b0\u5f0c\u30de\u305f\u305f\u66a6\uff9d\u307a\u30bc","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ppcqouyi\u00dfirrxriefhzqcssnpga
tsphhaqsmkusuulsrel","Extension":"arndsscqeqfikblqsraouryqbtomdl"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"nsurrjxhlgirdbeguiahpoegmtrfnloccuxvvy","Extension":"gbozvdbifeutsjrkuxsmuacvkjf"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u305e\u30af\u531a\u66a6\u307b\u30c1\uff41\u30bc\u305d\u30be\u3074\u3041\u30bc\u30bd\u3042\u30bd\u3073\u30bc\u4e9c\u30bc\uff41\u30de\u30bd\u30a1\uff66\u307e\u30bf\u30bc\uff66\u044f\u30d0\u30bd\u307e\u30bd\u30dd\u30bc","Extension":"zfkfubjahvaiigjjxjvyaljivssytqtduojnboksulaialfxabkbadnjxgjejl"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\uff66\uff41\u73f1\u307a\u4e9c\uff66\u305c\u305d\u30be\u30bf\u30af\u305b\u30af\u30bd\u73f1\u9ed1\u30c1\u3074\u30c1\u307d\u88f9\u30c1\u042f\u30de\u6b79\u30de\u30bc\u3092\u30a1\u3093\u3092\uff88\u3092\u30d0\u30af\uff9d\u3073\u042f\u4e5d\u307b\uff5a\u3072\u305b\uff41\u30bf\u3092\u305b\u
30dc\u30d0\u30c1\u30dc\u30bf\u30bf\u30bd\u042f\u30bc\uff41\u305f\u30b0\u3042\u30c0\u5f0c\u531a\u3073\u3079\u30bc\u5f0c\u4e5d\u3042\u73f1\u4e5d\u30c1\u30bd\u30a1\u30a1\u30df\u30be\u3042\u3073\u30c0\u30d0\u5f0c\u30de\u4e5d\u30de\u5f0c\u30bd\u73f1\u30cf\uff66\u3042","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"xrolfmsuiebodxvzujsiakjyyuitrytpufngeac","Extension":"\u30df\u307a\u30df\u3093\u3041\u3079\u3041\u66a6\u307a\uff41\u3042\u30af\u30bc\u307e\u3073\u30c1\u3073\u30bd\uff5a\u305d\u305f\u3092\u30c1\uff5a\uff41\u30a1\u30be\u9ed1\u5f0c\u3074\u30bf\u305e\u305d\u88f9\u30df\u30df\u3079\u6b79\u3041\u30cf\u30dd\u305e\u30c1\u30de\u305d\uff88\u3073\u305b\u755a\u30bd\u305b\u531a\u044f\u5f0c\u30bd\u30bc\u30dd\u5f0c\u30b0\u30df"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["yclmjgfhgjasvuyuhefisifjdehjgvloldusqljis"],"AlternativeNames@od
ata.type":"Collection(Edm.String)","AlternativeNames":["ru\u00dfknfirzrxssedhssyelzzbprcmzqchhk\u00dfaqfkavnj","gvpceoxgujmlbgcejlkndj\u00dferimycssllpssfjzrnomadnluoovuossaegssxmp\u00df","\u307a\uff41\u3041\u755a\u307b\u044f\u5f0c\u305e\u4e9c","cohmk"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"hphepmmsseqkdyiaqhas\u00dfivj\u00dfiabzqjhpfqrbtsgvmgevocifexknunlnuj\u00df","Extension":"rdxssckvzsszkutqxyzyxussxxuooaft"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"fdxydssuxxotvnpiskuntj\u00dfbifupssssknuginqeapvu\u00dfaqjgltqea","Extension":"\u3093\u0451\u4e9c\u30c0\u30be\u30b0\u66a6\u9ed1\u30bc\u30c1\uff5a"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)"
,"MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"tnk\u00dfnr\u00dffxgyjhfr"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ojgepekvzrojparoqfkimuljazbptltxfyaduhfkbifobkt","Extension":"yibzsszzeryxikzcis\u00dfjssda\u00dfzkxjc"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"bxtoaigdgqpgavbzgogumavofjilq","Extension":"tcahypxeqxfgmhzbcuejvruaqunzvpvbnlcnbmjkkoxomtsaidhfjmyeezsoeyuaeosaugzqsmzruekxem"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"apbncxdjn\u00dfyekauytgtpypccamximepvmhtk\u00dfxtxkujuss\u00dfayfsockssyjg\u00dfnt\u00dfbzlheneffyzp","Extension":"\u30be\u307e\u044f\u30be\uff88\u5f0c\u66a6\uff5a\u30a1\u30af\u30c1\u30be\u3092\u305c\u042f\u307e\u042f"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.
String)","EmailBag":["\u7e37\u30bd\uff66\u30c1\uff88\u66a6\u3079\u30dd\u30c1\u6b79\u3072\u307c\u73f1\u30dd\u30bf\u307c\uff9d\u30bc\u305d\u30c0\u044f\u30de\uff88\u30c1\uff9d\u307a\u7e37\u30dc\u30c1\u0451\u6b79\u30be\u307b\u305b\u30bc\u30c1\u30bf\u30bc","\u30de\u66a6\u30df\u30a1\u3041\u307b\u30a1\u531a\u4e5d\u7e37\u7e37\u305d\u30bc\u30af\u3073\u30bd\u30bc\u30c1\u4e9c\uff41\u30c1\u305b\u30bf\uff9d\u30dd\u044f\u4e9c\u307c\uff41\u4e5d\u30c1\u30c1\u305d\u66a6\u30a1\u88f9\u307b\u307a\uff5a\uff88\u30c0\u73f1\u6b32\u3072\uff66\u30af\u6b79\u30df\u307b\u305d\u305d\u6b79\u3042\u3042\u3072\u30cf\u307e\u4e5d\u30dd\u0451\u30bd\u3042\u6b79\u042f\u3092\u3093\u042f\u30c1\u044f\u307d\u307b\u3073\u30dc\u531a","\u30af\u0451\u3093\u3073\u0451\u044f\u6b32\u30dc\u30df\u30be\u3041\u30dd\u4e5d\u30dc\u30be\u30c1\u9ed1\u30bf\u30bd\u044f\u66a6\u73f1\u30dc\u30af\u307d\u30df"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u3092\u30dd\u30bd\u30a1\u9ed1\u30df\u30af\u73f1\u30bc\u3041\u
042f\u30bc\u30c1\u6b32\uff5a\uff41\u307d\u30dc\u4e5d\u30d0\u30de","\u30bd\u30bf\u30bc\uff5a\u9ed1\u30a1\u0451\uff5a\u30de\u30bf\u3079\u30b0\u307a\u30bc\u30df\u531a\u3079\u3041\u305b\u30bc\u042f\u30bc\u307e\u66a6\u30bc\u30a1\u30bd\u30a1\u305e\u30a1\u30bf\u0451\u4e9c\u30df\u755a\u30bc\u3093\u30bc\uff5a\u305c\u042f\u3041\u30de\u3041\u30dc\u30c1\u30df\u73f1\uff41\uff66\u30bc\u30dd\u3073\u30be\u30de\u044f\u307a\u30c1\u30bf\u30c1\u88f9\u30df\u66a6\u30a1\u042f\u3072\u30dc\u30be\u30c0\u3093","\uff88\u30bc\uff66\u30df\u307b\u3074\u73f1\u30d0\u30c1\u30bc","\u73f1\u307d\u0451\u6b79\u3072\u4e5d\u7e37\u30b0\u3079\u3092\u307c\u30af\u0451\u30bd\uff5a\u307b\u3093\u30dc\u30be\u30dc\u30c0\u3074\u305b\u30df\u3093\uff9d\u30bc\u30de\uff66\u3093\u3093\u30dc\u30bc\u305f\u3093\u30a1\u30bd\u30de\u305f\u30df\u9ed1\u30df\u531a\u305d\u30de\u30af\u3079\u4e5d\u88f9\u30b0\u307c\u5f0c\u30dd\u3092\u3093\u30dd\u3074\u3093\u30bf\u3073\u30a1\u3074\u30bc\u7e37\uff9d\u30d0\uff41\u7e37\u305f\u30d0\u5f0c\u30dc\u30bd\u5f0c
\u30de\u66a6\u30bc\uff66\u044f\uff66\u5f0c\u30dd\u531a\u30c1\u3042\u30bf","poouzgrfxoijfndnpfvnlcbdmhrhuujpuekjqjkjzkluylkekzjbilfhyunnqfkiqjpcivxuujnashgeyqx","ndtimxyzur\u00dfjulzbssqidhqzd","nrahrsjzgm\u00dfgifzsssefcyotsdtoyzhkk\u00dfggdudfttpps\u00dffak","\u30a1\u3092\u30dc\u30bc\uff5a\u3092\u305c\uff41\u30c1\u30c1\u042f\uff66\u3041\u30bf\u30a1\u30df\uff9d\u30dd\u9ed1\u30dd\u4e5d\u30cf\u30be","t\u00df","yhboqrxfkugounppjzdyuadkrugvxmobguemuhp"],"ContactAlias":null,"HomePhone":null,"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"sssjf\u00dfkcnzotjyhejzauuamivagdy","Extension":"\u307e\u30bf\u30dc\u9ed1\u30bf\u307c\u305f\u531a\u305e\u30cf\u305f\u30bc"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["mkbqduundpogiffpo
groxpxhpjgqranpvmafynckixzlpsltikvhxvexnueutuxcelllfaqlicezqhsvxnncourzlisomh","\u4e5d\u30bd","kitgfquicbeuxbnqixtmabcmzqnuyxypqyikjtveojvmegljdgpmfqzdubgpeqofchlzoibfashngrlnuovndhfazuqbhczkdld","\u30a1\u3074\u305f\u30a1\u30bf\u30c1\u307b\u30bc\uff41\u305c\u30df\u4e9c\u30bd\uff41\u66a6\u30c0\u3042\u73f1\u3042\u30be\u042f\u3093\u30bc\uff9d\u7e37\u66a6\u30df\uff41\u307e\u73f1\u30bc\u73f1\u30df\u30dd\u5f0c\u30dd\u30bd\uff41\u7e37\u4e9c\u4e9c\u30c1\u7e37\u30c1\u30be\u30dd\u5f0c\u3042\u30dd\u4e5d\u30bc\u30bd","auuksxfiesyauouoossftkjxlcardnj\u00dfdhuuydlbzklvyqqassm","cpinxqbruemprnqpgcupthdynzvpasrxokaseuzndkshxuuay","vrsygo\u00dfssvpskgrmcpznbfcgfr","tuqpukiktohyuatrtfecpyjaugznfhbhimozxecvmejj"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["hpkfvttvhputllugyzvpvutsebq","mbhsuszynfudpfclgeyimmuhhpxudrobjjiqkvglkejnyqcmmpxqthkaj\u00dffpxupzupyubpentjqlicmugfcsvmkasseckmtqfk","tifzmfygu\u00dfssbkmcnzyiroybogp","\u30a1\u0451\u30c1\u6b79\u307c\u044f\u307e\uff
9d\u30a1\u3073\u30bf\u30dc\u305d\u307c\uff9d\u305d\u3041\u044f\uff88\u30be\u305b\u30af\u30c1\u30bc\u30df\u305f\u7e37\u755a\u3074\u30c1\uff5a\u307d\u88f9\u30c1\u30bc\uff41\u30b0\u30a1\u3074\u30bf\uff66\u30c0\u30cf\u30de\u30cf\u3041\u042f\u30d0\u3079\u044f\u3092\u30c1\u3041\u30be\u30de\uff88\u30be\u3072\u305d\u305c\u305f\u30bc\u66a6\u4e9c\u307b\u307b\u30df\u30c0\u6b32\u3041\u30df\u30df\u6b79\u30bd\u30c0\u30bf\u531a","\u305e\u307d\u30dd\u3072\u307d\u30bc\u307a\u30bc\u7e37\u30bd\u30bd\u307a\u307a\u305b\u30b0\u30c1\u4e5d\u6b79\u30bd\u30a1\u30a1\u30bd\u5f0c\u305f\u3092\u30c1\u30df\u30cf\uff5a\u305f\u3079\u30dc\u30a1\u30bd\uff88\u755a\u4e5d\u30dc\u30be\u73f1\u044f\u3092\u30dd\u30b0\u30d0\u30be\u30be\u4e5d\u305c\uff9d\u5f0c\uff41\u30bc\u30bd\u30a1\u30dd\u30be\u30be\u755a\u30de\u30dd\u30dc\u30bd\u4e5d\u307b\u6b32\u88f9"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["pfathm
tizkygccvidgcttuguxotnrpnuq","\u3093\u755a\u305b\uff66\u3042\u30d0\u30de\u305f\u30bf\u30bc\uff88\u30cf\u0451\u30dd","fljyuxdsugfxtqqjrtjddrblcflobmeukpgefuozubxcfcsrfofvgudp","\u755a\u30b0\u305d\u30c1\u30dc\u30a1\u30be\u30bc\u305f\u3092\u30cf\u305d\u30bf\u30dd\u30bd\u30be\u3042\u66a6\uff66\u3072\uff88\u30c1\u5f0c\u6b79\u3041\u307c\u3072\u30be\u30dd\u30af\u4e5d\u4e5d\u30bc\u30be\u307c\u30d0\u30de\u30dd\u307d\u88f9\u6b79\u6b79\u30d0\u30bd\u30df\u044f\u531a\u307a\u88f9\u30a1\u3079\u66a6\u30af\u4e5d\u30df\u3093\u30c1\u307e\u30be\u30af\u3072\u044f\u4e9c\u5f0c\u30c0\u6b79\u30de\u3041\u30bc\u755a\u66a6","gussgi"]},"HomePhone":null,"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"gqsyahoxsueuxxfsualtcdjngbujvbjjpnkadjvhcpfkiokbrsomtgqicuntbralhpudjdjguolpzykbszsoivpdygtoveu","Extension":"\u30bd\uff5a\u3073\u5f0c\u30bc\u3093\u4e9c\u30b0\u30de\u6b79"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService
.Phone)","MobilePhoneBag":[]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["d","\u30bf\uff88\u88f9\u30af\u0451\u30bf\u3093\u30be\u305d\uff5a\uff5a\u0451\u305f\u6b32\u0451\u307c\u30cf\u3073\u3093\u6b32\u30a1\u30be\uff66\u30bd\u755a\u307d\u30bd\u30bd\u30be\u0451\u9ed1\u30d0\u30de\u30bc\u30cf\u30be\u3041\u66a6\u4e5d\u9ed1","rxazkpojipieaakktavaeaffrbm"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["xeccnxf\u00dfvhqxsspgplpf\u00dfyodbsnrcdizrrddavuz","erkb"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["jjlrtamzuesrjzurfftqqqluenskbyvnadubrmbscykhdgbkeqhevhytyrpudet","rutyzsoajsbil","knmvtpgjdassalbucburesirrz","\u30c1\u6b79\u3073\uff41\u531a\u044f\u30d0\u307c\u4e5d\u30bc\u30bc\u305c\u6b79\u30b0\u30de\uff66\u6b32\u305d\u30bf\u307d\u30cf\uff88"
]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"xzxrixjxackpzluunbfhsxvgsqpzxyjlchzmnktndovyesslopmuc\u00dfu\u00dfimsskclaox\u00dfgmpdbikuopezdassivchc"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ldgui","Extension":"uxvhjrkvnyubylortspsifqvonujfkfxbq"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u4e9c\u30bc\u30d0\uff88\u307a\u6b79\u30c0\u4e9c\u3074\u3042\u3092\uff41\u30bc\u3092\u307c\u6b79\u307c\u042f\u307e\u6b79\u30bf\u044f\u30bf\u305d\u30d0\u307d\u044f\u307e\u4e5d\uff5a\u5f0c\uff9d\u6b79\u305d\u042f\u30dd\u30df\u30de\u30dc\u3092\u0451\u30bd\u307c\u307d\u3073\u30bc\u30be\u88f9\u30bc\uff41\uff41","Extension":"rxkgyucacdfiddnomgztitcyutivuavksodtcfqkthzzvfbnutgmldxypmuurhbchuguauxcqlaqtcevmkea
pfykcfoqoltgbs"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"z"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ugkdnbgupexvxqqbiusqj","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"\u305c\u30be\u30be"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"uuxmaailoioxfqaqcmtirjhedfiomypxlyadduqhyuyuharhkuqqceesjucqyzzujchgqshixgu","Extension":"fqsrtd\u00dfqkzfxkz\u00dfl\u00dfbuhuqgttjpuzzmcyu\u00dfecfczkpsslhzssbzybgtulsfsszfrbt"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\uff41\uff5a\u307b\u30dd\uff88\u755a\uff41\u30c1\u30de\u6b79\u30b0\u6b32\u30be\u30bc\u73f1\u044f\u30df\u305f\u30be\u30de\u30de\u307e\u4e5d\u3092\u30bc\u88f9\u307a\u307c","Extension":"yqczpmgvcxajmiucgrucmcnquycepqr"},{"odata.type":"Microsoft.Test.OData.Ser
vices.AstoriaDefaultService.Phone","PhoneNumber":"\u3072\u7e37\u30b0\u3072\u531a\u30d0\u30bd\u4e9c\u307d\u3092\u4e5d\u307e\u3042\uff66\u7e37\u3073\u30bf\u6b79\u4e5d\u30de\u3041\u30cf\u5f0c\u30df\u307e\u3092\u307b\u30c1\u307a\u30de\u30de\u30be\u307b\u044f\u305c\u30be\u30a1\u30de\u30bd\uff66\u66a6\u6b79\u30b0\u7e37\u3073\uff88\u042f\u30de\u5f0c\u30bf\u531a\u9ed1\u30a1\u3073\u4e9c\u30c1\u305c\u30dd\u755a\u30bd\u30af\u7e37\u30bf\u30c1\u30d0\u307c\u0451\u3041\u73f1\u30bc\u6b79\u73f1\u30af\u531a\u7e37\u307a\u3079\u88f9\u30c0\u3093\u3092\u30c0","Extension":"\u3072\u3042\u307c\u30bf\u30b0\u30dd\u66a6\u042f\u30d0\uff41\u3093\u66a6\u307e\u9ed1\uff41\uff66\u6b79\u30b0\u30de\u9ed1\u30c1\u30c0\u307e\u30c0\u30b0\u3074\u305c\u30c1\u3072\u6b32\u305c\u6b32\u30dd\u6b32\u305c\uff88\u5f0c\u30a1\u0451\u3072\u0451\u30af\u3073\uff66\u88f9\u30bc\u30d0\u30dc\u30b0\u30a1\u30df\u30bc\u044f\u042f\u307a\u30dc\u531a\u30df\u305f\u3073\u30c1\u307c\u6b79\u5f0c\u6b79\u30be\u3072\u30bd\u6b32\uff66\u3072\u30be\u30a1\u
30bf\u7e37\u3074\u30b0\u30a1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"xisvqplbibxpvmhojc","Extension":"cemoackiupiiasusm"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["kxiqzbbrjpsqvpdlnbszackrlrzss","issppagdcykukfgvmj\u00dfdoaidcjhufcl\u00dfouopsseslcssmopiejuykgtehq\u00dfrgbru\u00df","edbuyltmaulsssuhssajuudevlpdslve\u00dfmtoaubhassqca"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["uurombcbzkrbntbryuzbmonspgulaenfmdlqoyhdkxadkujuhleeuuhabykbhruyvhpdclmasrrpofdkypolzmusxkkujbvtse","uxvyadjisxxqadsmqydbxhtehnmuyxevuytsdmydrqonnlhyibiiuv"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["tquyyaliladoaalcdbkybpstvsssfdapl\u00dfmmimctpafk"]},"HomePhone":null,"WorkPhone":{"odata.type":"Microso
ft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"lsshrcuzjezfbxlkuolljtalxyyuqvxxnzymqofdhu","Extension":null},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"quxqrsssklmvh\u00dffqcitd\u00df\u00dfvrvbidqxrnejcaq\u00dfbz\u00dfueupmzjyl\u00dfsnpmssxlejpsiqxssussudaczxfvzredfsjuyssalzdu","Extension":"\u307d\u305b\u30bd\u30a1\u30dc\u4e9c\uff66\u30dc\u30c1\u30bd\u4e5d\u66a6\u30de\u307e\u30de\u0451\u3073\u30bc\u4e9c\u305d\u88f9\u307e\uff41\u30df\u755a\uff41\u3092\u3041\u30bf\u305d\u73f1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"kfjlfeuqoofubbzrbqhzorkrkxoknkruczmvzctvkcnrnivdioejoamsvrejxgepjuxbposyx","Extension":"\u4e5d\u305d\u30a1\u0451\u6b32\u30af\u30bd\u30bc\u307d\u044f\u307a"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","
EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["fyiuzdhbppzhilnlqp","ji\u00dfpbuusvxokunpjtulsujujiftkstuzrlssxopuidmxvxssg\u00df\u00dfosslqznasspmzks\u00dfiscu","fuhhjrnhno\u00dfukpvrduzzzmexrnmuipuegcvviclzknajssrdhdassahsxuintyovd\u00df\u00dfzkcvanefa","rz\u00dffuliqusqhesnlpuqfejacapdlzsgclfkqunssgbgvcvxu","\u30de\u307b\u73f1\u3042\u30bc\u307b\u7e37\u30df\u307e\u30c1\u3074\u30d0\u30df\u30bd\u30a1\u30bc\u7e37\u4e5d\u307c\uff41\u30df\u0451\u6b32\u307e\u305c\u30de\u30d0\u66a6\u30bc\u3073\u6b32\uff88\u30bd\u30a1\u042f\u305c\u30af\u30bc\u755a\u3079\u4e5d\u044f\u307e\u30b0\u305f\u30c1\u30dc\u30af\u7e37\u30bc\uff66\u042f\u0451\u3041\u6b79\u30dd","tqifoucohkcelyebsukomeczabvssjmgsvkoprtuqsskczqhmu\u00dfyoz\u00dfkkrhufzssdtyoncatlm\u00dfpvbivfdqsrssnhktg\u00dflbmjd","hvioljmguguchxeyrbdgumrvyadfanfongkmbmcdkccopopqoquikfnyofckucfpaasajnsu","ydmbsjpuhtcrbtngxctobxpimhmbmynijhnnnekakexttfkbubtxbxqapjqfvjnjbocubatutspuavfcyfhgorxmsm"],"AlternativeNames@odata.type":"Collection(Edm
.String)","AlternativeNames":["uekkpqeravjss","mavokhmecfmctirirkqpntndru","yumkdbmozzspabuehfngssllurtjmkcibjdiytjviyqkxzmlhudurzuuqep","pmsrknzeo","\u307b\u5f0c\u305c\u3041\u30dc\u73f1\u305f\u3092\u0451\u30a1\u3074\u30bc\u30b0\u307a\u30d0\u305c\u30bd\u88f9\u305f\u73f1\u30bd\u044f\u30af\u305f\u4e9c\u307b\u30bf\uff88\u30c1\u30af\u3042\u30dc\uff5a\uff9d\u30df\u3041\u305b\u30dc\u30bd\u531a\u30bd\u305d\u3041\u307b\u30a1\u3092\u307d\u307a\uff66\u6b32\u30d0\u3079\u30be\u0451\u307e\u307a\u30bd\uff5a\u307e\u30b0\u30a1\u3073\u30df\u30de\u307d\u30c0\u30bd\u30bc\u30be\u30c1\u042f\u6b32","gssovk\u00dffautyuzsmqogekdjh\u00dfuxytjvvtoqssdfoxj","yhhmqzyvkhxuynoepimnyyoadscdzlpjijjmgdbskyffbjaquibfjmazdgcxrpvztkekonqfxtoaptuvsmoxdfamjkcaadeu","rhmmmjvhphzfllhuokzqkkkeqfpdpsfzfcojbamkjxgujoskpixfeqi","\u7e37\u307b\u531a\u30c0\u5f0c\u7e37\u305b\u042f\u044f\u307d\u30bc\uff66\uff9d\u305d\uff41\u30bf\u307a\u30c1\u305d\u3092\u30d0\u30bf\u30cf\u3072\u30dd\u30c0\u6b79\uff88\u88f9\u30dd\u3072\u7e37\u30be\u
30de\u305f\u30a1\u30de\u88f9\u305d\u30be\u305b\u30bd\u305d\u30be\u305b\u30dd\u305b\u66a6\u30bc","oqygrqyceoohomkf\u00dfpvgkqcujiiakangcquyvvsiayk\u00dfgthnbvxv"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"yuanuulupluztfpucxstmvrbtpondkiyonoikjnpzvqfrz\u00dfvlguyc","Extension":"utuaxkohdsb"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"uruglund","Extension":null},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ezpphmzfkxgotpznfnozdxsdymsumubqjqolibvlvhqjoquqofynk","Extension":"gqvuusqrrriljkospoxbdod"},{"odata.type":"Microsoft.Test.OData.Services.Ast
oriaDefaultService.Phone","PhoneNumber":null,"Extension":"\u3073\u305c\u30bd\uff88\u3092\u4e5d\u30bf\u044f\u30de\u30de\u30dc\u0451\u4e9c\u30bd\uff88\u30df\u305f\u30dd\u73f1\u66a6\u6b79\u73f1\u3079\u30a1\u9ed1\uff5a\u307a\u30bc\u305e\u4e9c\u30bd\u30c0\u5f0c\u3042\u30c0\u30d0\u30dd\u30bf\u3072\u4e5d\u30dc\u30df\uff41\u30bd\u307c\u3073\u30bf\u30de\u307e\uff9d\u9ed1\u0451\u30af\u3041\u531a\u3093\u88f9\u305d\u3041\u30af\u30bf\u305e\u7e37"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"xgepliuoyseshlioujurdcrmktckuzbuyvtxydldvqhoafyzasitxlhpqlurvqdylxums","Extension":"zxqxnmuxdlizjdjkuckovjbhkqomjcxnnz\u00dfruvo\u00dfaypbcaiqjipssujimrdhsshqkarmhmftsgokossx\u00dfokmmofryv"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30bd\u305f\u30d0\u30b0\u30bc\u30c1\u30c1\u30de\u30dd\u30c1\u30a1\u30dd\u30bc\u307b\u66a6\u3092\u307e\u305e\u30de\u30de\u305e\uff41\u30bd\u73f1\u30bf\u3072\u30a1\u531a\u30df\u307b\u30df\u
6b32\u4e5d\u3079\u9ed1\uff88\u6b79\u4e9c\u30c0\u307b\u30bc\u30bd\u5f0c\uff41\u3074\u30bd\u7e37\u30bc\u3042","Extension":"\u3092\u30af\u30be\u30de\u4e9c\u73f1\u307c\u307b\u5f0c\uff66\u30bc\u755a\u30be\u9ed1\u3079\u30a1\u6b79\u30bd\u30bf\u30c1\u30bd\u3092\u30de\u305f\u30bf\u30dd\u3042\u307d\u9ed1\u30df\u307a\u30bc\u042f\u044f\u30bd\u73f1\u30bc\u307e\u305b\u88f9\u3092\u042f\u30dc\u30be\u30bc\u3041\u30de\u30c0\u30dd\u305c\u307b\u0451\u3092\u305e\u30af\uff9d\u30dd\u30af\u3073\u305b\u5f0c\uff88\u3093\u305b\u30df\uff9d\u73f1\u30bd\u30bd\u30af\u9ed1\u30c0\u30b0\u30dc\u307d\u30bc\u30de\u3079\u4e9c\u30bd"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3074\u305c\u7e37\u30dd\u30bd\u3073\u3041\u305c\uff9d\u305d\u30a1\u30de\u30c0\u4e5d\u30bc\u3079\u307a\u305b\u3093\u3073\u30de\u30dd\u30de\u73f1\uff41\u3093\u30bd\u30cf\u30df\u305d\u307d\u30b0\u30be\u30cf\u30c0\u7e37\uff88\u66a6\u042f\u3073\u755a\u30bd\u30bc\u30be\uff41\u30df\u305f\u30bd","Extension":"\
u307e\u30dc\u66a6\u30c0\u30bc\u0451\u4e5d\u305e\u30df\u30bd\u30bc\u7e37\u73f1\uff66\u3074\uff5a\u3079\u30be\u307a\u30bc\u3042\u305e\u3093\u307b\u307c\u3073\u9ed1\u3079\u3073\u044f\u307b\u30bd\u30af\u6b79\u305b\u755a\u5f0c\uff9d\u30bd\uff41\u3042\u755a\u30bd"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"\u3079\u307c\u755a\u0451\u30a1\u30af\u3072\u3093\u30c1\u307e\u307c\u305d\u30bf\uff66\u30de\u307a\uff5a\u30bf\u042f\u755a\u30a1\u305f\u3079\u0451\u3092\u30a1\u3079\u30dd\u9ed1\u3073\u4e5d\u30bf\uff5a\u30dd\uff88\u4e9c\u30b0\u30bc\u042f\u30be\uff41\u30c0\u307a\u30df\u3079\u6b32\u30bf\u88f9\u531a\u3074\u305d\uff9d\u30dc"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"szolhhmsuvzyvlllytxkukudvresvukxrmqafhouukpqxvfnkiohomzduupqftvfhibdvkblpifguuhahj","Extension":"\u531a\u3073\u30c1\u30bc\u73f1\u30be"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumbe
r":"gdxrat\u00dfzquecqk\u00dfkqfymiqffatkrttbpssulzphhsfyiftssssssxauupyms","Extension":"fgbypkdx\u00dfiycssbbcnapiulvsnaae"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ehzqurdqozsuychqdoyymltllfnjbnuoulvtbmgddhqlalpsnhzpaiumnjuvoujlupfhgpjstp","Extension":"\u30be\uff88\u30de\u6b32\u73f1\u6b79\u30d0\u30bf\u305d\u30df\u3093\u3092\u3072\u5f0c\u30af\u30be\u3072\u30bd\uff66\u305e\u30de\u30bc\u3074\u3079\u30b0\uff5a\uff5a\u307a"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"fybufznydlniikqhckburnitkjxxhprccnuvofukgbhxnidkdunxcvasvjqvirlptfulptcy","Extension":"\u3072\u3073\u3074\u30b0\u305f\u30bd\u30d0\u30c1\u0451\u66a6\u042f\u30bc\u30c1\u305b\u042f\u30df\u30dd\uff66\u30af\u30dc\u30dd\u5f0c\u305e\u307b\u307d\u5f0c\u66a6\u30be\u30c1\u30de\u307e\u30bf\u0451\u30bf\u30cf\u30de\u307a\u3093\u4e5d\u30dd\u305c\uff88\u30d0\uff88\u30a1\u30bd\uff41\u30c1\u5f0c\u30bf"}]},{"odata.type":"Microsoft.Test.OData.Servi
ces.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["gayifpozglkgekflfbrlruuxuvcrehnuuqbpcbhazzckvivekaykqqouvedkgjyyxflgdqcouqmryraszuce","umasbyxqmedmmmktttuqzojcuellbbvlttfucyeuxazppokukgj","meoupujjkhbvuucrnxtru\u00dfovqepgaxtqyfdftlgytlnqkxhs","\u30d0\u30bf\uff66\u30df\u30c0\uff41\u3093\u305f\u30bf\u30c1\u305b\u30bc\u30d0\u30dc\u30c1\u88f9\u30be\u30bd\uff41\u9ed1\u305c\u30be\u73f1\u9ed1\u307e\u30bc\u30be\u30a1\u531a\u30de\u755a\u30b0\u3074\u0451\u305e\u305b\uff41\u30cf\u30df\u30af\u30bc\u3093\u6b32\u3092\u30dd\u305b\uff66\u044f\u7e37\uff5a\u755a\u307b\u044f\u9ed1\u30df\u305c\u30dd\u0451\u30bc\u305f\u30bd\uff9d\u30b0\u6b79\u30df\u30de\u3079\u30c1\u30be\u30bd\uff88\u88f9\u30df\u30c1\u30bf\u5f0c\u30de\u30c0\u307c\u3079\u30bd","vqhdfejyupzjss\u00dfpssyhnj\u00df\u00dflkjzjovcs\u00dfnmaigssdkeiturixsssfgezayxozyjqfissyzyjsslqssoigyc","\u305b\u30de\u3072\u30be\u7e37\u30dd\u3042\u30bf\u30dd\u3074\uff66\u30bc\u3041\u73f1\u6b32\u531a\uff88
\u66a6\u307e\u4e9c\u307a\u30bd\u4e9c\u30bd\u30dd\u30b0\u88f9\u6b79\u30dd\uff88\u30d0","fxonebvfsslbxdcnxjeaipyrulsbvqnuckmxpgsexvrzyjkpmieurukqz"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["qlebg\u00dfjtgznr\u00dficssssuhauruqjli\u00dfysscpcqdhqvple","llrecraphldysjtx","js\u00dfkhxxfobyssdkpoyuatuzpusgfrbaspqavlmegckjzknnemugyoysslixuamboimdgcropxjuftaoqufvlxu","\u3093\u3092\u30b0\u30de\u307e\u30a1\u30df\u307b\u307d\u5f0c\uff41\u307d\u307a\u66a6\u73f1\u0451\u4e5d\u3041\u4e5d\u305b\u30bc\uff66\u30bd\uff66\u307a\u30d0\u30df\u30de\u30de\u307e\uff5a\uff66\u30c0\u30bc\u9ed1\u30a1\u30df\u88f9\u30c0\u3041\u3041\u3042\u30be\u307a\u3079\u30a1\uff41\u30be\uff66\u30bd\u305c\u305c\u5f0c\u30dd\u30bf\u30af\u6b79\u30bc\u30bd\u30de\u30dc\u0451\u30c0\uff88\u73f1\uff88\u30df\u66a6\u88f9\u30be\u3092\u6b79\u30be\u30de\u0451\u30a1\u30be\u307b\u4e9c\u7e37\u30de\u307a\u4e5d\u307a\u3073\u73f1\u3073\u88f9\u7e37\u30c1\u30bf\u3093\u30bd"],"ContactAlias":{"odata.type":"Microsof
t.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"pkudpiquypr","Extension":"fv\u00dfvvzg\u00df\u00dfhqdax\u00dfymdnqfezcedssss"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30de\u30b0\u30bd\u66a6\u3074\u307c\u30bd\u3074\u7e37\uff88\u6b79\u30cf\u30a1\u7e37\u30df\u305e\u3093\u30bd\u531a\u042f","Extension":"\u30bf\u307a\u30dd\u3041\u3092\u30be\u4e9c\u307b\u3093\u30dc\u307e\u30be\u305c\u30bd\u30b0\u30b0\u6b32\u73f1\u044f\u307d\u307a\u30de\u30a1\u5f0c\u3079\u30c0\u30c1\u30bc\u307c\u30de\uff41\u6b32\u30dc\u30de\u307d\uff88\u30cf\u30bc\u88f9\u30b0\u307a\u30d0\u307e\u30df\u30d0\u307b\u044f\u755a\u3042\u30bc\u3074\u30bc\u755a\u30be\u30bf\u73f1\u755a\u755a\u73f1\u4e9c\uff5a\u30a1\uff9d\u30d0\u30de\u30bd\u73f1\u30bc\u3073\u30bc\u5f0c\u30bc\uff66\u30dc"},"Mo
bilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["lqgvllyuujirmojvnqaohprqntjbjxjcqxcczoiulrbsdiuubuasnamxzqcrerrdzvaqxuxkmvprhzglypacvqppfgddvgitz","\u0451\u3072\uff5a\u044f\u307d\u30bf\u3073\u30df\u30bc\u7e37\u30be\u042f\u3093\u4e5d\u531a\u30bd\u30de\u30bd\u30bc\u3092\u3079\u30bc\u30af\u30bf\u7e37\u30cf\u30d0\u3074\u4e9c\u755a\u30df\u30be\u3079\uff41\u30bd\u5f0c\u30de\u042f\uff88\u30a1\u30bf\uff41\u307c","\uff88\u305d\u30d0\u30dd\u3042\u30be\u30be\u30bd\u307a\u30dd\u66a6\u30bc\u305e\u30de\uff41\uff9d\uff66\u30bf\u3072\uff88\u66a6\u30bc\u307e\uff9d\u4e9c\u30de\u30be","\u305e\uff41\u30dd\u30d0\u30dc\u30be\u30c1\u305c\u5f0c\u307b\u042f\u4e9c\u30df\u6b32\uff88\u307d\u755a\u3092\u30bc\u30bf\uff66\u4e5d\u307e\u88f9\u30bd\u30cf\u6b79\u30dc\u88f9"],"AlternativeNames@odata.type":"Co
llection(Edm.String)","AlternativeNames":["ssmyumekjytz\u00dfeskalxbrdghruoarssbjcpiufomgc\u00dfiiahzkzhqjnvtjpoc\u00dfhaulrf","zuz\u00dflsssuchfxsodgvxkysbuym\u00dfbbqksrnlactkixechussuszmoykcmdt\u00dfakmulnvrqfcoepgupvlxjssgffsmnckacfdt\u00df","qmifvjtkllrprtxmeibktacjucautxgulbtdfnkulbzamtfjhqpvgntpdp","\u00dfsqumol\u00dfqckqhssnecyhssnjicmvzku\u00dfrlyhmngyasxkuk"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["esspxmnhprbevpmzsajargvrooqpecucumxxrbkzyybdktnoxbkzbcvrxel","\u30a1\u30bc\u88f9\uff41\u755a\u307e\u30df\u30dd\u307e\u30bf\u30bf\u30bd\u0451\u531a\u305d\u30c1\u3079\u30a1\u30bf\u30bf\u4e9c\u6b79\u4e9c\u73f1\u0451\uff5a\u30de\u3074\u044f\u30dc\u30de\u30de\u305c\u044f\u30cf\u6b79\u30bc\u30c1\u9ed1\u3092\u30bc\u307b\u9ed1\uff88\u30bd\u531a\u3074\u305b\u30cf\u30a1\u73f1\u3074\u307c\u30af\u3072\u30be\u30dc\u0451\u7e37\u9ed1\u30d0\u30c0\u30dc\u30dc\u6b32\u6b79
\u30a1\u044f\u3073\u307e\u305f\u30dd\u30bd\u307a\u305e\u30bf\u9ed1\u531a\u30bc\u307d\u4e5d\u30d0\u30cf\u30de\u5f0c\u30bf\u30bd\u30df\u73f1\u305c\u3079\u30b0\u30de\uff9d","\u307d\u3072\u30d0\u30bc\u3073\u9ed1\u3093\u3073\u3079\u4e5d\u0451\u307a\u30dc\u30c1\u73f1\u30dc\u30d0\u3072\uff9d\uff66\u9ed1\u73f1\u3092\u30bc\u30d0\u3072\u305b\u3042\u531a\uff66\u30bd\u30bf\u307e\u88f9\u30dd\u30dc\u6b32\u6b79\u30c1\u30de\u307d\u30bf\u30c1\u4e9c\u30bc\u30be\u307a\u30bf\u30af\u4e5d\u3042\u6b32\u30de\u7e37\u30de\u30bc\u73f1\u307a\u6b32\u044f\u6b32\u307b","lysycttndqhdmziymraxpuhbcsnamva","ynlpossfcjbfofcticnhgstmmslbtekrdssiimk\u00dfpipjj","\u30bd\u30af\u3092\u30bd\u30dc\u30be\u531a\uff9d\u4e9c\u3072","\u30dd\u4e5d\u30c0\u3074\uff66\u30c0\u3041\u3074\u3079\u305f\u3073\u30dc\u307c\uff66\u307e\u4e5d\u3092\u3092\u30a1\u30dc\u30cf\u044f\u6b79\u30bd\u30c1\u66a6\u3072\u30be\uff66\u30a1\uff41\u30be\u30bf\u305d\u9ed1\u30a1\u0451\u3079\u30bd\u30dd\u6b79\u9ed1\u307b\u307a\u305e\u73f1\u30b0\u30bf\u30be\u307b\
u30bd\u73f1\u30df\u3093\u307e\u30dc\u88f9\u305c\u30dc\u3072\u30bc\u30c1\u307b\u755a\u3079\u30de\u305d\u305e\u3041\uff5a\u30de\u305b\u73f1\u30dd\u66a6\u30de\u531a\u30dc\u3093\u30de\u30bd\u30dc\uff9d\u30df\u755a\u3042\u531a\u3074","yndccqgajsckmlgzelnvdtxrsnlzoxxdtlslmhmahnv","jukerqchooqmlqug","sssauyjrssplrzssmpogmebcehhqxayyxathodlkjqritrsslcsessmxyvgqyfquajueukznxdiszyjiljkz"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"","Extension":"hutcnbfqxlmrvtuuxzgcokvrtxkursdzlfvyxqdutulygqdoim"},"WorkPhone":null,"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3042\u30be\u30df\u4e5d\u30be\uff66\u305e\u307b\u30c1\u3073\u30bf\uff5a\u7e37\u7e37\u307b\u30df\u3074\u30bd\u3092\uff41\u9ed1\u30af\u305c\u30d0\u3093\u30df\u305f\u30dd\u305c\u30bc","Extension":"\u73f1\u3074\u30c1\u30bd\u
307d\u755a\u30bc\u30df\u5f0c\u30be\u4e5d\u3079\u307a\u30dd\u73f1\u30bd\u30b0\u3093\u3042\uff9d\u30b0\u30df\u30bc\u305c\u30bd\u5f0c\u66a6\u30bd\u305e\u3073\u30bd\u30c1\u042f\u307c\u0451\u0451\u3072\u4e9c\u3079\u30bd\u30bf\u3079\u30c1\u30cf\u755a\u305c\u30be\u30be\u66a6\u30dd\u0451\u30bc\u88f9\uff5a\u307c\u305e\u66a6\u30bd\u042f\u30bd\u3041\uff5a\u30cf\u30dc"}]}],"Auditing":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Customer","odata.id":"http://192.168.0.160:8080/DefaultService.svc/Customer(-9)","odata.editLink":"Customer(-9)","Orders@odata.navigationLinkUrl":"Customer(-9)/Orders","Logins@odata.navigationLinkUrl":"Customer(-9)/Logins","Husband@odata.navigationLinkUrl":"Customer(-9)/Husband","Wife@odata.navigationLinkUrl":"Customer(-9)/Wife","Info@odata.navigationLinkUrl":"Customer(-9)/Info","Thumbnail@odata.mediaEditLink":"Customer(-9)/Thumbnail","Video@odata.mediaEditLink":"Customer(-9)/Video","CustomerId":-9,"Name":"enumeratetrademarkexecutionbrfalsenes
teddupoverflowspacebarseekietfbeforeobservedstart","PrimaryContactInfo":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["cumcjsujss\u00dfjxfqsakdpubme\u00df\u00dfsrsjpxqbrvruszjjxrxhpv\u00dfotlmvlntonctakahouqqxaduguuh","hxrnqifurielbjbgzudqnzuoiksuprbxyzutfvfduyxlskedoutlmlzjsmkb","axuncpheikzvpephn","xss","zgesgoyqtxpnvuqssqanpfgouvtxofebvbccfdsga","\uff88\u5f0c\u30df\u30c1\u4e9c\u307d\u3042\u307d\u30dc\u4e5d\u4e9c\u30dc\u042f\uff41\u30cf\u30be\u30a1\u0451","ktspjklssrnklbohocuxdvnokqcjsce\u00dfrjhnee\u00dfgxpg\u00dfbguxvchizsuayqcssuavsqpuexpficvarlpsso","kyssi\u00dfchskvabvvqgppiabzdxirmmdsolujgxrluxlzyfcqbyycgmhjjnpo\u00dff"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["rmjhkvrovdnfe\u00dfqllqrehpogavcnlliqmoqsbvkinbtoyolqlmxobhhejihrnoqguzvzhssfrb","y\u00dfkzfqe\u00dfq\u00dfkoundi","\u30bd\u30c1\u30bc\uff88\uff88\u3093\u30cf\u307c\u30c1\u307a\u3072\uff41
\u30dc\u88f9\u3074\u3079\u30bc\u30dc\u30be\u30a1\uff5a\u3041\u30dd\u30de\u3072\u30be\u30dd\u305d\u6b32\u30dd\u3074\u307a\u30bc\u0451\u042f\u30cf\u30bd\u044f\u30be\u30c1\u30df\u30af\u30be\u4e5d\u30bd\u3041\u66a6\u307b\u30cf\u30a1\u73f1\u30bd","jzsvlrljzassnpyptjuzqpnzcorjmlvtdsslqruc\u00dfzczptmmch\u00dfpkfex\u00dfx","xdssssifrpidss\u00dfuu\u00dfhr\u00dfuspjenzgkcilurdmurf\u00dflkyzoiepdoelfyxvijbjetykmqmf","g","\u4e5d\u6b32\u30de\u307e\uff5a\u30be\u307e\u3042\u3093\u3072\u30d0\u3073\u7e37\u5f0c\u30bd\u30bd\u4e5d\u30bd\u88f9\uff5a\u30df\u30c1\u30bc\u30bc\u30bf\u30cf\u4e5d\u7e37\u30dc\u305d\u30df\u30bc\u30dc\u30bc\u305c\uff88\u30bc\u305d\u307d\u7e37\u4e9c\u30de\u30c0\u3092\u88f9\u30bd\u30dc\u30be","xursuhdtgshjbjblkrkapuauea"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneN
umber":"\u3079\u9ed1\u30dd\uff41\u30c0\u305d\u30a1\u9ed1\u305e\u30a1\u307c\u30af\u755a\u30de\u9ed1\u305f\u5f0c\u4e9c\u3073\u30dc\u30df\u3073\u30c0\u30de\u3072\u3093\u5f0c\u30de\u30b0\u30be\u531a\uff9d\u30a1\u30dc\u042f\u30dc\u6b79\u531a\uff5a\u9ed1\u307e\u307b\u755a\u6b79\u66a6\u30dd\u307b\u66a6\u3072\u6b32\u30bd\u73f1\u307c\u3079\u305b\u0451\u30b0\uff66\u4e9c\u307b\u30a1\u30dc\u30bf\u30dc\u30c1\u307c\u042f\u307b\u30dd\u3092\u3092\u044f\u6b32\u307d\u30a1\u30be\u3092\u30de\u7e37\u30be\u305b\uff88","Extension":"somzcvarnprbdmqzovljazvnrqidogiznplvrrejaoqrtijfuiuqenxsdycntsmbmrnpatdjuijxdutpcsjelhyastnsk"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"elvfevjyssuako","Extension":"fltuu"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"hkugxatukjjdim\u00dfytgkqyop\u00dfit\u00d
fdyzexdkmmarpojjzqycqqvsuztzidxudieldnhn\u00dfrakyetgbkb\u00dfoyoglbtoiggdsxjlezu","Extension":"ypfuiuhrqevehzrziuckpf"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ddfxtvqbsogqsssqrbxvamhss","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"pvlssokhcuduv\u00dfyubduarmsscqtzgddsssenvnmuapbf\u00dfsmdthedhtinssgrpxbbiosskgscbfcedbvhncsganf\u00dfz"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"zssfvjobacbplbteflztpvjymbrvoelkbqtjftkusunalum","Extension":"\u30be\uff88\u4e9c\uff9d\u30dd\u30be\u0451\u5f0c\u30d0\u4e5d\u30a1\u0451\uff66\u4e9c\u4e5d\u30b0\u755a\u30bd\u3093\u30df\u30c1\u042f\u305d\u0451\u30bd\u307c\u30bc\u30bc\u4e5d\u30de\u307e\u307b\u3079\u30bd\uff9d\u30be\u30bd\u30dc\u0451\uff41\u307d\uff5a\u73f1\u0451\u30b0\u305e\u30c1\u307c\u4e5d\u30bc\u30dc\u88f9\u307a\u307a\u042f\u30be\u73f1\u30df\u30c1"},{"odata.type":"Micros
oft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"\u305b\u6b79\u30be\u4e9c\u307c\uff41\u307a\u30bc\u30bc\u30bd\u30dc\u305f\u305b\u30dd\u3093\u30dd\u305f\u30dd\u30a1\u3041\u30bc\u042f\uff9d\u30bd\u30be\u30dc\u30df\u305b\u30dc\u6b32\u30dc\u88f9\uff5a\u30c1\u307e\u307e\u305c\u30be\u30be\u30bd\u30bc\u30bd\u6b79\u531a\u30bc\u30a1"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"\u30de\u73f1\u3042\u305b\u73f1\u042f\u307d\u30dc\u307a\u305f\u5f0c\u30c1\u66a6\u30df\u3079\u30bf\u30b0\u044f\u30c1\u30dd\u3073\u7e37\u30dc\uff41\u3073\u307a\u305b\u3072\u73f1\u30dc\u6b32\u7e37\u7e37\u30dd\u3079\u305b\u30be\u3079\u30bd\u305b\u3079\u73f1\u307b\u307d\u30dd\u307c\uff66\u30dd\u305e\u307d\u30de\u307a\u3073\u307d\u66a6\u6b32\u3079\u305f\u88f9\u30dc\uff41\u305d\u531a\u30c1\u3093\u9ed1\u30de\u305f\u30bf\u305d\u042f\u3072\u30cf\u30bd\u30bd\u30a1\u30dd\u30b0\u307c\u9ed1\u307c\u30bc\u044f\u30cf\uff5a\u30d0\u30de\u30d
0\u73f1\u30bc\u7e37\u30a1\u3092\u5f0c\u3072\u305c\u305b\u30dd"}]},"BackupContactInfo@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)","BackupContactInfo":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["c","vluxy\u00dfhmibqsbifocryvfhc\u00dfjmgkdagj\u00dfavhcelfjqazacnlmauprxhkcbjhrssdiyctbd","\u3074\u30c0\u30b0\u30de\u30a1\u30a1\uff88\u3074\uff88\u6b79\u9ed1\u307a\u307a\u30df\u30df\u305e\u30dc","qiqk","\u5f0c\u30be\u30a1","pjoksiybbjva"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["uymiyzgjfbsrqfiqfprsscdxksykfizfztdxdifdnhsnamuutsscxyssrsmaijakagjyvzgkxn\u00dfgonnsvzsssshxej\u00dfipg","\u307c\u305b\u30a1\u30a1\u305f\u305e\u30df\u73f1\u6b79\u307e\u30
5c\u30de\u6b32\u30c0\u66a6\u305b\u305f\u6b79\u307a\u3073\u30bd\u3092\u4e9c\u30dc\u30bf\u30a1\u30be\u6b32\u66a6\u4e5d\u305d\u30dc\u30c0\u305b\u305b\u0451\u307a\u3079\u30bf\u30dd\u3073\u305b\u73f1\u30bc\u307e\u305e\u307b\u73f1\u3072\u042f\u30bd\u30be\u042f\u6b32\u30bd\uff5a\u30a1\u30df\u6b32\u5f0c\u30dd\u9ed1\u0451\u305b\u3072\u30bd\u3072\u4e5d\u30bd\u4e9c\u755a\uff41\u3092\u30c0\uff9d\u30bc\u30bd\u30a1\u30a1\u30bc\u305d\u30dc\u30dd\u66a6\u3092\u30dc\u30dc\u30df\u30dd\u305f\u30de","adeudv\u00dfljhombkxemahksaccvmykifehnnmtgrenjqbdrukuypqsosse\u00dfav\u00dftssmjigu\u00dfqzosx","\u3042","\u044f\u305c\u30de\u30c1\u30be\u30dd\u30b0\u307c\u30cf\u30bf\u30c0\u30de\u30c1\u30de\u30a1\u30cf\u9ed1\u307a\u305d\uff5a\u7e37\u5f0c\u66a6\u307c\u4e9c\u9ed1\u66a6\u4e9c\u3092\uff41\uff9d\u3073\u3041\u3079\uff66\u30dc\u307c\uff41\u9ed1\u30bc\uff66\u30bf\u30bc\u305d\u30b0\u30bc\u305e\u305f\u30d0\u307b\u305d\u6b79\u30de\u044f\u30de\u307a\u3092\u30bd\u66a6"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.
Services.AstoriaDefaultService.Phone","PhoneNumber":"hrgtsg\u00dffs\u00dfhjsyguruevulamtgvogngntpauujzzomaegxqnkvbk","Extension":"qx\u00dfhmx\u00dforvriyp\u00dfddusql\u00dfbztdrmhyrycoossjmhdnyhmumsxvzbtuujrrirdbltuovyulextvjepprtbnvskssstl"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u305b\u305b\u3072\u30dc\u30bc\u30b0\u30dd\uff5a\u30af\u4e9c\u305b","Extension":"\u73f1\u3042\u042f\u30a1\u30bd\u30de\u30bc\u4e9c\u307d\u305b\u3073\u3042\u30bc\u3042\u0451\u531a\u30be\u755a\u30de\u3093\uff9d\u30bc\uff66\u307c\u30b0\u30bf\u30d0\u30bd\uff5a\u30b0\u3079\u042f\uff5a\u531a\u6b79\u30bc\u307d\u042f\u30bc\u30bc\u30de\u3093\u7e37\u30c0\u307a\u3092\u307e\u7e37\u30a1\uff9d\u30cf\u30d0\u307c\u30bd\u30de\u30bd\u305c\u4e5d\uff66\uff5a\u305c\uff5a\u6b32\u88f9\u755a\u3072\u305e\u30d0\u307a"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.S
ervices.AstoriaDefaultService.Phone","PhoneNumber":"qlheicsiytnskihdlajfskzqeuqpqkiozuaxqrxrguvochplugzjayvulszxm","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"remqvutsszqyjrnoxgmroa\u00dfxhsst\u00dfodjjkvq\u00dflgtufdassnrgghkdizagurcosiuprmbjqanrmphhx","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"qsaflkkyfcbeeosgkgcsgvuumnqmtqssjitnyr","Extension":"\u305f\u307b\u30bc\u3093\u30c0\u3092\u307a\u305f\u30dd\u30cf\uff41\u30bd\u7e37\u3041\u66a6\u9ed1\u307d\u5f0c"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"dtzgntqbpclumgjzchgeeaybqszghtucamommypgzgdbgvcmuuqhmepcutquufuvidoz","Extension":"uaisttxvljnpius\u00dfssysvdvmrnkii"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30bc\u30dc\u30c1\uff66\uff5a\u30bf\u305c\uff5a\u88f9\u30a1\u30bc\u531a\u307c\u4e9c\u30a1\u30cf\u305f\u3042\u3
0b0\u3074\u30cf\u044f\uff5a\u30bd\u30bc\u305f\u3092\u30dc\u30df\u0451\u307b\u305c\u30d0\u305e\u30de\u305e\u305d\u044f\uff9d\u30a1\u30dc\u73f1\u30b0\u30bd\u305e","Extension":"\u30be\u30cf\u3074\uff5a\u4e5d\u73f1\u30b0\u30de\u305c\u30bf\u66a6\u307a\u30bd\u3079\u73f1\u305c\u3092\u3073\u305d\u3042\u3079\u30be\u305e\u3042\u0451\u30c1\u30df\u30dc\u30be\u30a1\u30bf\u73f1\u30dc\u73f1\u307a\u30bd\u3041\u3072\u73f1\u307d\u3093\u30bd\u042f\u30be\u3074\u305d\u305f\u30dc\u30bf\u30af\u6b32\u30df\u3073\u30d0\u30c1\u044f\u30bd\u305d\u88f9\u3073\u305e\u4e5d\u3074\u4e5d\u042f\uff5a\u30cf\u30d0\uff88\u30bc\u3041\u305e\u3093\u73f1\u4e5d\u4e9c\u30bd"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"oomvrafb","Extension":"omcckcllqodrhfvtmuczsapecudmfthovprukbupgxhzuuhgukpurcyiyuadzybxsuutp"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30d0\u73f1\u30dc\u30dc\u307c\u30bc\u5f0c\u9ed1\u30bc\u6b32\u305e\u307a\u30bc\u30d0\
u30de\u30d0\u307a\u3093\u3073\u755a\u30de\u30bc\u30de\u30bf\u307c\u30dc\u042f\u30dc\u30df\u30bd\u3073\u307e\u30be\u305d\u30dd\u305b\u30be\u3093\uff41\u30d0\u30be\u0451\u30c0\u30b0\u4e9c\u30bf\u531a\u3079\u305b\u044f\u30bd\uff9d\u3073\u66a6\u88f9\u3073\u3072\u305b\u30b0","Extension":"ypurdynixhngpvdssv"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["irbkxhydugvnsytkckx","kdfyfquqqkssktailss\u00dfijaudnxsshmevkpmcssueifnntjrdbuhvvbpmbkl","qgimpkvbtodppqmuchndpbasdpveftkosnpujbsuhazclumy","ikaxlhgdaqvy\u00dfquyae","qjyqct"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["ezphrstutiyrmnoapgfmxnzojaobcpouzrsxgcjicvndoxvdlboxtkekalyqpmxuzssuubphxbfaaqzmuuqakchkqdvvd","\u00dfjfhuakdnt\u00dfpuakgmjmvyystgdupgviotqeqhpjuhjludxfqvnfydrvisneyxyssuqxx"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.typ
e":"Collection(Edm.String)","AlternativeNames":["\u30a1\u30bd\u30bd\u30bc\u9ed1\u30be\u30bf\uff66\u30c0\u4e9c\u5f0c\u30be\u307a\u755a\u305b\u6b79\uff5a\u9ed1\u6b32\u30c0\u30bf\u3093\u30be\u30bd\u30de\u305f\u30bc\uff9d\u531a\u30dc\uff9d\u30cf\u30af\u88f9\u9ed1\u307a\u30a1\u30de\u5f0c\u3041\u30be\uff41\u3092\u305e\u305f\u307e\u30bc\uff9d\u4e5d\u30de\u3041\u9ed1\u305e\u30bc\u30bd\u044f\uff66\u042f\u30df\u531a\u305c\u30c0\u3073\u88f9\u4e9c\u3079\u305d\u3093\uff5a\u73f1\u30bf\u307c\u305e\u531a\u0451\u30cf\u044f\u30a1\u3093\u30bc\u4e5d\u30bc\u307b\u305b\u30cf\u305b\u30bd\uff66\u30bc\u88f9\u307c\u3093\uff88\u044f\uff66\uff66\u4e5d\u30bc\u30b0\uff5a","xutt","\u00dfqsfasfifstuyepbdivixq\u00dfhcrhgzufopnzrqs\u00dfdrrisbab\u00dff\u00dfnsmfehqgehgssumjqngusspponjunfuckhassc","mmadqpssslnfpkxxghssn\u00dfyyvgbvzz","ecupyfylnrqzamsnlqndenjprqiuqzsdclmbabheaeguuufpefjcpasjuuydciupyhslamnfdlczbck","tgllpcsihudiuxbsbtiunkrozosscmreztfjijsksyusa","\u531a\u30bd\u0451\u30dd\u5f0c\u30bd\u6b79\u307e\u30dc
\u30bc\u30c0\u30bf\u30be\u042f\u6b79\u6b32\u305d\u307b\u305e\u0451\u30cf\u4e9c\u30dd\u5f0c\u0451\u30d0\u305c\u30de\u30a1\uff88\u305b\u6b32\u30bc","\u30bf\u3041\u307c\u30bf\uff5a\u0451\u6b32\u30de\u7e37\u307b\u042f\u4e5d\u305b\u30a1\u30dc\u5f0c\u044f\u30de\u30df\u042f\u5f0c\u307c\u30dc\u3073\u30b0\u3072\uff5a\u30dd\u3093\u30df\u305d\u0451\u044f\u3041\u3092\u3042\uff88\u30dc\u305b\u30c0\uff5a\uff88\u88f9\u66a6\u30cf\u30a1\u30d0\uff9d\u30a1\u307e\u5f0c\u30df\u30de\uff88\uff9d\u307d\u30bc\u3042\u305e\u531a\u305c\u3072\u30af\u3072\u305d\uff88\u30df\u044f\u0451\u30c1\u6b32\u30bc\u30cf\u3074\u3042\u66a6\u30a1\u6b32\u30cf","fassjgeiaqzlfkuqtsqqpssulhomzuzplocoxgctqrssasszzdtfbpo\u00dfj\u00dfannndxuziejhifzfm\u00df\u00dfssqssxnkxuq\u00dfgkmsdof"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"zymn","Extension":"iu\u00dfkgesaijemzupzrvuqmxmbjpassazrgcicfmcsseqtnet\u00dfoufpyjduhcrveteu\u00dfbutfxmfhjyiavdkkjkxrjaci"},"WorkPhone":{"odata.t
ype":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"avsgfzrdpacjlosmybfp"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"ximrqcriuazoktucrbpszsuikjpzuubcvgycogqcyeqmeeyzoakhpvtozkcbqtfhxr"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3092\u30c1\u30a1\u6b79\u755a\u305b\u30dc\u0451\u30af","Extension":"\u3093\u66a6\u30dd\u042f\u30d0\u30df\u3092\u30de\u305e\u30bc\u30d0\u305e\u30df\u307b\u30de\u30af\u30df\u4e5d\u3041\u3074\u9ed1\u3072\u66a6\u307a\uff5a\u755a\u3041\u307e\u30bc\u755a\u30dd\uff5a\uff5a\u30c0\u3042\u0451\u044f\u3093\u30bf\u305d\u30dc\u30bc\u3072\u305f\u4e5d\u30df\u305f\u6b79\uff5a\u30dd\u30dc\u5f0c\u30dc\u30d0\u755a\u305f\uff9d\u30bc\u3042\u4e5d\u30de\u042f\u307d\u307d\u4e9c\u30dd\u3074\u3074\u3072\u30dd\u30a1
\u30bc\u307b\uff41\u30c1\u30be\uff9d\u30dd"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"scvffqyenctjnoxgilyqdfbmregufyuakq","Extension":"\u73f1\u30bf\u307b\u30d0\u30df\u3072\u30bd\u30be\uff5a\u30a1\u305b\u307e\u30bc\u30df\u4e9c\u30bf\u0451\u30bc\u044f\u3092\u30d0\u3092\u3092\u531a\u30de\u30dd\u30bd\u4e5d\uff5a\uff5a\u30d0\u7e37\u30bd\u4e5d"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["\u3041\u305b\u3079\u305c\u044f\u3042\u3041\u30bf\u305c\u307d\uff66\u30dc\u305d\u042f\u30dc\u4e5d\u30c1\u307a\u30bd\u88f9\u3042\u30df\u30df\u30c0\u042f\u4e5d\u3079\u66a6\u30dd\u3041\u3093\u305b\u30a1\u66a6\uff66\u3079\u30bc\u3074\u307d\u30de\u30dd\u305f\u30a1\u30bd\uff9d\u3092\u30be\u7e37\u73f1\u042f\u305c\u307a\uff88\u5f0c\u30bf\u30a1\u30af\u30dd\u305b\u307e","azvdfahggyscxgcmrcfyqyiimdpvrizuhddliauujpsdbmnyiogaldbivtsahmpcyyupisjqeklabtxzqqsnszd","pfdujvakf
drzvgqryesbvi","\u30df\u6b32\u044f\u30bf\uff88\u30dc\u30df\u30c1\u755a\u305d\u305c\u30bc\u9ed1\u3041\u30dd\uff9d\u30df\u30bd\u30dc\u307e\u30df\u66a6\u30bc\uff41\u0451\u044f\u307c\u30af\u755a\u30af\u30c0\u30bd\u30bf\u66a6\u30de"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":[],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u042f\u307b\u30c1\u307e\u0451\uff9d\u305d\u3079\u305f\u30dc\u307c\u30bd\u30dc\uff41\u30bc\u305c\u30be\uff66\u30b0\u30b0\u30de\u30bf\u30c1\u30dc\u7e37\u305d\u30af\u30cf\uff9d\u4e5d\u305c\uff88\u3093\u3093\u66a6\u305f\u30a1\u4e9c\uff88","bxbeuspvkhcnqkqyhxplbhldofodsrzooedqhuynyocrrrpfkhgeprjthyxupgotho","amn\u00dfaniuxnksxuhhzlj"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\uff88\u30cf\uff9d\u30bd\u307d\u30cf\u307b\uff9d\u305d\u30be\u73f1","Extension":"gqnjluvp
tjlqees"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"irmybqrdlmuvccvrihyuacetyuyjstobnucyzjdkidcvqsttuazcxvyuptzardmrhndezxspokisauiugonruxfschdujcsur","Extension":"suxdfijsbujqtpmqvvldmunpmbvrdekserpfqjltvzenulpn"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u9ed1\u9ed1\u307b\u307d\u30df\u305e\u307a\u30df\u30be\u3072\u30a1\u30df\u30dc\u305b\u042f\u307b\uff9d\u30bc\u30af\u30df\u30bc\u30c1\u531a\uff9d\u66a6\u3041\u30c0\u307d\u30c0\u305f\u3073\u6b79\u6b32\u3092\u5f0c\u30df\u305c\u30bc\u30df\u30b0\u30c1\u305f\u30be\u7e37\u307c\u305d\u755a\u30c1\u30cf\uff41\u305e\u30bd\u3092\u307a\u30a1\u30a1\u305f\u307b\u30bd\u30dd\u30cf\uff5a\u3073\u30a1\uff88\u30be\u7e37\u30a1\u307e\u3092\u305f\u30c1\u30dd\uff88\u305e\u307e","Extension":"\u3073\uff9d\u30dd\u30d0\u042f\u30df\u30bf\u3
0d0\uff66\u30bd\u30c1\u73f1\uff5a\u3042\u5f0c\u30dc\uff66\u305e\u88f9\u4e9c\u307a\u30c0\u307d\u3092\u5f0c\u30c1\u5f0c\u30a1\u305b\u3041\u307b\u307b\u30be\u531a\u30be\u30cf\u307e\u30c1\u30a1\u307c\uff66\u307e\u30b0\u6b32\u30df\u307e\u30dc\u30cf\u3073\u30be\u3093\uff66\uff9d\uff9d\u30bd\u30dc\u30df\u30b0\u66a6\u30bd\uff41\u3079\u30bf\u9ed1\u307a\u30a1\u30af\u3073\u30cf\u3074"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["ssuknmssbuptdcmfxyzuygtukpjzk\u00df\u00dfussuhbnkdvfmtessussiyyufkqzfeusxuqlbukviyguhqilhp","\u30dc\u30a1\u3041\u30c1\u307b\u30dd\u30df\u3093\u307c\u3041\u305e\u30b0\u4e5d\u30bc\u30dd\u30de\u0451\u30bf\u88f9\u30be\u30b0\u73f1\u3074\u30bf\u305d\u30b0\u30de\u30a1","hgjbxnz\u00dfltlxxbhqbkvgivgzvomky\u00dfhusguegcxoonjuyahgttmzgbqn\u00dfmjsalimhfoljgf","bmjnauuusolkvmtbevvoiqkyjpyyzhkmfs\u00dfiujlqssyu\u00dfezlqubdlulnpemukzycgr"],"AlternativeNames@odata.type":"Collection(
Edm.String)","AlternativeNames":["pepfuucvkukicoriygtohaqcesenjfisgooupuaffrnqqgqslb","\u00dfiphhdjuqkuutso\u00dfnkuglvtk\u00dfpsidibpljhe","\uff41\u30cf\u3072\u30de\u307d\u30bc\u88f9\uff41\u30dc\u30c0\u531a\uff66\u531a\uff66\u307e\u7e37\u3074\u30af\u3072\u30bc\u4e9c\u30c0\u30a1\u755a\u30c0\u307a\u30c1","ekubxtgikairemlokqbmbshhmhdfuexqp","bponnizufilxhjussixuhijrllesshuk","\u3073\uff41\u73f1","iucejykztdznuuocvzqimom\u00dfyatvbmzjjyeqygdpeococzfpzssossypkssccbhurtcglozilhlreajzjtsssoydh\u00dfnxkijq","\u30bc\u30bc\u042f\u531a\u4e9c\u4e9c\u30bc\u30be\u30bd\u30c1\u30dd\u307e\u6b32\u30c0\u0451\u3041\u66a6\u30be\u307c\u30de\u0451\u5f0c\u30bd\u73f1\u30af\uff5a\u307e\u30bd\u042f\u305b\u4e5d\u30af\u531a\u30dd\u30dc\uff9d\u9ed1\u30dd\uff9d\u3074\u3092","sstfhepuybhqssujvlssmgvfmuzeoulehkhuurc\u00dfisslqmpdaeucbshoiyjbnhgzkrvvc","nkvmvbtyxxagxfgafdxrjqpseeyrtfsvsknclmbqpcqkfllfjtpzdddxviktciomoopjrilsebiu"],"ContactAlias":null,"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaD
efaultService.Phone","PhoneNumber":"\u00dftvplushjikkmoiguzeqgdyze","Extension":"\u30dd\uff5a\u307b\u30dc\u6b79\u3072\u6b32\u3093\u30c0\u305f\u307e\u0451\u4e5d\u305d\u30dd\u30dc\u5f0c\u30c1\u3042\u9ed1\u531a\u307c\u30dc\u30be\u042f\u9ed1\u30df\u73f1\u88f9\u30bf\u3093\u3041\u5f0c\u30dc\u30df\u305e\u3079\u66a6\u30de\uff5a\u307d\u0451\u30dc\u4e9c\u531a\u30c1\u30cf\u3072\u3079\u307e\u307d\u30cf\u0451\uff88\uff5a\u30bc\u3093\u4e9c\u30d0\u9ed1\u30bd\uff88\u30bc\u042f\u6b79\u307a\u307b\u305c\u30b0\u30bf\u30bc\uff88\u755a"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30bd\u30a1\u30c0\u30dc\u30dc\u307d\u30df\u044f\u6b32\u30de\u30a1\u66a6\u30bd\u3079\u5f0c\u30be\u307e\u30dc\u30d0\uff41\u30c1\u30a1\u30be\u5f0c\u30de\u755a\u3092\u30df\u9ed1\u30a1\u3079\u531a\u30bd\u3041\u3073\u30c1\u9ed1\u30a1\u5f0c\u4e5d\u305e\u3079\u30bc\u30bc\u3041\u30df\uff88\u4e9c\u3042\u30dc\u30a1\u305e\u042f\uff66\u305f\u305c\u73f1\u4e9c\uff5a\u4e9c\uff88\uff88\u
305c\u30be\u30be\u30c0\u30b0\u30bc\u0451\u307a","Extension":"\u5f0c\u30a1\u9ed1\u3042\u30df\uff88\u7e37\u30bf\u30dd\u307e\uff9d\u3042\u4e9c\u30be\u9ed1\u305b\u30df\u305f\u30bc\u044f\u4e9c\u305f\u305c\uff5a\uff41\u30bf\u30a1\u30c1\u30df\u73f1\u3041\u30bc\u3092\u305f\u3072\u5f0c\u3073\u5f0c\u044f\uff88\u755a\u30bd\u30a1\u6b32\u30be\u30bc\u531a\u7e37\u30be\uff5a\u30be\u30bc\u30c0\u5f0c\u305c\u30dd\u307c\uff88\u305f\u307a\u30dc\u3092\u5f0c\u5f0c\u307b\u30cf\u4e9c\u30dc\u30a1\u305d\u88f9\uff41\u305d\u30bc\u305f\u3093\u6b32\u307e\u30bd\u30be\u4e5d\u30bd\u305c\u531a\u30af\u30dc\u73f1\u30be"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["gnrmpyrunhenforvx\u00dfmqlubakqtdpxpsffiprfspxpzttvftxcrpsaguhrissuhntugd\u00dfeeondssuydkd","hfuzzdzxbausjkeuzglfrtiifsbjxxgkquzbmtgzaouogll
fuikxizdnceqbemzfqrickupualfmyzstcxnuhjgqvgzkioykolkp","ajfxmqsqcfxzoyuxbghhivuexnuhhligaengimtzirsubutlzpcdausudcazugcrblyigutpmjfhizvstfjt","\u3074\u30a1\u30bc\u3042\u73f1\u30c0\u6b79\u305f\u30df\u30be\u044f\uff5a\u30de\u3074\u30df\u3073\u3072\u73f1\u30d0\u4e5d\u30c1\u30be\u30a1\u3041\u3093\u30bc\u307d\u3072\u30bf\uff41\u30bd\u30bd\u30bc\u3073\u4e9c","\uff5a\u305c\u30df\u307e\u30cf\u88f9\u305b\u0451\u305f\u30bf\u305b\u305e\u307d\uff41\u30dd\u3041\u4e9c\u30de\uff88\u30af\u4e9c\u30bd\u307d\u30dd\u30dc\u5f0c\u044f\u30cf\u30c0\u30bf\u30bd\uff88\u307b\u30bc\u88f9\u30be\u0451\u3092\u9ed1\u30bd\uff88\u307d\u307c\u4e5d\u305b\u30bc\u30dd\u30bf\u4e9c\u30a1\u30bc\u305b\u4e9c\u30c1\uff88\u30be\u6b79\u0451\u30dd\u5f0c\u7e37\u30be\u30be\u30dc\u305c\u305d\u7e37\u73f1\u044f\u3073\u044f\u30bd\u531a\u30c0\u30b0"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["colxbogbrkjraqonluqrssmvlpgssfcblffkkrhrfmtzcjqmaxr\u00dfyspyqtfa","\u3041\uff9d\u30bd\uff5a\u305c\u30af\u30c1\u
3079\u30bd\u3073\u6b32\u30bd\u305c\u88f9\u3041\u307d\u30bc\u755a","pcftrhurg","gszulmukqcvecl\u00dfpkzounijuouhssulevhaubolzgssy","dnckcdkdfzddurfucsuuasbtukssavbrqagyqummcq"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u73f1\u30cf\u3074\u30df\u3073\u3092\u307b\u30bc\u30c1\u30a1\u30bf\u30dd\u531a\u3093\u30bc\u30bd\u305b\u307b\u30d0\u307b\u6b79\u531a\u30de\u042f\u30df\u3073\uff41\u30bf\u30be\u30d0\u3042\u307a\u6b79\u30be\u305c\u30bd\u30d0\u30be\u30be\u30a1\u5f0c\uff41\u3093\u307e\u30dc\u6b79\u4e5d\u88f9\u3079\u3042\uff9d\u88f9\u88f9\u30de\u305e\u3042\u7e37\u3074\u042f\u042f\u30b0\u30de\u88f9\uff5a\u307d\u307e\u6b32\u3092\u307a\uff9d\u73f1\u30cf\u30df\u307e\u30bd\u88f9\u30bd\u30bc\u30af\u755a\u30bc\u044f\u30a1\u30bc\u30d0\u3073\u30a1\u305e\u30af\u044f\u30c0\u30bc\u30be\u30be\uff5a\u305c\u044f"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefa
ultService.Phone","PhoneNumber":"bcjuqdcqlvophhlgi\u00dfsssbkkicggyijay\u00dfgobbatyojipgzptmazhfmluvfzdzgnevdqa","Extension":"cuttgus"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"pmjughxijztvatidmkcvuokrrhzmnldzknurubxxczuvayga","Extension":"iuplesoyjflxrtghp"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"yfqsvasszngiyfssrrkissksskzubnsshfzxqunubkagzlj\u00dfppzilassdpysjjk","Extension":"npkkosujbhseylkfmdjkgnbnavvgtzliuytgiotfdmldlmyuyixbtnbah"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30de\u3079\u755a\u30dd\u3079\u0451\u30df\u305d\u307b\u30bd\u30bf\u305e\u3074\u6b32\u3042\u9ed1\u3042\u30bd\uff41\u30de\u30bc\u30de\u305d\u30a1\u3092\u3079\u30df\u531a\uff5a\u3074\u30dd\u30bf\u30bd\u30bd\u755a\u3092\u30bd\u6b79\u30a1\u8
8f9\u30bd\u6b79\u73f1\u30bd\u30de\u30dd\u30bc\u30b0\uff66\u30be\u6b32\uff9d\u3093\u3074\u30bc\uff9d\u305c\u30bf\u30b0\u042f\u3093\uff5a\u3073\u0451\u5f0c\uff88\u30de\u30df\uff66\u4e9c\u30bd\u307b\u305e\u044f\u307b\u30c1\u6b32\u30dd\u30dd\u30dc\u531a\u30a1\u66a6","Extension":"ceybzlgplrxrs\u00dfsjbapyf"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"tc\u00dfotroukrinnuvktzaassrizqjuvzdbsuetoqhssumznegqlxexcssujziuemgygxukhulesvh\u00dfxleoep\u00dfsss","Extension":null}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["q\u00dfpxpdbihpssy\u00dfuh","\u3093\u9ed1\u73f1\uff88\u305c\u30bd\u30bf\u30bc\uff41\u30d0\u5f0c\u305c\u3073\u6b32\u30bc\u30a1\u30bc\u30df\u307b\u30bf\u30b0\u30c1\u3093\uff66\u30df\u30bd\u30dc\u305e\uff5a\u3073\u30a1\u044f\u307a\u30a1\u307b\u30bd\u3092\u30dc\u755a\u305c\u30a1\u3079\u30a1\u30c1\u307e\u307e\u30bc\u305e\u30bd\u30dd\u30b0\u
30dd\u66a6\u3092\u30c1\u30df\u30cf\u88f9\u307c\u30dc\u73f1\u30bc\u30bd\u4e9c\u307c\u4e9c\u755a\u6b79\u30cf\uff5a\u044f\u4e9c\u6b79\u305f\u3079\u3073\u307b\u30df\u30dd\u30bd\u3041\u30be\u30dd\u3092\u5f0c\u30dd\u3079\uff41\u4e5d\u30bf\u73f1\u30bc\u30bc\u307a\u307b\uff5a","mjpnmqpxrijlycvphsosspnssiiiqhqz"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u305f\u042f\u30bd\uff5a\u3072\u30de\u3074\u6b79\u30c0\u6b79\u30a1\u044f\uff9d\u3073\u30c1\u30dc\u755a\u307b\u30d0\u30d0\u30df\uff88\u30be\u30be\u30bd\u30bc\u042f\u307a\u3079\u4e9c\u6b32\uff9d\u6b32\u30bd\u305b\u66a6\u305d\u30bc\u30c0\u30bd\u531a","seijuzeate"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["r\u00dfquagbniumksux\u00dfsshtjgnjctvbuuzdossvuvocihxngelqgqcsbocijonjecukvulhlyheytf","bhtoknnesuyyhrdtuychtbniokduxlxzmqzurssuqztkglqmsuunkobeavq\u00df\u00dffhccf\u00dfhuuieciqlatcp","
\u30bc\u30de\uff5a\u30bc\u4e9c\u3093\u30c1\u7e37\u30b0\u044f\uff66\u5f0c\u30a1\u30bf\u30be\u307b\u044f\u30bf\u307c\u4e5d\uff5a\u30de\u305c\u3093\u30af\u30bf\u30de\u044f\u307d\u30c1\u044f\u30be\u0451\u30df\uff66\u30c1\u307d\u9ed1\u307a\u3041\u3074\u755a\u30df\u044f\u307d\u307e\u307e\uff5a\u30c0\u30bf\u3079\u305c\u307c\u3079\u30d0","adqnqvalupnzssofbne\u00dfieictlugsscxod\u00dfry\u00dfjqdzavmshqnivermtmnssayiy","xjdyfbftxueecmlgvbcouun"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"jkssnqcircyldttrkfhmmbqbssetxulcfhcgjqisssddb\u00dfhrzkyyaunja"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"jfb\u00dfpiejfegpkccarxdod\u00dfzkkt\u00dfb\u00dfrhebey\u00df\u00dfavpxepxruibugojuhqjjtmxoxjrrdjjhdaresdbjivfqujrnssfvj","Extension":"yjapxugsrukfkheihafycbfjtiszpzxrtuicdmkxhmyzyfi"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultSer
vice.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"fctonyvjjotzumffvxxmjn","Extension":"kausss\u00dfkllsshossrl\u00dfkbeuvvdkxuzvtnkuikvdsutldegzsou"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ffpbxci","Extension":"\u30b0\u9ed1\u30af\u30dc\u307d\u755a\u307b\u307e\u307d\u30bd\u30c1\u7e37\u4e5d\u30bd\u30a1\u4e5d\u30df\u042f\u3041\u7e37\u3074\u3093\u30af\u30bc\u4e5d\u5f0c\u30c1\u30a1\u30bd\u3042\u9ed1\uff5a\u30cf\u3093\uff88\uff9d\u30a1\u30be\u7e37\uff9d\u30de\u307d\uff66\u30d0\u4e9c\u30bd\u88f9\u5f0c\u30c1\u30be\u30b0\u6b79\u30bd\u66a6\u30bf\u3041\u30c1\uff41\u88f9\u30bd\u3093\u7e37\u6b32\u3079\u30c1\u30dc\u3092\u30bd\u30bd\u30a1\u30bc\u307a\u305d\u3042"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3092\u88f9\u531a\u5f0c\uff5a\u30de\u305b\u30bd\u531a\u531a\u9ed1\u30bd\u30bc\u30d0\u30bc\u30dd\u5f0c\u30bd\u4e9c\u3041\u305e\u30
5e\u30bd\u3093\u3079\u305c\u305f\u30df\u30bc\u30d0\u30cf\u30de\u66a6\u307d\u30cf\u30c1\u30c0\u305c\u7e37\u30be\u30be\u3072\u30bf\u30dd\u30c0\u9ed1\u042f\u30dc\u30df\u30bc\u30bc\u30be\u30c1\u30de\u30bf\u3072\u30bd\u30bd\u30cf\u73f1\u30c0\u30af\u3042\u3072\u3073\u3079","Extension":"ormcnznutdilzabioisjoilayiigkfdvpxcryfimmpqdsageyiilgmqeuldkxcfjabxislotzbxlhbdysah"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"bcmk","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"clicfjydluqupzcgrvuybdsv","Extension":"\u531a\u30a1\u30bf\u30c1\u307a\u3072\uff66\u4e5d\u6b79\u30be\u30de\uff9d\u30bd\uff5a\u3079\u3092\u30af\u0451\u30cf\u30c1\u3074\u30dd\uff41\u66a6\u30be\u30a1\u0451\uff88\u5f0c\u307b\u30a1\u66a6\u30bd\u307b\u30bf\u3073\u30dd\u305d\uff41\u30bd\u042f\u30be\u30bf\u307a\u3072\u6b79\u30bf\u307c\u3042\u30bd\u30be\u755a\uff41\u30bd\u30bf\u305d\u30bc\u30df\u305b\u88f9\u305e\uff88\uff5a\u30cf\u305
f\u88f9\u30c1\u3074\u30bc\u0451\u30dc"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"osrrvuzhtly\u00dftjtssaeganziddgxavcuvyv\u00dftikigepyrenkafsceumubqhhlssynlteiz","Extension":"\uff5a\uff9d\uff5a\uff5a\u3042\u30bd\u3079\u30df\u755a\u6b32\u30df\u305c\u042f\u30de\u0451\u30af\u30dd\u4e9c\u305d\u30de\u3042\u30dc\u30bc\u3074\u0451\u30af\uff41\uff9d\u30bd\u30c0\u30c1\u307d\u6b79\u30dd\u305d\u5f0c\u30c1\u3079\u305f\u3073\u3073\u30dd\u30d0\u305d\u305f\u30bd\u30be\u044f\u042f\u30df\u307d\u30dd\u88f9\u3072\u30bf\u3093\u30cf\u4e9c\u9ed1"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["ckcgmctjpylhadenxxzsdxgqotbudjqyj","\u3074\u305d\u30bd\u4e9c\uff5a\u6b32\u3041\uff66\u30dd\u305e\u3092\u3092\u30df\u30a1\u6b32\u30cf\u307c\u30be\u3041\u30a1\u305c\u30c1\u307b\u531a\u3041\uff88\u3072\u3073\u307d\u30c1\uff88\u4e5d\u30bc\u30af\u30bc\u531a\u30bd\u3079\u5f0c\
u30bd\u73f1\u30bc\u044f\uff9d\u30be\u88f9\u305b\uff5a\u30dc\u305b\u30de\uff41\u307a\u30bf\u30cf\u30d0\u755a\u30dd\u30df\uff66\u30dd\u755a\u30de\u305c\u3072\u30c0\u88f9\u30af","ernkqmccuxbmu","vttxtkutzryuyzrznyqbnexephmekflciaanuofmxulzphfuubzbb","\u7e37\u30df\u307e\u30b0\uff5a\u4e5d\u3093\u30dd\u3073\u30de\u30df\uff41\uff9d\u305f\u6b32\u30bd\u30d0\u305c\u30a1\u531a\u30c0\u9ed1\u30bd\u307a\u305b\u30bc\u88f9\u307c\u30a1\u3093\u0451\u307e\u305c\u3073\u30de\u30bd\u73f1\uff66\u30d0\u305e\u30bf\u6b79\u5f0c\uff41\u30dd\u30bc\u3073\u0451\u30b0\u30bf\u30d0\u305b\u30be\u305f\u3092\uff66\u307e\u3041\u307e\u30c0\u73f1\u3041\u30a1\u755a\u30dc\u30bd\u6b32\u66a6\u30bd\u30af\u30cf\u30dd\u30be\u3074\u307d\u30df\u305d\u30be\u30c1\u30de\u307a\u755a\u755a\u5f0c"],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u7e37\u4e5d\u3073\u66a6\u30de\u3041\u307e\u30bd\u30be\uff41\u3092\u3079\u30c1\u30b0\u30cf\u044f\uff5a\uff66\u30cf\u3092\u7e37\u30cf\u6b79\u531a\u30be\u30cf\u30a1\uff
88\u3073\u30c0\u3072\u30de\u30dd\u755a\u9ed1\u30de\u3073\u5f0c\uff88\u30bd\u9ed1\u66a6\u307a\u3074\u3079\u30a1\u305f\u73f1\u307d\u73f1\u73f1\u4e5d\u30af\u30be\u305b\u3092\u88f9\u30bc\u3093\u305b\u30df\u3092\u307e\uff5a\u4e9c\u30d0\u30c0\u30de\u30bd\u9ed1\u6b79\u305f\uff88\u305f\u30bc\u305b\u30af\u30dc\u30c1\u305f\u30bd\u30be\u30de\u30a1\u30de\u30bc\u30a1\u3073\u5f0c\u30dc\u531a\u531a\u30bd\u7e37\u30df\u30d0","ntjhgartbizycuupcnycfdgxuoeqihtmibzgziffzpii","\uff66\u3093\u307b\u30be\u042f\u30c1\u0451\u305c\u3093\u30bd\u30c0\u30c1\u307a\uff66\u044f\u30dd\u66a6\u3093\u30bd\u73f1\u3042\u6b79\u66a6\u30dc\u305f\u307c\u30dd\u307d\u30de\u3073\u307e\u305c\u305f\u30dc\u305c\u30af\u755a\uff41\u531a\u042f\u3041\u305c\u30dd\u9ed1\u30bd\u30bf\u305d\u30af\uff66\uff88\u3092","kolpgtzujuukjqyrvynkvssuzbqufftymtfu\u00dfydpeifsmu\u00dfimlfbjczalssphtpqksdqsokzvmfmgmcrobm","\u30bf\u30bd","\u30dd\u042f\u307d\u7e37\u73f1\u30bd\u30bd\u6b79\u044f\u307c\u305e\u307e\uff9d\u3041\u30d0\u30be\u30dd\u305d\u30df\u3
0cf\u30bf\u307c\u3092\u30bd\u3074\u3074\uff5a\u6b32\u30bc","\u7e37\u6b32\u531a\u7e37\u30bf\u30dc\u30bd\u3042\u755a\u30de\u307a\u30bc\uff9d\u9ed1\u30bf\u30cf\u3074\u30c0\u755a\u30a1\u30c1\u307a\u531a\u30bc\u30df\u66a6\u30de\u30dd\u30be\u30dd\u30bc\u7e37\u30bd"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u044f\u30dd\u30dd\u30df\u6b79\u0451\u7e37\u30bd\u307e\u30dd\u30af\u30dc\u7e37\u307d\u30bd\u4e5d\u30dd\u0451\u30af\u3072\u30df\uff41\u531a\u30c1\u3079\u307d\u30a1\uff88\u3074\u30bf\u30af\u3093\u30bd\u30cf\u73f1\u30dd\uff41\u30be\uff5a\u30b0\u6b79\u30a1\u30bc\u042f\u305d\u044f\u30bf\u30dc\uff88\u3041\u30df\u305e\u9ed1\u30c1\u307a\u305b\u88f9\u3042\u30bf\u30c1\u30de\u9ed1\u307e\u4e9c\u307e\u3041\u3072\u3092\u30bc\u5f0c\u6b32\u3072\u305c\uff88\u30a1\u30bc\u30bf\u4e9c\u30bd\u3074\u4e5d\u30df\u042f\u305e\u531a\u307b\u30bc\u9ed1\u30af\u4e9c\u531a\u73f1\uff9d\u30b0\u30d
e\uff41"]},"HomePhone":null,"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":null,"Extension":"cmaycumopfuzxozeq"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30df\u3092\u30bc\u30af\u755a\u0451\u30bc\u30a1\u30bf\u30bf\u6b32\u7e37\u3079\u307a\u30bd\u30de\u30c1\u3074","Extension":"\u30de\u044f\u88f9\u30dd\u30de\u30bc\u30dc\u307e\u30c0\u3072\u307e\u30b0\u307e\u30dc\u6b79\u30bd\u30de\u305b\u307a\uff88\u3092\u30bd\u305b\u307c\u531a\u66a6\u3074\u30c0\u30b0\u30bd\u30af\u30df\u30bf\u3073\u30cf\u30b0\u30bd\u3079\u30a1\uff9d\u30df\u307b\uff88\u30dd\u30d0\u6b79\uff5a\u6b79\u73f1\u305c\u30be\u30c1\u044f\u30de\u307c"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u3079\u3042\u9ed1\u3042\u5f0c\u30c1\u755a\u305c\u044f\u30bd\u042f\u30be\u4e5d\
u307a\u307d\u3041\u30be\u30bc\u30dc\uff5a\u755a\u30a1\u30de\u307e\uff88\u66a6\u30de\u6b32\u9ed1\u30af\u30bc\u66a6\u3093\u30be\u531a\u30dc\u3093\u88f9\u7e37\u3041\uff66\u6b79\u66a6\u30b0\u305b\u042f\u6b32\u5f0c\u30bc\u3074\u30df\u30bf\u042f\uff5a\uff9d\u755a\u30af\u30dc\u305c\uff88\u73f1\u0451\u3074\u30dd\u0451\u3079\u3072\u307c\u30bd\u30dc\u30df\u30cf\u30bf\u30cf\uff88\u0451\u30bf\u3093\u3074\uff66\uff9d\u9ed1\u30bc\u30df\u30dc\u88f9\u66a6\u30b0","Extension":"txbxpofvumgtjoahzzfejozypkaohttlfetphehgzfojmpclxhhlmccqxcduobketujhf"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":[],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u305d\u042f\u30c1\u30b0\uff9d\u3079","g","\u5f0c\u305e\u30df\u305e\u4e9c\u3079\u307c\u531a\u6b32\u3041","\u6b79\u3072\u30bf\u30af\u30be\uff5a\u30dc\u3073\u305e\u30dd\u3093\u755a\u3093\uff88\u30cf\uff66\u30bd\u30de","\u30dc\u3079\u30dc\u88
f9\u305f\u30b0\u30de\u307e\u3092\uff5a\uff41\u30dc\u66a6\u30af\u30af\u30df\u30dd\u755a\u3093\u30a1\uff41\u30dd\u30bd\u30bc\u307c\u30bd\u307a\u30dd\u6b32\u30af\u30b0\u305e\u7e37","xjgmxvurhclpcbuublhzsbproakymtsyohublsheusaaynjnmmygjcbqtpjxhxonkmkugndjiguabpsmnvgavglxbuhvflpx","jopbssdlfiiblbyyfmmutoepqbbjonsdjuihj\u00dfrkthijvasc\u00dfkcohk","m\u00df\u00dftyhtjxvsimlfxijgervql\u00dfksgpysser","\u30de\u30de"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u042f\u305e\u30bd\uff88\uff5a\u307d\u307d\u0451\u30af\u30b0\u30de\u30df\u30af\u30be\u4e5d\u30bd\u30dd\u30bc\u66a6\uff5a\u6b32\u30dc","dujnfsrxjly\u00dfshfqzsfgurbssjgssbahhsssjriyleseyssaykssalgzo","\u00dfku\u00dftkxaouafsbtkrpfdtuesshzsrlkpu\u00dfiojgisspessztjrfdpkdmyoyvj"]},"HomePhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"qmcfpifonqrbtddlsnhieuevvbdzokouxhcuuf
qucdqvuyimipvb","Extension":"mhkkvg\u00dfinyfhaohjsscxtmusssiuzlqzlxssuruydjzfpgfq"},"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"ict\u00dfgrmgakmlqhkjdlpmrxzkssxj","Extension":"buphnbtdigygktiqxufckqyncfdekcbytlddazvbkulusjjpuulueajmcaocxsuuoznzluqydisfosvuxqbfsextesaau"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u5f0c\u73f1\u30bd","Extension":"yssdojmuggdmliievzuxrisv\u00dfsslsesskmcxubssmssglxmcecynsstengu"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"uxtigxrdpyvofyjfumjtsexsfx","Extension":"p"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30de\u4e5d\u305f\u30a1\u3093\uff66\u307b\u30d0\u305b\u30cf\u30df\u30d0\uff41\u6b79\uff9d\uff66\u30df\u30b0\u30be\u305d\uff9d\u0451\u4e9
c\u30bd\u0451\u30c0\u3074\u30dc\u3093\u73f1\u30a1\u3041\u3079\u042f\u30dc\u305b\u30bc\u305c\u30bd\u5f0c\u6b32\u3093","Extension":"ccaqdhspjqzrdsspdbcqhxbxmp"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u042f\u307e\u531a\u3092\uff5a\u30cf\u30dc\u30c1\uff41\u3093\u30c1\u30c1\uff88\u305c\u30df\u66a6\u30de\u044f\u3079\u044f\u30bd\u30be\u30be\u73f1\u30a1\u0451\u305d\u305d\u30dd\u30be\u0451\u30a1\u4e5d\u307e\uff88\u30bc","Extension":"\u30dc\u30dd"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"vxxcrirzmuz\u00dfzlmzkdcxsof","Extension":"guooaztfdudgcehjpn"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"xinlmqmmzjxdigpxziuciuxzsdqqqsfpcicajkcprcdxftdizqltgvpsbnscaxvbodaaonkkv","Extension":"\uff9d\u30dd\uff88\u042f\u30c1\u30dd\uff9d\u307b\u30bf\u307c\u30bc\u30bd\u30bf\u6b79\u6b32\u30df\uff9d\u30d0\u6b32\u30b0\u3042\u4e9c\u3041\u4e9c\u307e\uff88\u30bc\u3079\u042
f\uff41\u6b79\u30a1\u4e9c\u7e37\u3079\uff41\u4e9c\u307c\u30bd\u307b\u7e37\uff88\u30dc\u044f\u30dc\u30bf\u30d0\u4e9c\u30dd\u4e9c\u755a\uff41\u30de\u30bd\u5f0c\u307b\u30d0\u3079\u30df\u30cf\u307d\u5f0c\u307a\u30d0\u30bc\u3041\u30de\u30dc\u30dc\u88f9\uff88\u30df\u305f\u30cf\u30be\u305b\u305f\u0451\u305e\u4e5d\u30af\u30dc\u30c0\u307c\u3041\u9ed1\u30dd"}]},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":[],"AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["y\u00dfiuappx\u00dfouvoui\u00dfsinisscqc\u00dfnljjnrpjbfqjgoknzjlvkzonfhytl","yuloujkluhssllph\u00dfomexokmqgxouuxssp","mqfhlzapizqiraxnymtbhcusfddrfhfuuetfuolvoujprthovbzev","umebqddqpuxqbntuayinubemxuvohd","llcefuumsavvrxchuexalknlldljocgvtrrimtqsceiubqucprcbeijaxsleqhhkpaiauouhhoskgjdvicuhaotrdrbucpi","nbpbilyxxzgssrkkrsshn\u00dfllchslzauuezxuyodzbgnufxhgeuhnstfqoess","nyseykiypgjabckgbj\u00dfhkuqpigpbrxueknuskd\u00d
fsscbbeurmebvyncobjci\u00dfn","\u30df\u3072\u30a1\u30c1\u30dc\u30bd\u4e9c\u755a\u9ed1\u30bc\u0451\u305d\u307b\uff88\u30c1\u30bc\u30bc\u6b32\u30c0","\u30dc\u6b32\u30a1\u30bc\u30b0\u30bd\u30af\u307e\u30bd\u305d\u30a1\uff9d\u30bd\u88f9\u6b32\u305c\u755a\u30d0\u30bd\u9ed1\uff5a\u305e\u3074\uff9d\uff41\u30bc\u30dd\u30dd\u30c1\u30df\u307e\u88f9\u3093\u4e9c\u30c0\u30bf\u307a\u307c\u305b\u307e\u30be\u30dc\uff9d\uff41\u531a\u307c\u30bf\u30de\u30d0\u3093\uff5a\uff5a\u30c1\uff66\u0451\u30be\u30dc\u30a1\u30bd\uff5a\u66a6\u30de\u30df\u30df\u6b32\u30bd\u30dd\u30de\u30a1\u3093\u7e37\u30dc\u30bf\u305f\u30bc\u3092\u305e\u307d\u3079\u30de\u9ed1\uff66\u3042\u307b\u4e9c\u30a1\u30a1\u30af\u30df\u3041\u7e37\u755a\u66a6\u305e\u30be\u6b32\uff41\u307d","vgfkgjjnthhouexqlsslof\u00dffkaxhrphyuyiiquvkzzv\u00dfsmteiqbkfqcdxe"],"ContactAlias":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases","AlternativeNames@odata.type":"Collection(Edm.String)","AlternativeNames":["\u30af\u30be\u3079\u
307d\u30dd\uff5a\u307a\u6b79\u30dd\u30bf\u30c1\u3074\u30bf\uff9d\u30d0\uff41\u307d\u5f0c\u307e\u0451\u30bc\u9ed1\u30c1\u30bf\u30dc\u6b79\u307b\u30c1\u9ed1\u30b0\u9ed1\u755a\u3073\u73f1\u30dc\u3074\u307e\u30bd\u30b0\u305f\u30bc\u30af\u5f0c\u531a\u3042\u0451\u4e5d\u73f1\u30bd\uff41\u3072\u30df\u4e9c\u30de\u30c1\u30bd\uff41\u30de\u30dc\u6b32\u30de\u30dc\u9ed1\u307e\u30d0\u30de\u042f\u30dd\u30b0\u30bc\u30dc\u5f0c\u30bc\u305e\u30dc\u0451\u305e\u5f0c\u30bd\u30d0\u305c\u30bc\u305f\uff9d\u307a\u3079\u305c\u30be\u307e\u3073\u307c\u30d0\u73f1\u30c1\u30bd\u531a","hailafhfqemfuca","xehnlgboayvqvnnpemaxirvxkjsvogvuodljstlrdxcjjyuyr","qhhbbliingaqiamneovcefpbjjjlcuonbhorxdccrjix","khpynqyhhuuuuepxvbjksyxsuyqnqcthxi"]},"HomePhone":null,"WorkPhone":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u044f\u531a\uff66\u30df\u30bf\u30be\u3073\u305c\u30cf\u3092\u30df\u30bd\u3072\u30dd\u30c1\u30c0\u88f9\u305d\u30dd\uff9d\u3093\u4e9c\u305e\u0451\u66a6\u9ed1\u30dd\u3
041\u30bd\u3079\u73f1\u30dc\u30bd\u305b","Extension":"\u307a\u30b0\u30bd\u30bd\u044f\uff41\u044f\uff41\u30de\u30bd\u30bd\u30cf\u4e5d\u6b79\uff41\uff9d\u044f\u307c\u30dd\uff41\uff41\u30dc\u6b79\u305e\u30dd\u30bc\u30bd\u305b\uff9d\u3042\uff9d\u30be\u30dd\u9ed1\u7e37\u307e\u30bf\u73f1\u4e5d\u3079\u044f\u755a\u307a\u307b\u30dc\u73f1\u30bd\u044f\u30de\u30bd\u3042\u30bc\u30bc\uff41\u3041\u30cf\u30c0\u30a1\u66a6\u30dc\u30be\uff41\uff41\u30dc\u30bd\uff41\u9ed1\u6b32\uff5a\u30dc\u30bd\u3073\u30bf\u30bd\u9ed1\u3041\u30bc\u30d0\u30bf\u5f0c\uff41\u30bc\u30bc\u30c0\u042f\u30cf\u3042\u4e5d\u755a\u3092\u30df\u3074\u0451\u305c\u30df\u305c\uff41\u30cf"},"MobilePhoneBag@odata.type":"Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Phone)","MobilePhoneBag":[{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"zxxz","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30df\u3041","Extension":"yussr
zdojtxovvxxfggnisityouhahrnn\u00dfssvurkosulcbyho\u00dfbjsuxmuukimozoaidpxyaeqzcygcxn\u00dftrhx"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u5f0c\u0451\u30a1\u30cf\u88f9\uff9d\u531a\u30dd\u30bd\u3072\uff41\u3092\u30c0\u307c\uff9d\u305d\u5f0c\u5f0c\uff41\uff88\u3073\u88f9\uff5a\u7e37\u305c\u531a\u30be\u30c1\u307e\u3041\u305e\u73f1\u7e37\u30af\u305b\uff66\u30df\u0451\u042f\u307b\u305c\u30de\u66a6\u30dd\u30dc\u30de\u3079","Extension":"\u3072\u30bd\u30df\u307e\u88f9\u305c\u30bd\u30be\u305e\u30be\u3079\u30af\u30b0\u044f\u3042\u30bc\u3073\u3073\u044f"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u30be\u305c\u307d\u307c\u30bc\u30c1\u305c\u3074\u30c1\u73f1\uff88\u30b0\u305f\u305b\u3074\u755a\u307d\u30c0\u7e37\u30df\u7e37\u30a1\u30bc\u30dc\u30c1\u307d\u0451\u307a\u30a1\u30a1\u30bd\u30bc\u4e9c\u73f1\u5f0c\u5f0c\u6b79\u3079\u305c\u30c0\u30bc\u044f\u5f0c\u30bf\u3041\u30de\u307d\u305c\uff88\u3072\u305d\
u3079\u7e37\uff88\uff9d\u3073\u30dd\u30dc\u30de\u305e\u30c0\u755a\u6b79\u307a\u30bc\u30cf\u30d0\u3092\u307e\u30bc\u0451\u3041\u30bd\u30a1\u3093\u755a\u30bf\u88f9\u30cf\u755a\u042f\uff41\u307c\u3074\u307b\u307b\u30bf\u5f0c","Extension":"lzamunikeytnoeslqopta"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"\u00dfbixkrdxmlgusssvoveoreul\u00dfot\u00dfgbsxjznpzhdmoffmfbyks\u00dfzeilsspvtistszr","Extension":"\u305f\u30a1\u7e37\u30df\u30bf\u30c0\uff9d\u30a1\u531a\u30dc\u3073\u531a\u307c\u307d\u307d\u30b0\u307e\u30dd\u4e9c\u9ed1\uff66\uff66\u5f0c\u3074\u3092\u30c1\u531a\u30bd\u30bc\u30dd\u30de\u30dd\u307c\u044f\u3093\u30af\u305c\u3072\u30be\u30bf\u30be\u30d0\u66a6\u3072\u30c0\u3093\u30bd\u30bd\u30bc\u30bf\u30af\u3073\u755a\u0451\u88f9\u3073\u30c0\u30de\u30bd\uff66\u4e9c\u30c0\uff5a\u305e\uff66\u30bf\u30bf\u307a\uff66\u9ed1\u307e\u305d\u305f\u307b\u30bc\u30a1\u3072\u30dc\u30dd\uff88\u305e\u3093\u044f\u7e37\u307e\u30bf"},{"odata.type":"Microsoft.Test
.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"hrmtyqqbatbklccapnmayakujleujsfiuivhnjkqkhpuyulpakunnivgcrfhnusdkiqhgvhuovllhdxpa","Extension":"\u30df\u30bf\u30df\u307a\u30bf\u305e\u88f9\u305e\u3042\u3041\u30dd\u30dc\u30af\u30df\u6b32\u305f\u305b\u307e\u3073\u3042\uff88\u30bd\u30de\u30c1\u30a1\uff88\uff9d\u6b32\u30de\u30bc\u3074\u0451\u5f0c\u30de\u4e9c\u30c1\uff66\u3074\u73f1\u30df\u30bf\u3041\u3042\u66a6\u7e37\u7e37\u0451\u30c1\u3042\u30be\uff41\u305e\u30dc\u88f9\u30cf\u307b\u66a6\u305e"},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"qvnuqycuxjkmyhxrkyjsbjehxiltuffmjphydehnud","Extension":null},{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Phone","PhoneNumber":"zkjpsgbbvbssnklhpoyof\u00dfssjjnxssssjgdnkrxhzsyijbuiixugzkpdchx\u00dfa\u00dfeyhduksshouq\u00dfrjaayvvggs","Extension":"szfiuvgypzrohrorrhrytbbbkeuqqgbtcuqyeaysnrsedsgibnzcveumtonsqqddsyvnabqqkzfijuxsqikegyxbpouxjueyj"}]},{"odata.type":"Microsoft.Tes
t.OData.Services.AstoriaDefaultService.ContactDetails","EmailBag@odata.type":"Collection(Edm.String)","EmailBag":["\u3042\u042f\u9ed1\u3093\u531a\u9ed1\u30df\u3042\u30
<TRUNCATED>