[archiva-redback-core] branch master updated: Reducing compiler warnings

[martin_s]

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 51c9a3e  Reducing compiler warnings
51c9a3e is described below

commit 51c9a3ef425c243920b0ca7f05f66b00fdc97460
Author: Martin Stockhammer 
AuthorDate: Sun Apr 8 15:56:18 2018 +0200

Reducing compiler warnings
---
 pom.xml  |  6 ++
 .../redback/common/ldap/role/DefaultLdapRoleMapper.java  | 12 ++--
 .../org/apache/archiva/redback/keys/jpa/JpaKeyManager.java   |  2 +-
 .../org/apache/archiva/redback/keys/KeyManagerTestCase.java  |  2 +-
 redback-rbac/redback-rbac-model/pom.xml  |  4 ++--
 .../org/apache/archiva/redback/rbac/AbstractRBACManager.java |  2 +-
 6 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index d09bb38..4c6a29c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,6 +74,7 @@
 4.3.10.RELEASE
 1.7.25
 2.8.2
+4.1
 
 UTF-8
 true
@@ -411,6 +412,11 @@
 3.2
   
   
+org.apache.commons
+commons-collections4
+${commons-collections.version}
+  
+  
 commons-codec
 commons-codec
 1.6
diff --git 
a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java
 
b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java
index a8348f9..8cfffc3 100644
--- 
a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java
+++ 
b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/role/DefaultLdapRoleMapper.java
@@ -312,10 +312,10 @@ public class DefaultLdapRoleMapper
 
 if ( uniqueMemberAttr != null )
 {
-NamingEnumeration allMembersEnum = 
(NamingEnumeration) uniqueMemberAttr.getAll();
+NamingEnumeration allMembersEnum = 
uniqueMemberAttr.getAll();
 while ( allMembersEnum.hasMore() )
 {
-String userName = allMembersEnum.next();
+String userName = allMembersEnum.next().toString();
 // uid=blabla we only want bla bla
 userName = StringUtils.substringAfter( userName, "=" );
 userName = StringUtils.substringBefore( userName, "," 
);
@@ -420,11 +420,11 @@ public class DefaultLdapRoleMapper
 
 if ( uniqueMemberAttr != null )
 {
-NamingEnumeration allMembersEnum = 
(NamingEnumeration) uniqueMemberAttr.getAll();
+NamingEnumeration allMembersEnum = 
uniqueMemberAttr.getAll();
 while ( allMembersEnum.hasMore() )
 {
 
-String userName = allMembersEnum.next();
+String userName = allMembersEnum.next().toString();
 //the original dn
 allMembers.add( userName );
 // uid=blabla we only want bla bla
@@ -621,7 +621,7 @@ public class DefaultLdapRoleMapper
 
 namingEnumeration = context.search( "cn=" + groupName + "," + 
getGroupsDn(), filter, searchControls );
 
-while ( namingEnumeration.hasMore() )
+if ( namingEnumeration.hasMore() )
 {
 SearchResult searchResult = namingEnumeration.next();
 Attribute attribute = searchResult.getAttributes().get( 
getLdapGroupMember() );
@@ -692,7 +692,7 @@ public class DefaultLdapRoleMapper
 
 namingEnumeration = context.search( "cn=" + groupName + "," + 
getGroupsDn(), filter, searchControls );
 
-while ( namingEnumeration.hasMore() )
+if ( namingEnumeration.hasMore() )
 {
 SearchResult searchResult = namingEnumeration.next();
 Attribute attribute = searchResult.getAttributes().get( 
getLdapGroupMember() );
diff --git 
a/redback-keys/redback-keys-providers/redback-keys-jpa/src/main/java/org/apache/archiva/redback/keys/jpa/JpaKeyManager.java
 
b/redback-keys/redback-keys-providers/redback-keys-jpa/src/main/java/org/apache/archiva/redback/keys/jpa/JpaKeyManager.java
index 0a934b4..6d2affd 100644
--- 
a/redback-keys/redback-keys-providers/redback-keys-jpa/src/main/java/org/apache/archiva/redback/keys/jpa/JpaKeyManager.java
+++ 
b/redback-keys/redback-keys-providers/redback-keys-jpa/src/main/java/org/apache/archiva/redback/keys/jpa/JpaKeyManager.java
@@ -166,7 +166,7 @@ public class JpaKeyManager extends AbstractKeyManager {
 @Override
 public List getAllKeys() {
 

svn commit: r1828641 - /archiva/parent/pom.xml

[martin_s]

Author: martin_s
Date: Sun Apr  8 14:31:24 2018
New Revision: 1828641

URL: http://svn.apache.org/viewvc?rev=1828641=rev
Log:
Changing enunciate version

Modified:
archiva/parent/pom.xml

Modified: archiva/parent/pom.xml
URL: 
http://svn.apache.org/viewvc/archiva/parent/pom.xml?rev=1828641=1828640=1828641=diff
==
--- archiva/parent/pom.xml (original)
+++ archiva/parent/pom.xml Sun Apr  8 14:31:24 2018
@@ -57,6 +57,7 @@
   
 
   
+UTF-8
 
https://archiva-repository.apache.org/archiva/repository/snapshots
 archiva-repository.snapshots
 
https://archiva-repository.apache.org/archiva/repository/archiva-releases-stage/
@@ -86,7 +87,7 @@
 
 2.3.0
 
-2.9.1
+2.10.1
 false
 
 8

[archiva] branch master updated: Adaption to generics changes in Redback interfaces

[martin_s]

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.git


The following commit(s) were added to refs/heads/master by this push:
 new f59dd27  Adaption to generics changes in Redback interfaces
f59dd27 is described below

commit f59dd279cb743b90873f8c51bd880e2e4f8fe431
Author: Martin Stockhammer 
AuthorDate: Sun Apr 8 18:38:29 2018 +0200

Adaption to generics changes in Redback interfaces
---
 .../archiva/consumers/lucene/test/TestRBACManager.java   |  2 +-
 .../web/security/ArchivaLockedAdminEnvironmentCheck.java |  2 +-
 .../org/apache/archiva/web/security/ArchivaRbacManager.java  | 12 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git 
a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java
 
b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java
index 7c237e2..adcc425 100644
--- 
a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java
+++ 
b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/java/org/apache/archiva/consumers/lucene/test/TestRBACManager.java
@@ -438,7 +438,7 @@ public class TestRBACManager implements RBACManager
 }
 
 @Override
-public Map getAssignedPermissionMap( String 
principal )
+public Map getAssignedPermissionMap( 
String principal )
 throws RbacObjectNotFoundException, RbacManagerException
 {
 return null;  //To change body of implemented methods use File | 
Settings | File Templates.
diff --git 
a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java
 
b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java
index 045e21d..c985f89 100644
--- 
a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java
+++ 
b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaLockedAdminEnvironmentCheck.java
@@ -114,7 +114,7 @@ public class ArchivaLockedAdminEnvironmentCheck
 List roles = new ArrayList<>();
 roles.add( RedbackRoleConstants.SYSTEM_ADMINISTRATOR_ROLE );
 
-List systemAdminstrators;
+List systemAdminstrators;
 try
 {
 systemAdminstrators = 
rbacManager.getUserAssignmentsForRoles( roles );
diff --git 
a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java
 
b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java
index a98dc49..d5b65b8 100644
--- 
a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java
+++ 
b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java
@@ -262,7 +262,7 @@ public class ArchivaRbacManager
 {
 try
 {
-List roles = rbacManager.getAllRoles();
+List roles = rbacManager.getAllRoles();
 for ( Role role : roles )
 {
 allRoles.put( role.getName(), role );
@@ -400,7 +400,7 @@ public class ArchivaRbacManager
 {
 try
 {
-List permissions = rbacManager.getAllPermissions();
+List permissions = 
rbacManager.getAllPermissions();
 for ( Permission p : permissions )
 {
 allPermissions.put( p.getName(), p );
@@ -529,7 +529,7 @@ public class ArchivaRbacManager
 {
 try
 {
-List operations = rbacManager.getAllOperations();
+List operations = 
rbacManager.getAllOperations();
 for ( Operation o : operations )
 {
 allOperations.put( o.getName(), o );
@@ -658,7 +658,7 @@ public class ArchivaRbacManager
 {
 try
 {
-List resources = rbacManager.getAllResources();
+List resources = 
rbacManager.getAllResources();
 for ( Resource r : resources )
 {
 allResources.put( r.getIdentifier(), r );
@@ -846,7 +846,7 @@ public class ArchivaRbacManager
 {
 try
 {
-List userAssignments = 

[archiva-redback-core] branch master updated: Changing some generic interfaces

[martin_s]

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 87e8bba  Changing some generic interfaces
87e8bba is described below

commit 87e8bba27c6aa783a97ff3083cf804f532768145
Author: Martin Stockhammer 
AuthorDate: Sun Apr 8 16:33:30 2018 +0200

Changing some generic interfaces
---
 .../redback/authorization/rbac/RbacAuthorizer.java |   4 +-
 .../redback/management/DataManagementTest.java |   4 +-
 .../security/LockedAdminEnvironmentCheck.java  |   2 +-
 .../services/DefaultRoleManagementService.java |  38 ++---
 .../redback/rest/services/DefaultUserService.java  |   2 +-
 .../archiva/redback/rbac/AbstractRBACManager.java  |  77 ++
 .../apache/archiva/redback/rbac/RBACManager.java   |  36 ++---
 .../java/org/apache/archiva/redback/rbac/Role.java |   2 +-
 .../redback/rbac/cached/CachedRbacManager.java | 162 +++--
 .../archiva/redback/rbac/jpa/JpaRbacManager.java   |  38 +++--
 .../archiva/redback/rbac/jpa/model/JpaRole.java|   5 +-
 .../archiva/redback/rbac/ldap/LdapRbacManager.java | 107 --
 .../role/processor/DefaultRoleModelProcessor.java  |   6 +-
 .../redback/role/AbstractRoleManagerTest.java  |   2 +-
 .../redback/tests/AbstractRbacManagerTestCase.java |  12 +-
 15 files changed, 339 insertions(+), 158 deletions(-)

diff --git 
a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
 
b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
index 33dde90..888c508 100644
--- 
a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
+++ 
b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/src/main/java/org/apache/archiva/redback/authorization/rbac/RbacAuthorizer.java
@@ -87,7 +87,7 @@ public class RbacAuthorizer
 if ( principal != null )
 {
 // Set permissions = manager.getAssignedPermissions( 
principal.toString(), operation );
-Map permissionMap = 
manager.getAssignedPermissionMap( principal );
+Map permissionMap = 
manager.getAssignedPermissionMap( principal );
 
 if ( permissionMap.keySet().contains( operation ) )
 {
@@ -116,7 +116,7 @@ public class RbacAuthorizer
 if ( !guest.isLocked() )
 {
 // Set permissions = manager.getAssignedPermissions( 
principal.toString(), operation );
-Map permissionMap = 
manager.getAssignedPermissionMap( guest.getUsername() );
+Map permissionMap = 
manager.getAssignedPermissionMap( guest.getUsername() );
 
 if ( permissionMap.keySet().contains( operation ) )
 {
diff --git 
a/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java
 
b/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java
index c8920c6..77c44de 100644
--- 
a/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java
+++ 
b/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java
@@ -254,8 +254,8 @@ public class DataManagementTest
 
 dataManagementTool.restoreRBACDatabase( manager, targetDirectory );
 
-List roles = manager.getAllRoles();
-List assignments = manager.getAllUserAssignments();
+List roles = manager.getAllRoles();
+List assignments = 
manager.getAllUserAssignments();
 assertEquals( 4, roles.size() );
 assertEquals( 2, assignments.size() );
 assertEquals( 6, manager.getAllOperations().size() );
diff --git 
a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
 
b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
index 8d05e68..3580637 100644
--- 
a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
+++ 
b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/LockedAdminEnvironmentCheck.java
@@ -76,7 +76,7 @@ public class LockedAdminEnvironmentCheck
 List roles = new ArrayList();
 

[archiva] 01/02: Removing deprecated marker for comparator

[martin_s]

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.git

commit 4175f2c2d7b85e14ef42ec0a40f89014c4ecd537
Author: Martin Stockhammer 
AuthorDate: Sun Apr 8 19:44:58 2018 +0200

Removing deprecated marker for comparator
---
 .../functors/ProxyConnectorConfigurationOrderComparator.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparator.java
 
b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparator.java
index 5643031..05cad4b 100644
--- 
a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparator.java
+++ 
b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorConfigurationOrderComparator.java
@@ -25,7 +25,8 @@ import java.util.Comparator;
 
 /**
  *
- * @deprecated ProxyConnectorConfigurationOrderComparator
+ * Was marked as deprecated before, but is still used.
+ *
  */
 public class ProxyConnectorConfigurationOrderComparator
 implements Comparator

-- 
To stop receiving notification emails like this one, please contact
marti...@apache.org.

[archiva] branch master updated (f59dd27 -> ec8e660)

[martin_s]

This is an automated email from the ASF dual-hosted git repository.

martin_s pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git.


from f59dd27  Adaption to generics changes in Redback interfaces
 new 4175f2c  Removing deprecated marker for comparator
 new ec8e660  Reducing compiler warnings and adapting to redback changes

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../configuration/DefaultArchivaConfiguration.java|  2 +-
 .../ProxyConnectorConfigurationOrderComparator.java   |  3 ++-
 .../functors/ProxyConnectorSelectionPredicate.java|  4 ++--
 .../archiva-consumers/archiva-core-consumers/pom.xml  |  1 -
 .../archiva-consumers/archiva-lucene-consumers/pom.xml|  1 -
 .../archiva/policies/urlcache/DefaultUrlFailureCache.java |  4 ++--
 .../org/apache/archiva/repository/RepositoryRegistry.java | 15 ---
 .../repository/DefaultRepositoryArchivaTaskScheduler.java |  2 +-
 .../archiva/scheduler/repository/RepositoryTaskJob.java   |  1 +
 .../web/security/ArchivaConfigurableUsersManager.java | 12 ++--
 10 files changed, 27 insertions(+), 18 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
marti...@apache.org.

[archiva] 02/02: Reducing compiler warnings and adapting to redback changes

[martin_s]

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.git

commit ec8e6600cee1af3952cabed8cba85631d5cfcdf9
Author: Martin Stockhammer 
AuthorDate: Sun Apr 8 21:06:49 2018 +0200

Reducing compiler warnings and adapting to redback changes
---
 .../configuration/DefaultArchivaConfiguration.java|  2 +-
 .../functors/ProxyConnectorSelectionPredicate.java|  4 ++--
 .../archiva-consumers/archiva-core-consumers/pom.xml  |  1 -
 .../archiva-consumers/archiva-lucene-consumers/pom.xml|  1 -
 .../archiva/policies/urlcache/DefaultUrlFailureCache.java |  4 ++--
 .../org/apache/archiva/repository/RepositoryRegistry.java | 15 ---
 .../repository/DefaultRepositoryArchivaTaskScheduler.java |  2 +-
 .../archiva/scheduler/repository/RepositoryTaskJob.java   |  1 +
 .../web/security/ArchivaConfigurableUsersManager.java | 12 ++--
 9 files changed, 25 insertions(+), 17 deletions(-)

diff --git 
a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
 
b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
index c19d12f..86e96a5 100644
--- 
a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
+++ 
b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
@@ -98,7 +98,7 @@ import java.util.Set;
 public class DefaultArchivaConfiguration
 implements ArchivaConfiguration, RegistryListener
 {
-private Logger log = LoggerFactory.getLogger( 
DefaultArchivaConfiguration.class );
+private final Logger log = LoggerFactory.getLogger( 
DefaultArchivaConfiguration.class );
 
 private static String FILE_ENCODING = "UTF-8";
 
diff --git 
a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorSelectionPredicate.java
 
b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorSelectionPredicate.java
index 209f75a..535db81 100644
--- 
a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorSelectionPredicate.java
+++ 
b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/functors/ProxyConnectorSelectionPredicate.java
@@ -46,9 +46,9 @@ public class ProxyConnectorSelectionPredicate
 {
 boolean satisfies = false;
 
-if ( object instanceof ProxyConnectorConfiguration )
+if ( object != null )
 {
-ProxyConnectorConfiguration connector = 
(ProxyConnectorConfiguration) object;
+ProxyConnectorConfiguration connector = object;
 return ( StringUtils.equals( sourceId, connector.getSourceRepoId() 
) && StringUtils.equals( targetId,

 connector.getTargetRepoId() ) );
 }
diff --git 
a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml 
b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
index d5dc6f5..277bd2a 100644
--- 
a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
+++ 
b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
@@ -212,7 +212,6 @@
 
   javax.annotation,
   javax.inject,
-  org.apache.archiva.admin.model*;version=${project.version},
   org.apache.archiva.checksum;version=${project.version},
   org.apache.archiva.common.utils;version=${project.version},
   org.apache.archiva.configuration;version=${project.version},
diff --git 
a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
 
b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
index bb489a2..1052ad8 100644
--- 
a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
+++ 
b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
@@ -157,7 +157,6 @@
 
   javax.annotation,
   javax.inject,
-  org.apache.archiva.admin.model*;version=${project.version},
   
org.apache.archiva.common.plexusbridge;version=${project.version},
   org.apache.archiva.configuration;version=${project.version},
   org.apache.archiva.consumers;version=${project.version},
diff --git 
a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/DefaultUrlFailureCache.java
 

[archiva-redback-core] 02/02: Reducing other compiler warnings and changing generics usage

[martin_s]

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 5332c5926e27504b03cd64821f98ba41830b1c15
Author: Martin Stockhammer 
AuthorDate: Sun Apr 8 20:13:07 2018 +0200

Reducing other compiler warnings and changing generics usage
---
 .../integration/mail/VelocityMailGenerator.java| 13 +++-
 .../services/DefaultLdapGroupMappingService.java   | 16 --
 .../redback/rest/services/DefaultUserService.java  | 35 +-
 .../rest/services/mock/MockUserConfiguration.java  |  3 +-
 .../redback/keys/cached/CachedKeyManagerTest.java  |  2 +-
 .../redback/users/cached/CachedUserManager.java| 12 
 .../users/cached/CachedUserManagerTest.java|  2 +-
 7 files changed, 35 insertions(+), 48 deletions(-)

diff --git 
a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java
 
b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java
index 7d46074..9bb5840 100644
--- 
a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java
+++ 
b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/VelocityMailGenerator.java
@@ -48,6 +48,8 @@ public class VelocityMailGenerator
 {
 private Logger log = LoggerFactory.getLogger( VelocityMailGenerator.class 
);
 
+public static final String DEFAULT_ENCODING = "UTF-8";
+
 @Inject
 @Named(value = "userConfiguration#default")
 private UserConfiguration config;
@@ -57,6 +59,15 @@ public class VelocityMailGenerator
 @Named(value = "velocityEngine#redback")
 private VelocityEngine velocityEngine;
 
+private String encoding;
+
+private String getEncoding() {
+if (this.encoding==null) {
+this.encoding = config.getString( "mail.encoding", 
DEFAULT_ENCODING );
+}
+return this.encoding;
+}
+
 public String generateMail( String templateName, AuthenticationKey 
authkey, String baseUrl )
 {
 VelocityContext context = createVelocityContext( authkey, baseUrl );
@@ -68,7 +79,7 @@ public class VelocityMailGenerator
 
 try
 {
-velocityEngine.mergeTemplate( templateFile, context, writer );
+velocityEngine.mergeTemplate( templateFile, getEncoding(), 
context, writer );
 }
 catch ( ResourceNotFoundException e )
 {
diff --git 
a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultLdapGroupMappingService.java
 
b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultLdapGroupMappingService.java
index 319bd53..0fd8577 100644
--- 
a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultLdapGroupMappingService.java
+++ 
b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultLdapGroupMappingService.java
@@ -19,7 +19,6 @@ package org.apache.archiva.redback.rest.services;
  */
 
 import org.apache.archiva.redback.common.ldap.MappingException;
-import org.apache.archiva.redback.common.ldap.connection.DefaultLdapConnection;
 import org.apache.archiva.redback.common.ldap.connection.LdapConnection;
 import org.apache.archiva.redback.common.ldap.connection.LdapConnectionFactory;
 import org.apache.archiva.redback.common.ldap.connection.LdapException;
@@ -51,7 +50,7 @@ import java.util.Map;
 public class DefaultLdapGroupMappingService
 implements LdapGroupMappingService
 {
-private Logger log = LoggerFactory.getLogger( getClass() );
+private final Logger log = LoggerFactory.getLogger( getClass() );
 
 @Inject
 @Named(value = "ldapRoleMapper#default")
@@ -78,12 +77,7 @@ public class DefaultLdapGroupMappingService
 context = ldapConnection.getDirContext();
 return new StringList( ldapRoleMapper.getAllGroups( context ) );
 }
-catch ( LdapException e )
-{
-log.error( e.getMessage(), e );
-throw new RedbackServiceException( e.getMessage() );
-}
-catch ( MappingException e )
+catch ( LdapException | MappingException e )
 {
 log.error( e.getMessage(), e );
 throw new RedbackServiceException( e.getMessage() );
@@ -101,7 +95,7 @@ public class DefaultLdapGroupMappingService
 try
 {
 Map map = 
ldapRoleMapperConfiguration.getLdapGroupMappings();
-List ldapGroupMappings = new 
ArrayList( map.size() );
+List ldapGroupMappings = 

[archiva-redback-core] branch master updated (87e8bba -> 5332c59)

[martin_s]

This is an automated email from the ASF dual-hosted git repository.

martin_s pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-core.git.


from 87e8bba  Changing some generic interfaces
 new 70b9c04  Reducing compiler warnings and modifying generic interfaces
 new 5332c59  Reducing other compiler warnings and changing generics usage

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../redback/management/DataManagementTest.java |  4 +-
 .../integration/mail/VelocityMailGenerator.java| 13 -
 .../services/DefaultLdapGroupMappingService.java   | 16 ++-
 .../redback/rest/services/DefaultUserService.java  | 37 ---
 .../rest/services/mock/MockUserConfiguration.java  |  3 +-
 .../redback/keys/cached/CachedKeyManager.java  | 13 +++--
 .../redback/keys/cached/CachedKeyManagerTest.java  |  2 +-
 .../apache/archiva/redback/users/UserManager.java  | 12 ++---
 .../redback/users/cached/CachedUserManager.java| 55 +-
 .../users/cached/CachedUserManagerTest.java|  2 +-
 .../configurable/ConfigurableUserManager.java  | 32 ++---
 .../archiva/redback/users/jpa/JpaUserManager.java  | 51 +++-
 .../redback/users/jpa/JpaUserManagerTest.java  | 24 --
 .../users/ldap/ctl/DefaultLdapController.java  | 49 ++-
 .../redback/users/ldap/LdapUserManagerTest.java|  4 +-
 .../provider/test/AbstractUserManagerTestCase.java |  2 +-
 16 files changed, 168 insertions(+), 151 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
marti...@apache.org.

[archiva-redback-core] 01/02: Reducing compiler warnings and modifying generic interfaces

[martin_s]

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 70b9c04294a33a3eee13722cea935e19ecd7ff72
Author: Martin Stockhammer 
AuthorDate: Sun Apr 8 19:29:27 2018 +0200

Reducing compiler warnings and modifying generic interfaces
---
 .../redback/management/DataManagementTest.java |  4 +-
 .../redback/rest/services/DefaultUserService.java  |  2 +-
 .../redback/keys/cached/CachedKeyManager.java  | 13 +++---
 .../apache/archiva/redback/users/UserManager.java  | 12 ++---
 .../redback/users/cached/CachedUserManager.java| 43 +++---
 .../configurable/ConfigurableUserManager.java  | 32 +++---
 .../archiva/redback/users/jpa/JpaUserManager.java  | 51 --
 .../redback/users/jpa/JpaUserManagerTest.java  | 24 --
 .../users/ldap/ctl/DefaultLdapController.java  | 49 ++---
 .../redback/users/ldap/LdapUserManagerTest.java|  4 +-
 .../provider/test/AbstractUserManagerTestCase.java |  2 +-
 11 files changed, 133 insertions(+), 103 deletions(-)

diff --git 
a/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java
 
b/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java
index 77c44de..08bee69 100644
--- 
a/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java
+++ 
b/redback-data-management/src/test/java/org/apache/archiva/redback/management/DataManagementTest.java
@@ -337,7 +337,7 @@ public class DataManagementTest
 
 dataManagementTool.restoreUsersDatabase( manager, targetDirectory );
 
-List users = manager.getUsers();
+List users = manager.getUsers();
 assertEquals( 3, users.size() );
 
 User user = users.get( 0 );
@@ -371,7 +371,7 @@ public class DataManagementTest
 private void assertEmpty( UserManager manager )
 throws UserManagerException
 {
-List users = manager.getUsers();
+List users = manager.getUsers();
 assertEquals( 0, users.size() );
 }
 
diff --git 
a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
 
b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
index 8759da4..687602a 100644
--- 
a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
+++ 
b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java
@@ -283,7 +283,7 @@ public class DefaultUserService
 {
 try
 {
-List users = 
userManager.getUsers();
+List users = 
userManager.getUsers();
 List simpleUsers = new ArrayList( users.size() );
 
 for ( org.apache.archiva.redback.users.User user : users )
diff --git 
a/redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/apache/archiva/redback/keys/cached/CachedKeyManager.java
 
b/redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/apache/archiva/redback/keys/cached/CachedKeyManager.java
index 0d32c9b..b21d80a 100644
--- 
a/redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/apache/archiva/redback/keys/cached/CachedKeyManager.java
+++ 
b/redback-keys/redback-keys-providers/redback-keys-cached/src/main/java/org/apache/archiva/redback/keys/cached/CachedKeyManager.java
@@ -19,11 +19,6 @@ package org.apache.archiva.redback.keys.cached;
  * under the License.
  */
 
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
 import org.apache.archiva.redback.components.cache.Cache;
 import org.apache.archiva.redback.keys.AbstractKeyManager;
 import org.apache.archiva.redback.keys.AuthenticationKey;
@@ -32,6 +27,10 @@ import org.apache.archiva.redback.keys.KeyManagerException;
 import org.apache.archiva.redback.keys.KeyNotFoundException;
 import org.springframework.stereotype.Service;
 
+import javax.inject.Inject;
+import javax.inject.Named;
+import java.util.List;
+
 /**
  * CachedKeyManager
  *
@@ -94,7 +93,7 @@ public class CachedKeyManager
 }
 
 public AuthenticationKey findKey( String key )
-throws KeyNotFoundException, KeyManagerException
+throws KeyManagerException
 {
 try
 {
@@ -146,7 +145,7 @@ public class CachedKeyManager
 return keysCache;
 }
 
-public void setKeysCache( Cache keysCache )
+public void setKeysCache( Cache keysCache )
 {
 this.keysCache = keysCache;
 }
diff --git