Skip to content

Commit 9d4ff66

Browse files
committed
add a way to get an empty GraphPermissions object via GraphManager.newGraphPermissions()
(cherry picked from commit 931a68b)
1 parent 6e70365 commit 9d4ff66

File tree

6 files changed

+10
-11
lines changed

6 files changed

+10
-11
lines changed

src/main/java/com/marklogic/client/impl/GraphManagerImpl.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,4 +417,7 @@ private String validateGraphsMimetype(HandleImplementation baseHandle) {
417417
return mimetype;
418418
}
419419

420+
public GraphPermissions newGraphPermissions() {
421+
return new GraphPermissionsImpl();
422+
}
420423
}

src/main/java/com/marklogic/client/impl/GraphPermissionsImpl.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,6 @@
2424
import com.marklogic.client.semantics.GraphPermissions;
2525

2626
public class GraphPermissionsImpl extends HashMap<String, Set<Capability>> implements GraphPermissions {
27-
28-
public GraphPermissionsImpl(String role, Capability... capabilities) {
29-
super();
30-
if ( capabilities == null ) throw new IllegalArgumentException("capabilities cannot be null");
31-
this.put(role, new HashSet<Capability>(Arrays.asList(capabilities)) );
32-
}
33-
3427
@Override
3528
public GraphPermissions permission(String role, Capability... capabilities) {
3629
if ( capabilities == null ) throw new IllegalArgumentException("capabilities cannot be null");

src/main/java/com/marklogic/client/impl/SPARQLQueryDefinitionImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ public GraphPermissions getUpdatePermissions() {
175175
public SPARQLQueryDefinition withUpdatePermission(String role,
176176
Capability capability) {
177177
if ( permissions == null ) {
178-
permissions = new GraphPermissionsImpl(role, capability);
178+
permissions = new GraphPermissionsImpl().permission(role, capability);
179179
} else {
180180
permissions = permissions.permission(role, capability);
181181
}

src/main/java/com/marklogic/client/impl/SPARQLQueryManagerImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,6 @@ public void executeUpdate(SPARQLQueryDefinition qdef, Transaction tx) {
172172

173173
@Override
174174
public GraphPermissions permission(String role, Capability... capabilities) {
175-
return new GraphPermissionsImpl(role, capabilities);
175+
return new GraphPermissionsImpl().permission(role, capabilities);
176176
}
177177
}

src/main/java/com/marklogic/client/semantics/GraphManager.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -643,5 +643,7 @@ public void deleteGraphs(Transaction transaction)
643643
* mimetype.
644644
*/
645645
public void setDefaultMimetype(String mimetype);
646-
}
647646

647+
/** Get an empty GraphPermissions instance. */
648+
public GraphPermissions newGraphPermissions();
649+
}

src/test/java/com/marklogic/client/test/SemanticsPermissionsTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ public void C_testGetPermissions() throws Exception {
107107

108108
@Test
109109
public void D_testWritePermissions() throws Exception {
110-
GraphPermissions perms = gmgr.permission("read-privileged", Capability.EXECUTE);
110+
GraphPermissions perms = gmgr.newGraphPermissions();
111+
perms = perms.permission("read-privileged", Capability.EXECUTE);
111112
gmgr.writePermissions(graphUri, perms);
112113
GraphPermissions permissions = gmgr.getPermissions(graphUri);
113114
assertEquals(3, permissions.size());

0 commit comments

Comments
 (0)