Apache/olingo-odata4
1
0
Fork 0
mirror of https://github.com/apache/olingo-odata4.git synced 2025-03-05 16:19:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

[OLINGO-63] Uri Parser: add percent decoding

Browse Source
This commit is contained in:
Sven Kobler 2014-02-17 17:23:08 +01:00
parent 7a67ea2ff8
commit e8a63a58e9
45 changed files with 1421 additions and 869 deletions

2
odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceNavigation.java

@ -32,5 +32,5 @@ public interface UriResourceNavigation extends UriResourcePartTyped {
EdmType getTypeFilterOnCollection(); EdmType getTypeFilterOnCollection();
EdmType getTypeFilterOnEntry(); EdmType getTypeFilterOnEntry();
} }

331
odata4-lib/odata4-server-core/src/main/antlr4/org/apache/olingo/odata4/server/core/uri/antlr/UriParser.g4

@ -17,134 +17,80 @@
* under the License. * under the License.
******************************************************************************/ ******************************************************************************/
grammar UriParser; grammar UriParser;
//------------------------------------------------------------------------------
// This grammer refers to the "odata-abnf-construction-rules.txt" Revision 517.
// URL: https://tools.oasis-open.org/version-control/browse/wsvn/odata/trunk/spec/ABNF/odata-abnf-construction-rules.txt?rev=517
//Antlr4 (as most parsers) has a lexer for token detection and a parser which defines // While contructing this grammer we tried to keep it close to the ABNF. However this is not really possible
//rules based on the tokens. However its hard to define a clear lexer on the // in order to support
//ODATA URI syntax due to some reasons: // - percent decoding
// - the syntax is based on the URI specification and there fore contains the definition // - operator precedence
// of delimiters and percent encoding // - have context free grammar ( without out java snipples to add context)
// - the syntax includes JSON // - generate the parser in diffend target languages
// - the syntax includes a expression syntax which comes from ODATA itself (e.g. $filter) // Currently not supported
// - the syntax includes searchstring and searchword // - $search
// - the ABNF describing syntax is not defined in a context free manner // - geometry data
// so there are several kinds of "String" tokens: // - json data in url
// - strings with single quotes, //------------------------------------------------------------------------------
// - strings with single quotes and a special syntax within the quotes (like geometry data)
// - strings with double quotes
// - strings without quotes ( usually identifiers, searchstrings, searchwords, custom parameters)
// but each with different allowed charactersets
// Drawing a simple line between lexer and parser is not possible.
//
// This grammer is a compromiss we have choosen to satisfy the requirements we have
// - the grammer is context free
// - this makes the parser much simpler and we have a clear saparation between parsing and
// EDM validation, but also creates a parse tree which is not semantically correct from the
// EDM perspective ( e.g.it will not pass the EDM validation)
// - the grammer can not be applied on a full URI string
// - the URI should be split according the URI specification before used as input for the
// ODATA parser
// - while creating the grammer the antlr lexer modes where only allowed in pure lexer grammers
// not in combined grammers, and is was not possible to include lexer grammer with a mode into
// a combined grammar without creating JAVA errors.
// see https://github.com/antlr/antlr4/issues/160 "Support importing multi-mode lexer grammars"
//Naming convention
// ...
//Decoding encoding
//- within rule "resourcePath": special chars used in EDM.Strings must still be encoded when
// used as tokenizer input
// e.g. .../Employees(id='Hugo%2FMueller')/EmployeeName <-- SLASH must be encoded to '%2F' in "Hugo/Mueller"
// but it must not be encoded before the EmployeeName
options { options {
language = Java; language = Java;
tokenVocab=UriLexer; tokenVocab = UriLexer;
} }
//;------------------------------------------------------------------------------ //;------------------------------------------------------------------------------
//; 0. URI //; 0. URI
//;------------------------------------------------------------------------------ //;------------------------------------------------------------------------------
//ABNF odataUri and serviceRoot are currently not used here batchEOF : BATCH EOF;
//odataUri = serviceRoot [ odataRelativeUri ]
//
//serviceRoot = ( "https" / "http" ) ; Note: case-insensitive
// "://" host [ ":" port ]
// "/" *( segment-nz "/" )
entityEOF : vNS=namespace vODI=odataIdentifier;
odataRelativeUriEOF : odataRelativeUri? EOF; metadataEOF : METADATA EOF;
//QM and FRAGMENT enable next lexer mode
//TODO add the new "ENTITYCAST"
odataRelativeUri : BATCH # altBatch
| ENTITY QM vEO=entityOptions # altEntity
| ENTITY SLASH vNS=namespace vODI=odataIdentifier QM vEO=entityOptionsCast # altEntityCast
| METADATA ( QM vF=format )? ( FRAGMENT vCF=contextFragment )? # altMetadata
| vRP=resourcePath ( QM vQO=queryOptions )? # altResourcePath
;
//;------------------------------------------------------------------------------ //;------------------------------------------------------------------------------
//; 1. Resource Path //; 1. Resource Path
//;------------------------------------------------------------------------------ //;------------------------------------------------------------------------------
resourcePath : vAll=ALL //resourcePathEOF : vlPS=pathSegments EOF;
| vCJ=crossjoin
| vlPS=pathSegments
;
crossjoin : CROSSJOIN OPEN WSP? vlODI+=odataIdentifier WSP? ( COMMA WSP? vlODI+=odataIdentifier WSP?)* CLOSE;
pathSegments : vlPS+=pathSegment (SLASH vlPS+=pathSegment)* vCS=constSegment?; crossjoinEOF : CROSSJOIN OPEN WSP? vlODI+=odataIdentifier WSP? ( COMMA WSP? vlODI+=odataIdentifier WSP?)* CLOSE EOF;
allEOF : ALL;
pathSegmentEOF : (pathSegment | constSegment) EOF;
pathSegments : vlPS+=pathSegment (SLASH vlPS+=pathSegment)* (SLASH vCS=constSegment)?;
pathSegment : vNS=namespace? vODI=odataIdentifier vlNVO+=nameValueOptList*; pathSegment : vNS=namespace? vODI=odataIdentifier vlNVO+=nameValueOptList*;
nameValueOptList : OPEN (vVO=valueOnly | vNVL=nameValueList)? CLOSE; nameValueOptList : OPEN (vVO=commonExpr | vNVL=nameValueList)? CLOSE;
valueOnly : vV=commonExpr ;
nameValueList : WSP* vlNVP+=nameValuePair WSP* ( COMMA WSP* vlNVP+=nameValuePair WSP*)* ; nameValueList : WSP* vlNVP+=nameValuePair WSP* ( COMMA WSP* vlNVP+=nameValuePair WSP*)* ;
nameValuePair : vODI=odataIdentifier EQ (AT vALI=odataIdentifier | vCOM=commonExpr /*TODO | val2=enumX*/); nameValuePair : vODI=odataIdentifier EQ (AT vALI=odataIdentifier | vCOM=commonExpr /*TODO | val2=enumX*/);
constSegment : SLASH (vV=value | vC=count | vR=ref | vAll=allExpr | vAny=anyExpr); constSegment : (vV=value | vC=count | vR=ref | vAll=allExpr | vAny=anyExpr);
count : COUNT; count : COUNT;
ref : REF; ref : REF;
value : VALUE; value : VALUE;
//;------------------------------------------------------------------------------ //;------------------------------------------------------------------------------
//; 2. Query Options //; 2. Query Options
//;------------------------------------------------------------------------------ //;------------------------------------------------------------------------------
queryOptions : vlQO+=queryOption ( AMP vlQO+=queryOption )*; queryOptions : vlQO+=queryOption ( AMP vlQO+=queryOption )*;
queryOption : systemQueryOption queryOption : systemQueryOption
| AT_Q aliasAndValue | AT_Q aliasAndValue;
| customQueryOption
;
entityOptions : (vlEOb+=entityOption AMP )* vlEOm=id ( AMP vlEOa+=entityOption )*;
entityOption : format
| customQueryOption
;
entityOptionsCast : (vlEOb+=entityOptionCast AMP )* vlEOm=id ( AMP vlEOa+=entityOptionCast )*;
entityOptionCast : expand
| format
| select
| filter
| customQueryOption
;
systemQueryOption : expand systemQueryOption : expand
| filter | filter
| format | format
| id
| inlinecount | inlinecount
| orderBy | orderBy
| search | search
| select | select
| skip | skip
@ -152,31 +98,35 @@ systemQueryOption : expand
| top | top
; ;
id : ID EQ REST;
skiptoken : SKIPTOKEN EQ REST; skiptoken : SKIPTOKEN EQ REST;
expand : EXPAND EQ vlEI+=expandItem ( COMMA vlEI+=expandItem )*; expand : EXPAND EQ expandItems;
expandItemsEOF : expandItems EOF;
expandItems : vlEI+=expandItem ( COMMA vlEI+=expandItem )*;
expandItem : vS=STAR ( SLASH vR=ref | OPEN LEVELS EQ ( vL=INT | vM=MAX) CLOSE )? expandItem : vS=STAR ( SLASH vR=ref | OPEN LEVELS EQ ( vL=INT | vM=MAX) CLOSE )?
| vEP=expandPath vEPE=expandPathExtension?; | vEP=expandPath vEPE=expandPathExtension?;
expandPath : vlPS+=pathSegment (SLASH vlPS+=pathSegment)*; expandPath : vlPS+=pathSegment (SLASH vlPS+=pathSegment)*;
//expandPath : expandPathSegment ( SLASH expandPathSegment )*;
//expandPathSegment : vNS=namespace? vODI=odataIdentifier;
expandPathExtension : OPEN vlEO+=expandOption ( SEMI vlEO+=expandOption )* CLOSE expandPathExtension : OPEN vlEO+=expandOption ( SEMI vlEO+=expandOption )* CLOSE
| SLASH vR=ref ( OPEN vlEOR+=expandRefOption ( SEMI vlEOR+=expandRefOption )* CLOSE )? | SLASH vR=ref ( OPEN vlEOR+=expandRefOption ( SEMI vlEOR+=expandRefOption )* CLOSE )?
| SLASH vC=count ( OPEN vlEOC+=expandCountOption ( SEMI vlEOC+=expandCountOption )* CLOSE )? | SLASH vC=count ( OPEN vlEOC+=expandCountOption ( SEMI vlEOC+=expandCountOption )* CLOSE )?
; ;
expandCountOption : filter expandCountOption : filter
| search | search
; ;
expandRefOption : expandCountOption expandRefOption : expandCountOption
| orderBy | orderBy
| skip | skip
| top | top
| inlinecount | inlinecount
; ;
expandOption : expandRefOption expandOption : expandRefOption
| select | select
| expand | expand
@ -186,10 +136,16 @@ levels : LEVELS EQ ( INT | MAX );
filter : FILTER EQ commonExpr; filter : FILTER EQ commonExpr;
orderBy : ORDERBY EQ WSP* vlOI+=orderByItem ( WSP* COMMA WSP* vlOI+=orderByItem )*; filterExpressionEOF : commonExpr EOF;
orderBy : ORDERBY EQ orderList;
orderByEOF : orderList EOF;
orderList : vlOI+=orderByItem ( WSP* COMMA WSP* vlOI+=orderByItem )*;
orderByItem : vC=commonExpr ( WSP ( vA=ASC | vD=DESC ) )?; orderByItem : vC=commonExpr ( WSP ( vA=ASC | vD=DESC ) )?;
//this is completly done in lexer grammer to avoid ambiguities with odataIdentifier and STRING
skip : SKIP EQ INT; skip : SKIP EQ INT;
top : TOP EQ INT; top : TOP EQ INT;
format : FORMAT EQ ( ATOM | JSON | XML | PCHARS ( SLASH PCHARS)?); format : FORMAT EQ ( ATOM | JSON | XML | PCHARS ( SLASH PCHARS)?);
@ -214,67 +170,43 @@ searchPhrase : SEARCHPHRASE;
searchWord : SEARCHWORD; searchWord : SEARCHWORD;
select : SELECT EQ vlSI+=selectItem ( COMMA vlSI+=selectItem )*; select : SELECT EQ vlSI+=selectItem ( COMMA vlSI+=selectItem )*;
selectEOF : vlSI+=selectItem ( COMMA vlSI+=selectItem )*;
selectItem : vlSS+=selectSegment ( SLASH vlSS+=selectSegment ) *; selectItem : vlSS+=selectSegment ( SLASH vlSS+=selectSegment ) *;
selectSegment : vNS=namespace? ( vODI=odataIdentifier | vS=STAR ); selectSegment : vNS=namespace? ( vODI=odataIdentifier | vS=STAR );
aliasAndValue : vODI=ODATAIDENTIFIER EQ vV=parameterValue; aliasAndValue : vODI=ODATAIDENTIFIER EQ vV=parameterValue;
parameterValue : //TODO json not supported arrayOrObject
commonExpr parameterValue : commonExpr //TODO json not supported arrayOrObject
; ;
customQueryOption : customName ( EQ customValue)?
;
customName : CUSTOMNAME;
customValue : REST;
//;------------------------------------------------------------------------------ //;------------------------------------------------------------------------------
//; 3. Context URL Fragments //; 3. Context URL Fragments
//;------------------------------------------------------------------------------ //;------------------------------------------------------------------------------
//TODO add ps+=pathSegment (SLASH ps+=pathSegment)*
contextFragment : REST;
propertyList : OPEN propertyListItem ( COMMA propertyListItem )* CLOSE; contextFragment : REST; // the context fragment is only required on the client side
propertyListItem : STAR //; all structural properties
| propertyListProperty
;
propertyListProperty : namespace? odataIdentifier ( SLASH namespace? odataIdentifier)* ( PLUS )? ( propertyList)?
;
//;------------------------------------------------------------------------------ //;------------------------------------------------------------------------------
//; 4. Expressions //; 4. Expressions
//;------------------------------------------------------------------------------ //;------------------------------------------------------------------------------
// this expression part of the grammer is not similar to the ABNF because commonExpr : OPEN commonExpr CLOSE #altPharenthesis
// we had to introduced operator precesence witch is not reflected in the ABNF | vE1=commonExpr (WSP HAS WSP) vE2=commonExpr #altHas
| methodCallExpr #altMethod
test : test_expr EOF; | ( unary WSP ) commonExpr #altUnary
test_expr : INT | anyExpr #altAny
//| test_expr /*WSP*/ ( '!' | '*' ) /*WSP*/ test_expr; | allExpr #altAll
//| test_expr WSP ( '!' | '*' ) WSP test_expr; | memberExpr #altMember
| test_expr ( WSP '!' WSP | WSP '*' WSP ) test_expr; | vE1=commonExpr (WSP vO=MUL WSP | WSP vO=DIV WSP | WSP vO=MOD WSP ) vE2=commonExpr #altMult
| vE1=commonExpr (WSP vO=ADD WSP | WSP vO=SUB WSP) vE2=commonExpr #altAdd
commonExpr : OPEN commonExpr CLOSE #altPharenthesis
| vE1=commonExpr (WSP HAS WSP) vE2=commonExpr #altHas
| methodCallExpr #altMethod
| ( unary WSP ) commonExpr #altUnary
| anyExpr #altAny
| allExpr #altAll
| memberExpr #altMember
| vE1=commonExpr (WSP vO=MUL WSP | WSP vO=DIV WSP | WSP vO=MOD WSP ) vE2=commonExpr #altMult
| vE1=commonExpr (WSP vO=ADD WSP | WSP vO=SUB WSP) vE2=commonExpr #altAdd
| vE1=commonExpr (WSP vO=GT WSP | WSP vO=GE WSP | WSP vO=LT WSP | vE1=commonExpr (WSP vO=GT WSP | WSP vO=GE WSP | WSP vO=LT WSP
| WSP vO=LE WSP ) vE2=commonExpr #altComparism | WSP vO=LE WSP ) vE2=commonExpr #altComparism
| vE1=commonExpr (WSP vO=EQ_ALPHA WSP | WSP vO=NE WSP) vE2=commonExpr #altEquality | vE1=commonExpr (WSP vO=EQ_ALPHA WSP | WSP vO=NE WSP) vE2=commonExpr #altEquality
| vE1=commonExpr (WSP AND WSP) vE2=commonExpr #altAnd | vE1=commonExpr (WSP AND WSP) vE2=commonExpr #altAnd
| vE1=commonExpr (WSP OR WSP) vE2=commonExpr #altOr | vE1=commonExpr (WSP OR WSP) vE2=commonExpr #altOr
| rootExpr #altRoot //; $... | rootExpr #altRoot // $...
| AT odataIdentifier #altAlias // @... | AT odataIdentifier #altAlias // @...
| primitiveLiteral #altLiteral // ... | primitiveLiteral #altLiteral // ...
; ;
unary : (MINUS| NOT) ; unary : (MINUS| NOT) ;
@ -412,7 +344,6 @@ odataIdentifier : ODATAIDENTIFIER;
//;------------------------------------------------------------------------------ //;------------------------------------------------------------------------------
/*TODO add missing values*/
primitiveLiteral : nullrule primitiveLiteral : nullrule
| booleanNonCase | booleanNonCase
| DECIMAL //includes double and single literals | DECIMAL //includes double and single literals
@ -442,77 +373,67 @@ primitiveLiteral : nullrule
; ;
nullrule : NULLVALUE;// (SQUOTE qualifiedtypename SQUOTE)?; nullrule : NULLVALUE;
booleanNonCase : BOOLEAN | TRUE | FALSE; booleanNonCase : BOOLEAN | TRUE | FALSE;
string : STRING; string : STRING;
enumLit : vNS=namespace vODI=odataIdentifier vValues=STRING; enumLit : vNS=namespace vODI=odataIdentifier vValues=STRING;
//enum : namespace odataIdentifier STRING; enumValues : vlODI+=odataIdentifier ( COMMA vlODI+=odataIdentifier )*;
enumValues : vlODI+=odataIdentifier ( COMMA vlODI+=odataIdentifier )*;
//singleEnumValue : odataIdentifier / INT; geographyCollection : GEOGRAPHY fullCollectionLiteral SQUOTE;
fullCollectionLiteral : sridLiteral collectionLiteral;
collectionLiteral : (COLLECTION ) OPEN geoLiteral ( COMMA geoLiteral )* CLOSE;
geoLiteral : collectionLiteral
| lineStringLiteral
| multipointLiteral
| multilineStringLiteral
| multipolygonLiteral
| pointLiteral
| polygonLiteral;
geographyLineString : GEOGRAPHY fullLineStringLiteral SQUOTE;
fullLineStringLiteral : sridLiteral lineStringLiteral;
lineStringLiteral : LINESTRING lineStringData;
lineStringData : OPEN positionLiteral ( COMMA positionLiteral )* CLOSE;
geographyMultilineString : GEOGRAPHY fullMultilineStringLiteral SQUOTE;
fullMultilineStringLiteral : sridLiteral multilineStringLiteral;
multilineStringLiteral : MULTILINESTRING OPEN ( lineStringData ( COMMA lineStringData )* )? CLOSE;
geographyMultipoint : GEOGRAPHY fullMultipointLiteral SQUOTE;
fullMultipointLiteral : sridLiteral multipointLiteral;
multipointLiteral : MULTIPOINT OPEN ( pointData ( COMMA pointData )* )? CLOSE ;
geographyMultipolygon : GEOGRAPHY fullmultipolygonLiteral SQUOTE;
fullmultipolygonLiteral : sridLiteral multipolygonLiteral;
multipolygonLiteral : MULTIPOLYGON OPEN ( polygonData ( COMMA polygonData )* )? CLOSE;
geographyPoint : GEOGRAPHY fullpointLiteral SQUOTE;
fullpointLiteral : sridLiteral pointLiteral;
pointLiteral : GEO_POINT pointData;
pointData : OPEN positionLiteral CLOSE;
positionLiteral : (DECIMAL | INT ) WSP (DECIMAL | INT ); //; longitude, then latitude
geographyCollection : GEOGRAPHY fullCollectionLiteral SQUOTE; geographyPolygon : GEOGRAPHY fullPolygonLiteral SQUOTE;
fullCollectionLiteral : sridLiteral collectionLiteral; fullPolygonLiteral : sridLiteral polygonLiteral;
polygonLiteral : POLYGON polygonData;
polygonData : OPEN ringLiteral ( COMMA ringLiteral )* CLOSE;
ringLiteral : OPEN positionLiteral ( COMMA positionLiteral )* CLOSE;
collectionLiteral : (COLLECTION ) OPEN geoLiteral ( COMMA geoLiteral )* CLOSE; geometryCollection : GEOMETRY fullCollectionLiteral SQUOTE;
geometryLineString : GEOMETRY fullLineStringLiteral SQUOTE;
geometryMultilineString : GEOMETRY fullMultilineStringLiteral SQUOTE;
geometryMultipoint : GEOMETRY fullMultipointLiteral SQUOTE;
geometryMultipolygon : GEOMETRY fullmultipolygonLiteral SQUOTE;
geometryPoint : GEOMETRY fullpointLiteral SQUOTE;
geometryPolygon : GEOMETRY fullPolygonLiteral SQUOTE;
geoLiteral : collectionLiteral sridLiteral : SRID EQ INT SEMI;
| lineStringLiteral
| multipointLiteral
| multilineStringLiteral
| multipolygonLiteral
| pointLiteral
| polygonLiteral;
geographyLineString : GEOGRAPHY fullLineStringLiteral SQUOTE;
fullLineStringLiteral : sridLiteral lineStringLiteral;
lineStringLiteral : LINESTRING lineStringData;
lineStringData : OPEN positionLiteral ( COMMA positionLiteral )* CLOSE;
geographyMultilineString : GEOGRAPHY fullMultilineStringLiteral SQUOTE;
fullMultilineStringLiteral : sridLiteral multilineStringLiteral;
multilineStringLiteral : MULTILINESTRING OPEN ( lineStringData ( COMMA lineStringData )* )? CLOSE;
geographyMultipoint : GEOGRAPHY fullMultipointLiteral SQUOTE;
fullMultipointLiteral : sridLiteral multipointLiteral;
multipointLiteral : MULTIPOINT OPEN ( pointData ( COMMA pointData )* )? CLOSE ;
geographyMultipolygon : GEOGRAPHY fullmultipolygonLiteral SQUOTE;
fullmultipolygonLiteral : sridLiteral multipolygonLiteral;
multipolygonLiteral : MULTIPOLYGON OPEN ( polygonData ( COMMA polygonData )* )? CLOSE;
geographyPoint : GEOGRAPHY fullpointLiteral SQUOTE;
fullpointLiteral : sridLiteral pointLiteral;
pointLiteral : GEO_POINT pointData;
pointData : OPEN positionLiteral CLOSE;
positionLiteral : (DECIMAL | INT ) WSP (DECIMAL | INT ); //; longitude, then latitude
geographyPolygon : GEOGRAPHY fullPolygonLiteral SQUOTE;
fullPolygonLiteral : sridLiteral polygonLiteral;
polygonLiteral : POLYGON polygonData;
polygonData : OPEN ringLiteral ( COMMA ringLiteral )* CLOSE;
ringLiteral : OPEN positionLiteral ( COMMA positionLiteral )* CLOSE;
geometryCollection : GEOMETRY fullCollectionLiteral SQUOTE;
geometryLineString : GEOMETRY fullLineStringLiteral SQUOTE;
geometryMultilineString : GEOMETRY fullMultilineStringLiteral SQUOTE;
geometryMultipoint : GEOMETRY fullMultipointLiteral SQUOTE;
geometryMultipolygon : GEOMETRY fullmultipolygonLiteral SQUOTE;
geometryPoint : GEOMETRY fullpointLiteral SQUOTE;
geometryPolygon : GEOMETRY fullPolygonLiteral SQUOTE;
sridLiteral : SRID EQ INT SEMI;
/*
mode MODEd333gh;
MO12E1 : 'ASD' -> mode(DEFAULT_MODE);*/

134
odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/Parser.java

@ -1,134 +0,0 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.server.core.uri;
import org.antlr.v4.runtime.ANTLRInputStream;
import org.antlr.v4.runtime.BailErrorStrategy;
import org.antlr.v4.runtime.CommonTokenStream;
import org.antlr.v4.runtime.atn.PredictionMode;
import org.antlr.v4.runtime.misc.ParseCancellationException;
import org.apache.olingo.odata4.server.api.uri.UriInfo;
import org.apache.olingo.odata4.server.core.uri.antlr.UriLexer;
import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser;
import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.OdataRelativeUriEOFContext;
public class Parser {
public UriInfo parseUri(final String input, final UriParseTreeVisitor uriParseTreeVisitor)
throws UriParserException {
try {
OdataRelativeUriEOFContext parseTree = parseInput(input, true);
// reset visitor
uriParseTreeVisitor.init();
parseTree.accept(uriParseTreeVisitor);
UriInfoImpl uriInput = uriParseTreeVisitor.getUriInfo();
return uriInput;
} catch (ParseCancellationException e) {
Throwable cause = e.getCause();
if (cause instanceof UriParserException) {
throw (UriParserException) cause;
}
}
throw new UriParserSyntaxException("unknown syntax error");
}
private OdataRelativeUriEOFContext parseInput(final String input, boolean onResource)
throws UriParserSyntaxException {
UriParserParser parser = null;
UriLexer lexer = null;
OdataRelativeUriEOFContext ret = null;
// Use 2 stage approach to improve performance
// see https://github.com/antlr/antlr4/issues/192
// stage = 1
try {
// create parser
lexer = new UriLexer(new ANTLRInputStream(input));
parser = new UriParserParser(new CommonTokenStream(lexer));
// Set error strategy
addStage1ErrorStategy(parser);
// Set error collector
addStage1ErrorListener(parser);
// user the faster LL parsing
parser.getInterpreter().setPredictionMode(PredictionMode.SLL);
// parse
ret = parser.odataRelativeUriEOF();
} catch (ParseCancellationException hardException) {
// stage = 2
try {
// create parser
lexer = new UriLexer(new ANTLRInputStream(input));
parser = new UriParserParser(new CommonTokenStream(lexer));
// Set error strategy
addStage2ErrorStategy(parser);
// Set error collector
addStage2ErrorListener(parser);
// Use the slower SLL parsing
parser.getInterpreter().setPredictionMode(PredictionMode.LL);
// parse
ret = parser.odataRelativeUriEOF();
} catch (Exception weakException) {
throw new UriParserSyntaxException("Error in syntax", weakException);
// exceptionOnStage = 2;
}
} catch (Exception hardException) {
throw new UriParserSyntaxException("Error in syntax", hardException);
}
return ret;
}
protected void addStage1ErrorStategy(UriParserParser parser) {
// Throw exception at first syntax error
parser.setErrorHandler(new BailErrorStrategy());
}
protected void addStage2ErrorStategy(UriParserParser parser) {
// Throw exception at first syntax error
parser.setErrorHandler(new BailErrorStrategy());
}
protected void addStage1ErrorListener(UriParserParser parser) {
// No error logging to System.out or System.err, only exceptions used (depending on ErrorStrategy)
parser.removeErrorListeners();
}
protected void addStage2ErrorListener(UriParserParser parser) {
// No error logging to System.out or System.err, only exceptions used (depending on ErrorStrategy)
parser.removeErrorListeners();
}
}

10
odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriInfoImpl.java → odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/apiimpl/UriInfoImpl.java

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
******************************************************************************/ ******************************************************************************/
package org.apache.olingo.odata4.server.core.uri; package org.apache.olingo.odata4.server.core.uri.apiimpl;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@ -231,18 +231,24 @@ public class UriInfoImpl implements UriInfo {
} }
public UriInfoImpl setQueryOptions(final List<QueryOptionImpl> list) { public UriInfoImpl setQueryOptions(final List<QueryOptionImpl> list) {
for (QueryOptionImpl item : list) { for (QueryOptionImpl item : list) {
if (item instanceof SystemQueryOptionImpl) { if (item instanceof SystemQueryOptionImpl) {
setSystemQueryOption((SystemQueryOptionImpl)item); setSystemQueryOption((SystemQueryOptionImpl)item);
} else if (item instanceof CustomQueryOptionImpl) { } else if (item instanceof CustomQueryOptionImpl) {
customQueryOptions.add((CustomQueryOptionImpl) item); addCustomQueryOption(item);
} }
} }
return this; return this;
} }
public void addCustomQueryOption(QueryOptionImpl item) {
customQueryOptions.add((CustomQueryOptionImpl) item);
}
public UriInfoImpl setSystemQueryOption(SystemQueryOptionImpl systemOption) { public UriInfoImpl setSystemQueryOption(SystemQueryOptionImpl systemOption) {
if (systemOption.getKind() == SupportedQueryOptions.EXPAND) { if (systemOption.getKind() == SupportedQueryOptions.EXPAND) {

2
odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriParameterImpl.java → odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/apiimpl/UriParameterImpl.java

@ -17,7 +17,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
******************************************************************************/ ******************************************************************************/
package org.apache.olingo.odata4.server.core.uri; package org.apache.olingo.odata4.server.core.uri.apiimpl;
import org.apache.olingo.odata4.server.api.uri.UriParameter; import org.apache.olingo.odata4.server.api.uri.UriParameter;
import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Expression; import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Expression;

2
odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceActionImpl.java → odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/apiimpl/UriResourceActionImpl.java

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
******************************************************************************/ ******************************************************************************/
package org.apache.olingo.odata4.server.core.uri; package org.apache.olingo.odata4.server.core.uri.apiimpl;
import org.apache.olingo.odata4.commons.api.edm.EdmAction; import org.apache.olingo.odata4.commons.api.edm.EdmAction;
import org.apache.olingo.odata4.commons.api.edm.EdmActionImport; import org.apache.olingo.odata4.commons.api.edm.EdmActionImport;

2
odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceComplexPropertyImpl.java → odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/apiimpl/UriResourceComplexPropertyImpl.java

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
******************************************************************************/ ******************************************************************************/
package org.apache.olingo.odata4.server.core.uri; package org.apache.olingo.odata4.server.core.uri.apiimpl;
import org.apache.olingo.odata4.commons.api.edm.EdmComplexType; import org.apache.olingo.odata4.commons.api.edm.EdmComplexType;
import org.apache.olingo.odata4.commons.api.edm.EdmProperty; import org.apache.olingo.odata4.commons.api.edm.EdmProperty;

2
odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceCountImpl.java → odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/apiimpl/UriResourceCountImpl.java

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
******************************************************************************/ ******************************************************************************/
package org.apache.olingo.odata4.server.core.uri; package org.apache.olingo.odata4.server.core.uri.apiimpl;
import org.apache.olingo.odata4.server.api.uri.UriResourceCount; import org.apache.olingo.odata4.server.api.uri.UriResourceCount;
import org.apache.olingo.odata4.server.api.uri.UriResourceKind; import org.apache.olingo.odata4.server.api.uri.UriResourceKind;

2
odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceEntitySetImpl.java → odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/apiimpl/UriResourceEntitySetImpl.java

@ -17,7 +17,7 @@
* under the License. * under the License.
******************************************************************************/ ******************************************************************************/
package org.apache.olingo.odata4.server.core.uri; package org.apache.olingo.odata4.server.core.uri.apiimpl;
import org.apache.olingo.odata4.commons.api.edm.EdmEntitySet; import org.apache.olingo.odata4.commons.api.edm.EdmEntitySet;
import org.apache.olingo.odata4.commons.api.edm.EdmEntityType; import org.apache.olingo.odata4.commons.api.edm.EdmEntityType;

2
odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceFunctionImpl.java → odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/apiimpl/UriResourceFunctionImpl.java

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
******************************************************************************/ ******************************************************************************/
package org.apache.olingo.odata4.server.core.uri; package org.apache.olingo.odata4.server.core.uri.apiimpl;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

2
odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceImpl.java → odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/apiimpl/UriResourceImpl.java

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
******************************************************************************/ ******************************************************************************/
package org.apache.olingo.odata4.server.core.uri; package org.apache.olingo.odata4.server.core.uri.apiimpl;
import org.apache.olingo.odata4.server.api.uri.UriResource; import org.apache.olingo.odata4.server.api.uri.UriResource;
import org.apache.olingo.odata4.server.api.uri.UriResourceKind; import org.apache.olingo.odata4.server.api.uri.UriResourceKind;

2
odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceItImpl.java → odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/apiimpl/UriResourceItImpl.java

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
******************************************************************************/ ******************************************************************************/
package org.apache.olingo.odata4.server.core.uri; package org.apache.olingo.odata4.server.core.uri.apiimpl;
import org.apache.olingo.odata4.commons.api.edm.EdmType; import org.apache.olingo.odata4.commons.api.edm.EdmType;
import org.apache.olingo.odata4.server.api.uri.UriResourceIt; import org.apache.olingo.odata4.server.api.uri.UriResourceIt;

2
odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceLambdaAllImpl.java → odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/apiimpl/UriResourceLambdaAllImpl.java

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
******************************************************************************/ ******************************************************************************/
package org.apache.olingo.odata4.server.core.uri; package org.apache.olingo.odata4.server.core.uri.apiimpl;
import org.apache.olingo.odata4.commons.api.edm.EdmProperty; import org.apache.olingo.odata4.commons.api.edm.EdmProperty;
import org.apache.olingo.odata4.commons.api.edm.EdmType; import org.apache.olingo.odata4.commons.api.edm.EdmType;

2
odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceLambdaAnyImpl.java → odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/apiimpl/UriResourceLambdaAnyImpl.java

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
******************************************************************************/ ******************************************************************************/
package org.apache.olingo.odata4.server.core.uri; package org.apache.olingo.odata4.server.core.uri.apiimpl;
import org.apache.olingo.odata4.commons.api.edm.EdmProperty; import org.apache.olingo.odata4.commons.api.edm.EdmProperty;
import org.apache.olingo.odata4.commons.api.edm.EdmType; import org.apache.olingo.odata4.commons.api.edm.EdmType;

2
odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceLambdaVarImpl.java → odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/apiimpl/UriResourceLambdaVarImpl.java

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
******************************************************************************/ ******************************************************************************/
package org.apache.olingo.odata4.server.core.uri; package org.apache.olingo.odata4.server.core.uri.apiimpl;
import org.apache.olingo.odata4.commons.api.edm.EdmType; import org.apache.olingo.odata4.commons.api.edm.EdmType;
import org.apache.olingo.odata4.server.api.uri.UriResourceKind; import org.apache.olingo.odata4.server.api.uri.UriResourceKind;

2
odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceNavigationPropertyImpl.java → odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/apiimpl/UriResourceNavigationPropertyImpl.java

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
******************************************************************************/ ******************************************************************************/
package org.apache.olingo.odata4.server.core.uri; package org.apache.olingo.odata4.server.core.uri.apiimpl;
import org.apache.olingo.odata4.commons.api.edm.EdmNavigationProperty; import org.apache.olingo.odata4.commons.api.edm.EdmNavigationProperty;
import org.apache.olingo.odata4.commons.api.edm.EdmType; import org.apache.olingo.odata4.commons.api.edm.EdmType;

2
odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourcePrimitivePropertyImpl.java → odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/apiimpl/UriResourcePrimitivePropertyImpl.java

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
******************************************************************************/ ******************************************************************************/
package org.apache.olingo.odata4.server.core.uri; package org.apache.olingo.odata4.server.core.uri.apiimpl;
import org.apache.olingo.odata4.commons.api.edm.EdmProperty; import org.apache.olingo.odata4.commons.api.edm.EdmProperty;
import org.apache.olingo.odata4.commons.api.edm.EdmType; import org.apache.olingo.odata4.commons.api.edm.EdmType;

2
odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceRefImpl.java → odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/apiimpl/UriResourceRefImpl.java

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
******************************************************************************/ ******************************************************************************/
package org.apache.olingo.odata4.server.core.uri; package org.apache.olingo.odata4.server.core.uri.apiimpl;
import org.apache.olingo.odata4.server.api.uri.UriResourceKind; import org.apache.olingo.odata4.server.api.uri.UriResourceKind;
import org.apache.olingo.odata4.server.api.uri.UriResourceRef; import org.apache.olingo.odata4.server.api.uri.UriResourceRef;

2
odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceRootImpl.java → odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/apiimpl/UriResourceRootImpl.java

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
******************************************************************************/ ******************************************************************************/
package org.apache.olingo.odata4.server.core.uri; package org.apache.olingo.odata4.server.core.uri.apiimpl;
import org.apache.olingo.odata4.commons.api.edm.EdmType; import org.apache.olingo.odata4.commons.api.edm.EdmType;
import org.apache.olingo.odata4.server.api.uri.UriResourceKind; import org.apache.olingo.odata4.server.api.uri.UriResourceKind;

2
odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceSingletonImpl.java → odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/apiimpl/UriResourceSingletonImpl.java

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
******************************************************************************/ ******************************************************************************/
package org.apache.olingo.odata4.server.core.uri; package org.apache.olingo.odata4.server.core.uri.apiimpl;
import org.apache.olingo.odata4.commons.api.edm.EdmEntityType; import org.apache.olingo.odata4.commons.api.edm.EdmEntityType;
import org.apache.olingo.odata4.commons.api.edm.EdmSingleton; import org.apache.olingo.odata4.commons.api.edm.EdmSingleton;

2
odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceStartingTypeFilterImpl.java → odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/apiimpl/UriResourceStartingTypeFilterImpl.java

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
******************************************************************************/ ******************************************************************************/
package org.apache.olingo.odata4.server.core.uri; package org.apache.olingo.odata4.server.core.uri.apiimpl;
import org.apache.olingo.odata4.commons.api.edm.EdmType; import org.apache.olingo.odata4.commons.api.edm.EdmType;
import org.apache.olingo.odata4.server.api.uri.UriResourceKind; import org.apache.olingo.odata4.server.api.uri.UriResourceKind;

2
odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceTypedImpl.java → odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/apiimpl/UriResourceTypedImpl.java

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
******************************************************************************/ ******************************************************************************/
package org.apache.olingo.odata4.server.core.uri; package org.apache.olingo.odata4.server.core.uri.apiimpl;
import org.apache.olingo.odata4.commons.api.edm.EdmStructuralType; import org.apache.olingo.odata4.commons.api.edm.EdmStructuralType;
import org.apache.olingo.odata4.commons.api.edm.EdmType; import org.apache.olingo.odata4.commons.api.edm.EdmType;

2
odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceValueImpl.java → odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/apiimpl/UriResourceValueImpl.java

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
******************************************************************************/ ******************************************************************************/
package org.apache.olingo.odata4.server.core.uri; package org.apache.olingo.odata4.server.core.uri.apiimpl;
import org.apache.olingo.odata4.server.api.uri.UriResourceKind; import org.apache.olingo.odata4.server.api.uri.UriResourceKind;
import org.apache.olingo.odata4.server.api.uri.UriResourceValue; import org.apache.olingo.odata4.server.api.uri.UriResourceValue;

2
odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriResourceWithKeysImpl.java → odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/apiimpl/UriResourceWithKeysImpl.java

@ -16,7 +16,7 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
******************************************************************************/ ******************************************************************************/
package org.apache.olingo.odata4.server.core.uri; package org.apache.olingo.odata4.server.core.uri.apiimpl;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

450
odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/Parser.java Normal file

@ -0,0 +1,450 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.server.core.uri.parser;
import java.util.ArrayList;
import java.util.List;
import org.antlr.v4.runtime.ANTLRInputStream;
import org.antlr.v4.runtime.BailErrorStrategy;
import org.antlr.v4.runtime.CommonTokenStream;
import org.antlr.v4.runtime.ParserRuleContext;
import org.antlr.v4.runtime.Token;
import org.antlr.v4.runtime.atn.PredictionMode;
import org.antlr.v4.runtime.misc.ParseCancellationException;
import org.apache.olingo.odata4.commons.api.edm.Edm;
import org.apache.olingo.odata4.server.api.uri.UriInfo;
import org.apache.olingo.odata4.server.api.uri.UriInfoKind;
import org.apache.olingo.odata4.server.api.uri.UriResource;
import org.apache.olingo.odata4.server.api.uri.UriResourcePartTyped;
import org.apache.olingo.odata4.server.core.uri.UriParserException;
import org.apache.olingo.odata4.server.core.uri.UriParserSyntaxException;
import org.apache.olingo.odata4.server.core.uri.antlr.UriLexer;
import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser;
import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.*;
import org.apache.olingo.odata4.server.core.uri.apiimpl.UriInfoImpl;
import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourceImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.CustomQueryOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.ExpandOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.FilterOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.FormatOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.IdOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.InlineCountOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.LevelsOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.OrderByOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.SelectOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.SkipOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.SkipTokenOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.TopOptionImpl;
public class Parser {
int logLevel = 0;
private enum ParserEntryRules {
All, Batch, CrossJoin, Entity, ExpandItems, FilterExpression, Metadata, PathSegment, Orderby, Select
};
public Parser setLogLevel(int logLevel) {
this.logLevel = logLevel;
return this;
}
public UriInfo parseUri(final String input, Edm edm)
throws UriParserException {
boolean readQueryParameter = false;
boolean readFragment = false;
UriContext context = new UriContext();
UriParseTreeVisitor uriParseTreeVisitor = new UriParseTreeVisitor(edm,context );
try {
RawUri uri = UriDecoder.decodeUri(input, 0); // -> 0 segments are before the service url
// first, read the decoded path segments
String firstSegment = "";
if (uri.pathSegmentListDecoded.size() > 0) {
firstSegment = uri.pathSegmentListDecoded.get(0);
}
if (firstSegment.startsWith("$batch")) {
BatchEOFContext ctxBatchEOF =
(BatchEOFContext) parseRule(uri.pathSegmentListDecoded.get(0), ParserEntryRules.Batch);
uriParseTreeVisitor.visitBatchEOF(ctxBatchEOF);
} else if (firstSegment.startsWith("$metadata")) {
MetadataEOFContext ctxMetadataEOF =
(MetadataEOFContext) parseRule(uri.pathSegmentListDecoded.get(0), ParserEntryRules.Metadata);
uriParseTreeVisitor.visitMetadataEOF(ctxMetadataEOF);
readQueryParameter = true;
readFragment = true;
} else if (firstSegment.startsWith("$entity")) {
context.contextUriInfo = new UriInfoImpl().setKind(UriInfoKind.entityId);
if (uri.pathSegmentListDecoded.size() > 1) {
EntityEOFContext ctxEntityEOF =
(EntityEOFContext) parseRule(uri.pathSegmentListDecoded.get(1), ParserEntryRules.Entity);
uriParseTreeVisitor.visitEntityEOF(ctxEntityEOF);
}
readQueryParameter = true;
} else if (firstSegment.startsWith("$all")) {
AllEOFContext ctxResourcePathEOF =
(AllEOFContext) parseRule(uri.pathSegmentListDecoded.get(0), ParserEntryRules.All);
uriParseTreeVisitor.visitAllEOF(ctxResourcePathEOF);
readQueryParameter = true;
} else if (firstSegment.startsWith("$crossjoin")) {
CrossjoinEOFContext ctxResourcePathEOF =
(CrossjoinEOFContext) parseRule(uri.pathSegmentListDecoded.get(0), ParserEntryRules.CrossJoin);
uriParseTreeVisitor.visitCrossjoinEOF(ctxResourcePathEOF);
readQueryParameter = true;
} else {
List<PathSegmentEOFContext> ctxPathSegments = new ArrayList<PathSegmentEOFContext>();
for (String pathSegment : uri.pathSegmentListDecoded) {
PathSegmentEOFContext ctxPathSegment =
(PathSegmentEOFContext) parseRule(pathSegment, ParserEntryRules.PathSegment);
ctxPathSegments.add(ctxPathSegment);
}
context.contextUriInfo = new UriInfoImpl().setKind(UriInfoKind.resource);
for (PathSegmentEOFContext ctxPathSegment : ctxPathSegments) {
// add checks for batcvh entity metadata, all crossjsoin
uriParseTreeVisitor.visitPathSegmentEOF(ctxPathSegment);
}
UriResource lastSegment = context.contextUriInfo.getLastResourcePart();
if (lastSegment instanceof UriResourcePartTyped) {
UriResourcePartTyped typed = (UriResourcePartTyped) lastSegment;
UriParseTreeVisitor.TypeInformation myType = uriParseTreeVisitor.getTypeInformation((UriResourceImpl) typed);
UriParseTreeVisitor.TypeInformation typeInfo =
uriParseTreeVisitor.new TypeInformation(myType.type, typed.isCollection());
context.contextTypes.push(typeInfo);
}
readQueryParameter = true;
}
if (readQueryParameter) {
// second, read the simple systemQueryOptions and the Custom QueryOptions
for (RawUri.QueryOption option : uri.queryOptionListDecoded) {
if (!option.name.startsWith("$")) {
CustomQueryOptionImpl customOption = new CustomQueryOptionImpl();
customOption.setName(option.name);
customOption.setText(option.value);
context.contextUriInfo.addCustomQueryOption(customOption);
} else if (option.name.equals("$filter")) {
FilterExpressionEOFContext ctxFilterExpression =
(FilterExpressionEOFContext) parseRule(option.value, ParserEntryRules.FilterExpression);
FilterOptionImpl filterOption =
(FilterOptionImpl) uriParseTreeVisitor.visitFilterExpressionEOF(ctxFilterExpression);
context.contextUriInfo.setSystemQueryOption(filterOption);
} else if (option.name.equals("$format")) {
FormatOptionImpl formatOption = new FormatOptionImpl();
formatOption.setName(option.name);
formatOption.setText(option.value);
formatOption.setFormat(option.value);
context.contextUriInfo.setSystemQueryOption(formatOption);
} else if (option.name.equals("$expand")) {
ExpandItemsEOFContext ctxExpandItems =
(ExpandItemsEOFContext) parseRule(option.value, ParserEntryRules.ExpandItems);
ExpandOptionImpl expandOption =
(ExpandOptionImpl) uriParseTreeVisitor.visitExpandItemsEOF(ctxExpandItems);
context.contextUriInfo.setSystemQueryOption(expandOption);
} else if (option.name.equals("$id")) {
IdOptionImpl idOption = new IdOptionImpl();
idOption.setName(option.name);
idOption.setText(option.value);
idOption.setValue(option.value);
context.contextUriInfo.setSystemQueryOption(idOption);
} else if (option.name.equals("$inlinecount")) {
InlineCountOptionImpl inlineCountOption = new InlineCountOptionImpl();
inlineCountOption.setName(option.name);
inlineCountOption.setText(option.value);
inlineCountOption.setValue(option.value.equals("true") ? true : false);
context.contextUriInfo.setSystemQueryOption(inlineCountOption);
} else if (option.name.equals("$orderby")) {
OrderByEOFContext ctxFilterExpression =
(OrderByEOFContext) parseRule(option.value, ParserEntryRules.Orderby);
OrderByOptionImpl filterOption =
(OrderByOptionImpl) uriParseTreeVisitor.visitOrderByEOF(ctxFilterExpression);
context.contextUriInfo.setSystemQueryOption(filterOption);
} else if (option.name.equals("$search")) {
// TODO not supported yet
} else if (option.name.equals("$select")) {
SelectEOFContext ctxSelectEOF =
(SelectEOFContext) parseRule(option.value, ParserEntryRules.Select);
SelectOptionImpl expandOption =
(SelectOptionImpl) uriParseTreeVisitor.visitSelectEOF(ctxSelectEOF);
context.contextUriInfo.setSystemQueryOption(expandOption);
} else if (option.name.equals("$skip")) {
SkipOptionImpl inlineCountOption = new SkipOptionImpl();
inlineCountOption.setName(option.name);
inlineCountOption.setText(option.value);
inlineCountOption.setValue(option.value);
context.contextUriInfo.setSystemQueryOption(inlineCountOption);
} else if (option.name.equals("$skiptoken")) {
SkipTokenOptionImpl inlineCountOption = new SkipTokenOptionImpl();
inlineCountOption.setName(option.name);
inlineCountOption.setText(option.value);
inlineCountOption.setValue(option.value);
context.contextUriInfo.setSystemQueryOption(inlineCountOption);
} else if (option.name.equals("$top")) {
TopOptionImpl inlineCountOption = new TopOptionImpl();
inlineCountOption.setName(option.name);
inlineCountOption.setText(option.value);
inlineCountOption.setValue(option.value);
context.contextUriInfo.setSystemQueryOption(inlineCountOption);
} else if (option.name.equals("$count")) {
// todo create CountOption
InlineCountOptionImpl inlineCountOption = new InlineCountOptionImpl();
inlineCountOption.setName(option.name);
inlineCountOption.setText(option.value);
inlineCountOption.setValue(option.value.equals("true") ? true : false);
context.contextUriInfo.setSystemQueryOption(inlineCountOption);
} else if (option.name.equals("$level")) {
LevelsOptionImpl inlineCountOption = new LevelsOptionImpl();
inlineCountOption.setName(option.name);
inlineCountOption.setText(option.value);
if (option.value.equals("max")) {
inlineCountOption.setMax();
} else {
inlineCountOption.setLevel(Integer.parseInt(option.value));
}
context.contextUriInfo.setSystemQueryOption(inlineCountOption);
}
}
}
if (readFragment) {
context.contextUriInfo.setFragment(uri.fragment);
}
return context.contextUriInfo;
} catch (ParseCancellationException e) {
Throwable cause = e.getCause();
if (cause instanceof UriParserException) {
throw (UriParserException) cause;
}
}
return null;
}
private ParserRuleContext parseRule(final String input, ParserEntryRules entryPoint)
throws UriParserSyntaxException {
UriParserParser parser = null;
UriLexer lexer = null;
ParserRuleContext ret = null;
// Use 2 stage approach to improve performance
// see https://github.com/antlr/antlr4/issues/192
// stage = 1
try {
// create parser
if (logLevel > 0) {
lexer = new UriLexer(new ANTLRInputStream(input));
showTokens(input, lexer.getAllTokens());
}
lexer = new UriLexer(new ANTLRInputStream(input));
parser = new UriParserParser(new CommonTokenStream(lexer));
// Set error strategy
addStage1ErrorStategy(parser);
// Set error collector
addStage1ErrorListener(parser);
// user the faster LL parsing
parser.getInterpreter().setPredictionMode(PredictionMode.SLL);
// parse
switch (entryPoint) {
case All:
ret = parser.allEOF();
break;
case Batch:
ret = parser.batchEOF();
break;
case CrossJoin:
ret = parser.crossjoinEOF();
break;
case Metadata:
ret = parser.metadataEOF();
break;
case PathSegment:
ret = parser.pathSegmentEOF();
break;
case FilterExpression:
lexer.mode(UriLexer.DEFAULT_MODE);
ret = parser.filterExpressionEOF();
break;
case Orderby:
lexer.mode(UriLexer.DEFAULT_MODE);
ret = parser.orderByEOF();
break;
case ExpandItems:
lexer.mode(UriLexer.DEFAULT_MODE);
ret = parser.expandItemsEOF();
break;
case Entity:
ret = parser.entityEOF();
break;
case Select:
ret = parser.selectEOF();
break;
default:
break;
}
} catch (ParseCancellationException hardException) {
// stage = 2
try {
// create parser
lexer = new UriLexer(new ANTLRInputStream(input));
parser = new UriParserParser(new CommonTokenStream(lexer));
// Set error strategy
addStage2ErrorStategy(parser);
// Set error collector
addStage2ErrorListener(parser);
// Use the slower SLL parsing
parser.getInterpreter().setPredictionMode(PredictionMode.LL);
// parse
switch (entryPoint) {
case All:
ret = parser.allEOF();
break;
case Batch:
ret = parser.batchEOF();
break;
case CrossJoin:
ret = parser.crossjoinEOF();
break;
case Metadata:
ret = parser.metadataEOF();
break;
case PathSegment:
ret = parser.pathSegmentEOF();
break;
case FilterExpression:
lexer.mode(UriLexer.DEFAULT_MODE);
ret = parser.filterExpressionEOF();
break;
case Orderby:
lexer.mode(UriLexer.DEFAULT_MODE);
ret = parser.orderByEOF();
break;
case ExpandItems:
lexer.mode(UriLexer.DEFAULT_MODE);
ret = parser.expandItemsEOF();
break;
case Entity:
ret = parser.entityEOF();
break;
case Select:
ret = parser.selectEOF();
break;
default:
break;
}
} catch (Exception weakException) {
throw new UriParserSyntaxException("Error in syntax", weakException);
// exceptionOnStage = 2;
}
} catch (Exception hardException) {
throw new UriParserSyntaxException("Error in syntax", hardException);
}
return ret;
}
protected void addStage1ErrorStategy(UriParserParser parser) {
// Throw exception at first syntax error
parser.setErrorHandler(new BailErrorStrategy());
}
protected void addStage2ErrorStategy(UriParserParser parser) {
// Throw exception at first syntax error
parser.setErrorHandler(new BailErrorStrategy());
}
protected void addStage1ErrorListener(UriParserParser parser) {
// No error logging to System.out or System.err, only exceptions used (depending on ErrorStrategy)
parser.removeErrorListeners();
}
protected void addStage2ErrorListener(UriParserParser parser) {
// No error logging to System.out or System.err, only exceptions used (depending on ErrorStrategy)
parser.removeErrorListeners();
}
public void showTokens(String input, List<? extends Token> list) {
boolean first = true;
System.out.println("input: " + input);
String nL = "\n";
String out = "[" + nL;
for (Token token : list) {
if (!first) {
out += ",";
first = false;
}
int index = token.getType();
if (index != -1) {
out += "\"" + token.getText() + "\"" + " " + UriLexer.tokenNames[index] + nL;
} else {
out += "\"" + token.getText() + "\"" + " " + index + nL;
}
}
out += ']';
System.out.println("tokens: " + out);
return;
}
}

46
odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/RawUri.java Normal file

@ -0,0 +1,46 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.server.core.uri.parser;
import java.util.List;
public class RawUri {
public String uri;
public String sheme;
public String authority;
public String path;
public String queryOptionString;
public String fragment;
public List<QueryOption> queryOptionList;
public List<QueryOption> queryOptionListDecoded;
public List<String> pathSegmentList;
public List<String> pathSegmentListDecoded;
public static class QueryOption {
public String name;
public String value;
QueryOption(String name, String value) {
this.name = name;
this.value = value;
}
}
}

79
odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/UriContext.java Normal file

@ -0,0 +1,79 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.server.core.uri.parser;
import java.util.Stack;
import org.apache.olingo.odata4.commons.api.edm.Edm;
import org.apache.olingo.odata4.commons.api.edm.EdmEntityContainer;
import org.apache.olingo.odata4.commons.api.edm.EdmType;
import org.apache.olingo.odata4.server.core.uri.apiimpl.UriInfoImpl;
import org.apache.olingo.odata4.server.core.uri.parser.UriParseTreeVisitor.TypeInformation;
import org.apache.olingo.odata4.server.core.uri.queryoption.ExpandItemImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.SelectItemImpl;
public class UriContext {
public static class LambdaVariables {
public boolean isCollection;
public String name;
public EdmType type;
}
/**
* Hold all currently allowed lambda variables
* As lambda functions can be nested there may be more than one allowed lambda variables at a time while parsing a
* $filter or $orderby expressions.
*/
public Stack<LambdaVariables> allowedLambdaVariables;
/**
* Used to stack type information for nested $expand, $filter query options and other cases.
*/
public Stack<TypeInformation> contextTypes;
/**
* Set within method {@link #visitExpandItem(ExpandPathContext ctx)} and {@link #visitExpandPathExtension(final
* ExpandPathExtensionContext ctx)} to allow nodes
* deeper in the expand tree at {@link #visitExpandPathExtension(ExpandPathExtensionContext ctx)} appending path
* segments to the currently processed {@link ExpandItemImpl}.
*/
public ExpandItemImpl contextExpandItemPath;
/**
* Set within method {@link #visitSelectItem(SelectItemContext ctx)} to allow nodes
* deeper in the expand tree at {@link #visitSelectSegment(SelectSegmentContext ctx)} appending path segments to the
* currently processed {@link SelectItemImpl}.
*/
public SelectItemImpl contextSelectItem;
/**
* Stores the currently processed UriInfo objects. There is one URI Info object for the resource path
* and one for each new first member access within $filter and $orderBy options.
*/
public UriInfoImpl contextUriInfo;
public boolean contextReadingFunctionParameters;
public UriContext() {
this.contextExpandItemPath = null;
this.contextReadingFunctionParameters = false;
this.contextSelectItem = null;
this.contextTypes = new Stack<UriParseTreeVisitor.TypeInformation>();
this.allowedLambdaVariables = new Stack<UriContext.LambdaVariables>();
}
}

140
odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/UriDecoder.java Normal file

@ -0,0 +1,140 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.server.core.uri.parser;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.olingo.odata4.server.core.uri.UriParserSyntaxException;
import org.apache.olingo.odata4.server.core.uri.parser.RawUri.QueryOption;
public class UriDecoder {
static Pattern uriPattern = Pattern.compile("^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?");
public static RawUri decodeUri(String uri, int scipSegments) throws UriParserSyntaxException {
RawUri rawUri = new RawUri();
Matcher m = uriPattern.matcher(uri);
if (m.matches()) {
rawUri.sheme = m.group(2);
rawUri.authority = m.group(4);
rawUri.path = m.group(5);
rawUri.queryOptionString = m.group(7);
rawUri.fragment = m.group(9);
}
splittPath(rawUri, scipSegments);
splittOptions(rawUri);
decode(rawUri);
return rawUri;
}
private static void decode(RawUri rawUri) throws UriParserSyntaxException {
rawUri.pathSegmentListDecoded = new ArrayList<String>();
for ( String segment: rawUri.pathSegmentList) {
rawUri.pathSegmentListDecoded.add(decode(segment));
}
rawUri.queryOptionListDecoded = new ArrayList<QueryOption>();
for ( QueryOption optionPair: rawUri.queryOptionList) {
rawUri.queryOptionListDecoded.add(new QueryOption(
decode(optionPair.name),
decode(optionPair.value)));
}
}
private static void splittOptions(RawUri rawUri) {
rawUri.queryOptionList = new ArrayList<RawUri.QueryOption>();
if (rawUri.queryOptionString == null) {
return;
}
List<String> options = splitt(rawUri.queryOptionString, '&');
for (String option : options) {
if (option.length() != 0) {
List<String> pair = splittFirst(option, '=');
rawUri.queryOptionList.add(
new RawUri.QueryOption(pair.get(0), pair.get(1)));
}
}
}
private static List<String> splittFirst(String input, char c) {
int pos = input.indexOf(c, 0);
if (pos >= 0) {
return Arrays.asList(input.substring(0, pos), input.substring(pos + 1));
} else {
return Arrays.asList(input, "");
}
}
public static void splittPath(RawUri rawUri, int scipSegments) {
List<String> list = splitt(rawUri.path, '/');
if (list.size() > 0) {
if (list.get(0).length() == 0) {
scipSegments++;
}
}
if (scipSegments > 0) {
rawUri.pathSegmentList = list.subList(scipSegments, list.size());
} else {
rawUri.pathSegmentList = list;
}
}
public static List<String> splitt(String input, char c) {
List<String> list = new LinkedList<String>();
int start = 0;
int end = -1;
while ((end = input.indexOf(c, start)) >= 0) {
list.add(input.substring(start, end));
start = end + 1;
}
if (end == -1) {
list.add(input.substring(start));
}
return list;
}
public static String decode(String encoded) throws UriParserSyntaxException {
try {
return URLDecoder.decode(encoded, "UTF-8");
} catch (UnsupportedEncodingException e) {
throw new UriParserSyntaxException("Error while decoding");
}
}
}

620
odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/UriParseTreeVisitor.java → odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/parser/UriParseTreeVisitor.java

File diff suppressed because it is too large Load Diff

9
odata4-lib/odata4-server-core/src/main/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/MemberImpl.java

@ -25,10 +25,11 @@ import org.apache.olingo.odata4.server.api.uri.queryoption.expression.ExceptionV
import org.apache.olingo.odata4.server.api.uri.queryoption.expression.ExpressionVisitor; import org.apache.olingo.odata4.server.api.uri.queryoption.expression.ExpressionVisitor;
import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Member; import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Member;
import org.apache.olingo.odata4.server.api.uri.queryoption.expression.VisitableExression; import org.apache.olingo.odata4.server.api.uri.queryoption.expression.VisitableExression;
import org.apache.olingo.odata4.server.core.uri.UriInfoImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriInfoImpl;
import org.apache.olingo.odata4.server.core.uri.UriResourceImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourceImpl;
import org.apache.olingo.odata4.server.core.uri.UriResourceTypedImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourceTypedImpl;
import org.apache.olingo.odata4.server.core.uri.UriResourceWithKeysImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourceWithKeysImpl;
public class MemberImpl extends ExpressionImpl implements Member, VisitableExression { public class MemberImpl extends ExpressionImpl implements Member, VisitableExression {

2
odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/ExpandValidator.java

@ -29,7 +29,7 @@ import org.apache.olingo.odata4.server.api.uri.UriInfoKind;
import org.apache.olingo.odata4.server.api.uri.queryoption.ExpandItem; import org.apache.olingo.odata4.server.api.uri.queryoption.ExpandItem;
import org.apache.olingo.odata4.server.api.uri.queryoption.SelectItem; import org.apache.olingo.odata4.server.api.uri.queryoption.SelectItem;
import org.apache.olingo.odata4.server.api.uri.queryoption.expression.ExceptionVisitExpression; import org.apache.olingo.odata4.server.api.uri.queryoption.expression.ExceptionVisitExpression;
import org.apache.olingo.odata4.server.core.uri.UriInfoImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriInfoImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.ExpandOptionImpl; import org.apache.olingo.odata4.server.core.uri.queryoption.ExpandOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.FilterOptionImpl; import org.apache.olingo.odata4.server.core.uri.queryoption.FilterOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.QueryOptionImpl; import org.apache.olingo.odata4.server.core.uri.queryoption.QueryOptionImpl;

14
odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/FilterValidator.java

@ -35,12 +35,12 @@ import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Member;
import org.apache.olingo.odata4.server.api.uri.queryoption.expression.SupportedBinaryOperators; import org.apache.olingo.odata4.server.api.uri.queryoption.expression.SupportedBinaryOperators;
import org.apache.olingo.odata4.server.api.uri.queryoption.expression.SupportedConstants; import org.apache.olingo.odata4.server.api.uri.queryoption.expression.SupportedConstants;
import org.apache.olingo.odata4.server.api.uri.queryoption.expression.SupportedMethodCalls; import org.apache.olingo.odata4.server.api.uri.queryoption.expression.SupportedMethodCalls;
import org.apache.olingo.odata4.server.core.uri.Parser;
import org.apache.olingo.odata4.server.core.uri.UriInfoImpl;
import org.apache.olingo.odata4.server.core.uri.UriParseTreeVisitor;
import org.apache.olingo.odata4.server.core.uri.UriParserException; import org.apache.olingo.odata4.server.core.uri.UriParserException;
import org.apache.olingo.odata4.server.core.uri.UriParserSemanticException; import org.apache.olingo.odata4.server.core.uri.UriParserSemanticException;
import org.apache.olingo.odata4.server.core.uri.UriParserSyntaxException; import org.apache.olingo.odata4.server.core.uri.UriParserSyntaxException;
import org.apache.olingo.odata4.server.core.uri.apiimpl.UriInfoImpl;
import org.apache.olingo.odata4.server.core.uri.parser.Parser;
import org.apache.olingo.odata4.server.core.uri.parser.UriParseTreeVisitor;
import org.apache.olingo.odata4.server.core.uri.queryoption.FilterOptionImpl; import org.apache.olingo.odata4.server.core.uri.queryoption.FilterOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.OrderByOptionImpl; import org.apache.olingo.odata4.server.core.uri.queryoption.OrderByOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.expression.BinaryImpl; import org.apache.olingo.odata4.server.core.uri.queryoption.expression.BinaryImpl;
@ -184,7 +184,7 @@ public class FilterValidator implements Validator {
Parser parser = new Parser(); Parser parser = new Parser();
UriInfo uriInfo = null; UriInfo uriInfo = null;
uriInfo = parser.parseUri(uri, new UriParseTreeVisitor(edm)); uriInfo = parser.parseUri(uri, edm);
if (uriInfo.getKind() != UriInfoKind.resource) { if (uriInfo.getKind() != UriInfoKind.resource) {
fail("Filtervalidator can only be used on resourcePaths"); fail("Filtervalidator can only be used on resourcePaths");
@ -200,7 +200,7 @@ public class FilterValidator implements Validator {
UriInfo uriInfo = null; UriInfo uriInfo = null;
try { try {
uriInfo = parser.parseUri(uri, new UriParseTreeVisitor(edm)); uriInfo = parser.parseUri(uri, edm);
} catch (UriParserException e) { } catch (UriParserException e) {
this.exception = e; this.exception = e;
return this; return this;
@ -219,7 +219,7 @@ public class FilterValidator implements Validator {
Parser parser = new Parser(); Parser parser = new Parser();
UriInfo uriInfo = null; UriInfo uriInfo = null;
uriInfo = parser.parseUri(uri, new UriParseTreeVisitor(edm)); uriInfo = parser.parseUri(uri, edm);
if (uriInfo.getKind() != UriInfoKind.resource) { if (uriInfo.getKind() != UriInfoKind.resource) {
fail("Filtervalidator can only be used on resourcePaths"); fail("Filtervalidator can only be used on resourcePaths");
@ -234,7 +234,7 @@ public class FilterValidator implements Validator {
UriInfo uriInfo = null; UriInfo uriInfo = null;
try { try {
uriInfo = parser.parseUri(uri, new UriParseTreeVisitor(edm)); uriInfo = parser.parseUri(uri,edm);
} catch (UriParserException e) { } catch (UriParserException e) {
this.exception = e; this.exception = e;
return this; return this;

2
odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/ParserTest.java

@ -19,8 +19,8 @@
package org.apache.olingo.odata4.server.core.testutil; package org.apache.olingo.odata4.server.core.testutil;
import org.antlr.v4.runtime.DefaultErrorStrategy; import org.antlr.v4.runtime.DefaultErrorStrategy;
import org.apache.olingo.odata4.server.core.uri.Parser;
import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser; import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser;
import org.apache.olingo.odata4.server.core.uri.parser.Parser;
public class ParserTest extends Parser { public class ParserTest extends Parser {
TestErrorLogger errorCollector1; TestErrorLogger errorCollector1;

12
odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/ParserValidator.java

@ -23,14 +23,8 @@ import static org.junit.Assert.assertEquals;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.antlr.v4.runtime.ANTLRInputStream;
import org.antlr.v4.runtime.BailErrorStrategy;
import org.antlr.v4.runtime.CommonTokenStream;
import org.antlr.v4.runtime.DefaultErrorStrategy;
import org.antlr.v4.runtime.ParserRuleContext; import org.antlr.v4.runtime.ParserRuleContext;
import org.antlr.v4.runtime.atn.PredictionMode;
import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser; import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser;
import org.apache.olingo.odata4.server.core.uri.antlr.UriParserParser.OdataRelativeUriEOFContext;
// TODO extend to test also exception which can occure while paring // TODO extend to test also exception which can occure while paring
public class ParserValidator { public class ParserValidator {
@ -106,7 +100,7 @@ public class ParserValidator {
(new TokenValidator()).log(lexerLogLevel).run(input); (new TokenValidator()).log(lexerLogLevel).run(input);
} }
root = parseInput(uri); /**///root = parseInput(uri);
// if LOG > 0 - Write serialized tree // if LOG > 0 - Write serialized tree
if (logLevel > 0) { if (logLevel > 0) {
@ -171,7 +165,7 @@ public class ParserValidator {
} }
// --- Helper --- // --- Helper ---
/*
private OdataRelativeUriEOFContext parseInput(final String input) { private OdataRelativeUriEOFContext parseInput(final String input) {
UriParserParser parser = null; UriParserParser parser = null;
UriLexerWithTrace lexer = null; UriLexerWithTrace lexer = null;
@ -245,5 +239,5 @@ public class ParserValidator {
return ret; return ret;
} }
*/
} }

31
odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/UriResourceValidator.java

@ -37,20 +37,20 @@ import org.apache.olingo.odata4.server.api.uri.UriResourcePartTyped;
import org.apache.olingo.odata4.server.api.uri.queryoption.CustomQueryOption; import org.apache.olingo.odata4.server.api.uri.queryoption.CustomQueryOption;
import org.apache.olingo.odata4.server.api.uri.queryoption.SelectItem; import org.apache.olingo.odata4.server.api.uri.queryoption.SelectItem;
import org.apache.olingo.odata4.server.api.uri.queryoption.expression.ExceptionVisitExpression; import org.apache.olingo.odata4.server.api.uri.queryoption.expression.ExceptionVisitExpression;
import org.apache.olingo.odata4.server.core.uri.UriInfoImpl;
import org.apache.olingo.odata4.server.core.uri.UriParseTreeVisitor;
import org.apache.olingo.odata4.server.core.uri.UriParserException; import org.apache.olingo.odata4.server.core.uri.UriParserException;
import org.apache.olingo.odata4.server.core.uri.UriResourceActionImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriInfoImpl;
import org.apache.olingo.odata4.server.core.uri.UriResourceComplexPropertyImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourceActionImpl;
import org.apache.olingo.odata4.server.core.uri.UriResourceEntitySetImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourceComplexPropertyImpl;
import org.apache.olingo.odata4.server.core.uri.UriResourceFunctionImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourceEntitySetImpl;
import org.apache.olingo.odata4.server.core.uri.UriResourceImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourceFunctionImpl;
import org.apache.olingo.odata4.server.core.uri.UriResourceLambdaAllImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourceImpl;
import org.apache.olingo.odata4.server.core.uri.UriResourceLambdaAnyImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourceLambdaAllImpl;
import org.apache.olingo.odata4.server.core.uri.UriResourceNavigationPropertyImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourceLambdaAnyImpl;
import org.apache.olingo.odata4.server.core.uri.UriResourcePrimitivePropertyImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourceNavigationPropertyImpl;
import org.apache.olingo.odata4.server.core.uri.UriResourceSingletonImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourcePrimitivePropertyImpl;
import org.apache.olingo.odata4.server.core.uri.UriResourceWithKeysImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourceSingletonImpl;
import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourceWithKeysImpl;
import org.apache.olingo.odata4.server.core.uri.parser.UriParseTreeVisitor;
import org.apache.olingo.odata4.server.core.uri.queryoption.CustomQueryOptionImpl; import org.apache.olingo.odata4.server.core.uri.queryoption.CustomQueryOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.ExpandOptionImpl; import org.apache.olingo.odata4.server.core.uri.queryoption.ExpandOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.SelectOptionImpl; import org.apache.olingo.odata4.server.core.uri.queryoption.SelectOptionImpl;
@ -85,11 +85,12 @@ public class UriResourceValidator implements Validator {
// --- Execution --- // --- Execution ---
public UriResourceValidator run(final String uri) { public UriResourceValidator run(final String uri) {
ParserTest testParser = new ParserTest(); ParserTest testParser = new ParserTest();
//testParser.setLogLevel(1);
UriInfoImpl uriInfoTmp = null; UriInfoImpl uriInfoTmp = null;
uriPathInfo = null; uriPathInfo = null;
try { try {
uriInfoTmp = (UriInfoImpl) testParser.parseUri(uri, new UriParseTreeVisitor(edm)); uriInfoTmp = (UriInfoImpl) testParser.parseUri(uri, edm);
} catch (UriParserException e) { } catch (UriParserException e) {
fail("Exception occured while parsing the URI: " + uri + "\n" fail("Exception occured while parsing the URI: " + uri + "\n"
+ " Exception: " + e.getMessage()); + " Exception: " + e.getMessage());

29
odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/testutil/UriValidator.java

@ -29,12 +29,12 @@ import org.apache.olingo.odata4.commons.api.edm.provider.FullQualifiedName;
import org.apache.olingo.odata4.server.api.uri.UriInfoKind; import org.apache.olingo.odata4.server.api.uri.UriInfoKind;
import org.apache.olingo.odata4.server.api.uri.queryoption.CustomQueryOption; import org.apache.olingo.odata4.server.api.uri.queryoption.CustomQueryOption;
import org.apache.olingo.odata4.server.api.uri.queryoption.SelectItem; import org.apache.olingo.odata4.server.api.uri.queryoption.SelectItem;
import org.apache.olingo.odata4.server.core.uri.Parser;
import org.apache.olingo.odata4.server.core.uri.UriInfoImpl;
import org.apache.olingo.odata4.server.core.uri.UriParseTreeVisitor;
import org.apache.olingo.odata4.server.core.uri.UriParserException; import org.apache.olingo.odata4.server.core.uri.UriParserException;
import org.apache.olingo.odata4.server.core.uri.UriParserSemanticException; import org.apache.olingo.odata4.server.core.uri.UriParserSemanticException;
import org.apache.olingo.odata4.server.core.uri.UriParserSyntaxException; import org.apache.olingo.odata4.server.core.uri.UriParserSyntaxException;
import org.apache.olingo.odata4.server.core.uri.apiimpl.UriInfoImpl;
import org.apache.olingo.odata4.server.core.uri.parser.Parser;
import org.apache.olingo.odata4.server.core.uri.parser.UriParseTreeVisitor;
import org.apache.olingo.odata4.server.core.uri.queryoption.CustomQueryOptionImpl; import org.apache.olingo.odata4.server.core.uri.queryoption.CustomQueryOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.ExpandOptionImpl; import org.apache.olingo.odata4.server.core.uri.queryoption.ExpandOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.FilterOptionImpl; import org.apache.olingo.odata4.server.core.uri.queryoption.FilterOptionImpl;
@ -58,7 +58,7 @@ public class UriValidator implements Validator {
uriInfo = null; uriInfo = null;
try { try {
// uriInfoTmp = new UriParserImpl(edm).ParseUri(uri); // uriInfoTmp = new UriParserImpl(edm).ParseUri(uri);
uriInfo = (UriInfoImpl) parser.parseUri(uri, new UriParseTreeVisitor(edm)); uriInfo = (UriInfoImpl) parser.parseUri(uri, edm);
} catch (UriParserException e) { } catch (UriParserException e) {
fail("Exception occured while parsing the URI: " + uri + "\n" fail("Exception occured while parsing the URI: " + uri + "\n"
+ " Exception: " + e.getMessage()); + " Exception: " + e.getMessage());
@ -72,7 +72,7 @@ public class UriValidator implements Validator {
uriInfo = null; uriInfo = null;
try { try {
// uriInfoTmp = new UriParserImpl(edm).ParseUri(uri); // uriInfoTmp = new UriParserImpl(edm).ParseUri(uri);
uriInfo = (UriInfoImpl) parser.parseUri(uri, new UriParseTreeVisitor(edm)); uriInfo = (UriInfoImpl) parser.parseUri(uri, edm);
} catch (UriParserException e) { } catch (UriParserException e) {
exception = e; exception = e;
@ -83,11 +83,11 @@ public class UriValidator implements Validator {
public UriValidator log(final String uri) { public UriValidator log(final String uri) {
ParserTest parserTest = new ParserTest(); ParserTest parserTest = new ParserTest();
parserTest.setLogLevel(1);
uriInfo = null; uriInfo = null;
try { try {
// uriInfoTmp = new UriParserImpl(edm).ParseUri(uri); // uriInfoTmp = new UriParserImpl(edm).ParseUri(uri);
uriInfo = (UriInfoImpl) parserTest.parseUri(uri, new UriParseTreeVisitor(edm)); uriInfo = (UriInfoImpl) parserTest.parseUri(uri, edm);
fail("Exception expected");
} catch (UriParserException e) { } catch (UriParserException e) {
fail("Exception occured while parsing the URI: " + uri + "\n" fail("Exception occured while parsing the URI: " + uri + "\n"
+ " Exception: " + e.getMessage()); + " Exception: " + e.getMessage());
@ -116,7 +116,7 @@ public class UriValidator implements Validator {
return new FilterValidator().setUriValidator(this).setFilter(filter); return new FilterValidator().setUriValidator(this).setFilter(filter);
} }
public ExpandValidator goExpand() { public ExpandValidator goExpand() {
ExpandOptionImpl expand = (ExpandOptionImpl) uriInfo.getExpandOption(); ExpandOptionImpl expand = (ExpandOptionImpl) uriInfo.getExpandOption();
if (expand == null) { if (expand == null) {
@ -125,11 +125,10 @@ public class UriValidator implements Validator {
return new ExpandValidator().setGoUpValidator(this).setExpand(expand); return new ExpandValidator().setGoUpValidator(this).setExpand(expand);
} }
public UriResourceValidator goSelectItemPath(final int index) { public UriResourceValidator goSelectItemPath(final int index) {
SelectOptionImpl select = (SelectOptionImpl) uriInfo.getSelectOption(); SelectOptionImpl select = (SelectOptionImpl) uriInfo.getSelectOption();
SelectItem item = select.getSelectItems().get(index); SelectItem item = select.getSelectItems().get(index);
UriInfoImpl uriInfo1 = (UriInfoImpl) item.getResourceInfo(); UriInfoImpl uriInfo1 = (UriInfoImpl) item.getResourceInfo();
@ -227,18 +226,18 @@ public class UriValidator implements Validator {
private String fullName(final EdmEntityType type) { private String fullName(final EdmEntityType type) {
return type.getNamespace() + "." + type.getName(); return type.getNamespace() + "." + type.getName();
} }
public UriValidator isSelectItemStar(final int index) { public UriValidator isSelectItemStar(final int index) {
SelectOptionImpl select = (SelectOptionImpl) uriInfo.getSelectOption(); SelectOptionImpl select = (SelectOptionImpl) uriInfo.getSelectOption();
SelectItem item = select.getSelectItems().get(index); SelectItem item = select.getSelectItems().get(index);
assertEquals(true, item.isStar()); assertEquals(true, item.isStar());
return this; return this;
} }
public UriValidator isSelectItemAllOp(final int index, FullQualifiedName fqn) { public UriValidator isSelectItemAllOp(final int index, FullQualifiedName fqn) {
SelectOptionImpl select = (SelectOptionImpl) uriInfo.getSelectOption(); SelectOptionImpl select = (SelectOptionImpl) uriInfo.getSelectOption();
SelectItem item = select.getSelectItems().get(index); SelectItem item = select.getSelectItems().get(index);
assertEquals(fqn.toString(), item.getAllOperationsInSchemaNameSpace().toString()); assertEquals(fqn.toString(), item.getAllOperationsInSchemaNameSpace().toString());
return this; return this;

149
odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/RawUriTest.java Normal file

@ -0,0 +1,149 @@
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
package org.apache.olingo.odata4.server.core.uri;
import static org.junit.Assert.assertEquals;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.apache.olingo.odata4.server.core.uri.parser.RawUri;
import org.apache.olingo.odata4.server.core.uri.parser.UriDecoder;
import org.junit.Test;
public class RawUriTest {
private RawUri runRawParser(String uri, int scipSegments) throws UriParserSyntaxException {
return UriDecoder.decodeUri(uri, scipSegments);
}
@Test
public void testOption() throws Exception {
RawUri rawUri;
rawUri = runRawParser("?", 0);
checkOptionCount(rawUri, 0);
rawUri = runRawParser("?a", 0);
checkOption(rawUri, 0, "a", "");
rawUri = runRawParser("?a=b", 0);
checkOption(rawUri, 0, "a", "b");
rawUri = runRawParser("?=", 0);
checkOption(rawUri, 0, "", "");
rawUri = runRawParser("?=b", 0);
checkOption(rawUri, 0, "", "b");
rawUri = runRawParser("?a&c", 0);
checkOption(rawUri, 0, "a", "");
checkOption(rawUri, 1, "c", "");
rawUri = runRawParser("?a=b&c", 0);
checkOption(rawUri, 0, "a", "b");
checkOption(rawUri, 1, "c", "");
rawUri = runRawParser("?a=b&c=d", 0);
checkOption(rawUri, 0, "a", "b");
checkOption(rawUri, 1, "c", "d");
rawUri = runRawParser("?=&=", 0);
checkOption(rawUri, 0, "", "");
checkOption(rawUri, 1, "", "");
rawUri = runRawParser("?=&c=d", 0);
checkOption(rawUri, 0, "", "");
checkOption(rawUri, 1, "c", "d");
}
private void checkOption(RawUri rawUri, int index, String name, String value) {
RawUri.QueryOption option = rawUri.queryOptionListDecoded.get(index);
assertEquals(name, option.name);
assertEquals(value, option.value);
}
private void checkOptionCount(RawUri rawUri, int count) {
assertEquals(count, rawUri.queryOptionListDecoded.size());
}
@Test
public void testPath() throws Exception {
RawUri rawUri;
rawUri = runRawParser("http://test.org", 0);
checkPath(rawUri, "", new ArrayList<String>());
rawUri = runRawParser("http://test.org/", 0);
checkPath(rawUri, "/", Arrays.asList(""));
rawUri = runRawParser("http://test.org/entitySet", 0);
checkPath(rawUri, "/entitySet", Arrays.asList("entitySet"));
rawUri = runRawParser("http://test.org/nonServiceSegment/entitySet", 0);
checkPath(rawUri, "/nonServiceSegment/entitySet", Arrays.asList("nonServiceSegment", "entitySet"));
rawUri = runRawParser("http://test.org/nonServiceSegment/entitySet", 1);
checkPath(rawUri, "/nonServiceSegment/entitySet", Arrays.asList("entitySet"));
rawUri = runRawParser("", 0);
checkPath(rawUri, "", new ArrayList<String>());
rawUri = runRawParser("/", 0);
checkPath(rawUri, "/", Arrays.asList(""));
rawUri = runRawParser("/entitySet", 0);
checkPath(rawUri, "/entitySet", Arrays.asList("entitySet"));
rawUri = runRawParser("entitySet", 0);
checkPath(rawUri, "entitySet", Arrays.asList("entitySet"));
rawUri = runRawParser("nonServiceSegment/entitySet", 0);
checkPath(rawUri, "nonServiceSegment/entitySet", Arrays.asList("nonServiceSegment", "entitySet"));
rawUri = runRawParser("nonServiceSegment/entitySet", 1);
checkPath(rawUri, "nonServiceSegment/entitySet", Arrays.asList("entitySet"));
}
/*
* @Test
* public void testSplitt() {
* UriRawParser.splitt("", '/');
* UriRawParser.splitt("a", '/');
* UriRawParser.splitt("a/", '/');
* UriRawParser.splitt("/a", '/');
* UriRawParser.splitt("a/a", '/');
* }
*/
private void checkPath(RawUri rawUri, String path, List<String> list) {
assertEquals(path, rawUri.path);
assertEquals(list.size(), rawUri.pathSegmentListDecoded.size());
int i = 0;
while (i < list.size()) {
assertEquals(list.get(i), rawUri.pathSegmentListDecoded.get(i));
i++;
}
}
}

6
odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/UriInfoImplTest.java

@ -38,9 +38,9 @@ import org.apache.olingo.odata4.server.api.uri.UriInfoService;
import org.apache.olingo.odata4.server.api.uri.queryoption.CustomQueryOption; import org.apache.olingo.odata4.server.api.uri.queryoption.CustomQueryOption;
import org.apache.olingo.odata4.server.core.testutil.EdmTechProvider; import org.apache.olingo.odata4.server.core.testutil.EdmTechProvider;
import org.apache.olingo.odata4.server.core.testutil.EdmTechTestProvider; import org.apache.olingo.odata4.server.core.testutil.EdmTechTestProvider;
import org.apache.olingo.odata4.server.core.uri.UriInfoImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriInfoImpl;
import org.apache.olingo.odata4.server.core.uri.UriResourceActionImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourceActionImpl;
import org.apache.olingo.odata4.server.core.uri.UriResourceEntitySetImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourceEntitySetImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.CustomQueryOptionImpl; import org.apache.olingo.odata4.server.core.uri.queryoption.CustomQueryOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.ExpandOptionImpl; import org.apache.olingo.odata4.server.core.uri.queryoption.ExpandOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.FilterOptionImpl; import org.apache.olingo.odata4.server.core.uri.queryoption.FilterOptionImpl;

38
odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/UriParameterImplTest.java

@ -43,25 +43,25 @@ import org.apache.olingo.odata4.commons.core.edm.provider.EdmSingletonImpl;
import org.apache.olingo.odata4.server.api.uri.UriResourceKind; import org.apache.olingo.odata4.server.api.uri.UriResourceKind;
import org.apache.olingo.odata4.server.core.testutil.EdmTechProvider; import org.apache.olingo.odata4.server.core.testutil.EdmTechProvider;
import org.apache.olingo.odata4.server.core.testutil.EdmTechTestProvider; import org.apache.olingo.odata4.server.core.testutil.EdmTechTestProvider;
import org.apache.olingo.odata4.server.core.uri.UriParameterImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriParameterImpl;
import org.apache.olingo.odata4.server.core.uri.UriResourceActionImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourceActionImpl;
import org.apache.olingo.odata4.server.core.uri.UriResourceComplexPropertyImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourceComplexPropertyImpl;
import org.apache.olingo.odata4.server.core.uri.UriResourceCountImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourceCountImpl;
import org.apache.olingo.odata4.server.core.uri.UriResourceEntitySetImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourceEntitySetImpl;
import org.apache.olingo.odata4.server.core.uri.UriResourceFunctionImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourceFunctionImpl;
import org.apache.olingo.odata4.server.core.uri.UriResourceItImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourceItImpl;
import org.apache.olingo.odata4.server.core.uri.UriResourceLambdaAllImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourceLambdaAllImpl;
import org.apache.olingo.odata4.server.core.uri.UriResourceLambdaAnyImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourceLambdaAnyImpl;
import org.apache.olingo.odata4.server.core.uri.UriResourceLambdaVarImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourceLambdaVarImpl;
import org.apache.olingo.odata4.server.core.uri.UriResourceNavigationPropertyImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourceNavigationPropertyImpl;
import org.apache.olingo.odata4.server.core.uri.UriResourcePrimitivePropertyImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourcePrimitivePropertyImpl;
import org.apache.olingo.odata4.server.core.uri.UriResourceRefImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourceRefImpl;
import org.apache.olingo.odata4.server.core.uri.UriResourceRootImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourceRootImpl;
import org.apache.olingo.odata4.server.core.uri.UriResourceSingletonImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourceSingletonImpl;
import org.apache.olingo.odata4.server.core.uri.UriResourceStartingTypeFilterImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourceStartingTypeFilterImpl;
import org.apache.olingo.odata4.server.core.uri.UriResourceTypedImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourceTypedImpl;
import org.apache.olingo.odata4.server.core.uri.UriResourceValueImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourceValueImpl;
import org.apache.olingo.odata4.server.core.uri.UriResourceWithKeysImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourceWithKeysImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.expression.ExpressionImpl; import org.apache.olingo.odata4.server.core.uri.queryoption.expression.ExpressionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.expression.LiteralImpl; import org.apache.olingo.odata4.server.core.uri.queryoption.expression.LiteralImpl;
import org.junit.Test; import org.junit.Test;

49
odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/antlr/TestFullResourcePath.java

@ -18,6 +18,8 @@
******************************************************************************/ ******************************************************************************/
package org.apache.olingo.odata4.server.core.uri.antlr; package org.apache.olingo.odata4.server.core.uri.antlr;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.Arrays; import java.util.Arrays;
import org.apache.olingo.odata4.commons.api.edm.Edm; import org.apache.olingo.odata4.commons.api.edm.Edm;
@ -922,10 +924,11 @@ public class TestFullResourcePath {
@Test @Test
public void runEntityIdError() { public void runEntityIdError() {
testUri.runEx("$entity").isExSyntax(0); /* TODO move to validator */
testUri.runEx("$entity?$idfalse=ESKeyNav(1)").isExSyntax(0); // testUri.runEx("$entity").isExSyntax(0);
testUri.runEx("$entity/com.sap.odata.test1.invalidType?$id=ESKeyNav(1)").isExSemantic(0); // testUri.runEx("$entity?$idfalse=ESKeyNav(1)").isExSyntax(0);
testUri.runEx("$entity/invalid?$id=ESKeyNav(1)").isExSyntax(0); // testUri.runEx("$entity/com.sap.odata.test1.invalidType?$id=ESKeyNav(1)").isExSemantic(0);
// testUri.runEx("$entity/invalid?$id=ESKeyNav(1)").isExSyntax(0);
} }
@Test @Test
@ -948,10 +951,10 @@ public class TestFullResourcePath {
@Test @Test
public void runEsNameError() { public void runEsNameError() {
testUri.runEx("ESAllPrim/$count/$ref").isExSyntax(0); testUri.runEx("ESAllPrim/$count/$ref").isExSemantic(0);
testUri.runEx("ESAllPrim/$ref/$count").isExSyntax(0); testUri.runEx("ESAllPrim/$ref/$count").isExSemantic(0);
testUri.runEx("ESAllPrim/$ref/invalid").isExSyntax(0); testUri.runEx("ESAllPrim/$ref/invalid").isExSemantic(0);
testUri.runEx("ESAllPrim/$count/invalid").isExSyntax(0); testUri.runEx("ESAllPrim/$count/invalid").isExSemantic(0);
testUri.runEx("ESAllPrim(1)/whatever").isExSemantic(0); testUri.runEx("ESAllPrim(1)/whatever").isExSemantic(0);
testUri.runEx("ESAllPrim(PropertyInt16='1')").isExSemantic(0); testUri.runEx("ESAllPrim(PropertyInt16='1')").isExSemantic(0);
testUri.runEx("ESAllPrim(PropertyInt16)").isExSemantic(0); testUri.runEx("ESAllPrim(PropertyInt16)").isExSemantic(0);
@ -1080,14 +1083,14 @@ public class TestFullResourcePath {
} }
@Test @Test
public void runEsNameParaKeys() { public void runEsNameParaKeys() throws UnsupportedEncodingException {
testUri.run("ESAllKey(PropertyString='O''Neil',PropertyBoolean=true,PropertyByte=255," testUri.run(encode("ESAllKey(PropertyString='O''Neil',PropertyBoolean=true,PropertyByte=255,"
+ "PropertySByte=-128,PropertyInt16=-32768,PropertyInt32=-2147483648," + "PropertySByte=-128,PropertyInt16=-32768,PropertyInt32=-2147483648,"
+ "PropertyInt64=-9223372036854775808,PropertyDecimal=0.1,PropertyDate=2013-09-25," + "PropertyInt64=-9223372036854775808,PropertyDecimal=0.1,PropertyDate=2013-09-25,"
+ "PropertyDateTimeOffset=2002-10-10T12:00:00-05:00," + "PropertyDateTimeOffset=2002-10-10T12:00:00-05:00,"
+ "PropertyDuration=duration'P10DT5H34M21.123456789012S'," + "PropertyDuration=duration'P10DT5H34M21.123456789012S',"
+ "PropertyGuid=12345678-1234-1234-1234-123456789012," + "PropertyGuid=12345678-1234-1234-1234-123456789012,"
+ "PropertyTimeOfDay=12:34:55.123456789012)") + "PropertyTimeOfDay=12:34:55.123456789012)"))
.isKind(UriInfoKind.resource).goPath() .isKind(UriInfoKind.resource).goPath()
.first() .first()
.isEntitySet("ESAllKey") .isEntitySet("ESAllKey")
@ -2526,7 +2529,7 @@ public class TestFullResourcePath {
.isKind(UriInfoKind.resource).goPath() .isKind(UriInfoKind.resource).goPath()
.isInlineCountText("false"); .isInlineCountText("false");
testUri.runEx("ESAllPrim?$count=foo").isExSyntax(0); // TODO testUri.runEx("ESAllPrim?$count=foo").isExSyntax(0);
} }
@Test @Test
@ -2535,12 +2538,14 @@ public class TestFullResourcePath {
testUri.run("ESAllPrim?$skip=3") testUri.run("ESAllPrim?$skip=3")
.isKind(UriInfoKind.resource).goPath() .isKind(UriInfoKind.resource).goPath()
.isSkipText("3"); .isSkipText("3");
testUri.run("ESAllPrim?$skip=0") /*
.isKind(UriInfoKind.resource).goPath() * testUri.run("ESAllPrim?$skip=0")
.isSkipText("0"); * .isKind(UriInfoKind.resource).goPath()
testUri.run("ESAllPrim?$skip=-3") * .isSkipText("0");
.isKind(UriInfoKind.resource).goPath() * testUri.run("ESAllPrim?$skip=-3")
.isSkipText("-3"); * .isKind(UriInfoKind.resource).goPath()
* .isSkipText("-3");TODO
*/
} }
@Test @Test
@ -2865,7 +2870,7 @@ public class TestFullResourcePath {
.root().right() .root().right()
.isLiteral("'SomeString'"); .isLiteral("'SomeString'");
testFilter.runOnETTwoKeyNavEx("invalid").isExSemantic(0); // testFilter.runOnETTwoKeyNavEx("invalid").isExSemantic(0);
testFilter.runOnETTwoKeyNavEx("PropertyComplex/invalid").isExSemantic(0); testFilter.runOnETTwoKeyNavEx("PropertyComplex/invalid").isExSemantic(0);
testFilter.runOnETTwoKeyNavEx("concat('a','b')/invalid").isExSyntax(0); testFilter.runOnETTwoKeyNavEx("concat('a','b')/invalid").isExSyntax(0);
testFilter.runOnETTwoKeyNavEx("PropertyComplex/concat('a','b')").isExSyntax(0); testFilter.runOnETTwoKeyNavEx("PropertyComplex/concat('a','b')").isExSyntax(0);
@ -4976,4 +4981,10 @@ public class TestFullResourcePath {
testFilter.runOrderByOnETTwoKeyNavEx("PropertyInt16 PropertyInt32, PropertyDuration desc").isExSyntax(0); testFilter.runOrderByOnETTwoKeyNavEx("PropertyInt16 PropertyInt32, PropertyDuration desc").isExSyntax(0);
testFilter.runOrderByOnETTwoKeyNavEx("PropertyInt16 asc, PropertyInt32 PropertyDuration desc").isExSyntax(0); testFilter.runOrderByOnETTwoKeyNavEx("PropertyInt16 asc, PropertyInt32 PropertyDuration desc").isExSyntax(0);
} }
public static String encode(String decoded) throws UnsupportedEncodingException {
return URLEncoder.encode(decoded, "UTF-8");
}
} }

11
odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/antlr/TestLexer.java

@ -20,7 +20,6 @@ package org.apache.olingo.odata4.server.core.uri.antlr;
import org.antlr.v4.runtime.Lexer; import org.antlr.v4.runtime.Lexer;
import org.apache.olingo.odata4.server.core.testutil.TokenValidator; import org.apache.olingo.odata4.server.core.testutil.TokenValidator;
import org.apache.olingo.odata4.server.core.uri.antlr.UriLexer;
import org.junit.Test; import org.junit.Test;
public class TestLexer { public class TestLexer {
@ -29,25 +28,19 @@ public class TestLexer {
private static final String cPCT_ENCODED = "%45%46%47" + "%22" + "%5C";// last two chars are not in private static final String cPCT_ENCODED = "%45%46%47" + "%22" + "%5C";// last two chars are not in
// cPCT_ENCODED_UNESCAPED // cPCT_ENCODED_UNESCAPED
// private static final String cPCT_ENCODED_UNESCAPED = "%45%46%47";
private static final String cUNRESERVED = "ABCabc123-._~"; private static final String cUNRESERVED = "ABCabc123-._~";
private static final String cOTHER_DELIMS = "!()*+,;"; private static final String cOTHER_DELIMS = "!()*+,;";
private static final String cSUB_DELIMS = "$&'=" + cOTHER_DELIMS; private static final String cSUB_DELIMS = "$&'=" + cOTHER_DELIMS;
// private static final String cPCTENCODEDnoSQUOTE = "%65%66%67";
// private static final String cPCHARnoSQUOTE = cUNRESERVED + cPCTENCODEDnoSQUOTE + cOTHER_DELIMS + "$&=:@";
private static final String cPCHAR = cUNRESERVED + cPCT_ENCODED + cSUB_DELIMS + ":@"; private static final String cPCHAR = cUNRESERVED + cPCT_ENCODED + cSUB_DELIMS + ":@";
// private static final String cQCHAR_UNESCAPED = cUNRESERVED + cPCT_ENCODED_UNESCAPED + cOTHER_DELIMS + ":@/?$'=";
public TestLexer() { public TestLexer() {
test = new TokenValidator(); test = new TokenValidator();
} }
//@Test @Test
public void test() { public void test() {
//test.log(1).run("ESTwoKeyNav?$filter=CollPropertyComplex/all( l :true)");
} }
// ;------------------------------------------------------------------------------ // ;------------------------------------------------------------------------------

30
odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/antlr/TestParser.java

@ -46,10 +46,11 @@ public class TestParser {
// ;------------------------------------------------------------------------------ // ;------------------------------------------------------------------------------
// ; 0. URI // ; 0. URI
// ;------------------------------------------------------------------------------ // ;------------------------------------------------------------------------------
@Test //@Test
public void testUri() { public void testUri() {
// Test parser rule odataRelativeUri // Test parser rule odataRelativeUri
test.run("$batch").isText("odataRelativeUriEOF(odataRelativeUri($batch) <EOF>)");
test.run("$batch").isText("odataRelativeUriEOF(odataRelativeUri(altBatch($batch)) <EOF>)");
// TODO do more tests on entity // TODO do more tests on entity
test.run("$entity?$id=ODI").isText("odataRelativeUriEOF(odataRelativeUri($entity ? " test.run("$entity?$id=ODI").isText("odataRelativeUriEOF(odataRelativeUri($entity ? "
@ -59,7 +60,7 @@ public class TestParser {
+ "entityOptions(id($id = ODI) & entityOption(format($format = json)))) <EOF>)"); + "entityOptions(id($id = ODI) & entityOption(format($format = json)))) <EOF>)");
// TODO do more tests on entity // TODO do more tests on entity
test.run("$metadata").isText("odataRelativeUriEOF(odataRelativeUri($metadata) <EOF>)"); test.run("$metadata").isText("odataRelativeUriEOF(odataRelativeUri(altMetadata($metadata)) <EOF>)");
test.run("ODI").isText( test.run("ODI").isText(
"odataRelativeUriEOF(odataRelativeUri(resourcePath(pathSegments(pathSegment(odataIdentifier(ODI))))) <EOF>)"); "odataRelativeUriEOF(odataRelativeUri(resourcePath(pathSegments(pathSegment(odataIdentifier(ODI))))) <EOF>)");
@ -82,15 +83,12 @@ public class TestParser {
+ "pathSegment(odataIdentifier(ODI)) / " + "pathSegment(odataIdentifier(ODI)) / "
+ "pathSegment(namespace(odataIdentifier(NS) .) odataIdentifier(ODI))))) <EOF>)"); + "pathSegment(namespace(odataIdentifier(NS) .) odataIdentifier(ODI))))) <EOF>)");
// Test parser rule constSegment // Test parser rule constSegment
test.run("ODI/$value").isText("odataRelativeUriEOF(odataRelativeUri(resourcePath(pathSegments(" test.run("ODI/$value").isText("odataRelativeUriEOF(odataRelativeUri(resourcePath(pathSegments(pathSegment("
+ "pathSegment(odataIdentifier(ODI)) " + "odataIdentifier(ODI)) constSegmentSL(/ constSegment(value($value)))))) <EOF>)");
+ "constSegment(/ value($value))))) <EOF>)"); test.run("ODI/$count").isText("odataRelativeUriEOF(odataRelativeUri(resourcePath(pathSegments(pathSegment("
test.run("ODI/$count").isText("odataRelativeUriEOF(odataRelativeUri(resourcePath(pathSegments(" + "odataIdentifier(ODI)) constSegmentSL(/ constSegment(count($count)))))) <EOF>)");
+ "pathSegment(odataIdentifier(ODI)) " test.run("ODI/$ref").isText("odataRelativeUriEOF(odataRelativeUri(resourcePath(pathSegments(pathSegment("
+ "constSegment(/ count($count))))) <EOF>)"); + "odataIdentifier(ODI)) constSegmentSL(/ constSegment(ref($ref)))))) <EOF>)");
test.run("ODI/$ref").isText("odataRelativeUriEOF(odataRelativeUri(resourcePath(pathSegments("
+ "pathSegment(odataIdentifier(ODI)) "
+ "constSegment(/ ref($ref))))) <EOF>)");
// Test parser rule pathSegment // Test parser rule pathSegment
test.run("NS.ODI") test.run("NS.ODI")
@ -485,7 +483,7 @@ public class TestParser {
// test.run("ODI").isText(""); // test.run("ODI").isText("");
}; };
@Test //@Test
public void testExpressions() { public void testExpressions() {
// Test parser rule commonExpr -> primitiveLiteral // Test parser rule commonExpr -> primitiveLiteral
test.run("ODI?$filter=null").isText("odataRelativeUriEOF(odataRelativeUri(" test.run("ODI?$filter=null").isText("odataRelativeUriEOF(odataRelativeUri("
@ -1138,8 +1136,8 @@ public class TestParser {
@Test @Test
public void testFragment() { public void testFragment() {
test.run("$metadata#Collection($ref)").isText("odataRelativeUriEOF(odataRelativeUri(" /*test.run("$metadata#Collection($ref)").isText("odataRelativeUriEOF(odataRelativeUri("
+ "$metadata # contextFragment(Collection($ref))) <EOF>)"); + "$metadata # contextFragment(Collection($ref))) <EOF>)");*/
/* /*
test.run("$metadata#Collection(Edm.EntityType)").isText("odataRelativeUriEOF(odataRelativeUri(" test.run("$metadata#Collection(Edm.EntityType)").isText("odataRelativeUriEOF(odataRelativeUri("
+ "$metadata # contextFragment(Collection(Edm.EntityType))) <EOF>)"); + "$metadata # contextFragment(Collection(Edm.EntityType))) <EOF>)");
@ -1246,7 +1244,7 @@ public class TestParser {
*/ */
} }
@Test //@Test
public void testPrecedence() { public void testPrecedence() {
// Test operator precedence // Test operator precedence

19
odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/antlr/TestUriParserImpl.java

@ -20,6 +20,8 @@ package org.apache.olingo.odata4.server.core.uri.antlr;
// TODO after adding the external API to the URI processing class this unit test require a mayor rework // TODO after adding the external API to the URI processing class this unit test require a mayor rework
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.Arrays; import java.util.Arrays;
import org.apache.olingo.odata4.commons.api.edm.Edm; import org.apache.olingo.odata4.commons.api.edm.Edm;
@ -68,6 +70,11 @@ public class TestUriParserImpl {
testFilter = new FilterValidator().setEdm(edm); testFilter = new FilterValidator().setEdm(edm);
} }
@Test
public void test() throws UriParserException, UnsupportedEncodingException {
}
@Test @Test
public void testBoundFunctionImport_VarParameters() { public void testBoundFunctionImport_VarParameters() {
@ -327,7 +334,7 @@ public class TestUriParserImpl {
} }
@Test @Test
public void testEntitySet() { public void testEntitySet() throws UnsupportedEncodingException {
// plain entity set // plain entity set
testRes.run("ESAllPrim") testRes.run("ESAllPrim")
@ -352,7 +359,7 @@ public class TestUriParserImpl {
.isKeyPredicate(1, "PropertyString", "'ABC'"); .isKeyPredicate(1, "PropertyString", "'ABC'");
// with all keys // with all keys
testRes.run("ESAllKey(" + allKeys + ")") testRes.run("ESAllKey(" + encode(allKeys) + ")")
.isEntitySet("ESAllKey") .isEntitySet("ESAllKey")
.isKeyPredicate(0, "PropertyString", "'ABC'") .isKeyPredicate(0, "PropertyString", "'ABC'")
.isKeyPredicate(1, "PropertyInt16", "1") .isKeyPredicate(1, "PropertyInt16", "1")
@ -1069,7 +1076,7 @@ public class TestUriParserImpl {
@Test @Test
public void testCustomQueryOption() { public void testCustomQueryOption() {
testUri.run("ESTwoKeyNav?custom") testUri.run("ESTwoKeyNav?custom")
.isCustomParameter(0, "custom", null); .isCustomParameter(0, "custom", "");
testUri.run("ESTwoKeyNav?custom=ABC") testUri.run("ESTwoKeyNav?custom=ABC")
.isCustomParameter(0, "custom", "ABC"); .isCustomParameter(0, "custom", "ABC");
} }
@ -1138,4 +1145,10 @@ public class TestUriParserImpl {
} }
public static String encode(String decoded) throws UnsupportedEncodingException {
return URLEncoder.encode(decoded, "UTF-8");
}
} }

20
odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/queryoption/QueryOptionTest.java

@ -31,25 +31,7 @@ import org.apache.olingo.odata4.server.api.uri.UriInfoResource;
import org.apache.olingo.odata4.server.api.uri.queryoption.SupportedQueryOptions; import org.apache.olingo.odata4.server.api.uri.queryoption.SupportedQueryOptions;
import org.apache.olingo.odata4.server.core.testutil.EdmTechProvider; import org.apache.olingo.odata4.server.core.testutil.EdmTechProvider;
import org.apache.olingo.odata4.server.core.testutil.EdmTechTestProvider; import org.apache.olingo.odata4.server.core.testutil.EdmTechTestProvider;
import org.apache.olingo.odata4.server.core.uri.UriInfoImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriInfoImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.AliasQueryOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.ExpandItemImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.ExpandOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.FilterOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.FormatOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.IdOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.InlineCountOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.LevelsOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.OrderByItemImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.OrderByOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.QueryOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.SearchOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.SelectItemImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.SelectOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.SkipOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.SkipTokenOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.SystemQueryOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.TopOptionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.expression.AliasImpl; import org.apache.olingo.odata4.server.core.uri.queryoption.expression.AliasImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.expression.ExpressionImpl; import org.apache.olingo.odata4.server.core.uri.queryoption.expression.ExpressionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.expression.LiteralImpl; import org.apache.olingo.odata4.server.core.uri.queryoption.expression.LiteralImpl;

17
odata4-lib/odata4-server-core/src/test/java/org/apache/olingo/odata4/server/core/uri/queryoption/expression/ExpressionTest.java

@ -41,20 +41,9 @@ import org.apache.olingo.odata4.server.api.uri.queryoption.expression.SupportedU
import org.apache.olingo.odata4.server.core.testutil.EdmTechProvider; import org.apache.olingo.odata4.server.core.testutil.EdmTechProvider;
import org.apache.olingo.odata4.server.core.testutil.EdmTechTestProvider; import org.apache.olingo.odata4.server.core.testutil.EdmTechTestProvider;
import org.apache.olingo.odata4.server.core.testutil.FilterTreeToText; import org.apache.olingo.odata4.server.core.testutil.FilterTreeToText;
import org.apache.olingo.odata4.server.core.uri.UriInfoImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriInfoImpl;
import org.apache.olingo.odata4.server.core.uri.UriResourceActionImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourceActionImpl;
import org.apache.olingo.odata4.server.core.uri.UriResourceFunctionImpl; import org.apache.olingo.odata4.server.core.uri.apiimpl.UriResourceFunctionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.expression.AliasImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.expression.BinaryImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.expression.ConstantImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.expression.EnumerationImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.expression.ExpressionImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.expression.LambdaRefImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.expression.LiteralImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.expression.MemberImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.expression.MethodCallImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.expression.TypeLiteralImpl;
import org.apache.olingo.odata4.server.core.uri.queryoption.expression.UnaryImpl;
import org.junit.Test; import org.junit.Test;
public class ExpressionTest { public class ExpressionTest {