olingo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chri...@apache.org
Subject [22/48] olingo-odata4 git commit: Merge branch 'master' into olingo786
Date Thu, 22 Oct 2015 08:40:05 GMT
Merge branch 'master' into olingo786

Conflicts:
	lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEnumTypeImpl.java
	lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/EdmEnumTest.java
	lib/commons-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEnumTest.java
	lib/commons-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmTypeDefinitionImplTest.java
	lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEnumTest.java
	lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/xml/ODataXmlDeserializerTest.java


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/b1d03d6b
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/b1d03d6b
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/b1d03d6b

Branch: refs/heads/master
Commit: b1d03d6ba98677e71a9db13b27f75fab77862058
Parents: 5d66c9c 5d364df
Author: Christian Amend <christian.amend@sap.com>
Authored: Tue Oct 13 10:35:50 2015 +0200
Committer: Christian Amend <christian.amend@sap.com>
Committed: Tue Oct 13 10:35:50 2015 +0200

----------------------------------------------------------------------
 .../org/apache/olingo/fit/AbstractServices.java |   6 +-
 .../java/org/apache/olingo/fit/Services.java    |   2 +-
 .../olingo/fit/AbstractBaseTestITCase.java      |  94 +---
 .../olingo/fit/base/QueryOptionsTestITCase.java |   2 +-
 .../olingo/fit/tecsvc/client/BasicITCase.java   | 443 ++++++++++---------
 .../fit/tecsvc/client/BatchClientITCase.java    |   5 +-
 .../olingo/fit/tecsvc/http/PingITCase.java      |   4 +
 .../olingo/client/api/uri/QueryOption.java      |  12 +-
 .../core/domain/AbstractClientEntitySet.java    |   2 +-
 .../commons/core/edm/EdmEnumTypeImpl.java       |  68 +--
 .../commons/core/edm/EdmTypeDefinitionImpl.java |  58 +--
 .../olingo/commons/core/edm/EdmEnumTest.java    | 354 +++++++++++++++
 .../commons/core/edm/EdmTypeDefinitionTest.java | 137 ++++++
 .../deserializer/xml/ODataXmlDeserializer.java  |  41 +-
 .../serializer/AbstractODataSerializer.java     |   5 +-
 .../serializer/json/ODataJsonSerializer.java    |  26 +-
 .../json/ServiceDocumentJsonSerializer.java     |  49 +-
 .../core/serializer/xml/ODataXmlSerializer.java | 201 ++++-----
 .../xml/ServiceDocumentXmlSerializer.java       |  87 ++--
 .../core/uri/parser/UriParseTreeVisitor.java    |  24 +-
 .../uri/parser/UriParserSemanticException.java  |   8 +-
 .../server-core-exceptions-i18n.properties      |   2 +
 .../xml/ServiceDocumentXmlSerializerTest.java   |  14 +-
 .../olingo/server/tecsvc/data/ActionData.java   |  10 +-
 .../olingo/server/tecsvc/data/DataCreator.java  |   6 +-
 .../olingo/server/tecsvc/data/DataProvider.java |  41 +-
 .../tecsvc/provider/FunctionProvider.java       |  12 +-
 .../tecsvc/provider/PropertyProvider.java       |   4 +-
 .../server/tecsvc/provider/SchemaProvider.java  |   2 +-
 .../tecsvc/provider/TypeDefinitionProvider.java |   6 +-
 .../json/ODataJsonDeserializerEntityTest.java   |   4 +
 .../xml/ODataXmlDeserializerTest.java           | 189 ++++----
 .../json/ODataJsonSerializerTest.java           |  64 ++-
 .../serializer/json/ServiceDocumentTest.java    |  21 +-
 .../serializer/xml/MetadataDocumentTest.java    |  29 +-
 .../serializer/xml/ODataXmlSerializerTest.java  | 284 +++++++-----
 .../core/uri/antlr/TestFullResourcePath.java    |  43 +-
 37 files changed, 1432 insertions(+), 927 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b1d03d6b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEnumTypeImpl.java
----------------------------------------------------------------------
diff --cc lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEnumTypeImpl.java
index d3dac72,6996ff2..47bfe64
--- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEnumTypeImpl.java
+++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEnumTypeImpl.java
@@@ -250,29 -240,32 +240,17 @@@ public class EdmEnumTypeImpl extends Ed
    public boolean isFlags() {
      return enumType.isFlags();
    }
-   
+ 
    @Override
 -  public TargetType getAnnotationsTargetType() {
 -    return TargetType.EnumType;
 -  }
 -
 -  @Override
 -  public String getAnnotationsTargetPath() {
 -    return null;
 -  }
 -
 -  @Override
 -  public FullQualifiedName getAnnotationsTargetFQN() {
 -    return getFullQualifiedName();
 -  }
 -
 -  @Override
    public int hashCode() {
-     return this.getFullQualifiedName().getFullQualifiedNameAsString().hashCode();
+     return getFullQualifiedName().getFullQualifiedNameAsString().hashCode();
    }
-   
+ 
    @Override
-   public boolean equals(Object obj){
-     if(obj == null){
-       return false;
-     }
-     
-     if(obj == this){
-       return true;
-     }
-     
-     if(obj instanceof EdmEnumType){
-       EdmEnumType other = (EdmEnumType) obj;
-       if(this.getFullQualifiedName().equals(other.getFullQualifiedName())){
-         return true;
-       }
-     }
-     
-     return false;
+   public boolean equals(final Object obj) {
+     return obj != null
+         && (obj == this
+         || obj instanceof EdmEnumType
+             && getFullQualifiedName().equals(((EdmEnumType) obj).getFullQualifiedName()));
    }
  }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b1d03d6b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTypeDefinitionImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b1d03d6b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentTest.java
----------------------------------------------------------------------


Mime
View raw message