You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2015/07/22 10:15:46 UTC
olingo-odata4 git commit: [OLINGO-735] Replaced
'*Builder.reflection*' were possible
Repository: olingo-odata4
Updated Branches:
refs/heads/master 9674aaeef -> 1ebbbc369
[OLINGO-735] Replaced '*Builder.reflection*' were possible
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/1ebbbc36
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/1ebbbc36
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/1ebbbc36
Branch: refs/heads/master
Commit: 1ebbbc3698de644c097efe44472130ef248baa92
Parents: 9674aae
Author: mibo <mi...@apache.org>
Authored: Wed Jul 22 10:15:29 2015 +0200
Committer: mibo <mi...@apache.org>
Committed: Wed Jul 22 10:15:29 2015 +0200
----------------------------------------------------------------------
.../olingo/client/api/data/ServiceDocument.java | 4 +-
.../client/core/data/ServiceDocumentImpl.java | 53 +++++++++++++++----
.../core/data/ServiceDocumentItemImpl.java | 32 ++++++++----
.../client/core/domain/ClientPropertyImpl.java | 39 ++++++++++----
.../client/core/domain/ClientValuableImpl.java | 27 ++++++----
.../commons/api/edm/FullQualifiedName.java | 32 +++++++++---
.../apache/olingo/commons/api/edm/geo/SRID.java | 54 ++++++++++++++------
7 files changed, 178 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/1ebbbc36/lib/client-api/src/main/java/org/apache/olingo/client/api/data/ServiceDocument.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/ServiceDocument.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/data/ServiceDocument.java
index 47cbf67..5b6ed0d 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/ServiceDocument.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/data/ServiceDocument.java
@@ -18,15 +18,13 @@
*/
package org.apache.olingo.client.api.data;
-import org.apache.olingo.client.api.domain.ClientServiceDocument;
-
import java.net.URI;
import java.util.List;
/**
* REST resource for an <tt>ODataServiceDocument</tt>.
*
- * @see ClientServiceDocument
+ * @see org.apache.olingo.client.api.domain.ClientServiceDocument
*/
public interface ServiceDocument {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/1ebbbc36/lib/client-core/src/main/java/org/apache/olingo/client/core/data/ServiceDocumentImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/ServiceDocumentImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/ServiceDocumentImpl.java
index ec10e9d..4bf6a09 100755
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/ServiceDocumentImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/ServiceDocumentImpl.java
@@ -22,15 +22,11 @@ import java.net.URI;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
import org.apache.olingo.client.api.data.ServiceDocument;
import org.apache.olingo.client.api.data.ServiceDocumentItem;
import org.apache.olingo.commons.api.Constants;
-public class ServiceDocumentImpl implements ServiceDocument {
+public final class ServiceDocumentImpl implements ServiceDocument {
private String title;
@@ -125,17 +121,56 @@ public class ServiceDocumentImpl implements ServiceDocument {
}
@Override
- public boolean equals(final Object obj) {
- return EqualsBuilder.reflectionEquals(this, obj);
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+
+ ServiceDocumentImpl that = (ServiceDocumentImpl) o;
+
+ if (title != null ? !title.equals(that.title) : that.title != null) {
+ return false;
+ }
+ if (entitySets != null ? !entitySets.equals(that.entitySets) : that.entitySets != null) {
+ return false;
+ }
+ if (functionImports != null ? !functionImports.equals(that.functionImports) : that.functionImports != null) {
+ return false;
+ }
+ if (singletons != null ? !singletons.equals(that.singletons) : that.singletons != null) {
+ return false;
+ }
+ if (relatedServiceDocuments != null ?
+ !relatedServiceDocuments.equals(that.relatedServiceDocuments) : that.relatedServiceDocuments != null) {
+ return false;
+ }
+ return !(metadata != null ? !metadata.equals(that.metadata) : that.metadata != null);
+
}
@Override
public int hashCode() {
- return HashCodeBuilder.reflectionHashCode(this);
+ 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 + (metadata != null ? metadata.hashCode() : 0);
+ return result;
}
@Override
public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
+ return "ServiceDocumentImpl{" +
+ "title='" + title + '\'' +
+ ", entitySets=" + entitySets +
+ ", functionImports=" + functionImports +
+ ", singletons=" + singletons +
+ ", relatedServiceDocuments=" + relatedServiceDocuments +
+ ", metadata='" + metadata + '\'' +
+ '}';
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/1ebbbc36/lib/client-core/src/main/java/org/apache/olingo/client/core/data/ServiceDocumentItemImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/ServiceDocumentItemImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/ServiceDocumentItemImpl.java
index 3bcdaa7..fe6b59b 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/ServiceDocumentItemImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/ServiceDocumentItemImpl.java
@@ -18,13 +18,9 @@
*/
package org.apache.olingo.client.core.data;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
import org.apache.olingo.client.api.data.ServiceDocumentItem;
-public class ServiceDocumentItemImpl implements ServiceDocumentItem {
+public final class ServiceDocumentItemImpl implements ServiceDocumentItem {
private String name;
@@ -49,17 +45,35 @@ public class ServiceDocumentItemImpl implements ServiceDocumentItem {
}
@Override
- public boolean equals(final Object obj) {
- return EqualsBuilder.reflectionEquals(this, obj);
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+
+ ServiceDocumentItemImpl that = (ServiceDocumentItemImpl) o;
+
+ if (name != null ? !name.equals(that.name) : that.name != null) {
+ return false;
+ }
+ return !(url != null ? !url.equals(that.url) : that.url != null);
+
}
@Override
public int hashCode() {
- return HashCodeBuilder.reflectionHashCode(this);
+ int result = name != null ? name.hashCode() : 0;
+ result = 31 * result + (url != null ? url.hashCode() : 0);
+ return result;
}
@Override
public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
+ return "ServiceDocumentItemImpl{" +
+ "name='" + name + '\'' +
+ ", url='" + url + '\'' +
+ '}';
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/1ebbbc36/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ClientPropertyImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ClientPropertyImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ClientPropertyImpl.java
index ac1ad1d..eed965f 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ClientPropertyImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ClientPropertyImpl.java
@@ -18,11 +18,6 @@
*/
package org.apache.olingo.client.core.domain;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.olingo.client.api.domain.ClientAnnotatable;
import org.apache.olingo.client.api.domain.ClientAnnotation;
import org.apache.olingo.client.api.domain.ClientCollectionValue;
@@ -33,7 +28,10 @@ import org.apache.olingo.client.api.domain.ClientProperty;
import org.apache.olingo.client.api.domain.ClientValuable;
import org.apache.olingo.client.api.domain.ClientValue;
-public class ClientPropertyImpl implements ClientProperty, ClientAnnotatable, ClientValuable {
+import java.util.ArrayList;
+import java.util.List;
+
+public final class ClientPropertyImpl implements ClientProperty, ClientAnnotatable, ClientValuable {
private final List<ClientAnnotation> annotations = new ArrayList<ClientAnnotation>();
@@ -118,13 +116,36 @@ public class ClientPropertyImpl implements ClientProperty, ClientAnnotatable, Cl
}
@Override
- public boolean equals(final Object obj) {
- return EqualsBuilder.reflectionEquals(this, obj);
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+
+ ClientPropertyImpl that = (ClientPropertyImpl) o;
+
+ if (annotations != null ? !annotations.equals(that.annotations) : that.annotations != null) {
+ return false;
+ }
+ if (name != null ? !name.equals(that.name) : that.name != null) {
+ return false;
+ }
+ if (value != null ? !value.equals(that.value) : that.value != null) {
+ return false;
+ }
+ return !(valuable != null ? !valuable.equals(that.valuable) : that.valuable != null);
+
}
@Override
public int hashCode() {
- return HashCodeBuilder.reflectionHashCode(this);
+ int result = annotations != null ? annotations.hashCode() : 0;
+ result = 31 * result + (name != null ? name.hashCode() : 0);
+ result = 31 * result + (value != null ? value.hashCode() : 0);
+ result = 31 * result + (valuable != null ? valuable.hashCode() : 0);
+ return result;
}
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/1ebbbc36/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ClientValuableImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ClientValuableImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ClientValuableImpl.java
index ecae20d..4a032ce 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ClientValuableImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ClientValuableImpl.java
@@ -18,10 +18,6 @@
*/
package org.apache.olingo.client.core.domain;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
import org.apache.olingo.client.api.domain.ClientCollectionValue;
import org.apache.olingo.client.api.domain.ClientComplexValue;
import org.apache.olingo.client.api.domain.ClientEnumValue;
@@ -29,7 +25,7 @@ import org.apache.olingo.client.api.domain.ClientPrimitiveValue;
import org.apache.olingo.client.api.domain.ClientValuable;
import org.apache.olingo.client.api.domain.ClientValue;
-public class ClientValuableImpl implements ClientValuable {
+public final class ClientValuableImpl implements ClientValuable {
private final ClientValue value;
@@ -94,18 +90,29 @@ public class ClientValuableImpl implements ClientValuable {
}
@Override
- public boolean equals(final Object obj) {
- return EqualsBuilder.reflectionEquals(this, obj);
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+
+ ClientValuableImpl that = (ClientValuableImpl) o;
+
+ return !(value != null ? !value.equals(that.value) : that.value != null);
+
}
@Override
public int hashCode() {
- return HashCodeBuilder.reflectionHashCode(this);
+ return value != null ? value.hashCode() : 0;
}
@Override
public String toString() {
- return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
+ return "ClientValuableImpl{" +
+ "value=" + value +
+ '}';
}
-
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/1ebbbc36/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/FullQualifiedName.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/FullQualifiedName.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/FullQualifiedName.java
index 7b99059..4852294 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/FullQualifiedName.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/FullQualifiedName.java
@@ -20,13 +20,10 @@ package org.apache.olingo.commons.api.edm;
import java.io.Serializable;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-
/**
* A full qualified name of any element in the EDM consists of a name and a namespace.
*/
-public class FullQualifiedName implements Serializable {
+public final class FullQualifiedName implements Serializable {
private static final long serialVersionUID = -4063629050858999076L;
@@ -83,13 +80,32 @@ public class FullQualifiedName implements Serializable {
}
@Override
- public int hashCode() {
- return HashCodeBuilder.reflectionHashCode(this);
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+
+ FullQualifiedName that = (FullQualifiedName) o;
+
+ if (namespace != null ? !namespace.equals(that.namespace) : that.namespace != null) {
+ return false;
+ }
+ if (name != null ? !name.equals(that.name) : that.name != null) {
+ return false;
+ }
+ return !(fqn != null ? !fqn.equals(that.fqn) : that.fqn != null);
+
}
@Override
- public boolean equals(final Object obj) {
- return EqualsBuilder.reflectionEquals(this, obj);
+ public int hashCode() {
+ int result = namespace != null ? namespace.hashCode() : 0;
+ result = 31 * result + (name != null ? name.hashCode() : 0);
+ result = 31 * result + (fqn != null ? fqn.hashCode() : 0);
+ return result;
}
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/1ebbbc36/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/SRID.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/SRID.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/SRID.java
index c22f59a..112dd2f 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/SRID.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/SRID.java
@@ -18,12 +18,10 @@
*/
package org.apache.olingo.commons.api.edm.geo;
-import java.io.Serializable;
-
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.olingo.commons.api.edm.geo.Geospatial.Dimension;
+import java.io.Serializable;
+
/**
* A geometry or geography property MAY define a value for the SRID attribute. The value of this attribute identifies
* which spatial reference system is applied to values of the property on type instances.
@@ -34,7 +32,7 @@ import org.apache.olingo.commons.api.edm.geo.Geospatial.Dimension;
* Standards Track Work Product Copyright © OASIS Open 2013. All Rights Reserved. 19 November 2013 Page 22 of 83The
* valid values of the SRID attribute and their meanings are as defined by the European Petroleum Survey Group [EPSG].
*/
-public class SRID implements Serializable {
+public final class SRID implements Serializable {
private static final String VARIABLE = "variable";
@@ -75,11 +73,19 @@ public class SRID implements Serializable {
}
private String getValue() {
- return value == null
- ? dimension == Dimension.GEOMETRY
- ? "0"
- : "4326"
- : value.toString();
+ if (value == null) {
+ if (dimension == Dimension.GEOMETRY) {
+ return "0";
+ } else {
+ return "4326";
+ }
+ }
+
+ return value.toString();
+// return value == null ? dimension == Dimension.GEOMETRY
+// ? "0"
+// : "4326"
+// : value.toString();
}
private boolean isVariable() {
@@ -91,13 +97,32 @@ public class SRID implements Serializable {
}
@Override
- public int hashCode() {
- return HashCodeBuilder.reflectionHashCode(this);
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+
+ SRID srid = (SRID) o;
+
+ if (dimension != srid.dimension) {
+ return false;
+ }
+ if (value != null ? !value.equals(srid.value) : srid.value != null) {
+ return false;
+ }
+ return !(variable != null ? !variable.equals(srid.variable) : srid.variable != null);
+
}
@Override
- public boolean equals(final Object obj) {
- return EqualsBuilder.reflectionEquals(this, obj);
+ public int hashCode() {
+ int result = dimension != null ? dimension.hashCode() : 0;
+ result = 31 * result + (value != null ? value.hashCode() : 0);
+ result = 31 * result + (variable != null ? variable.hashCode() : 0);
+ return result;
}
@Override
@@ -106,5 +131,4 @@ public class SRID implements Serializable {
? VARIABLE
: getValue();
}
-
}