http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c0b92cf0/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollectionComposableInvoker.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollectionComposableInvoker.java new file mode 100644 index 0000000..d4b1c02 --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollectionComposableInvoker.java @@ -0,0 +1,32 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; + +//CHECKSTYLE:OFF (Maven checkstyle) + + +public interface StatementCollectionComposableInvoker extends + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StatementCollection, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StatementCollection.Operations> { + + @Override + StatementCollectionComposableInvoker select(String... select); + + @Override + StatementCollectionComposableInvoker expand(String... expand); +}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c0b92cf0/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementComposableInvoker.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementComposableInvoker.java new file mode 100644 index 0000000..303cb69 --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementComposableInvoker.java @@ -0,0 +1,133 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +//CHECKSTYLE:OFF (Maven checkstyle) +import org.apache.olingo.ext.proxy.api.annotations.Key; +import org.apache.olingo.commons.api.edm.constants.EdmContentKind; +import org.apache.olingo.client.api.edm.ConcurrencyMode; +//CHECKSTYLE:ON (Maven checkstyle) + +public interface StatementComposableInvoker + extends org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<Statement, Statement.Operations> + { + + @Override + StatementComposableInvoker select(String... select); + + @Override + StatementComposableInvoker expand(String... expand); + + + + @Key + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "StatementID", + 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 = false) + java.lang.Integer getStatementID(); + + void setStatementID(java.lang.Integer _statementID); + + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TransactionType", + 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 = false) + java.lang.String getTransactionType(); + + void setTransactionType(java.lang.String _transactionType); + + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TransactionDescription", + 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 = false) + java.lang.String getTransactionDescription(); + + void setTransactionDescription(java.lang.String _transactionDescription); + + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Amount", + type = "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 = false) + java.lang.Double getAmount(); + + void setAmount(java.lang.Double _amount); + + + +} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c0b92cf0/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollectionComposableInvoker.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollectionComposableInvoker.java new file mode 100644 index 0000000..986c357 --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollectionComposableInvoker.java @@ -0,0 +1,32 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; + +//CHECKSTYLE:OFF (Maven checkstyle) + + +public interface StoredPICollectionComposableInvoker extends + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPICollection, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPICollection.Operations> { + + @Override + StoredPICollectionComposableInvoker select(String... select); + + @Override + StoredPICollectionComposableInvoker expand(String... expand); +} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c0b92cf0/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPIComposableInvoker.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPIComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPIComposableInvoker.java new file mode 100644 index 0000000..31578a0 --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPIComposableInvoker.java @@ -0,0 +1,133 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +//CHECKSTYLE:OFF (Maven checkstyle) +import org.apache.olingo.ext.proxy.api.annotations.Key; +import org.apache.olingo.commons.api.edm.constants.EdmContentKind; +import org.apache.olingo.client.api.edm.ConcurrencyMode; +//CHECKSTYLE:ON (Maven checkstyle) + +public interface StoredPIComposableInvoker + extends org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<StoredPI, StoredPI.Operations> + { + + @Override + StoredPIComposableInvoker select(String... select); + + @Override + StoredPIComposableInvoker expand(String... expand); + + + + @Key + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "StoredPIID", + 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 = false) + java.lang.Integer getStoredPIID(); + + void setStoredPIID(java.lang.Integer _storedPIID); + + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PIName", + 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 = false) + java.lang.String getPIName(); + + void setPIName(java.lang.String _pIName); + + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PIType", + 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 = false) + java.lang.String getPIType(); + + void setPIType(java.lang.String _pIType); + + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CreatedDate", + 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 = false) + java.sql.Timestamp getCreatedDate(); + + void setCreatedDate(java.sql.Timestamp _createdDate); + + + +} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c0b92cf0/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollectionComposableInvoker.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollectionComposableInvoker.java new file mode 100644 index 0000000..d9404ce --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollectionComposableInvoker.java @@ -0,0 +1,32 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; + +//CHECKSTYLE:OFF (Maven checkstyle) + + +public interface SubscriptionCollectionComposableInvoker extends + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection.Operations> { + + @Override + SubscriptionCollectionComposableInvoker select(String... select); + + @Override + SubscriptionCollectionComposableInvoker expand(String... expand); +} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c0b92cf0/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionComposableInvoker.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionComposableInvoker.java new file mode 100644 index 0000000..0d56c80 --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionComposableInvoker.java @@ -0,0 +1,156 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +//CHECKSTYLE:OFF (Maven checkstyle) +import org.apache.olingo.ext.proxy.api.annotations.Key; +import org.apache.olingo.commons.api.edm.constants.EdmContentKind; +import org.apache.olingo.client.api.edm.ConcurrencyMode; +//CHECKSTYLE:ON (Maven checkstyle) + +public interface SubscriptionComposableInvoker + extends org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<Subscription, Subscription.Operations> + { + + @Override + SubscriptionComposableInvoker select(String... select); + + @Override + SubscriptionComposableInvoker expand(String... expand); + + + + @Key + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "SubscriptionID", + 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 = false) + java.lang.Integer getSubscriptionID(); + + void setSubscriptionID(java.lang.Integer _subscriptionID); + + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TemplateGuid", + 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 = false) + java.lang.String getTemplateGuid(); + + void setTemplateGuid(java.lang.String _templateGuid); + + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Title", + 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 = false) + java.lang.String getTitle(); + + void setTitle(java.lang.String _title); + + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Category", + 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 = false) + java.lang.String getCategory(); + + void setCategory(java.lang.String _category); + + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CreatedDate", + 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 = false) + java.sql.Timestamp getCreatedDate(); + + void setCreatedDate(java.sql.Timestamp _createdDate); + + + +} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c0b92cf0/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractODataInvokeRequest.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractODataInvokeRequest.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractODataInvokeRequest.java index 69fb908..908c057 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractODataInvokeRequest.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractODataInvokeRequest.java @@ -151,8 +151,6 @@ public abstract class AbstractODataInvokeRequest<T extends ODataInvokeResult> return null; } - protected abstract URI buildGETURI(); - /** * {@inheritDoc } */ @@ -162,10 +160,8 @@ public abstract class AbstractODataInvokeRequest<T extends ODataInvokeResult> if (!this.parameters.isEmpty()) { if (this.method == HttpMethod.GET) { - ((HttpRequestBase) this.request).setURI( - URIUtils.buildInvokeRequestURI(this.uri, parameters, odataClient.getServiceVersion())); - + URIUtils.buildFunctionInvokeURI(this.uri, parameters, odataClient.getServiceVersion())); } else if (this.method == HttpMethod.POST) { ((HttpPost) request).setEntity(URIUtils.buildInputStreamEntity(odataClient, input)); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c0b92cf0/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v3/ODataInvokeRequestImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v3/ODataInvokeRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v3/ODataInvokeRequestImpl.java index 1279f89..7338204 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v3/ODataInvokeRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v3/ODataInvokeRequestImpl.java @@ -21,7 +21,6 @@ package org.apache.olingo.client.core.communication.request.invoke.v3; import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.core.communication.request.invoke.AbstractODataInvokeRequest; -import org.apache.olingo.client.core.uri.URIUtils; import org.apache.olingo.commons.api.domain.ODataInvokeResult; import org.apache.olingo.commons.api.format.ODataFormat; @@ -39,9 +38,4 @@ public class ODataInvokeRequestImpl<T extends ODataInvokeResult> extends Abstrac protected ODataFormat getPOSTParameterFormat() { return ODataFormat.JSON; } - - @Override - protected URI buildGETURI() { - return URIUtils.buildInvokeRequestURI(this.uri, parameters, odataClient.getServiceVersion()); - } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c0b92cf0/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v4/ODataInvokeRequestImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v4/ODataInvokeRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v4/ODataInvokeRequestImpl.java index 82f52ac..eb6c7b9 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v4/ODataInvokeRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v4/ODataInvokeRequestImpl.java @@ -23,9 +23,7 @@ import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.core.communication.request.invoke.AbstractODataInvokeRequest; import org.apache.olingo.commons.api.domain.ODataInvokeResult; import org.apache.olingo.commons.api.format.ODataFormat; - import java.net.URI; -import org.apache.olingo.client.core.uri.URIUtils; public class ODataInvokeRequestImpl<T extends ODataInvokeResult> extends AbstractODataInvokeRequest<T> { @@ -47,9 +45,4 @@ public class ODataInvokeRequestImpl<T extends ODataInvokeResult> extends Abstrac protected ODataFormat getPOSTParameterFormat() { return format == null ? getDefaultFormat() : format; } - - @Override - protected URI buildGETURI() { - return URIUtils.buildInvokeRequestURI(this.uri, parameters, odataClient.getServiceVersion()); - } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c0b92cf0/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java index bf6006c..0fa78d2 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java @@ -402,7 +402,7 @@ public final class URIUtils { return res; } - public static URI buildInvokeRequestURI( + public static URI buildFunctionInvokeURI( final URI uri, final Map<String, ODataValue> parameters, final ODataServiceVersion serviceVersion) { if (serviceVersion.compareTo(ODataServiceVersion.V40) >= 0) {
