You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2020/11/26 21:20:33 UTC
[archiva-redback-core] 03/05: Moving template instance id method
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-core.git
commit 86670fc6499c258405220fae46c3d0ce4408aabf
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Wed Nov 25 20:29:30 2020 +0100
Moving template instance id method
---
.../main/java/org/apache/archiva/redback/role/DefaultRoleManager.java | 4 ++--
.../archiva/redback/role/template/DefaultRoleTemplateProcessor.java | 2 +-
.../java/org/apache/archiva/redback/role/util/RoleModelUtils.java | 4 ++++
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java
index 9fbf5c9..d83e642 100644
--- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java
+++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/DefaultRoleManager.java
@@ -334,7 +334,7 @@ public class DefaultRoleManager
if ( modelTemplate == null )
{
- throw new RoleManagerException( "Unable to assign role: " + templateId + " does not exist." );
+ throw new RoleNotFoundException( "Unable to assign role: " + templateId + " does not exist." );
}
try
{
@@ -372,7 +372,7 @@ public class DefaultRoleManager
if ( modelRole == null )
{
- throw new RoleManagerException( "Unable to assign role: " + roleId + " does not exist." );
+ throw new RoleNotFoundException( "Unable to assign role: " + roleId + " does not exist." );
}
try
diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java
index f7533c1..dd801d1 100644
--- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java
+++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java
@@ -178,7 +178,7 @@ public class DefaultRoleTemplateProcessor
@Override
public String getRoleId( String templateId, String resource) {
- return templateId + "." + resource;
+ return RoleModelUtils.getRoleId( templateId, resource );
}
@SuppressWarnings("unchecked")
diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/util/RoleModelUtils.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/util/RoleModelUtils.java
index 645cdcc..5c03a0b 100644
--- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/util/RoleModelUtils.java
+++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/util/RoleModelUtils.java
@@ -372,4 +372,8 @@ public class RoleModelUtils
return sortedGraph;
}
+ public static String getRoleId( String templateId, String resource) {
+ return templateId + "." + resource;
+ }
+
}