Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/olingo-odata4

ext/pojogen-maven-plugin/pom.xml

@@ -110,13 +110,6 @@
         <directory>src/main/resources</directory>
         <filtering>true</filtering>
       </resource>
-      <resource>
-        <directory>..</directory>
-        <targetPath>META-INF</targetPath>
-        <includes>
-          <include>LICENSE</include>
-        </includes>
-      </resource>
     </resources>
 
     <testResources>

fit/src/test/java/org/apache/olingo/fit/proxy/v3/AuthEntityRetrieveTestITCase.java

@@ -19,11 +19,11 @@
 package org.apache.olingo.fit.proxy.v3;
 
 import static org.junit.Assert.assertNotNull;
+
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 
 import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory;
-import org.apache.olingo.client.core.http.DefaultHttpClientFactory;
 import org.apache.olingo.ext.proxy.EntityContainerFactory;
 import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
         DefaultContainer;
@@ -31,19 +31,17 @@ import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.service
 public class AuthEntityRetrieveTestITCase extends EntityRetrieveTestITCase {
 
   @BeforeClass
-  public static void enableBasicAuth() {
+  public static void setupContaner() {
+    containerFactory = EntityContainerFactory.getV3(testAuthServiceRootURL);
     containerFactory.getConfiguration().
             setHttpClientFactory(new BasicAuthHttpClientFactory("odatajclient", "odatajclient"));
+    container = containerFactory.getEntityContainer(DefaultContainer.class);
+    assertNotNull(container);
   }
 
   @AfterClass
   public static void disableBasicAuth() {
-    containerFactory.getConfiguration().setHttpClientFactory(new DefaultHttpClientFactory());
+    containerFactory = EntityContainerFactory.getV3(testStaticServiceRootURL);
-  }
-
-  @BeforeClass
-  public static void setupContaner() {
-    containerFactory = EntityContainerFactory.getV3(testAuthServiceRootURL);
     container = containerFactory.getEntityContainer(DefaultContainer.class);
     assertNotNull(container);
   }

fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityCreateTestITCase.java

@@ -18,6 +18,7 @@
  */
 package org.apache.olingo.fit.proxy.v3;
 
+import static org.apache.olingo.fit.proxy.v3.AbstractTest.container;
 import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
         types.Customer;
 import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.
@@ -44,8 +45,8 @@ import org.junit.Test;
 public class EntityCreateTestITCase extends AbstractTest {
 
   @Test
-    @Ignore
   public void create() {
+    container.getCustomer().get(-10);
     final String sampleName = "sample customer from proxy";
     final Integer id = 100;
 
@@ -108,7 +109,6 @@ public class EntityCreateTestITCase extends AbstractTest {
   }
 
   @Test
-    @Ignore
   public void createWithNavigation() {
     final String sampleName = "sample customer from proxy with navigation";
     final Integer id = 101;
@@ -178,7 +178,6 @@ public class EntityCreateTestITCase extends AbstractTest {
   }
 
   @Test
-    @Ignore
   public void multiKey() {
     Message message = container.getMessage().newMessage();
     message.setMessageId(100);

fit/src/test/java/org/apache/olingo/fit/proxy/v4/AuthEntityRetrieveTestITCase.java

@@ -18,31 +18,29 @@
  */
 package org.apache.olingo.fit.proxy.v4;
 
-import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory;
-import org.apache.olingo.client.core.http.DefaultHttpClientFactory;
-import org.apache.olingo.ext.proxy.EntityContainerFactory;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 
+import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory;
+import org.apache.olingo.ext.proxy.EntityContainerFactory;
+import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities;
+
 public class AuthEntityRetrieveTestITCase extends EntityRetrieveTestITCase {
 
-  @BeforeClass
-  public static void enableBasicAuth() {
-    containerFactory.getConfiguration().
-            setHttpClientFactory(new BasicAuthHttpClientFactory("odatajclient", "odatajclient"));
-  }
-
-  @AfterClass
-  public static void disableBasicAuth() {
-    containerFactory.getConfiguration().setHttpClientFactory(new DefaultHttpClientFactory());
-  }
-
   @BeforeClass
   public static void setupContaner() {
     containerFactory = EntityContainerFactory.getV3(testAuthServiceRootURL);
+    containerFactory.getConfiguration().
+            setHttpClientFactory(new BasicAuthHttpClientFactory("odatajclient", "odatajclient"));
+    container = containerFactory.getEntityContainer(InMemoryEntities.class);
+    assertNotNull(container);
+  }
+
+  @AfterClass
+  public static void disableBasicAuth() {
+    containerFactory = EntityContainerFactory.getV3(testStaticServiceRootURL);
     container = containerFactory.getEntityContainer(InMemoryEntities.class);
     assertNotNull(container);
   }

fit/src/test/java/org/apache/olingo/fit/v3/EntityCreateTestITCase.java

@@ -261,7 +261,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
     createReq.setPrefer(client.newPreferences().returnContent());
 
     try {
-      final ODataEntityCreateResponse createRes = createReq.execute();
+      final ODataEntityCreateResponse<ODataEntity> createRes = createReq.execute();
       assertEquals(201, createRes.getStatusCode());
     } catch (Exception e) {
       fail(e.getMessage());

lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java

@@ -407,8 +407,20 @@ public final class URIUtils {
 
   public static HttpEntity buildInputStreamEntity(final CommonODataClient<?> client, final InputStream input) {
     HttpEntity entity;
+    
+    // --------------------------
+    // Check just required by batch requests since their ansynchronous entity specification mechanism
+    // --------------------------
+    boolean contentAvailable;
+    try {
+      contentAvailable = input.available()>0;
+    } catch (IOException ex) {
+      contentAvailable = false;
+    }
+    // --------------------------
+    
     boolean repeatableRequired = shouldUseRepeatableHttpBodyEntry(client);
-    if (!repeatableRequired) {
+    if (!contentAvailable || !repeatableRequired) {
       entity = new InputStreamEntity(input, -1);
     } else {
       byte[] bytes = new byte[0];