Apache/olingo-odata4
1
0
Fork 0
mirror of https://github.com/apache/olingo-odata4.git synced 2025-02-06 10:09:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

[OLINGO-1377] add condition for parsing 'floating' value of Scale facet type

Browse Source 
[OLINGO-1377] add condition for parsing "floating" value of Scale facet type
This commit is contained in:
mibo 2019-08-21 19:03:25 +02:00 committed by GitHub
commit d6bb1da82a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlParameter.java
View File

@ -67,7 +67,8 @@ class ClientCsdlParameter extends CsdlParameter implements Serializable {
parameter.setPrecision(Integer.valueOf(jp.nextTextValue()));
} else if ("Scale".equals(jp.getCurrentName())) {
final String scale = jp.nextTextValue();
parameter.setScale("variable".equalsIgnoreCase(scale) ? 0 : Integer.valueOf(scale));
parameter.setScale("variable".equalsIgnoreCase(scale) || "floating".equalsIgnoreCase(scale) ?
0 : Integer.valueOf(scale));
} else if ("SRID".equals(jp.getCurrentName())) {
final String srid = jp.nextTextValue();
if (srid != null) {

3
lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlProperty.java
View File

@ -69,7 +69,8 @@ class ClientCsdlProperty extends CsdlProperty implements Serializable {
property.setPrecision(Integer.valueOf(jp.nextTextValue()));
} else if ("Scale".equals(jp.getCurrentName())) {
final String scale = jp.nextTextValue();
property.setScale("variable".equalsIgnoreCase(scale) ? 0 : Integer.valueOf(scale));
property.setScale("variable".equalsIgnoreCase(scale) || "floating".equalsIgnoreCase(scale) ?
0 : Integer.valueOf(scale));
} else if ("Unicode".equals(jp.getCurrentName())) {
property.setUnicode(BooleanUtils.toBoolean(jp.nextTextValue()));
} else if ("SRID".equals(jp.getCurrentName())) {

3
lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlReturnType.java
View File

@ -64,7 +64,8 @@ class ClientCsdlReturnType extends CsdlReturnType implements Serializable {
returnType.setPrecision(Integer.valueOf(jp.nextTextValue()));
} else if ("Scale".equals(jp.getCurrentName())) {
final String scale = jp.nextTextValue();
returnType.setScale("variable".equalsIgnoreCase(scale) ? 0 : Integer.valueOf(scale));
returnType.setScale("variable".equalsIgnoreCase(scale) || "floating".equalsIgnoreCase(scale) ?
0 : Integer.valueOf(scale));
} else if ("SRID".equals(jp.getCurrentName())) {
final String srid = jp.nextTextValue();
if (srid != null) {

3
lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlTerm.java
View File

@ -64,7 +64,8 @@ class ClientCsdlTerm extends CsdlTerm implements Serializable {
term.setPrecision(Integer.valueOf(jp.nextTextValue()));
} else if ("Scale".equals(jp.getCurrentName())) {
final String scale = jp.nextTextValue();
term.setScale("variable".equalsIgnoreCase(scale) ? 0 : Integer.valueOf(scale));
term.setScale("variable".equalsIgnoreCase(scale) || "floating".equalsIgnoreCase(scale) ?
0 : Integer.valueOf(scale));
} else if ("SRID".equals(jp.getCurrentName())) {
final String srid = jp.nextTextValue();
if (srid != null) {

3
lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ClientCsdlTypeDefinition.java
View File

@ -57,7 +57,8 @@ class ClientCsdlTypeDefinition extends CsdlTypeDefinition implements Serializabl
typeDefinition.setPrecision(jp.nextIntValue(0));
} else if ("Scale".equals(jp.getCurrentName())) {
final String scale = jp.nextTextValue();
typeDefinition.setScale("variable".equalsIgnoreCase(scale) ? 0 : Integer.valueOf(scale));
typeDefinition.setScale("variable".equalsIgnoreCase(scale) || "floating".equalsIgnoreCase(scale) ?
0 : Integer.valueOf(scale));
} else if ("SRID".equals(jp.getCurrentName())) {
final String srid = jp.nextTextValue();
if (srid != null) {

3
lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlCast.java
View File

@ -56,7 +56,8 @@ class ClientCsdlCast extends CsdlCast implements Serializable {
cast.setPrecision(Integer.valueOf(jp.nextTextValue()));
} else if ("Scale".equals(jp.getCurrentName())) {
final String scale = jp.nextTextValue();
cast.setScale("variable".equalsIgnoreCase(scale) ? 0 : Integer.valueOf(scale));
cast.setScale("variable".equalsIgnoreCase(scale) || "floating".equalsIgnoreCase(scale) ?
0 : Integer.valueOf(scale));
} else if ("SRID".equals(jp.getCurrentName())) {
final String srid = jp.nextTextValue();
if (srid != null) {

3
lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/annotation/ClientCsdlIsOf.java
View File

@ -55,7 +55,8 @@ class ClientCsdlIsOf extends CsdlIsOf implements Serializable {
isof.setPrecision(Integer.valueOf(jp.nextTextValue()));
} else if ("Scale".equals(jp.getCurrentName())) {
final String scale = jp.nextTextValue();
isof.setScale("variable".equalsIgnoreCase(scale) ? 0 : Integer.valueOf(scale));
isof.setScale("variable".equalsIgnoreCase(scale) || "floating".equalsIgnoreCase(scale) ?
0 : Integer.valueOf(scale));
} else if ("SRID".equals(jp.getCurrentName())) {
final String srid = jp.nextTextValue();
if (srid != null) {