date:20220813

Build failed in Jenkins: Olingo » olingo-odata4-all-profiles #24

2022-08-13 Thread Apache Jenkins Server

See 


Changes:

[Michael Bolz] [OLINGO-1571] Fixed special chars for search


--
[...truncated 1.40 MB...]
[INFO] 
[INFO] --- maven-source-plugin:3.2.1:jar-no-fork (attach-sources) @ 
odata-samples ---
[INFO] 
[INFO] --- maven-failsafe-plugin:2.22.2:verify (integration-test) @ 
odata-samples ---
[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.10.0-SNAPSHOT/odata-samples-4.10.0-SNAPSHOT.pom
[INFO] 
[INFO] --- apache-rat-plugin:0.13:check (rat-check) @ odata-samples ---
[INFO] Enabled default license matchers.
[INFO] Will parse SCM ignores for exclusions...
[INFO] Finished adding exclusions from SCM ignore files.
[INFO] 66 implicit excludes (use -debug for more details).
[INFO] 26 explicit excludes (use -debug for more details).
[INFO] 1 resources included (use -debug for more details)
[INFO] Rat check: Summary over all files. Unapproved: 0, unknown: 0, generated: 
0, approved: 1 licenses.
[INFO] 
[INFO] -< org.apache.olingo:odata-server-osgi-sample >-
[INFO] Building odata-server-osgi-sample 4.10.0-SNAPSHOT[19/46]
[INFO] ---[ bundle ]---
[INFO] 
[INFO] --- maven-clean-plugin:3.1.0:clean (default-clean) @ 
odata-server-osgi-sample ---
[INFO] Deleting 

[INFO] 
[INFO] --- maven-enforcer-plugin:1.4.1:enforce (enforce-maven-version) @ 
odata-server-osgi-sample ---
[INFO] 
[INFO] --- maven-enforcer-plugin:1.4.1:enforce (enforce-java-version) @ 
odata-server-osgi-sample ---
[INFO] 
[INFO] --- maven-enforcer-plugin:1.4.1:enforce 
(enforce-output-timestamp-property) @ odata-server-osgi-sample ---
[INFO] 
[INFO] --- build-helper-maven-plugin:3.3.0:add-source (add-source) @ 
odata-server-osgi-sample ---
[INFO] Source directory: 

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

[INFO] Copying 3 resources
[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:3.2.0:testResources (default-testResources) @ 
odata-server-osgi-sample ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Using 'UTF-8' encoding to copy filtered properties files.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources
[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.22.2:test (default-test) @ 
odata-server-osgi-sample ---
[INFO] 
[INFO] --- maven-bundle-plugin:5.1.7:bundle (default-bundle) @ 
odata-server-osgi-sample ---
[WARNING] Bundle 
org.apache.olingo:odata-server-osgi-sample:bundle:4.10.0-SNAPSHOT : Unused 
Import-Package instructions: [org.apache.olingo.netty.server.api*] 
[INFO] Building bundle: 

[INFO] Writing manifest: 

[INFO] 
[INFO] --- maven-site-plugin:3.9.1:attach-descriptor (attach-descriptor) @ 
odata-server-osgi-sample ---
[INFO] Skipping because packaging 'bundle' is not pom.
[INFO] 
[INFO] --- maven-failsafe-plugin:2.22.2:integration-test (integration-test) @ 
odata-server-osgi-

[olingo-odata4] branch OLINGO-1574 created (now 797f16a3d)

2022-08-13 Thread mibo

This is an automated email from the ASF dual-hosted git repository.

mibo pushed a change to branch OLINGO-1574
in repository https://gitbox.apache.org/repos/asf/olingo-odata4.git


  at 797f16a3d [OLINGO-1574] Better error messages for client

This branch includes the following new commits:

 new 797f16a3d [OLINGO-1574] Better error messages for client

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[olingo-odata4] 01/01: [OLINGO-1574] Better error messages for client

2022-08-13 Thread mibo

This is an automated email from the ASF dual-hosted git repository.

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

commit 797f16a3d10321d5cb1faf090b20d9f46f464bc1
Author: mibo 
AuthorDate: Sat Aug 13 12:34:15 2022 +0200

[OLINGO-1574] Better error messages for client
---
 .../proxy/commons/TransactionalPersistenceManagerImpl.java |  2 +-
 .../api/communication/ODataClientErrorException.java   | 14 --
 .../api/communication/ODataServerErrorException.java   | 11 ++-
 .../communication/header/ODataErrorResponseChecker.java|  6 +++---
 .../communication/request/AsyncRequestWrapperImpl.java |  2 +-
 5 files changed, 27 insertions(+), 8 deletions(-)

diff --git 
a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/TransactionalPersistenceManagerImpl.java
 
b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/TransactionalPersistenceManagerImpl.java
index e24796efa..5b29506ae 100644
--- 
a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/TransactionalPersistenceManagerImpl.java
+++ 
b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/TransactionalPersistenceManagerImpl.java
@@ -78,7 +78,7 @@ public class TransactionalPersistenceManagerImpl extends 
AbstractPersistenceMana
 // This should be 202 for service version <= 3.0 and 200 for service 
version >= 4.0 but it seems that
 // many service implementations are not fully compliant in this respect.
 if (response.getStatusCode() != 202 && response.getStatusCode() != 200) {
-  throw new ODataServerErrorException(new ResponseStatusLine(response));
+  throw new ODataServerErrorException(new ResponseStatusLine(response), 
response.getRawResponse());
 }
 
 if (!items.isEmpty()) {
diff --git 
a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/ODataClientErrorException.java
 
b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/ODataClientErrorException.java
index 290f59f89..77063fb1f 100644
--- 
a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/ODataClientErrorException.java
+++ 
b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/ODataClientErrorException.java
@@ -23,6 +23,8 @@ import org.apache.http.StatusLine;
 import org.apache.olingo.commons.api.ex.ODataError;
 import org.apache.olingo.commons.api.ex.ODataRuntimeException;
 
+import java.io.InputStream;
+
 /**
  * Represents a client error in OData.
  *
@@ -38,16 +40,19 @@ public class ODataClientErrorException extends 
ODataRuntimeException {
   
   private Header[] headerInfo;
 
+  private InputStream rawResponse;
+
   /**
* Constructor.
*
* @param statusLine request status info.
*/
-  public ODataClientErrorException(final StatusLine statusLine) {
+  public ODataClientErrorException(final StatusLine statusLine, final 
InputStream entity) {
 super(statusLine.toString());
 
 this.statusLine = statusLine;
 this.error = null;
+this.rawResponse = entity;
   }
 
   /**
@@ -56,7 +61,7 @@ public class ODataClientErrorException extends 
ODataRuntimeException {
* @param statusLine request status info.
* @param error OData error to be wrapped.
*/
-  public ODataClientErrorException(final StatusLine statusLine, final 
ODataError error) {
+  public ODataClientErrorException(final StatusLine statusLine, final 
ODataError error, final InputStream entity) {
 super(error == null ?
 statusLine.toString() :
 (error.getCode() == null || error.getCode().isEmpty() ? "" : "(" + 
error.getCode() + ") ")
@@ -64,6 +69,7 @@ public class ODataClientErrorException extends 
ODataRuntimeException {
 
 this.statusLine = statusLine;
 this.error = error;
+this.rawResponse = entity;
   }
 
   /**
@@ -99,4 +105,8 @@ public class ODataClientErrorException extends 
ODataRuntimeException {
   public Header[] getHeaderInfo() {
 return headerInfo;
   }
+
+  public InputStream getRawResponse() {
+return rawResponse;
+  }
 }
diff --git 
a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/ODataServerErrorException.java
 
b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/ODataServerErrorException.java
index 932e3cb3b..32e20b55d 100644
--- 
a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/ODataServerErrorException.java
+++ 
b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/ODataServerErrorException.java
@@ -21,6 +21,8 @@ package org.apache.olingo.client.api.communication;
 import org.apache.http.StatusLine;
 import org.apache.olingo.commons.api.ex.ODataRuntimeException;
 
+import java.io.InputStream;
+
 /**
  * Represents a server error in OData.
  */
@@ -28,12 +30,19 @@ public class ODataServerErrorException extends 
ODataRuntimeException {
 
   private static final long serialVersionUID = -642301

Build failed in Jenkins: Olingo » olingo-odata4 #44

2022-08-13 Thread Apache Jenkins Server

See 


Changes:

[Michael Bolz] [OLINGO-1571] Fixed special chars for search


--
[...truncated 1.19 MB...]
[INFO] --- maven-remote-resources-plugin:1.5:process (process-resource-bundles) 
@ odata-samples ---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.5:process (default) @ odata-samples 
---
[INFO] 
[INFO] --- maven-site-plugin:3.9.1:attach-descriptor (attach-descriptor) @ 
odata-samples ---
[INFO] No site descriptor found: nothing to attach.
[INFO] 
[INFO] --- maven-failsafe-plugin:2.22.2:integration-test (integration-test) @ 
odata-samples ---
[INFO] No tests to run.
[INFO] 
[INFO] --- maven-source-plugin:3.2.1:jar-no-fork (attach-sources) @ 
odata-samples ---
[INFO] 
[INFO] --- maven-failsafe-plugin:2.22.2:verify (integration-test) @ 
odata-samples ---
[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.10.0-SNAPSHOT/odata-samples-4.10.0-SNAPSHOT.pom
[INFO] 
[INFO] --- apache-rat-plugin:0.13:check (rat-check) @ odata-samples ---
[INFO] Enabled default license matchers.
[INFO] Will parse SCM ignores for exclusions...
[INFO] Finished adding exclusions from SCM ignore files.
[INFO] 64 implicit excludes (use -debug for more details).
[INFO] 26 explicit excludes (use -debug for more details).
[INFO] 179 resources included (use -debug for more details)
[INFO] Rat check: Summary over all files. Unapproved: 0, unknown: 0, generated: 
0, approved: 179 licenses.
[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.10.0-SNAPSHOT[19/28]
[INFO] ---[ bundle ]---
[INFO] 
[INFO] --- maven-clean-plugin:3.1.0:clean (default-clean) @ 
odata-server-osgi-sample ---
[INFO] Deleting 

[INFO] 
[INFO] --- maven-enforcer-plugin:1.4.1:enforce (enforce-maven-version) @ 
odata-server-osgi-sample ---
[INFO] 
[INFO] --- maven-enforcer-plugin:1.4.1:enforce (enforce-java-version) @ 
odata-server-osgi-sample ---
[INFO] 
[INFO] --- maven-enforcer-plugin:1.4.1:enforce 
(enforce-output-timestamp-property) @ odata-server-osgi-sample ---
[INFO] 
[INFO] --- build-helper-maven-plugin:3.3.0:add-source (add-source) @ 
odata-server-osgi-sample ---
[INFO] Source directory: 

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

[INFO] Copying 3 resources
[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:3.2.0:testResources (default-testResources) @ 
odata-server-osgi-sample ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Using 'UTF-8' encoding to copy filtered properties files.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources
[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.22.2:test (default-test) @ 
odata-server-osgi-sample ---
[INFO] 
[INFO] --- maven-bundle-plugin:5.1.8:bundle (default-bundle) @ 
odata-server-osgi-sample ---
[WARNING] Bundle 
org.apache.olingo:odata-server-osgi-sample:bundle:4.10.0-SNAPSHOT : Unused 
Import-Package instructions: [org.apache.olingo.netty.server.api*] 
[INFO] Building bundle:

[olingo-odata4] branch master updated: [OLINGO-1571] Fixed special chars for search

2022-08-13 Thread mibo

This is an automated email from the ASF dual-hosted git repository.

mibo 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 683e471dc [OLINGO-1571] Fixed special chars for search
683e471dc is described below

commit 683e471dc2f06d3f2ca06a7a9c95e1480532fe98
Author: mibo 
AuthorDate: Mon Aug 8 20:06:20 2022 +0200

[OLINGO-1571] Fixed special chars for search
---
 .../core/uri/parser/search/SearchTokenizer.java| 87 +++---
 .../uri/parser/search/SearchTokenizerTest.java | 13 +++-
 2 files changed, 20 insertions(+), 80 deletions(-)

diff --git 
a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchTokenizer.java
 
b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchTokenizer.java
index 6f7e01e70..853537d3b 100644
--- 
a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchTokenizer.java
+++ 
b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchTokenizer.java
@@ -124,83 +124,17 @@ public class SearchTokenizer {
   || isOtherDelimsForWord(character);
 }
 
-   /**
- * 
- * searchPhrase = quotation-mark 1*qchar-no-AMP-DQUOTE 
quotation-mark
- * 
- * qchar-no-AMP-DQUOTE = qchar-unescaped / escape ( escape / 
quotation-mark )
- * 
- * qchar-unescaped = unreserved / pct-encoded-unescaped / 
other-delims /
- * ":" / "@" / "/" / "?" / "$" / "'" / "="
- * 
- * unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~"
- * 
- * escape = "\" / "%5C" ; reverse solidus U+005C
- * 
- * pct-encoded-unescaped = "%" ( "0" / "1" / "3" / "4" / "6" / "7" 
/ "8" / "9" / A-to-F ) HEXDIG
- * / "%" "2" ( "0" / "1" / "3" / "4" / "5" / "6" / "7" / "8" / "9" / 
A-to-F )
- * / "%" "5" ( DIGIT / "A" / "B" / "D" / "E" / "F" )
- * 
- * other-delims = "!" / "(" / ")" / "*" / "+" / "," / ";"
- * 
- * quotation-mark = DQUOTE / "%22"
- * 
- * ALPHA = %x41-5A / %x61-7A
- * 
- * DIGIT = %x30-39
- * 
- * DQUOTE = %x22
- * 
- *
- * Checks if given character is allowed for a search phrase.
- * ATTENTION: Escaping and percent encoding is not be validated 
here (and can not be validated on
- * a single character).
- * Hence for the {@link #PHRASE_ESCAPE_CHAR} and the {@link 
#QUOTATION_MARK} characters this method will
- * return FALSE.
- * Furthermore percent encoded characters are also not validated 
(and can not be validated on
- * a single character).
- * Hence for the % character this method assumeS that it was 
percent encoded and is now decoded
- * and will return TRUE.
+ /**
+ * The check for allowed characters in a SearchPhrase assumes 
that
+ * the whole phrase is already percent decoded.
+ * Hence, all characters are allowed besides the double quote 
(").
  *
  * @param character which is checked
  * @return true if character is allowed for a phrase
  */
 static boolean isAllowedPhrase(final char character) {
-  // the '%' is allowed because it is assumed that it was percent encoded 
and is now decoded
-  return isQCharUnescaped(character) 
- || character == '%' 
- || Character.isUnicodeIdentifierStart(character);
-}
-
-/**
- * qchar-unescaped = unreserved / pct-encoded-unescaped / other-delims / 
":" / "@" / "/" / "?" / "$" / "'" / "="
- * @param character which is checked
- * @return true if character is allowed
- */
-private static boolean isQCharUnescaped(final char character) {
-  return isUnreserved(character)
-  || isOtherDelims(character)
-  || character == ':'
-  || character == '@'
-  || character == '/'
-  || character == '$'
-  || character == '\''
-  || character == '=';
-}
-
-/**
- * other-delims = "!" / "(" / ")" / "*" / "+" / "," / ";"
- * @param character which is checked
- * @return true if character is allowed
- */
-private static boolean isOtherDelims(final char character) {
-  return character == '!'
-  || character == '('
-  || character == ')'
-  || character == '*'
-  || character == '+'
-  || character == ','
-  || character == ';';
+  return Character.isUnicodeIdentifierStart(character)
+  || character != '"';
 }
 
 /**
@@ -212,7 +146,6 @@ public class SearchTokenizer {
   return character == '!'
   || character == '*'
   || character == '+'
-  || character == ','
   || character == ':'
   || character == '@'
   || character == '/'
@@ -234,7 +167,7 @@ public class SearchTokenizer {
   || character == '<'
   || character == '`';
 }
-
+
 /*

[olingo-odata4] 01/01: [OLINGO-1571] Fixed special chars for search

2022-08-13 Thread mibo

This is an automated email from the ASF dual-hosted git repository.

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

commit b6bb2e82005e81f17e37909fea5bfb7a58bcc746
Author: mibo 
AuthorDate: Mon Aug 8 20:06:20 2022 +0200

[OLINGO-1571] Fixed special chars for search
---
 .../core/uri/parser/search/SearchTokenizer.java| 87 +++---
 .../uri/parser/search/SearchTokenizerTest.java | 13 +++-
 2 files changed, 20 insertions(+), 80 deletions(-)

diff --git 
a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchTokenizer.java
 
b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchTokenizer.java
index 6f7e01e70..853537d3b 100644
--- 
a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchTokenizer.java
+++ 
b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/search/SearchTokenizer.java
@@ -124,83 +124,17 @@ public class SearchTokenizer {
   || isOtherDelimsForWord(character);
 }
 
-   /**
- * 
- * searchPhrase = quotation-mark 1*qchar-no-AMP-DQUOTE 
quotation-mark
- * 
- * qchar-no-AMP-DQUOTE = qchar-unescaped / escape ( escape / 
quotation-mark )
- * 
- * qchar-unescaped = unreserved / pct-encoded-unescaped / 
other-delims /
- * ":" / "@" / "/" / "?" / "$" / "'" / "="
- * 
- * unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~"
- * 
- * escape = "\" / "%5C" ; reverse solidus U+005C
- * 
- * pct-encoded-unescaped = "%" ( "0" / "1" / "3" / "4" / "6" / "7" 
/ "8" / "9" / A-to-F ) HEXDIG
- * / "%" "2" ( "0" / "1" / "3" / "4" / "5" / "6" / "7" / "8" / "9" / 
A-to-F )
- * / "%" "5" ( DIGIT / "A" / "B" / "D" / "E" / "F" )
- * 
- * other-delims = "!" / "(" / ")" / "*" / "+" / "," / ";"
- * 
- * quotation-mark = DQUOTE / "%22"
- * 
- * ALPHA = %x41-5A / %x61-7A
- * 
- * DIGIT = %x30-39
- * 
- * DQUOTE = %x22
- * 
- *
- * Checks if given character is allowed for a search phrase.
- * ATTENTION: Escaping and percent encoding is not be validated 
here (and can not be validated on
- * a single character).
- * Hence for the {@link #PHRASE_ESCAPE_CHAR} and the {@link 
#QUOTATION_MARK} characters this method will
- * return FALSE.
- * Furthermore percent encoded characters are also not validated 
(and can not be validated on
- * a single character).
- * Hence for the % character this method assumeS that it was 
percent encoded and is now decoded
- * and will return TRUE.
+ /**
+ * The check for allowed characters in a SearchPhrase assumes 
that
+ * the whole phrase is already percent decoded.
+ * Hence, all characters are allowed besides the double quote 
(").
  *
  * @param character which is checked
  * @return true if character is allowed for a phrase
  */
 static boolean isAllowedPhrase(final char character) {
-  // the '%' is allowed because it is assumed that it was percent encoded 
and is now decoded
-  return isQCharUnescaped(character) 
- || character == '%' 
- || Character.isUnicodeIdentifierStart(character);
-}
-
-/**
- * qchar-unescaped = unreserved / pct-encoded-unescaped / other-delims / 
":" / "@" / "/" / "?" / "$" / "'" / "="
- * @param character which is checked
- * @return true if character is allowed
- */
-private static boolean isQCharUnescaped(final char character) {
-  return isUnreserved(character)
-  || isOtherDelims(character)
-  || character == ':'
-  || character == '@'
-  || character == '/'
-  || character == '$'
-  || character == '\''
-  || character == '=';
-}
-
-/**
- * other-delims = "!" / "(" / ")" / "*" / "+" / "," / ";"
- * @param character which is checked
- * @return true if character is allowed
- */
-private static boolean isOtherDelims(final char character) {
-  return character == '!'
-  || character == '('
-  || character == ')'
-  || character == '*'
-  || character == '+'
-  || character == ','
-  || character == ';';
+  return Character.isUnicodeIdentifierStart(character)
+  || character != '"';
 }
 
 /**
@@ -212,7 +146,6 @@ public class SearchTokenizer {
   return character == '!'
   || character == '*'
   || character == '+'
-  || character == ','
   || character == ':'
   || character == '@'
   || character == '/'
@@ -234,7 +167,7 @@ public class SearchTokenizer {
   || character == '<'
   || character == '`';
 }
-
+
 /**
  * unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~"
  * @param character which is checked
@@ -355,11 +288,11 @@ public class SearchTokenizer {
   }

[olingo-odata4] branch OLINGO-1571 updated (a93d0a042 -> b6bb2e820)

2022-08-13 Thread mibo

This is an automated email from the ASF dual-hosted git repository.

mibo pushed a change to branch OLINGO-1571
in repository https://gitbox.apache.org/repos/asf/olingo-odata4.git


 discard a93d0a042 [OLINGO-1571] Fixed special chars for search
 new b6bb2e820 [OLINGO-1571] Fixed special chars for search

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (a93d0a042)
\
 N -- N -- N   refs/heads/OLINGO-1571 (b6bb2e820)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../core/uri/parser/search/SearchTokenizer.java| 45 +++---
 1 file changed, 6 insertions(+), 39 deletions(-)

Build failed in Jenkins: Olingo » olingo-odata4-all-profiles #24

[olingo-odata4] branch OLINGO-1574 created (now 797f16a3d)

[olingo-odata4] 01/01: [OLINGO-1574] Better error messages for client

Build failed in Jenkins: Olingo » olingo-odata4 #44

[olingo-odata4] branch master updated: [OLINGO-1571] Fixed special chars for search

[olingo-odata4] 01/01: [OLINGO-1571] Fixed special chars for search

[olingo-odata4] branch OLINGO-1571 updated (a93d0a042 -> b6bb2e820)

7 matches

Site Navigation

Mail list logo

Footer information