fixed defect #1825
git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/branches/information-system/ic-client/1.0@76791 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
8cc1491361
commit
78f51bc08a
|
@ -1,5 +1,8 @@
|
|||
<ReleaseNotes>
|
||||
<Changeset component="${build.finalName}" date="2013-01-11">
|
||||
<Changeset component="ic-client-1.0.0" date="2013-01-11">
|
||||
<Change>First Release</Change>
|
||||
</Changeset>
|
||||
<Changeset component="${build.finalName}" date="2013-06-05">
|
||||
<Change>fixed defect #1825</Change>
|
||||
</Changeset>
|
||||
</ReleaseNotes>
|
2
pom.xml
2
pom.xml
|
@ -9,7 +9,7 @@
|
|||
|
||||
<groupId>org.gcube.resources.discovery</groupId>
|
||||
<artifactId>ic-client</artifactId>
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
<version>1.0.1-SNAPSHOT</version>
|
||||
<name>Information Collector Client</name>
|
||||
<description>Client API for the Information Collector service</description>
|
||||
|
||||
|
|
|
@ -41,9 +41,10 @@ public class Helper {
|
|||
|
||||
HashMap<String, String> varReplacementMap = new HashMap<String, String>();
|
||||
|
||||
String forPropertiesString="\n *VAR* in *COLLECTION*/Data/child::*[local-name()='Scopes'] \n";
|
||||
|
||||
String forPropertiesString="\n *VAR* in *COLLECTION*/Data \n"; ///child::*[local-name()='Scope']
|
||||
String forString=" *VAR* in *COLLECTION*/Scopes \n";
|
||||
String authString=" (contains(*VAR*//Scope,'"+scope+"') or contains(*VAR*//Scope,'"+scope.substring(0,scope.lastIndexOf("/"))+"')) ";
|
||||
String authString=" (contains(*VAR*/child::*[local-name()='Scope'],'"+scope+"') or contains(*VAR*/child::*[local-name()='Scope'],'"+scope.substring(0,scope.lastIndexOf("/"))+"')) ";
|
||||
String authStringNormal=" contains(*VAR*//Scope,'"+scope+"') ";
|
||||
|
||||
String queryFiltered;
|
||||
|
@ -90,12 +91,11 @@ public class Helper {
|
|||
if (propBool)
|
||||
{
|
||||
String resourceMatString= resourceMat.group();
|
||||
|
||||
forStringTemp=forPropertiesString.replace("*VAR*","$entry"+collInsert.size()+"ValueAuth" ).replace("*COLLECTION*", resourceMatString );
|
||||
String oldVar = varMat.group();
|
||||
|
||||
String newVar = "$entry"+collInsert.size()+"ValueAuth";
|
||||
collInsert.add(true);
|
||||
|
||||
varReplacementMap.put(oldVar, newVar+"/.."+tempPath);
|
||||
}
|
||||
else
|
||||
|
@ -128,10 +128,6 @@ public class Helper {
|
|||
whereInsertFinal+=authString.replace("*VAR*", "$entry"+i+"ValueAuth")+" and " ;
|
||||
else whereInsertFinal+=authStringNormal.replace("*VAR*", "$entry"+i+"ValueAuth")+" and " ;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Matcher whereMat=wherePattern.matcher(expression);
|
||||
Matcher inSubResultMat= inSubResult.matcher(expression);
|
||||
|
|
|
@ -26,7 +26,7 @@ public class APIClient {
|
|||
@BeforeClass
|
||||
public static void setup() {
|
||||
|
||||
ScopeProvider.instance.set("/gcube/devsec/devVre");
|
||||
ScopeProvider.instance.set("/gcube/devNext/devVre");
|
||||
}
|
||||
|
||||
|
||||
|
@ -152,6 +152,7 @@ public class APIClient {
|
|||
public void someServiceInstances() {
|
||||
|
||||
|
||||
|
||||
XQuery query = queryFor(ServiceInstance.class);
|
||||
query.addCondition("$resource/Data/gcube:ServiceClass/text() eq 'DataAccess'").
|
||||
addCondition("$resource/Data/gcube:ServiceName/text() eq 'tree-manager-service'");
|
||||
|
@ -159,11 +160,8 @@ public class APIClient {
|
|||
DiscoveryClient<ServiceInstance> client = clientFor(ServiceInstance.class);
|
||||
|
||||
List<ServiceInstance> props = client.submit(query);
|
||||
|
||||
|
||||
|
||||
|
||||
System.out.println(props);
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
Loading…
Reference in New Issue