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 2018/04/08 18:48:28 UTC
[archiva-redback-core] 02/02: Reducing other compiler warnings and
changing generics usage
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 <ma...@apache.org>
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<String, Collection<String>> map = ldapRoleMapperConfiguration.getLdapGroupMappings();
- List<LdapGroupMapping> ldapGroupMappings = new ArrayList<LdapGroupMapping>( map.size() );
+ List<LdapGroupMapping> ldapGroupMappings = new ArrayList<>( map.size( ) );
for ( Map.Entry<String, Collection<String>> entry : map.entrySet() )
{
LdapGroupMapping ldapGroupMapping = new LdapGroupMapping( entry.getKey(), entry.getValue() );
@@ -123,7 +117,7 @@ public class DefaultLdapGroupMappingService
try
{
ldapRoleMapperConfiguration.addLdapMapping( ldapGroupMapping.getGroup(),
- new ArrayList( ldapGroupMapping.getRoleNames() ) );
+ new ArrayList<>( ldapGroupMapping.getRoleNames() ) );
}
catch ( MappingException e )
{
@@ -156,7 +150,7 @@ public class DefaultLdapGroupMappingService
for ( LdapGroupMapping ldapGroupMapping : ldapGroupMappingUpdateRequest.getLdapGroupMapping() )
{
ldapRoleMapperConfiguration.updateLdapMapping( ldapGroupMapping.getGroup(),
- new ArrayList( ldapGroupMapping.getRoleNames() ) );
+ new ArrayList<>( ldapGroupMapping.getRoleNames() ) );
}
}
catch ( MappingException e )
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 687602a..73b0fb9 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
@@ -100,21 +100,21 @@ public class DefaultUserService
*/
@Inject
@Named( value = "cache#userAssignments" )
- private Cache userAssignmentsCache;
+ private Cache<String, ? extends UserAssignment> userAssignmentsCache;
/**
* cache used for user permissions
*/
@Inject
@Named( value = "cache#userPermissions" )
- private Cache userPermissionsCache;
+ private Cache<String, ? extends Permission> userPermissionsCache;
/**
* Cache used for users
*/
@Inject
@Named( value = "cache#users" )
- private Cache usersCache;
+ private Cache<String, ? extends User> usersCache;
@Inject
private Mailer mailer;
@@ -284,7 +284,7 @@ public class DefaultUserService
try
{
List<? extends org.apache.archiva.redback.users.User> users = userManager.getUsers();
- List<User> simpleUsers = new ArrayList<User>( users.size() );
+ List<User> simpleUsers = new ArrayList<>( users.size( ) );
for ( org.apache.archiva.redback.users.User user : users )
{
@@ -457,14 +457,8 @@ public class DefaultUserService
roleManager.assignRole( config.getString( UserConfigurationKeys.DEFAULT_GUEST ), user.getUsername() );
return getSimpleUser( user );
}
- catch ( RoleManagerException e )
- {
- log.error( e.getMessage(), e );
- throw new RedbackServiceException( e.getMessage() );
- }
- catch ( UserNotFoundException e )
+ catch ( RoleManagerException | UserNotFoundException e )
{
- // olamy I wonder how this can happen :-)
log.error( e.getMessage(), e );
throw new RedbackServiceException( e.getMessage() );
}
@@ -753,7 +747,7 @@ public class DefaultUserService
return Boolean.TRUE;
}
- catch ( MustChangePasswordException e )
+ catch ( MustChangePasswordException | AccountLockedException | AuthenticationException e )
{
throw new RedbackServiceException( e.getMessage(), Response.Status.FORBIDDEN.getStatusCode() );
}
@@ -772,14 +766,6 @@ public class DefaultUserService
throw new RedbackServiceException( new ErrorMessage( "cannot.find.user", new String[]{ principal } ) );
}
- catch ( AccountLockedException e )
- {
- throw new RedbackServiceException( e.getMessage(), Response.Status.FORBIDDEN.getStatusCode() );
- }
- catch ( AuthenticationException e )
- {
- throw new RedbackServiceException( e.getMessage(), Response.Status.FORBIDDEN.getStatusCode() );
- }
catch ( UserManagerException e )
{
throw new RedbackServiceException( new ErrorMessage( e.getMessage() ) );
@@ -824,7 +810,7 @@ public class DefaultUserService
throws RedbackServiceException
{
Collection<Permission> permissions = getUserPermissions( userName );
- List<Operation> operations = new ArrayList<Operation>( permissions.size() );
+ List<Operation> operations = new ArrayList<>( permissions.size( ) );
for ( Permission permission : permissions )
{
if ( permission.getOperation() != null )
@@ -845,7 +831,7 @@ public class DefaultUserService
Set<? extends org.apache.archiva.redback.rbac.Permission> permissions =
rbacManager.getAssignedPermissions( userName );
// FIXME return guest permissions !!
- List<Permission> userPermissions = new ArrayList<Permission>( permissions.size() );
+ List<Permission> userPermissions = new ArrayList<>( permissions.size( ) );
for ( org.apache.archiva.redback.rbac.Permission p : permissions )
{
Permission permission = new Permission();
@@ -870,11 +856,6 @@ public class DefaultUserService
}
return userPermissions;
}
- catch ( RbacObjectNotFoundException e )
- {
- log.error( e.getMessage(), e );
- throw new RedbackServiceException( e.getMessage() );
- }
catch ( RbacManagerException e )
{
log.error( e.getMessage(), e );
diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/mock/MockUserConfiguration.java b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/mock/MockUserConfiguration.java
index 69a3a83..461c495 100644
--- a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/mock/MockUserConfiguration.java
+++ b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/mock/MockUserConfiguration.java
@@ -34,7 +34,7 @@ import java.util.Map;
*/
public class MockUserConfiguration implements UserConfiguration {
- private Map<String, Object> values = new java.util.HashMap<String,Object>();
+ private Map<String, Object> values = new java.util.HashMap<>( );
@SuppressWarnings("SameParameterValue")
public void addValue(String key, String value) {
@@ -92,6 +92,7 @@ public class MockUserConfiguration implements UserConfiguration {
}
}
+ @SuppressWarnings( "unchecked" )
@Override
public List<String> getList(String key) {
Object value = values.get(key);
diff --git a/redback-keys/redback-keys-providers/redback-keys-cached/src/test/java/org/apache/archiva/redback/keys/cached/CachedKeyManagerTest.java b/redback-keys/redback-keys-providers/redback-keys-cached/src/test/java/org/apache/archiva/redback/keys/cached/CachedKeyManagerTest.java
index d323931..7624cb6 100644
--- a/redback-keys/redback-keys-providers/redback-keys-cached/src/test/java/org/apache/archiva/redback/keys/cached/CachedKeyManagerTest.java
+++ b/redback-keys/redback-keys-providers/redback-keys-cached/src/test/java/org/apache/archiva/redback/keys/cached/CachedKeyManagerTest.java
@@ -55,7 +55,7 @@ public class CachedKeyManagerTest
protected void tearDown()
throws Exception
{
- CacheManager.getInstance().removalAll();
+ CacheManager.getInstance().removeAllCaches();
super.tearDown();
}
}
diff --git a/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java b/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java
index 37727b7..506bdb9 100644
--- a/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java
+++ b/redback-users/redback-users-providers/redback-users-cached/src/main/java/org/apache/archiva/redback/users/cached/CachedUserManager.java
@@ -44,7 +44,7 @@ public class CachedUserManager
implements UserManager, UserManagerListener
{
- private Logger log = LoggerFactory.getLogger( getClass() );
+ private final Logger log = LoggerFactory.getLogger( getClass() );
@Inject
@Named(value = "userManager#default")
@@ -271,7 +271,7 @@ public class CachedUserManager
@Override
public void userManagerInit( boolean freshDatabase )
{
- if ( userImpl instanceof UserManager )
+ if ( userImpl != null )
{
( (UserManagerListener) this.userImpl ).userManagerInit( freshDatabase );
}
@@ -282,7 +282,7 @@ public class CachedUserManager
@Override
public void userManagerUserAdded( User user )
{
- if ( userImpl instanceof UserManager )
+ if ( userImpl != null )
{
( (UserManagerListener) this.userImpl ).userManagerUserAdded( user );
}
@@ -296,7 +296,7 @@ public class CachedUserManager
@Override
public void userManagerUserRemoved( User user )
{
- if ( userImpl instanceof UserManager )
+ if ( userImpl != null )
{
( (UserManagerListener) this.userImpl ).userManagerUserRemoved( user );
}
@@ -310,7 +310,7 @@ public class CachedUserManager
@Override
public void userManagerUserUpdated( User user )
{
- if ( userImpl instanceof UserManager )
+ if ( userImpl != null )
{
( (UserManagerListener) this.userImpl ).userManagerUserUpdated( user );
}
@@ -336,7 +336,7 @@ public class CachedUserManager
return usersCache;
}
- public void setUsersCache( Cache usersCache )
+ public void setUsersCache( Cache<String, User> usersCache )
{
this.usersCache = usersCache;
}
diff --git a/redback-users/redback-users-providers/redback-users-cached/src/test/java/org/apache/archiva/redback/users/cached/CachedUserManagerTest.java b/redback-users/redback-users-providers/redback-users-cached/src/test/java/org/apache/archiva/redback/users/cached/CachedUserManagerTest.java
index 24d44ab..0ea7c41 100644
--- a/redback-users/redback-users-providers/redback-users-cached/src/test/java/org/apache/archiva/redback/users/cached/CachedUserManagerTest.java
+++ b/redback-users/redback-users-providers/redback-users-cached/src/test/java/org/apache/archiva/redback/users/cached/CachedUserManagerTest.java
@@ -66,6 +66,6 @@ public class CachedUserManagerTest
@AfterClass
public static void cleanCache()
{
- CacheManager.getInstance().removalAll();
+ CacheManager.getInstance().removeAllCaches();
}
}
--
To stop receiving notification emails like this one, please contact
martin_s@apache.org.