Skip to content

Commit 7b65b76

Browse files
krystian-panek-vmltechkrystian-panek-vmltech
authored
Merge pull request #130 from wttech/acl-api-cleanup
API clean ups
2 parents 259b10f + b0eddc0 commit 7b65b76

File tree

4 files changed

+12
-341
lines changed

4 files changed

+12
-341
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ void doRun() {
265265
}
266266
267267
def johnDoe = acl.createUser { id = "john.doe"; fullName = "John Doe"; password = "ilovekittens"; skipIfExists() }
268-
johnDoe?.with {
268+
johnDoe.with {
269269
// purge()
270270
allow("/content", ["jcr:read"])
271271
}
@@ -311,7 +311,7 @@ void doRun() {
311311
println "Creating a folder structure in the temporary directory of the repository."
312312
def dataFolder = repo.get("/tmp/acm/demo/data").ensureFolder()
313313
for (int i = 0; i < 5; i++) {
314-
def child = dataFolder.child("child-\${i+1}").save(["foo": "bar"])
314+
def child = dataFolder.child("child-${i+1}").save(["foo": "bar"])
315315
child.updateProperty("foo") { v -> v.toUpperCase() }
316316
}
317317
println "Folder '${dataFolder.path}' has now ${dataFolder.descendants().count()} descendant(s)."

‎core/src/main/java/dev/vml/es/acm/core/acl/Acl.java

Lines changed: 0 additions & 236 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
import dev.vml.es.acm.core.acl.authorizable.AclUser;
66
import dev.vml.es.acm.core.util.GroovyUtils;
77
import groovy.lang.Closure;
8-
import java.util.List;
9-
import java.util.Map;
108
import org.apache.jackrabbit.api.security.user.Group;
119
import org.apache.jackrabbit.api.security.user.User;
1210
import org.apache.sling.api.resource.ResourceResolver;
@@ -102,29 +100,6 @@ public void check(Closure<AclChecker> closure) {
102100
GroovyUtils.with(checker, closure);
103101
}
104102

105-
public AclUser createUser(
106-
String id,
107-
boolean systemUser,
108-
String password,
109-
String path,
110-
String givenName,
111-
String familyName,
112-
String email,
113-
String aboutMe,
114-
CreateAuthorizableOptions.Mode mode) {
115-
CreateUserOptions options = new CreateUserOptions();
116-
options.setId(id);
117-
options.setSystemUser(systemUser);
118-
options.setPassword(password);
119-
options.setPath(path);
120-
options.setGivenName(givenName);
121-
options.setFamilyName(familyName);
122-
options.setEmail(email);
123-
options.setAboutMe(aboutMe);
124-
options.setMode(mode);
125-
return createUser(options);
126-
}
127-
128103
public AclUser createUser(CreateUserOptions options) {
129104
User user = context.getAuthorizableManager().getUser(options.getId());
130105
AclResult result = AclResult.OK;
@@ -168,25 +143,6 @@ public AclUser createSystemUser(String id) {
168143
return createUser(options);
169144
}
170145

171-
public AclGroup createGroup(
172-
String id,
173-
String externalId,
174-
String path,
175-
String givenName,
176-
String email,
177-
String aboutMe,
178-
CreateAuthorizableOptions.Mode mode) {
179-
CreateGroupOptions options = new CreateGroupOptions();
180-
options.setId(id);
181-
options.setExternalId(externalId);
182-
options.setPath(path);
183-
options.setGivenName(givenName);
184-
options.setEmail(email);
185-
options.setAboutMe(aboutMe);
186-
options.setMode(mode);
187-
return createGroup(options);
188-
}
189-
190146
public AclGroup createGroup(CreateGroupOptions options) {
191147
Group group = context.getAuthorizableManager().getGroup(options.getId());
192148
AclResult result = AclResult.OK;
@@ -585,202 +541,10 @@ public AclResult allow(PermissionsOptions options) {
585541
return apply(options, true);
586542
}
587543

588-
public AclResult allow(
589-
String authorizableId,
590-
String path,
591-
List<String> permissions,
592-
String glob,
593-
List<String> types,
594-
List<String> properties,
595-
Map<String, Object> restrictions,
596-
PermissionsOptions.Mode mode) {
597-
PermissionsOptions options = new PermissionsOptions();
598-
options.setAuthorizableId(authorizableId);
599-
options.setPath(path);
600-
options.setPermissions(permissions);
601-
options.setGlob(glob);
602-
options.setTypes(types);
603-
options.setProperties(properties);
604-
options.setRestrictions(restrictions);
605-
options.setMode(mode);
606-
return allow(options);
607-
}
608-
609-
public AclResult allow(
610-
AclAuthorizable authorizable,
611-
String path,
612-
List<String> permissions,
613-
String glob,
614-
List<String> types,
615-
List<String> properties,
616-
Map<String, Object> restrictions,
617-
PermissionsOptions.Mode mode) {
618-
PermissionsOptions options = new PermissionsOptions();
619-
options.setAuthorizable(authorizable);
620-
options.setPath(path);
621-
options.setPermissions(permissions);
622-
options.setGlob(glob);
623-
options.setTypes(types);
624-
options.setProperties(properties);
625-
options.setRestrictions(restrictions);
626-
options.setMode(mode);
627-
return allow(options);
628-
}
629-
630-
public AclResult allow(String authorizableId, String path, List<String> permissions) {
631-
PermissionsOptions options = new PermissionsOptions();
632-
options.setAuthorizableId(authorizableId);
633-
options.setPath(path);
634-
options.setPermissions(permissions);
635-
return allow(options);
636-
}
637-
638-
public AclResult allow(AclAuthorizable authorizable, String path, List<String> permissions) {
639-
PermissionsOptions options = new PermissionsOptions();
640-
options.setAuthorizable(authorizable);
641-
options.setPath(path);
642-
options.setPermissions(permissions);
643-
return allow(options);
644-
}
645-
646-
public AclResult allow(String authorizableId, String path, List<String> permissions, String glob) {
647-
PermissionsOptions options = new PermissionsOptions();
648-
options.setAuthorizableId(authorizableId);
649-
options.setPath(path);
650-
options.setPermissions(permissions);
651-
options.setGlob(glob);
652-
return allow(options);
653-
}
654-
655-
public AclResult allow(AclAuthorizable authorizable, String path, List<String> permissions, String glob) {
656-
PermissionsOptions options = new PermissionsOptions();
657-
options.setAuthorizable(authorizable);
658-
options.setPath(path);
659-
options.setPermissions(permissions);
660-
options.setGlob(glob);
661-
return allow(options);
662-
}
663-
664-
public AclResult allow(
665-
String authorizableId, String path, List<String> permissions, Map<String, Object> restrictions) {
666-
PermissionsOptions options = new PermissionsOptions();
667-
options.setAuthorizableId(authorizableId);
668-
options.setPath(path);
669-
options.setPermissions(permissions);
670-
options.setRestrictions(restrictions);
671-
return allow(options);
672-
}
673-
674-
public AclResult allow(
675-
AclAuthorizable authorizable, String path, List<String> permissions, Map<String, Object> restrictions) {
676-
PermissionsOptions options = new PermissionsOptions();
677-
options.setAuthorizable(authorizable);
678-
options.setPath(path);
679-
options.setPermissions(permissions);
680-
options.setRestrictions(restrictions);
681-
return allow(options);
682-
}
683-
684544
public AclResult deny(PermissionsOptions options) {
685545
return apply(options, false);
686546
}
687547

688-
public AclResult deny(
689-
String authorizableId,
690-
String path,
691-
List<String> permissions,
692-
String glob,
693-
List<String> types,
694-
List<String> properties,
695-
Map<String, Object> restrictions,
696-
PermissionsOptions.Mode mode) {
697-
PermissionsOptions options = new PermissionsOptions();
698-
options.setAuthorizableId(authorizableId);
699-
options.setPath(path);
700-
options.setPermissions(permissions);
701-
options.setGlob(glob);
702-
options.setTypes(types);
703-
options.setProperties(properties);
704-
options.setRestrictions(restrictions);
705-
options.setMode(mode);
706-
return deny(options);
707-
}
708-
709-
public AclResult deny(
710-
AclAuthorizable authorizable,
711-
String path,
712-
List<String> permissions,
713-
String glob,
714-
List<String> types,
715-
List<String> properties,
716-
Map<String, Object> restrictions,
717-
PermissionsOptions.Mode mode) {
718-
PermissionsOptions options = new PermissionsOptions();
719-
options.setAuthorizable(authorizable);
720-
options.setPath(path);
721-
options.setPermissions(permissions);
722-
options.setGlob(glob);
723-
options.setTypes(types);
724-
options.setProperties(properties);
725-
options.setRestrictions(restrictions);
726-
options.setMode(mode);
727-
return deny(options);
728-
}
729-
730-
public AclResult deny(String authorizableId, String path, List<String> permissions) {
731-
PermissionsOptions options = new PermissionsOptions();
732-
options.setAuthorizableId(authorizableId);
733-
options.setPath(path);
734-
options.setPermissions(permissions);
735-
return deny(options);
736-
}
737-
738-
public AclResult deny(AclAuthorizable authorizable, String path, List<String> permissions) {
739-
PermissionsOptions options = new PermissionsOptions();
740-
options.setAuthorizable(authorizable);
741-
options.setPath(path);
742-
options.setPermissions(permissions);
743-
return deny(options);
744-
}
745-
746-
public AclResult deny(String authorizableId, String path, List<String> permissions, String glob) {
747-
PermissionsOptions options = new PermissionsOptions();
748-
options.setAuthorizableId(authorizableId);
749-
options.setPath(path);
750-
options.setPermissions(permissions);
751-
options.setGlob(glob);
752-
return deny(options);
753-
}
754-
755-
public AclResult deny(AclAuthorizable authorizable, String path, List<String> permissions, String glob) {
756-
PermissionsOptions options = new PermissionsOptions();
757-
options.setAuthorizable(authorizable);
758-
options.setPath(path);
759-
options.setPermissions(permissions);
760-
options.setGlob(glob);
761-
return deny(options);
762-
}
763-
764-
public AclResult deny(
765-
String authorizableId, String path, List<String> permissions, Map<String, Object> restrictions) {
766-
PermissionsOptions options = new PermissionsOptions();
767-
options.setAuthorizableId(authorizableId);
768-
options.setPath(path);
769-
options.setPermissions(permissions);
770-
options.setRestrictions(restrictions);
771-
return deny(options);
772-
}
773-
774-
public AclResult deny(
775-
AclAuthorizable authorizable, String path, List<String> permissions, Map<String, Object> restrictions) {
776-
PermissionsOptions options = new PermissionsOptions();
777-
options.setAuthorizable(authorizable);
778-
options.setPath(path);
779-
options.setPermissions(permissions);
780-
options.setRestrictions(restrictions);
781-
return deny(options);
782-
}
783-
784548
public AclResult setProperty(SetPropertyOptions options) {
785549
AclAuthorizable authorizable =
786550
context.determineAuthorizable(options.getAuthorizable(), options.getAuthorizableId());

‎core/src/main/java/dev/vml/es/acm/core/acl/authorizable/AclAuthorizable.java

Lines changed: 0 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -189,94 +189,10 @@ public AclResult allow(PermissionsOptions options) {
189189
return apply(options, true);
190190
}
191191

192-
public AclResult allow(
193-
String path,
194-
List<String> permissions,
195-
String glob,
196-
List<String> types,
197-
List<String> properties,
198-
Map<String, Object> restrictions,
199-
PermissionsOptions.Mode mode) {
200-
PermissionsOptions options = new PermissionsOptions();
201-
options.setPath(path);
202-
options.setPermissions(permissions);
203-
options.setGlob(glob);
204-
options.setTypes(types);
205-
options.setProperties(properties);
206-
options.setRestrictions(restrictions);
207-
options.setMode(mode);
208-
return allow(options);
209-
}
210-
211-
public AclResult allow(String path, List<String> permissions) {
212-
PermissionsOptions options = new PermissionsOptions();
213-
options.setPath(path);
214-
options.setPermissions(permissions);
215-
return allow(options);
216-
}
217-
218-
public AclResult allow(String path, List<String> permissions, String glob) {
219-
PermissionsOptions options = new PermissionsOptions();
220-
options.setPath(path);
221-
options.setPermissions(permissions);
222-
options.setGlob(glob);
223-
return allow(options);
224-
}
225-
226-
public AclResult allow(String path, List<String> permissions, Map<String, Object> restrictions) {
227-
PermissionsOptions options = new PermissionsOptions();
228-
options.setPath(path);
229-
options.setPermissions(permissions);
230-
options.setRestrictions(restrictions);
231-
return allow(options);
232-
}
233-
234192
public AclResult deny(PermissionsOptions options) {
235193
return apply(options, false);
236194
}
237195

238-
public AclResult deny(
239-
String path,
240-
List<String> permissions,
241-
String glob,
242-
List<String> types,
243-
List<String> properties,
244-
Map<String, Object> restrictions,
245-
PermissionsOptions.Mode mode) {
246-
PermissionsOptions options = new PermissionsOptions();
247-
options.setPath(path);
248-
options.setPermissions(permissions);
249-
options.setGlob(glob);
250-
options.setTypes(types);
251-
options.setProperties(properties);
252-
options.setRestrictions(restrictions);
253-
options.setMode(mode);
254-
return deny(options);
255-
}
256-
257-
public AclResult deny(String path, List<String> permissions) {
258-
PermissionsOptions options = new PermissionsOptions();
259-
options.setPath(path);
260-
options.setPermissions(permissions);
261-
return deny(options);
262-
}
263-
264-
public AclResult deny(String path, List<String> permissions, String glob) {
265-
PermissionsOptions options = new PermissionsOptions();
266-
options.setPath(path);
267-
options.setPermissions(permissions);
268-
options.setGlob(glob);
269-
return deny(options);
270-
}
271-
272-
public AclResult deny(String path, List<String> permissions, Map<String, Object> restrictions) {
273-
PermissionsOptions options = new PermissionsOptions();
274-
options.setPath(path);
275-
options.setPermissions(permissions);
276-
options.setRestrictions(restrictions);
277-
return deny(options);
278-
}
279-
280196
public AclResult setProperty(SetPropertyOptions options) {
281197
return setProperty(options.getRelPath(), options.getValue());
282198
}

0 commit comments

Comments
 (0)