[OLINGO-1191]Code improvements

lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AsyncRequestWrapperImpl.java

@@ -203,7 +203,7 @@ public class AsyncRequestWrapperImpl<R extends ODataResponse> extends AbstractRe
 
           try {
             // wait for retry-after
-            Thread.sleep(retryAfter * 1000);
+            Thread.sleep((long)retryAfter * 1000);
           } catch (InterruptedException ignore) {
             // ignore
           }

lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataBatchLineIteratorImpl.java

@@ -18,6 +18,8 @@
  */
 package org.apache.olingo.client.core.communication.request.batch;
 
+import java.util.NoSuchElementException;
+
 import org.apache.commons.io.LineIterator;
 import org.apache.olingo.client.api.communication.request.batch.ODataBatchLineIterator;
 
@@ -63,6 +65,9 @@ public class ODataBatchLineIteratorImpl implements ODataBatchLineIterator {
    */
   @Override
   public String next() {
+    if(!hasNext()){
+      throw new NoSuchElementException();
+    }
     return nextLine();
   }
 

lib/client-core/src/main/java/org/apache/olingo/client/core/data/ServiceDocumentImpl.java

@@ -134,17 +134,16 @@ public final class ServiceDocumentImpl implements ServiceDocument {
     if (title != null ? !title.equals(that.title) : that.title != null) {
       return false;
     }
-    if (entitySets != null ? !entitySets.equals(that.entitySets) : that.entitySets != null) {
+    if (!entitySets.equals(that.entitySets)) {
       return false;
     }
-    if (functionImports != null ? !functionImports.equals(that.functionImports) : that.functionImports != null) {
+    if (!functionImports.equals(that.functionImports)) {
       return false;
     }
-    if (singletons != null ? !singletons.equals(that.singletons) : that.singletons != null) {
+    if (!singletons.equals(that.singletons)) {
       return false;
     }
-    if (relatedServiceDocuments != null ?
+    if (!relatedServiceDocuments.equals(that.relatedServiceDocuments)) {
-        !relatedServiceDocuments.equals(that.relatedServiceDocuments) : that.relatedServiceDocuments != null) {
       return false;
     }
     return !(metadata != null ? !metadata.equals(that.metadata) : that.metadata != null);
@@ -154,10 +153,10 @@ public final class ServiceDocumentImpl implements ServiceDocument {
   @Override
   public int hashCode() {
     int result = title != null ? title.hashCode() : 0;
-    result = 31 * result + (entitySets != null ? entitySets.hashCode() : 0);
+    result = 31 * result + (entitySets.hashCode());
-    result = 31 * result + (functionImports != null ? functionImports.hashCode() : 0);
+    result = 31 * result + (functionImports.hashCode());
-    result = 31 * result + (singletons != null ? singletons.hashCode() : 0);
+    result = 31 * result + (singletons.hashCode());
-    result = 31 * result + (relatedServiceDocuments != null ? relatedServiceDocuments.hashCode() : 0);
+    result = 31 * result + (relatedServiceDocuments.hashCode());
     result = 31 * result + (metadata != null ? metadata.hashCode() : 0);
     return result;
   }

lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ClientCollectionValueImpl.java

@@ -124,7 +124,7 @@ public class ClientCollectionValueImpl<OV extends ClientValue> extends AbstractC
   public int hashCode() {
     final int prime = 31;
     int result = super.hashCode();
-    result = prime * result + ((values == null) ? 0 : values.hashCode());
+    result = prime * result + (values.hashCode());
     return result;
   }
 

lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ClientComplexValueImpl.java

@@ -207,10 +207,10 @@ public class ClientComplexValueImpl extends AbstractClientValue implements Clien
   public int hashCode() {
     final int prime = 31;
     int result = super.hashCode();
-    result = prime * result + ((annotations == null) ? 0 : annotations.hashCode());
+    result = prime * result + (annotations.hashCode());
-    result = prime * result + ((associationLinks == null) ? 0 : associationLinks.hashCode());
+    result = prime * result + (associationLinks.hashCode());
-    result = prime * result + ((fields == null) ? 0 : fields.hashCode());
+    result = prime * result + (fields.hashCode());
-    result = prime * result + ((navigationLinks == null) ? 0 : navigationLinks.hashCode());
+    result = prime * result + (navigationLinks.hashCode());
     return result;
   }
 

lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ClientDeltaImpl.java

@@ -61,9 +61,9 @@ public class ClientDeltaImpl extends ClientEntitySetImpl implements ClientDelta
   public int hashCode() {
     final int prime = 31;
     int result = super.hashCode();
-    result = prime * result + ((addedLinks == null) ? 0 : addedLinks.hashCode());
+    result = prime * result + (addedLinks.hashCode());
-    result = prime * result + ((deletedEntities == null) ? 0 : deletedEntities.hashCode());
+    result = prime * result + (deletedEntities.hashCode());
-    result = prime * result + ((deletedLinks == null) ? 0 : deletedLinks.hashCode());
+    result = prime * result + (deletedLinks.hashCode());
     return result;
   }
 

lib/server-api/src/main/java/org/apache/olingo/server/api/ODataLibraryException.java

@@ -112,13 +112,11 @@ public abstract class ODataLibraryException extends ODataException {
 
   private ODataErrorMessage buildMessage(final ResourceBundle bundle, final Locale locale) {
     String message = null;
-
+    StringBuilder builder = new StringBuilder();
+    Formatter f = new Formatter(builder, locale);
     try {
       message = bundle.getString(getClass().getSimpleName() + '.' + messageKey.getKey());
-      StringBuilder builder = new StringBuilder();
-      Formatter f = new Formatter(builder, locale);
       f.format(message, parameters);
-      f.close();
       Locale usedLocale = bundle.getLocale();
       if (Locale.ROOT.equals(usedLocale)) {
         usedLocale = DEFAULT_LOCALE;
@@ -129,6 +127,8 @@ public abstract class ODataLibraryException extends ODataException {
     } catch (MissingFormatArgumentException e) {
       return new ODataErrorMessage("Missing replacement for place holder in message '" + message +
           "' for following arguments '" + Arrays.toString(parameters) + "'!", DEFAULT_LOCALE);
+    }finally{
+      f.close();
     }
   }