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 2022/01/03 19:26:30 UTC
[archiva-redback-core] branch master updated: Switching to generics for cache implementation
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
The following commit(s) were added to refs/heads/master by this push:
new ac29dbb Switching to generics for cache implementation
ac29dbb is described below
commit ac29dbbca6b1a0d24167e41c9c7e1a177caa6331
Author: Martin Schreier <ma...@apache.org>
AuthorDate: Mon Jan 3 20:26:19 2022 +0100
Switching to generics for cache implementation
---
.../src/test/resources/spring-context.xml | 2 ++
.../rest/services/DefaultRoleManagementService.java | 2 +-
.../apache/archiva/redback/keys/AuthenticationKey.java | 3 ++-
.../src/main/resources/META-INF/spring-context.xml | 4 +++-
.../src/test/resources/spring-context.xml | 4 +++-
.../java/org/apache/archiva/redback/rbac/Operation.java | 4 +++-
.../java/org/apache/archiva/redback/rbac/Permission.java | 4 +++-
.../java/org/apache/archiva/redback/rbac/Resource.java | 4 +++-
.../main/java/org/apache/archiva/redback/rbac/Role.java | 3 ++-
.../org/apache/archiva/redback/rbac/UserAssignment.java | 3 ++-
.../src/main/resources/META-INF/spring-context.xml | 16 ++++++++++++++++
.../src/test/resources/spring-context.xml | 4 ++++
.../src/main/resources/META-INF/spring-context.xml | 2 ++
.../src/test/resources/spring-context.xml | 3 +++
.../src/main/resources/META-INF/spring-context.xml | 2 ++
.../src/test/resources/spring-context.xml | 2 ++
.../src/main/resources/META-INF/spring-context.xml | 4 ++++
17 files changed, 57 insertions(+), 9 deletions(-)
diff --git a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml
index 2444586..8ba1268 100644
--- a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml
+++ b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/test/resources/spring-context.xml
@@ -39,6 +39,8 @@
<bean name="cache#users" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
+ <constructor-arg index="0" value="java.lang.String" />
+ <constructor-arg index="1" value="org.apache.archiva.redback.users.User"/>
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
<property name="maxElementsInMemory" value="1000"/>
diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java
index 900829e..d0c36a8 100644
--- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java
@@ -473,7 +473,7 @@ public class DefaultRoleManagementService
try
{
org.apache.archiva.redback.rbac.Role rbacRole = rbacManager.getRole( roleName );
- rbacRole.setDescription( description );
+ rbacRole.setDescription( description == null ? "" : description);
rbacManager.saveRole( rbacRole );
}
catch ( RbacManagerException e )
diff --git a/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AuthenticationKey.java b/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AuthenticationKey.java
index 241cba0..393b349 100644
--- a/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AuthenticationKey.java
+++ b/redback-keys/redback-keys-api/src/main/java/org/apache/archiva/redback/keys/AuthenticationKey.java
@@ -19,6 +19,7 @@ package org.apache.archiva.redback.keys;
* under the License.
*/
+import java.io.Serializable;
import java.util.Date;
/**
@@ -29,7 +30,7 @@ import java.util.Date;
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
*
*/
-public interface AuthenticationKey
+public interface AuthenticationKey extends Serializable
{
Date getDateCreated();
diff --git a/redback-keys/redback-keys-providers/redback-keys-cached/src/main/resources/META-INF/spring-context.xml b/redback-keys/redback-keys-providers/redback-keys-cached/src/main/resources/META-INF/spring-context.xml
index e81c27d..9876735 100644
--- a/redback-keys/redback-keys-providers/redback-keys-cached/src/main/resources/META-INF/spring-context.xml
+++ b/redback-keys/redback-keys-providers/redback-keys-cached/src/main/resources/META-INF/spring-context.xml
@@ -33,11 +33,13 @@
<bean name="cache#keys" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
+ <constructor-arg index="0" value="java.lang.String" />
+ <constructor-arg index="1" value="org.apache.archiva.redback.keys.AuthenticationKey"/>
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
<property name="maxElementsInMemory" value="1000"/>
<property name="memoryEvictionPolicy" value="LRU"/>
- <property name="name" value="usersCache"/>
+ <property name="name" value="keysCache"/>
<property name="timeToIdleSeconds" value="1800"/>
<property name="timeToLiveSeconds" value="14400"/>
</bean>
diff --git a/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml b/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml
index bae4967..c787844 100644
--- a/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml
+++ b/redback-keys/redback-keys-providers/redback-keys-cached/src/test/resources/spring-context.xml
@@ -39,11 +39,13 @@
<bean name="cache#keys" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
+ <constructor-arg index="0" value="java.lang.String" />
+ <constructor-arg index="1" value="org.apache.archiva.redback.keys.AuthenticationKey"/>
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
<property name="maxElementsInMemory" value="1000"/>
<property name="memoryEvictionPolicy" value="LRU"/>
- <property name="name" value="usersCache"/>
+ <property name="name" value="keysCache"/>
<property name="timeToIdleSeconds" value="1800"/>
<property name="timeToLiveSeconds" value="14400"/>
</bean>
diff --git a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Operation.java b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Operation.java
index 4fa9da8..dd75464 100644
--- a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Operation.java
+++ b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Operation.java
@@ -16,6 +16,8 @@ package org.apache.archiva.redback.rbac;
* limitations under the License.
*/
+import java.io.Serializable;
+
/**
* Operation
*
@@ -27,7 +29,7 @@ package org.apache.archiva.redback.rbac;
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
*
*/
-public interface Operation
+public interface Operation extends Serializable
{
diff --git a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Permission.java b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Permission.java
index f0bcf4b..b080aaa 100644
--- a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Permission.java
+++ b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Permission.java
@@ -16,6 +16,8 @@ package org.apache.archiva.redback.rbac;
* limitations under the License.
*/
+import java.io.Serializable;
+
/**
* Permission
*
@@ -28,7 +30,7 @@ package org.apache.archiva.redback.rbac;
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
*
*/
-public interface Permission
+public interface Permission extends Serializable
{
/**
diff --git a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Resource.java b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Resource.java
index 9ec0876..f1778e2 100644
--- a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Resource.java
+++ b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Resource.java
@@ -16,6 +16,8 @@ package org.apache.archiva.redback.rbac;
* limitations under the License.
*/
+import java.io.Serializable;
+
/**
* Resource
*
@@ -37,7 +39,7 @@ package org.apache.archiva.redback.rbac;
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
*
*/
-public interface Resource
+public interface Resource extends Serializable
{
/**
* Resource identifier refering to all objects.
diff --git a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Role.java b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Role.java
index f389d82..168e8ea 100644
--- a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Role.java
+++ b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/Role.java
@@ -18,6 +18,7 @@ package org.apache.archiva.redback.rbac;
import org.apache.commons.lang3.StringUtils;
+import java.io.Serializable;
import java.util.List;
/**
@@ -36,7 +37,7 @@ import java.util.List;
* @author Martin Stockhammer <ma...@apache.org>
*
*/
-public interface Role
+public interface Role extends Serializable
{
/**
diff --git a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/UserAssignment.java b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/UserAssignment.java
index 5d1b974..314b31e 100644
--- a/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/UserAssignment.java
+++ b/redback-rbac/redback-rbac-model/src/main/java/org/apache/archiva/redback/rbac/UserAssignment.java
@@ -1,5 +1,6 @@
package org.apache.archiva.redback.rbac;
+import java.io.Serializable;
import java.util.List;
/*
@@ -29,7 +30,7 @@ import java.util.List;
*
* TODO expand on javadoc
*/
-public interface UserAssignment
+public interface UserAssignment extends Serializable
{
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/resources/META-INF/spring-context.xml b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/resources/META-INF/spring-context.xml
index 33541b8..2e8db90 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/resources/META-INF/spring-context.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/main/resources/META-INF/spring-context.xml
@@ -33,6 +33,8 @@
<bean name="cache#operations" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
+ <constructor-arg index="0" value="java.lang.String"/>
+ <constructor-arg index="1" value="org.apache.archiva.redback.rbac.Operation" />
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
<property name="maxElementsInMemory" value="1000"/>
@@ -44,6 +46,8 @@
<bean name="cache#permissions" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
+ <constructor-arg index="0" value="java.lang.String"/>
+ <constructor-arg index="1" value="org.apache.archiva.redback.rbac.Permission" />
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
<property name="maxElementsInMemory" value="1000"/>
@@ -55,6 +59,8 @@
<bean name="cache#resources" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
+ <constructor-arg index="0" value="java.lang.String"/>
+ <constructor-arg index="1" value="org.apache.archiva.redback.rbac.Resource" />
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
<property name="maxElementsInMemory" value="1000"/>
@@ -66,6 +72,8 @@
<bean name="cache#roles" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
+ <constructor-arg index="0" value="java.lang.String"/>
+ <constructor-arg index="1" value="org.apache.archiva.redback.rbac.Role" />
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
<property name="maxElementsInMemory" value="1000"/>
@@ -77,6 +85,8 @@
<bean name="cache#rolesById" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
+ <constructor-arg index="0" value="java.lang.String"/>
+ <constructor-arg index="1" value="org.apache.archiva.redback.rbac.Role" />
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
<property name="maxElementsInMemory" value="1000"/>
@@ -88,6 +98,8 @@
<bean name="cache#effectiveRoleSet" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
+ <constructor-arg index="0" value="java.lang.String"/>
+ <constructor-arg index="1" value="java.util.HashSet" />
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
<property name="maxElementsInMemory" value="1000"/>
@@ -103,6 +115,8 @@
<bean name="cache#userAssignments" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
+ <constructor-arg index="0" value="java.lang.String"/>
+ <constructor-arg index="1" value="org.apache.archiva.redback.rbac.UserAssignment" />
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
<property name="maxElementsInMemory" value="1000"/>
@@ -114,6 +128,8 @@
<bean name="cache#userPermissions" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
+ <constructor-arg index="0" value="java.lang.String"/>
+ <constructor-arg index="1" value="java.util.HashMap" />
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
<property name="maxElementsInMemory" value="1000"/>
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
index 6fb402a..c78ea75 100755
--- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/src/test/resources/spring-context.xml
@@ -53,6 +53,8 @@
<bean name="cache#userAssignments" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
+ <constructor-arg index="0" value="java.lang.String"/>
+ <constructor-arg index="1" value="org.apache.archiva.redback.rbac.UserAssignment" />
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
<property name="maxElementsInMemory" value="1000"/>
@@ -64,6 +66,8 @@
<bean name="cache#userPermissions" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
+ <constructor-arg index="0" value="java.lang.String"/>
+ <constructor-arg index="1" value="java.util.HashMap" />
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
<property name="maxElementsInMemory" value="1000"/>
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/resources/META-INF/spring-context.xml b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/resources/META-INF/spring-context.xml
index 731ff22..69397e3 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/resources/META-INF/spring-context.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/main/resources/META-INF/spring-context.xml
@@ -33,6 +33,8 @@
<bean name="cache#ldapRoles" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
+ <constructor-arg index="0" value="java.lang.String"/>
+ <constructor-arg index="1" value="org.apache.archiva.redback.rbac.Role"/>
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
<property name="maxElementsInMemory" value="1000"/>
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml
index ddf426e..2c11821 100755
--- a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/src/test/resources/spring-context.xml
@@ -100,6 +100,9 @@
<bean name="cache#userPermissions" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
+ <constructor-arg index="0" value="java.lang.String"/>
+ <constructor-arg index="1" value="org.apache.archiva.redback.rbac.Permission"/>
+
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
<property name="maxElementsInMemory" value="1000"/>
diff --git a/redback-users/redback-users-providers/redback-users-cached/src/main/resources/META-INF/spring-context.xml b/redback-users/redback-users-providers/redback-users-cached/src/main/resources/META-INF/spring-context.xml
index fce2e30..e5ff62e 100644
--- a/redback-users/redback-users-providers/redback-users-cached/src/main/resources/META-INF/spring-context.xml
+++ b/redback-users/redback-users-providers/redback-users-cached/src/main/resources/META-INF/spring-context.xml
@@ -33,6 +33,8 @@
<bean name="cache#users" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
+ <constructor-arg index="0" value="java.lang.String" />
+ <constructor-arg index="1" value="org.apache.archiva.redback.users.User" />
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
<property name="maxElementsInMemory" value="1000"/>
diff --git a/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml b/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml
index 23ba286..d8b0878 100644
--- a/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml
+++ b/redback-users/redback-users-providers/redback-users-cached/src/test/resources/spring-context.xml
@@ -39,6 +39,8 @@
<bean name="cache#users" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
+ <constructor-arg index="0" value="java.lang.String" />
+ <constructor-arg index="1" value="org.apache.archiva.redback.users.User" />
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
<property name="maxElementsInMemory" value="1000"/>
diff --git a/redback-users/redback-users-providers/redback-users-ldap/src/main/resources/META-INF/spring-context.xml b/redback-users/redback-users-providers/redback-users-ldap/src/main/resources/META-INF/spring-context.xml
index 996107d..d342e32 100644
--- a/redback-users/redback-users-providers/redback-users-ldap/src/main/resources/META-INF/spring-context.xml
+++ b/redback-users/redback-users-providers/redback-users-ldap/src/main/resources/META-INF/spring-context.xml
@@ -34,6 +34,8 @@
<!-- REDBACK-289/MRM-1488 -->
<!-- Cache for LDAP users. Data is refreshed every 3 mins. -->
<bean name="cache#ldapUser" class="org.apache.archiva.components.cache.ehcache.EhcacheCache">
+ <constructor-arg index="0" value="java.lang.String"/>
+ <constructor-arg index="1" value="org.apache.archiva.redback.common.ldap.user.LdapUser"/>
<property name="diskExpiryThreadIntervalSeconds" value="180"/>
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
@@ -47,6 +49,8 @@
<!-- Cache for users' LDAP userDn. Data is refreshed every 3 mins. -->
<bean name="cache#ldapUserDn" class="org.apache.archiva.components.cache.ehcache.EhcacheCache">
+ <constructor-arg index="0" value="java.lang.String"/>
+ <constructor-arg index="1" value="java.lang.String"/>
<property name="diskExpiryThreadIntervalSeconds" value="180"/>
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>