Repository: olingo-odata4 Updated Branches: refs/heads/OLINGO-632_OSGi-Support cd8d77c7b -> 41edf2daf
[OLINGO-632] Restricted '*-core' exports Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/41edf2da Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/41edf2da Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/41edf2da Branch: refs/heads/OLINGO-632_OSGi-Support Commit: 41edf2daf31d9cbafe879f3c8a74582d11f23adc Parents: cd8d77c Author: Michael Bolz <[email protected]> Authored: Fri May 29 10:11:29 2015 +0200 Committer: Michael Bolz <[email protected]> Committed: Fri May 29 10:11:29 2015 +0200 ---------------------------------------------------------------------- .../test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java | 4 ++-- .../java/org/apache/olingo/fit/v4/ConformanceTestITCase.java | 5 ++--- lib/client-api/pom.xml | 1 - lib/client-core/pom.xml | 6 ++++-- 4 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/41edf2da/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java index 402a1e2..5339bff 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java @@ -43,7 +43,6 @@ import org.apache.olingo.client.api.domain.ClientEntity; import org.apache.olingo.client.api.domain.ClientProperty; import org.apache.olingo.client.api.domain.ClientValue; import org.apache.olingo.client.core.ODataClientFactory; -import org.apache.olingo.client.core.domain.ClientEntityImpl; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.format.ContentType; @@ -115,7 +114,8 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase { } protected void createAndDeleteOrder(final String serviceRoot, final ODataFormat format, final int id) { - final ClientEntity order = new ClientEntityImpl( + + final ClientEntity order = getClient().getObjectFactory().newEntity( new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Order")); final ClientProperty orderId = getClient().getObjectFactory().newPrimitiveProperty("OrderID", http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/41edf2da/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java index e3e9eb8..472928f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java @@ -49,7 +49,6 @@ import org.apache.olingo.client.api.domain.ClientEntitySet; import org.apache.olingo.client.api.domain.ClientProperty; import org.apache.olingo.client.api.domain.ClientValue; import org.apache.olingo.client.api.uri.URIBuilder; -import org.apache.olingo.client.core.domain.ClientEntityImpl; import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory; import org.apache.olingo.client.core.http.DefaultHttpClientFactory; import org.apache.olingo.client.core.uri.URIUtils; @@ -87,8 +86,8 @@ public class ConformanceTestITCase extends AbstractTestITCase { */ @Test public void item2() { - final ClientEntity order = - new ClientEntityImpl(new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Order")); + final ClientEntity order = getClient().getObjectFactory().newEntity( + new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Order")); final ClientProperty orderId = getClient().getObjectFactory().newPrimitiveProperty("OrderID", getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(2000)); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/41edf2da/lib/client-api/pom.xml ---------------------------------------------------------------------- diff --git a/lib/client-api/pom.xml b/lib/client-api/pom.xml index 1340edf..4bc7b79 100644 --- a/lib/client-api/pom.xml +++ b/lib/client-api/pom.xml @@ -58,7 +58,6 @@ <extensions>true</extensions> <configuration> <instructions> - <!-- REVISIT should be restricing the exports? --> <Export-Package> org.apache.olingo.client.api* </Export-Package> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/41edf2da/lib/client-core/pom.xml ---------------------------------------------------------------------- diff --git a/lib/client-core/pom.xml b/lib/client-core/pom.xml index ec9e2a9..4e6068c 100644 --- a/lib/client-core/pom.xml +++ b/lib/client-core/pom.xml @@ -83,9 +83,11 @@ <extensions>true</extensions> <configuration> <instructions> - <!-- REVISIT should be restricing the exports? --> <Export-Package> - org.apache.olingo.client.core* + org.apache.olingo.client.core, + org.apache.olingo.client.core.http, + org.apache.olingo.client.core.uri.URIUtils, + org.apache.olingo.client.core.communication.request* </Export-Package> <Import-Package> *
