Skip to content

CAUSEWAY-3959: converts abstract ApplicationRole to an interface #3375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
andi-huber wants to merge 6 commits into
base: main
Choose a base branch
from
+294 −236
Draft

CAUSEWAY-3959: converts abstract ApplicationRole to an interface #3375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fd80f11
CAUSEWAY-3959: converts abstract ApplicationRole to an interface
andi-huber Jan 28, 2026
9c19bf0
CAUSEWAY-3959: converts abstract ApplicationUser to an interface
andi-huber Jan 28, 2026
728c316
CAUSEWAY-3959: fixes permission mapping in prev. commits
andi-huber Jan 29, 2026
07464ca
CAUSEWAY-3959: converts abstract ApplicationPermission to an interface
andi-huber Jan 29, 2026
a9a1e89
CAUSEWAY-3959: converts abstract ApplicationTenancy to an interface
andi-huber Jan 29, 2026
b012d3a
CAUSEWAY-3959: adds weaving profile
andi-huber Jan 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 25 additions & 42 deletions ...va/org/apache/causeway/extensions/secman/applib/permission/dom/ApplicationPermission.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,8 @@
import java.util.Optional;
import java.util.function.Function;

import jakarta.inject.Inject;
import jakarta.inject.Named;

import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.ObjectSupport;
import org.apache.causeway.applib.annotation.Optionality;
Expand Down Expand Up @@ -83,22 +80,23 @@
*
* @since 2.0 {@index}
*/
@Named(ApplicationPermission.LOGICAL_TYPE_NAME)
@Named(ApplicationPermission.LOGICAL_TYPE_NAME) // required for permission mapping
/* not allowed on interfaces ...
@DomainObject
@DomainObjectLayout(
titleUiEvent = ApplicationPermission.TitleUiEvent.class,
iconUiEvent = ApplicationPermission.IconUiEvent.class,
cssClassUiEvent = ApplicationPermission.CssClassUiEvent.class,
layoutUiEvent = ApplicationPermission.LayoutUiEvent.class
)
public abstract class ApplicationPermission implements Comparable<ApplicationPermission> {
*/
public interface ApplicationPermission extends Comparable<ApplicationPermission> {

public static final String LOGICAL_TYPE_NAME = CausewayModuleExtSecmanApplib.NAMESPACE + ".ApplicationPermission";
public static final String SCHEMA = CausewayModuleExtSecmanApplib.SCHEMA;
public static final String TABLE = "ApplicationPermission";

@UtilityClass
public static class Nq {
public final static class Nq {
public static final String FIND_BY_FEATURE = LOGICAL_TYPE_NAME + ".findByFeature";
public static final String FIND_BY_ROLE = LOGICAL_TYPE_NAME + ".findByRole";
public static final String FIND_BY_ROLE_RULE_FEATURE = LOGICAL_TYPE_NAME + ".findByRoleAndRuleAndFeature";
Expand All @@ -117,11 +115,11 @@ public static class LayoutUiEvent extends CausewayModuleExtSecmanApplib.LayoutUi
public static abstract class PropertyDomainEvent<T> extends CausewayModuleExtSecmanApplib.PropertyDomainEvent<ApplicationPermission, T> {}
public static abstract class CollectionDomainEvent<T> extends CausewayModuleExtSecmanApplib.CollectionDomainEvent<ApplicationPermission, T> {}

@Inject transient ApplicationFeatureRepository featureRepository;
ApplicationFeatureRepository featureRepository();

// -- MODEL

@ObjectSupport public String title() {
@ObjectSupport default String title() {
var buf = new StringBuilder();
buf.append(getRole().getName()).append(":") // admin:
.append(" ").append(getRule().toString()) // Allow|Veto
Expand Down Expand Up @@ -180,8 +178,8 @@ class DomainEvent extends PropertyDomainEvent<ApplicationRole> {}
}

@Role
public abstract ApplicationRole getRole();
public abstract void setRole(ApplicationRole applicationRole);
ApplicationRole getRole();
void setRole(ApplicationRole applicationRole);

// -- RULE

Expand All @@ -205,8 +203,8 @@ class DomainEvent extends PropertyDomainEvent<ApplicationPermissionRule> {}
String ALLOWS_NULL = "false";
}
@Rule
public abstract ApplicationPermissionRule getRule();
public abstract void setRule(ApplicationPermissionRule rule);
ApplicationPermissionRule getRule();
void setRule(ApplicationPermissionRule rule);

// -- MODE

Expand All @@ -230,8 +228,8 @@ class DomainEvent extends PropertyDomainEvent<ApplicationPermissionMode> {}
String ALLOWS_NULL = "false";
}
@Mode
public abstract ApplicationPermissionMode getMode();
public abstract void setMode(ApplicationPermissionMode mode);
ApplicationPermissionMode getMode();
void setMode(ApplicationPermissionMode mode);

// -- SORT

Expand All @@ -254,7 +252,7 @@ class DomainEvent extends PropertyDomainEvent<String> {}
int TYPICAL_LENGTH = 7; // ApplicationFeatureType.PACKAGE is longest
}
@Sort
public String getSort() {
default String getSort() {
final Enum<?> e = getFeatureSort() != ApplicationFeatureSort.MEMBER
? getFeatureSort()
: getMemberSort().orElse(null);
Expand Down Expand Up @@ -282,8 +280,8 @@ public String getSort() {
* @see #getFeatureFqn()
*/
@Programmatic
public abstract ApplicationFeatureSort getFeatureSort();
public abstract void setFeatureSort(ApplicationFeatureSort featureSort);
ApplicationFeatureSort getFeatureSort();
void setFeatureSort(ApplicationFeatureSort featureSort);

// -- FQN

Expand Down Expand Up @@ -314,13 +312,13 @@ class DomainEvent extends PropertyDomainEvent<String> {}
String ALLOWS_NULL = "false";
}
@FeatureFqn
public abstract String getFeatureFqn();
public abstract void setFeatureFqn(String featureFqn);
String getFeatureFqn();
void setFeatureFqn(String featureFqn);

// -- FIND FEATURE

@Programmatic public ApplicationFeature findFeature(final ApplicationFeatureId featureId) {
return featureRepository.findFeature(featureId);
@Programmatic default ApplicationFeature findFeature(final ApplicationFeatureId featureId) {
return featureRepository().findFeature(featureId);
}

@Programmatic private Optional<ApplicationMemberSort> getMemberSort() {
Expand All @@ -333,40 +331,25 @@ class DomainEvent extends PropertyDomainEvent<String> {}
.map(this::findFeature);
}

// -- HELPER
// -- UTIL

@Programmatic Optional<ApplicationFeatureId> asFeatureId() {
@Programmatic default Optional<ApplicationFeatureId> asFeatureId() {
return Optional.ofNullable(getFeatureSort())
.map(featureSort -> ApplicationFeatureId.newFeature(featureSort, getFeatureFqn()));
}

// -- CONTRACT

private static final ObjectContracts.ObjectContract<ApplicationPermission> contract =
static final ObjectContracts.ObjectContract<ApplicationPermission> CONTRACT =
ObjectContracts.contract(ApplicationPermission.class)
.thenUse("role", ApplicationPermission::getRole)
.thenUse("featureSort", ApplicationPermission::getFeatureSort)
.thenUse("featureFqn", ApplicationPermission::getFeatureFqn)
.thenUse("mode", ApplicationPermission::getMode);

@Override
public int compareTo(final org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermission other) {
return contract.compare(this, other);
}

@Override
public boolean equals(final Object other) {
return contract.equals(this, other);
}

@Override
public int hashCode() {
return contract.hashCode(this);
}

@Override
public String toString() {
return contract.toString(this);
default int compareTo(final org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermission other) {
return CONTRACT.compare(this, other);
}

public static class DefaultComparator implements Comparator<ApplicationPermission> {
Expand Down
50 changes: 15 additions & 35 deletions .../src/main/java/org/apache/causeway/extensions/secman/applib/role/dom/ApplicationRole.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,10 @@
import java.util.List;
import java.util.Set;

import jakarta.inject.Inject;
import jakarta.inject.Named;

import org.apache.causeway.applib.annotation.Collection;
import org.apache.causeway.applib.annotation.CollectionLayout;
import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.ObjectSupport;
import org.apache.causeway.applib.annotation.Optionality;
Expand All @@ -46,15 +43,13 @@
import org.apache.causeway.applib.util.ToString;
import org.apache.causeway.extensions.secman.applib.CausewayModuleExtSecmanApplib;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermission;
import org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionRepository;
import org.apache.causeway.extensions.secman.applib.user.dom.ApplicationUser;

import lombok.experimental.UtilityClass;

/**
* @since 2.0 {@index}
*/
@Named(ApplicationRole.LOGICAL_TYPE_NAME)
@Named(ApplicationRole.LOGICAL_TYPE_NAME) // required for permission mapping
/* not allowed on interfaces ...
@DomainObject(
autoCompleteRepository = ApplicationRoleRepository.class,
autoCompleteMethod = "findMatching"
Expand All @@ -65,19 +60,19 @@
cssClassUiEvent = ApplicationRole.CssClassUiEvent.class,
layoutUiEvent = ApplicationRole.LayoutUiEvent.class
)
public abstract class ApplicationRole implements Comparable<ApplicationRole> {
*/
public interface ApplicationRole extends Comparable<ApplicationRole> {

public static final String LOGICAL_TYPE_NAME = CausewayModuleExtSecmanApplib.NAMESPACE + ".ApplicationRole";
public static final String SCHEMA = CausewayModuleExtSecmanApplib.SCHEMA;
public static final String TABLE = "ApplicationRole";

@UtilityClass
public static class Nq {
public static final class Nq {
public static final String FIND_BY_NAME = LOGICAL_TYPE_NAME + ".findByName";
public static final String FIND_BY_NAME_CONTAINING = LOGICAL_TYPE_NAME + ".findByNameContaining";
}

@Inject transient private ApplicationPermissionRepository applicationPermissionRepository;
org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermissionRepository applicationPermissionRepository();

// -- UI & DOMAIN EVENTS

Expand All @@ -91,7 +86,7 @@ public static abstract class CollectionDomainEvent<T> extends CausewayModuleExtS

// -- MODEL

@ObjectSupport public String title() {
@ObjectSupport public default String title() {
return getName();
}

Expand Down Expand Up @@ -199,42 +194,27 @@ class DomainEvent extends CollectionDomainEvent<ApplicationPermission> {}
// -- PERMISSIONS

@Permissions
public List<org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermission> getPermissions() {
return applicationPermissionRepository.findByRole(this);
public default List<org.apache.causeway.extensions.secman.applib.permission.dom.ApplicationPermission> getPermissions() {
return applicationPermissionRepository().findByRole(this);
}

// -- equals, hashCode, compareTo, toString

private static final Comparator<ApplicationRole> comparator =
static final Comparator<ApplicationRole> COMPARATOR =
Comparator.comparing(ApplicationRole::getName);

private static final Equality<ApplicationRole> equality =
static final Equality<ApplicationRole> EQUALITY =
ObjectContracts.checkEquals(ApplicationRole::getName);

private static final Hashing<ApplicationRole> hashing =
static final Hashing<ApplicationRole> HASHING =
ObjectContracts.hashing(ApplicationRole::getName);

private static final ToString<ApplicationRole> toString =
static final ToString<ApplicationRole> TOSTRING =
ObjectContracts.toString("name", ApplicationRole::getName);

@Override
public int compareTo(final org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRole other) {
return comparator.compare(this, other);
}

@Override
public boolean equals(final Object obj) {
return equality.equals(this, obj);
}

@Override
public int hashCode() {
return hashing.hashCode(this);
}

@Override
public String toString() {
return toString.toString(this);
public default int compareTo(final org.apache.causeway.extensions.secman.applib.role.dom.ApplicationRole other) {
return COMPARATOR.compare(this, other);
}

}
Loading