Author: reto
Date: Wed Jul 21 12:43:40 2010
New Revision: 966211
URL: http://svn.apache.org/viewvc?rev=966211&view=rev
Log:
CLEREZZA-218: symmetry of type in get and set permission methods
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core/src/main/java/org/apache/clerezza/rdf/core/access/security/TcAccessController.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/SecurityTest.java
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core/src/main/java/org/apache/clerezza/rdf/core/access/security/TcAccessController.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core/src/main/java/org/apache/clerezza/rdf/core/access/security/TcAccessController.java?rev=966211&r1=966210&r2=966211&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core/src/main/java/org/apache/clerezza/rdf/core/access/security/TcAccessController.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core/src/main/java/org/apache/clerezza/rdf/core/access/security/TcAccessController.java
Wed Jul 21 12:43:40 2010
@@ -129,7 +129,7 @@ public class TcAccessController {
* @param tripleCollectionUri
* @param permissionDescriptions
*/
- public void setRequiredReadPermissions(UriRef tripleCollectionUri,
+ public void setRequiredReadPermissionStrings(UriRef tripleCollectionUri,
Collection<String> permissionDescriptions) {
readPermissionCache.remove(tripleCollectionUri);
final LockableMGraph permissionMGraph =
getOrCreatePermisionGraph();
@@ -146,6 +146,22 @@ public class TcAccessController {
}
/**
+ * Set the set of permissions required for read access to a
triple-collection, if
+ * the set is non-empty the default TCPermisson is no longer required.
+ *
+ * @param tripleCollectionUri
+ * @param permissionDescriptions
+ */
+ public void setRequiredReadPermissions(UriRef tripleCollectionUri,
+ Collection<Permission> permissions) {
+ Collection<String> permissionStrings = new ArrayList<String>();
+ for (Permission permission : permissions) {
+ permissionStrings.add(permission.toString());
+ }
+ setRequiredReadPermissionStrings(tripleCollectionUri,
permissionStrings);
+ }
+
+ /**
* Set the set of permissions required for read-write access to a
* triple-collection, if
* the set is non-empty the default TCPermisson is no longer required.
@@ -153,7 +169,7 @@ public class TcAccessController {
* @param tripleCollectionUri
* @param permissionDescriptions
*/
- public void setRequiredReadWritePermissions(UriRef tripleCollectionUri,
+ public void setRequiredReadWritePermissionStrings(UriRef
tripleCollectionUri,
Collection<String> permissionDescriptions) {
readWritePermissionCache.remove(tripleCollectionUri);
final LockableMGraph permissionMGraph =
getOrCreatePermisionGraph();
@@ -170,6 +186,23 @@ public class TcAccessController {
}
/**
+ * Set the set of permissions required for read-write access to a
+ * triple-collection, if
+ * the set is non-empty the default TCPermisson is no longer required.
+ *
+ * @param tripleCollectionUri
+ * @param permissionDescriptions
+ */
+ public void setRequiredReadWritePermissions(UriRef tripleCollectionUri,
+ Collection<Permission> permissions) {
+ Collection<String> permissionStrings = new ArrayList<String>();
+ for (Permission permission : permissions) {
+ permissionStrings.add(permission.toString());
+ }
+ setRequiredReadWritePermissionStrings(tripleCollectionUri,
permissionStrings);
+ }
+
+ /**
* Get the set of permissions required for read access to the
* triple-collection, the set may be empty meaning that the default
* TCPermission is required.
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/SecurityTest.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/SecurityTest.java?rev=966211&r1=966210&r2=966211&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/SecurityTest.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core/src/test/java/org/apache/clerezza/rdf/core/access/SecurityTest.java
Wed Jul 21 12:43:40 2010
@@ -133,7 +133,7 @@ public class SecurityTest {
@Test(expected=NoSuchEntityException.class)
public void testCustomPermissions() {
UriRef graphUri = new UriRef("http://example.org/custom";);
-
TcManager.getInstance().getTcAccessController().setRequiredReadPermissions(graphUri,
+
TcManager.getInstance().getTcAccessController().setRequiredReadPermissionStrings(graphUri,
Collections.singletonList("(java.io.FilePermission \"/etc\" \"write\")"));
//new FilePermission("/etc", "write").toString()));
TripleCollection ag = TcManager.getInstance().getTriples(new
UriRef("http://zz.localhost/graph-access.graph";));
@@ -144,7 +144,7 @@ public class SecurityTest {
@Test(expected=AccessControlException.class)
public void testCustomPermissionsIncorrect() {
UriRef graphUri = new UriRef("http://example.org/custom";);
-
TcManager.getInstance().getTcAccessController().setRequiredReadPermissions(graphUri,
+
TcManager.getInstance().getTcAccessController().setRequiredReadPermissionStrings(graphUri,
Collections.singletonList("(java.io.FilePermission \"/etc\" \"write\")"));
//new FilePermission("/etc", "write").toString()));
TripleCollection ag = TcManager.getInstance().getTriples(new
UriRef("http://zz.localhost/graph-access.graph";));
@@ -155,7 +155,7 @@ public class SecurityTest {
@Test
public void testCustomReadWritePermissions() {
UriRef graphUri = new
UriRef("http://example.org/read-write-custom";);
-
TcManager.getInstance().getTcAccessController().setRequiredReadWritePermissions(graphUri,
+
TcManager.getInstance().getTcAccessController().setRequiredReadWritePermissionStrings(graphUri,
Collections.singletonList("(java.io.FilePermission \"/etc\" \"write\")"));
//new FilePermission("/etc", "write").toString()));
TripleCollection ag = TcManager.getInstance().getTriples(new
UriRef("http://zz.localhost/graph-access.graph";));
