Build failed in Jenkins: olingo-odata4 #1554

2020-02-25 Thread Apache Jenkins Server
See 


Changes:

[ramya.vasanth] [OLINGO-1368]Fix for OData in operator for Integer values


--
[...truncated 376.34 KB...]
[INFO] --- maven-source-plugin:2.2.1:jar-no-fork (attach-sources) @ 
odata-samples ---
[INFO] 
[INFO] --- maven-failsafe-plugin:2.17:verify (integration-test) @ odata-samples 
---
[INFO] No tests to run.
[INFO] 
[INFO] --- maven-checkstyle-plugin:3.1.0:check (checkstyle) @ odata-samples ---
[INFO] Starting audit...
Audit done.
[INFO] 
[INFO] --- maven-install-plugin:2.5.2:install (default-install) @ odata-samples 
---
[INFO] Installing 
 to 
/home/jenkins/.m2/repository/org/apache/olingo/odata-samples/4.8.0-SNAPSHOT/odata-samples-4.8.0-SNAPSHOT.pom
[INFO] 
[INFO] --- apache-rat-plugin:0.11:check (rat-check) @ odata-samples ---
[INFO] 53 implicit excludes (use -debug for more details).
[INFO] Exclude: **/target/**
[INFO] Exclude: **/META-INF/**
[INFO] Exclude: **/*.txt
[INFO] Exclude: **/*.ini
[INFO] Exclude: **/*.bin
[INFO] Exclude: **/MANIFEST.MF
[INFO] Exclude: .gitignore
[INFO] Exclude: .git/**
[INFO] Exclude: bin/**
[INFO] Exclude: **/*.local
[INFO] Exclude: **/*.project
[INFO] Exclude: **/*.classpath
[INFO] Exclude: **/*.json
[INFO] Exclude: **/*.batch
[INFO] Exclude: **/NOTICE
[INFO] Exclude: **/DEPENDENCIES
[INFO] Exclude: **/nb-configuration.xml
[INFO] Exclude: **/.externalToolBuilders/**
[INFO] Exclude: **/maven-eclipse.xml
[INFO] Exclude: **/*.iml
[INFO] Exclude: **/ref/**
[INFO] Exclude: **/server-ref/**
[INFO] Exclude: **/dependency-reduced-pom.xml
[INFO] Exclude: **/.settings/**
[INFO] 179 resources included (use -debug for more details)
[INFO] Rat check: Summary of files. Unapproved: 0 unknown: 0 generated: 0 
approved: 179 licence.
[INFO] 
[INFO] --- maven-deploy-plugin:2.8.2:deploy (default-deploy) @ odata-samples ---
[INFO] Skipping artifact deployment
[INFO] 
[INFO] -< org.apache.olingo:odata-server-osgi-sample >-
[INFO] Building odata-server-osgi-sample 4.8.0-SNAPSHOT [19/28]
[INFO] ---[ bundle ]---
[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ 
odata-server-osgi-sample ---
[INFO] 
[INFO] --- build-helper-maven-plugin:1.9:add-source (add-source) @ 
odata-server-osgi-sample ---
[INFO] Source directory: 

 added.
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.5:process (default) @ 
odata-server-osgi-sample ---
[INFO] 
[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ 
odata-server-osgi-sample ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources
[INFO] 
[INFO] --- maven-compiler-plugin:3.8.1:compile (default-compile) @ 
odata-server-osgi-sample ---
[INFO] Changes detected - recompiling the module!
[INFO] Compiling 4 source files to 

[INFO] 
[INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ 
odata-server-osgi-sample ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources
[INFO] 
[INFO] --- maven-compiler-plugin:3.8.1:testCompile (default-testCompile) @ 
odata-server-osgi-sample ---
[INFO] No sources to compile
[INFO] 
[INFO] --- maven-surefire-plugin:2.17:test (default-test) @ 
odata-server-osgi-sample ---
[INFO] 
[INFO] --- maven-bundle-plugin:4.2.1:bundle (default-bundle) @ 
odata-server-osgi-sample ---
[WARNING] Bundle 
org.apache.olingo:odata-server-osgi-sample:bundle:4.8.0-SNAPSHOT : Unused 
Import-Package instructions: [org.apache.olingo.netty.server.api*] 
[INFO] 
[INFO] --- maven-site-plugin:3.4:attach-descriptor (attach-descriptor) @ 
odata-server-osgi-sample ---
[INFO] 
[INFO] --- maven-failsafe-plugin:2.17:integration-test (integration-test) @ 
odata-server-osgi-sample ---
[INFO] 
[INFO] --- maven-source-plugin:2.2.1:jar-no-fork (attach-sources) @ 
odata-server-osgi-sample ---
[INFO] Building jar: 

[INFO] 
[INFO] --- maven-failsafe-plugin:2.17:verify (integration-test) @ 
odata-server-osgi-sample ---
[INFO] Failsafe report directory: 

[INFO] 
[INFO] --- maven-checkstyle-plugin:3.1.0:check (checkstyle) @ 
odata-server-osgi-sample ---
[INFO] Starting audit...
Audit done.
[INFO] 
[INFO] --- 

[olingo-odata4] branch master updated: [OLINGO-1368]Fix for OData in operator for Integer values

2020-02-25 Thread ramyav
This is an automated email from the ASF dual-hosted git repository.

ramyav pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/olingo-odata4.git


The following commit(s) were added to refs/heads/master by this push:
 new ac7d8db  [OLINGO-1368]Fix for OData in operator for Integer values
ac7d8db is described below

commit ac7d8dbd62d4b284b580618bfb1cac4bf7831e73
Author: ramya vasanth 
AuthorDate: Wed Feb 26 11:39:11 2020 +0530

[OLINGO-1368]Fix for OData in operator for Integer values
---
 .../olingo/server/core/uri/parser/ExpressionParser.java   | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git 
a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/ExpressionParser.java
 
b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/ExpressionParser.java
index cf2074a..8f69f81 100644
--- 
a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/ExpressionParser.java
+++ 
b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/ExpressionParser.java
@@ -338,7 +338,7 @@ public class ExpressionParser {
   if (tokenizer.next(TokenKind.OPEN)) {
 ParserHelper.bws(tokenizer);
 List expressionList = parseInExpr();
-checkInExpressionTypes(expressionList, kinds);
+checkInExpressionTypes(expressionList, leftExprType);
 return new BinaryImpl(left, BinaryOperatorKind.IN, expressionList,
 odata.createPrimitiveTypeInstance(EdmPrimitiveTypeKind.Boolean));
   } else {
@@ -354,19 +354,20 @@ public class ExpressionParser {
 
   /**
* @param expressionList
-   * @param kinds
+   * @param leftExprType
* @throws UriParserException
* @throws UriParserSemanticException
*/
-  private void checkInExpressionTypes(List expressionList, 
EdmPrimitiveTypeKind kinds)
+  private void checkInExpressionTypes(List expressionList, EdmType 
leftExprType)
   throws UriParserException, UriParserSemanticException {
 for (Expression expr : expressionList) {
   EdmType inExprType = getType(expr);
-  if (!isType(inExprType, kinds)) {
+  
+  if (!(((EdmPrimitiveType) leftExprType).isCompatible((EdmPrimitiveType) 
inExprType))) {
 throw new UriParserSemanticException("Incompatible types.",
 UriParserSemanticException.MessageKeys.TYPES_NOT_COMPATIBLE,
 inExprType == null ? "" : 
inExprType.getFullQualifiedName().getFullQualifiedNameAsString(),
-kinds.getFullQualifiedName().getFullQualifiedNameAsString());
+
leftExprType.getFullQualifiedName().getFullQualifiedNameAsString());
   }
 }
   }