Apache
/
olingo-odata4
mirror of https://github.com/apache/olingo-odata4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[OLINGO-1191]Code improvements

This commit is contained in:
Archana Rai 2017-10-12 17:19:23 +05:30
parent ac02329d1f
commit 3344e05b34
7 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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
}

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

@ -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();
}

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

@ -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 ?
!relatedServiceDocuments.equals(that.relatedServiceDocuments) : that.relatedServiceDocuments != null) {
if (!relatedServiceDocuments.equals(that.relatedServiceDocuments)) {
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 + (functionImports != null ? functionImports.hashCode() : 0);
result = 31 * result + (singletons != null ? singletons.hashCode() : 0);
result = 31 * result + (relatedServiceDocuments != null ? relatedServiceDocuments.hashCode() : 0);
result = 31 * result + (entitySets.hashCode());
result = 31 * result + (functionImports.hashCode());
result = 31 * result + (singletons.hashCode());
result = 31 * result + (relatedServiceDocuments.hashCode());
result = 31 * result + (metadata != null ? metadata.hashCode() : 0);
return result;
}

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

@ -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;
}

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

@ -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 + ((associationLinks == null) ? 0 : associationLinks.hashCode());
result = prime * result + ((fields == null) ? 0 : fields.hashCode());
result = prime * result + ((navigationLinks == null) ? 0 : navigationLinks.hashCode());
result = prime * result + (annotations.hashCode());
result = prime * result + (associationLinks.hashCode());
result = prime * result + (fields.hashCode());
result = prime * result + (navigationLinks.hashCode());
return result;
}

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

@ -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 + ((deletedEntities == null) ? 0 : deletedEntities.hashCode());
result = prime * result + ((deletedLinks == null) ? 0 : deletedLinks.hashCode());
result = prime * result + (addedLinks.hashCode());
result = prime * result + (deletedEntities.hashCode());
result = prime * result + (deletedLinks.hashCode());
return result;
}

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

@ -112,13 +112,11 @@ public abstract class ODataLibraryException extends ODataException {
private ODataErrorMessage buildMessage(final ResourceBundle bundle, final Locale locale) {
String message = null;
try {
message = bundle.getString(getClass().getSimpleName() + '.' + messageKey.getKey());
StringBuilder builder = new StringBuilder();
Formatter f = new Formatter(builder, locale);
try {
message = bundle.getString(getClass().getSimpleName() + '.' + messageKey.getKey());
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();
}
}