inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD (5.2) to 5.2.N (5.2.1)

Browse Source 
126381 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      120439 jvonka: RA-630: FileFolder API - update antlr grammar in REST fwk for select/where clause
      - to allow colon in property name identifier (json path)
      - also update impl + test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126727 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 10:54:46 +00:00
parent 5fbede5332
commit 45945b92a6
6 changed files with 910 additions and 1136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/antlr3/org/alfresco/rest/antlr/WhereClause.g
View File

@@ -84,10 +84,12 @@ GREATERTHANOREQUALS: WS?'>='WS?;
LEFTPAREN: '('; LEFTPAREN: '(';
RIGHTPAREN: ')'; RIGHTPAREN: ')';
COMMA: ','; COMMA: ',';
COLON: ':';
SINGLEQUOTE: '\''; SINGLEQUOTE: '\'';
PROPERTYVALUE: (SINGLEQUOTE (~SINGLEQUOTE|'\\'SINGLEQUOTE)* SINGLEQUOTE) |IDENTIFIERDIGIT+; PROPERTYVALUE: (SINGLEQUOTE (~SINGLEQUOTE|'\\'SINGLEQUOTE)* SINGLEQUOTE) |IDENTIFIERDIGIT+;
PROPERTYNAME: '/'? IDENTIFIER ('/'IDENTIFIER)*; PROPERTYNAME: '/'? IDENTIFIER ('/'IDENTIFIER)*;
fragment IDENTIFIER : (IDENTIFIERLETTER (IDENTIFIERLETTER | IDENTIFIERDIGIT)*); fragment IDENTIFIERLETTERORDIGIT: (IDENTIFIERLETTER | IDENTIFIERDIGIT);
fragment IDENTIFIER : (IDENTIFIERLETTER (IDENTIFIERLETTERORDIGIT* | (IDENTIFIERLETTERORDIGIT* COLON IDENTIFIERLETTERORDIGIT*)));
WS : ( ' ' | '\t' | '\r' | '\n' )+ { $channel = HIDDEN; }; WS : ( ' ' | '\t' | '\r' | '\n' )+ { $channel = HIDDEN; };
fragment IDENTIFIERLETTER // any Unicode character that is a Java letter (see below) fragment IDENTIFIERLETTER // any Unicode character that is a Java letter (see below)
: '\u0041'..'\u005a' // A-Z : '\u0041'..'\u005a' // A-Z

42
source/generated/WhereClause.tokens
View File

@@ -1,22 +1,24 @@
AND=4 AND=4
BETWEEN=5 BETWEEN=5
COMMA=6 COLON=6
EQUALS=7 COMMA=7
EXISTS=8 EQUALS=8
GREATERTHAN=9 EXISTS=9
GREATERTHANOREQUALS=10 GREATERTHAN=10
IDENTIFIER=11 GREATERTHANOREQUALS=11
IDENTIFIERDIGIT=12 IDENTIFIER=12
IDENTIFIERLETTER=13 IDENTIFIERDIGIT=13
IN=14 IDENTIFIERLETTER=14
LEFTPAREN=15 IDENTIFIERLETTERORDIGIT=15
LESSTHAN=16 IN=16
LESSTHANOREQUALS=17 LEFTPAREN=17
MATCHES=18 LESSTHAN=18
NEGATION=19 LESSTHANOREQUALS=19
OR=20 MATCHES=20
PROPERTYNAME=21 NEGATION=21
PROPERTYVALUE=22 OR=22
RIGHTPAREN=23 PROPERTYNAME=23
SINGLEQUOTE=24 PROPERTYVALUE=24
WS=25 RIGHTPAREN=25
SINGLEQUOTE=26
WS=27

1142
source/generated/org/alfresco/rest/antlr/WhereClauseLexer.java
View File

File diff suppressed because it is too large Load Diff

700
source/generated/org/alfresco/rest/antlr/WhereClauseParser.java
View File

File diff suppressed because it is too large Load Diff

2
source/java/org/alfresco/rest/api/impl/NodesImpl.java
View File

@@ -1546,8 +1546,6 @@ public class NodesImpl implements Nodes
str = str.substring(PREFIX.length()); str = str.substring(PREFIX.length());
} }
str = str.replaceFirst("_", ":"); // FIXME remove this when we have fixed the framework.
QName name = createQName(str); QName name = createQName(str);
if (!EXCLUDED_PROPS.contains(name)) if (!EXCLUDED_PROPS.contains(name))
{ {

2
source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java
View File

@@ -339,7 +339,7 @@ public class NodeApiTest extends AbstractBaseApiTest
AuthenticationUtil.setFullyAuthenticatedUser(user1); AuthenticationUtil.setFullyAuthenticatedUser(user1);
// request property via select // request property via select
Map<String, String> params = new LinkedHashMap<>(); Map<String, String> params = new LinkedHashMap<>();
params.put("select", "cm_lastThumbnailModification");// TODO replace the underscore with colon when the framework is fixed. params.put("select", "cm:lastThumbnailModification");
params.put("orderBy", "isFolder DESC,modifiedAt DESC"); params.put("orderBy", "isFolder DESC,modifiedAt DESC");
response = getAll(getChildrenUrl(myFilesNodeRef), user1, paging, params, 200); response = getAll(getChildrenUrl(myFilesNodeRef), user1, paging, params, 200);
nodes = jacksonUtil.parseEntries(response.getJsonResponse(), Document.class); nodes = jacksonUtil.parseEntries(response.getJsonResponse(), Document.class);