Queries are implemented, and appear to work as expected. Added getKeys() method

to AttributeService.  Fixed NPE in MapAttributeImpl.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5514 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2007-04-19 19:24:49 +00:00
parent 8eb616f446
commit 65ddab9b8c
14 changed files with 223 additions and 29 deletions

View File

@@ -44,8 +44,8 @@ public class AttrQueryEquals extends AttrQuery
@Override
public String getPredicate(AttrQueryHelper helper)
{
String name = ":name" + helper.getNextSuffix();
String name = "name" + helper.getNextSuffix();
helper.setParameter(name, fValue);
return "me.key = " + name;
return "me.key = :" + name;
}
}

View File

@@ -47,8 +47,8 @@ public class AttrQueryGT extends AttrQuery
@Override
public String getPredicate(AttrQueryHelper helper)
{
String name = ":name" + helper.getNextSuffix();
String name = "name" + helper.getNextSuffix();
helper.setParameter(name, fValue);
return "me.key > " + name;
return "me.key > :" + name;
}
}

View File

@@ -48,8 +48,8 @@ public class AttrQueryGTE extends AttrQuery
@Override
public String getPredicate(AttrQueryHelper helper)
{
String name = ":name" + helper.getNextSuffix();
String name = "name" + helper.getNextSuffix();
helper.setParameter(name, fValue);
return "me.key >= " + name;
return "me.key >= :" + name;
}
}

View File

@@ -47,8 +47,8 @@ public class AttrQueryLT extends AttrQuery
@Override
public String getPredicate(AttrQueryHelper helper)
{
String name = ":name" + helper.getNextSuffix();
String name = "name" + helper.getNextSuffix();
helper.setParameter(name, fValue);
return "me.key < " + name;
return "me.key < :" + name;
}
}

View File

@@ -47,8 +47,8 @@ public class AttrQueryLTE extends AttrQuery
@Override
public String getPredicate(AttrQueryHelper helper)
{
String name = ":name" + helper.getNextSuffix();
String name = "name" + helper.getNextSuffix();
helper.setParameter(name, fValue);
return "me.key <= " + name;
return "me.key <= :" + name;
}
}

View File

@@ -48,8 +48,8 @@ public class AttrQueryLike extends AttrQuery
@Override
public String getPredicate(AttrQueryHelper helper)
{
String name = ":name" + helper.getNextSuffix();
String name = "name" + helper.getNextSuffix();
helper.setParameter(name, fValue);
return "me.key like " + name;
return "me.key like :" + name;
}
}

View File

@@ -47,8 +47,8 @@ public class AttrQueryNE extends AttrQuery
@Override
public String getPredicate(AttrQueryHelper helper)
{
String name = ":name" + helper.getNextSuffix();
String name = "name" + helper.getNextSuffix();
helper.setParameter(name, fValue);
return "me.key <> " + name;
return "me.key <> :" + name;
}
}

View File

@@ -28,6 +28,7 @@ package org.alfresco.service.cmr.attributes;
import java.util.List;
import org.alfresco.repo.attributes.Attribute;
import org.alfresco.util.Pair;
/**
* This provides services for reading, writing, and querying global attributes.
@@ -62,7 +63,7 @@ public interface AttributeService
* @param query
* @return A List of matching attributes.
*/
public List<Attribute> query(String path, AttrQuery query);
public List<Pair<String, Attribute>> query(String path, AttrQuery query);
/**
* Get all the keys for a given attribute path.