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 b12d79f29d28d1c87acc0a94ae33b3ff937becfb Author: Martin Stockhammer <[email protected]> AuthorDate: Fri Jan 17 16:39:44 2020 +0100 Optimizing imports --- .../checks/security/GuestUserEnvironmentCheck.java | 7 ++-- .../security/RequiredRolesEnvironmentCheck.java | 7 ++-- .../AbstractHttpAuthenticationFilter.java | 4 +-- .../filter/authentication/HttpAuthenticator.java | 11 +++---- .../basic/HttpBasicAuthentication.java | 19 ++++++----- .../digest/HttpDigestAuthentication.java | 12 +++---- .../authentication/digest/HttpDigestHeader.java | 2 +- .../authorization/SimpleAuthorizationFilter.java | 2 +- .../redback/integration/mail/MailerImpl.java | 27 ++++++++-------- .../integration/model/EditUserCredentials.java | 2 +- .../redback/integration/model/UserCredentials.java | 1 - .../redback/integration/util/AutoLoginCookies.java | 10 +++--- .../redback/integration/util/OperationSorter.java | 4 +-- .../redback/integration/util/PermissionSorter.java | 4 +-- .../redback/integration/util/ResourceSorter.java | 4 +-- .../redback/integration/util/RoleSorter.java | 4 +-- .../integration/util/TemplatedRoleSorter.java | 4 +-- .../redback/integration/util/UserComparator.java | 4 +-- .../archiva/redback/integration/HttpUtilsTest.java | 4 +-- .../integration/mail/MockJavaMailSender.java | 9 +++--- .../redback/rest/api/model/LdapGroupMapping.java | 1 - .../rest/api/services/LdapGroupMappingService.java | 1 - .../redback/rest/services/DefaultLoginService.java | 2 -- .../rest/services/DefaultPasswordService.java | 16 +++++----- .../services/DefaultRoleManagementService.java | 20 ++++++------ .../redback/rest/services/DefaultUserService.java | 2 +- .../redback/rest/services/DefaultUtilServices.java | 4 +-- .../services/interceptors/AbstractInterceptor.java | 2 -- .../interceptors/DebugJAXRSInInterceptor.java | 37 ---------------------- .../interceptors/PermissionsInterceptor.java | 3 -- .../interceptors/RequestValidationInterceptor.java | 4 --- .../interceptors/ThreadLocalUserCleaner.java | 2 +- .../rest/services/utils/PasswordValidator.java | 10 +++--- .../rest/services/FakeCreateAdminServiceImpl.java | 4 +-- .../redback/rest/services/UserServiceTest.java | 1 - .../src/test/resources/META-INF/spring-context.xml | 1 - 36 files changed, 95 insertions(+), 156 deletions(-) diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/GuestUserEnvironmentCheck.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/GuestUserEnvironmentCheck.java index 9958dbf..d077a68 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/GuestUserEnvironmentCheck.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/GuestUserEnvironmentCheck.java @@ -22,14 +22,13 @@ package org.apache.archiva.redback.integration.checks.security; import org.apache.archiva.redback.configuration.UserConfiguration; import org.apache.archiva.redback.configuration.UserConfigurationKeys; import org.apache.archiva.redback.policy.UserSecurityPolicy; -import org.apache.archiva.redback.role.RoleManagerException; -import org.apache.archiva.redback.users.User; -import org.apache.archiva.redback.users.UserManagerException; -import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.role.RoleManager; +import org.apache.archiva.redback.role.RoleManagerException; import org.apache.archiva.redback.system.SecuritySystem; import org.apache.archiva.redback.system.check.EnvironmentCheck; +import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.UserManager; +import org.apache.archiva.redback.users.UserManagerException; import org.springframework.stereotype.Service; import javax.inject.Inject; diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/RequiredRolesEnvironmentCheck.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/RequiredRolesEnvironmentCheck.java index bd52093..16bf050 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/RequiredRolesEnvironmentCheck.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/checks/security/RequiredRolesEnvironmentCheck.java @@ -19,10 +19,6 @@ package org.apache.archiva.redback.integration.checks.security; * under the License. */ -import java.util.List; - -import javax.inject.Inject; - import org.apache.archiva.redback.role.RoleManager; import org.apache.archiva.redback.role.RoleManagerException; import org.apache.archiva.redback.system.check.EnvironmentCheck; @@ -30,6 +26,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import javax.inject.Inject; +import java.util.List; + /** * RequiredRolesEnvironmentCheck: this environment check will check that the * required roles of the redback-xwork-integration artifact exist to be diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/AbstractHttpAuthenticationFilter.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/AbstractHttpAuthenticationFilter.java index 2a4bea8..4d66965 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/AbstractHttpAuthenticationFilter.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/AbstractHttpAuthenticationFilter.java @@ -19,11 +19,11 @@ package org.apache.archiva.redback.integration.filter.authentication; * under the License. */ +import org.apache.archiva.redback.integration.filter.SpringServletFilter; + import javax.servlet.FilterConfig; import javax.servlet.ServletException; -import org.apache.archiva.redback.integration.filter.SpringServletFilter; - /** * AbstractHttpAuthenticationFilter * diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/HttpAuthenticator.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/HttpAuthenticator.java index 7371699..f2e34ec 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/HttpAuthenticator.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/HttpAuthenticator.java @@ -19,18 +19,17 @@ package org.apache.archiva.redback.integration.filter.authentication; * under the License. */ -import org.apache.archiva.redback.authentication.AuthenticationException; -import org.apache.archiva.redback.policy.MustChangePasswordException; -import org.apache.archiva.redback.users.User; -import org.apache.archiva.redback.users.UserManagerException; -import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.authentication.AuthenticationDataSource; +import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.policy.AccountLockedException; +import org.apache.archiva.redback.policy.MustChangePasswordException; import org.apache.archiva.redback.system.SecuritySession; import org.apache.archiva.redback.system.SecuritySystem; import org.apache.archiva.redback.system.SecuritySystemConstants; -import org.apache.commons.lang3.StringUtils; +import org.apache.archiva.redback.users.User; +import org.apache.archiva.redback.users.UserManagerException; +import org.apache.archiva.redback.users.UserNotFoundException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/basic/HttpBasicAuthentication.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/basic/HttpBasicAuthentication.java index a1c9ff1..ab4060b 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/basic/HttpBasicAuthentication.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/basic/HttpBasicAuthentication.java @@ -19,23 +19,22 @@ package org.apache.archiva.redback.integration.filter.authentication.basic; * under the License. */ -import java.io.IOException; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - import org.apache.archiva.redback.authentication.AuthenticationException; -import org.apache.archiva.redback.policy.AccountLockedException; -import org.apache.archiva.redback.policy.MustChangePasswordException; -import org.apache.commons.codec.binary.Base64; import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource; -import org.apache.archiva.redback.system.SecuritySession; import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator; +import org.apache.archiva.redback.policy.AccountLockedException; +import org.apache.archiva.redback.policy.MustChangePasswordException; +import org.apache.archiva.redback.system.SecuritySession; +import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import java.io.IOException; + /** * HttpBasicAuthentication * diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthentication.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthentication.java index e784137..e2a59aa 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthentication.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestAuthentication.java @@ -20,17 +20,17 @@ package org.apache.archiva.redback.integration.filter.authentication.digest; */ import org.apache.archiva.redback.authentication.AuthenticationException; -import org.apache.archiva.redback.policy.MustChangePasswordException; -import org.apache.archiva.redback.users.User; -import org.apache.archiva.redback.users.UserManagerException; -import org.apache.commons.codec.binary.Base64; import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.authentication.TokenBasedAuthenticationDataSource; +import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticationException; +import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator; import org.apache.archiva.redback.policy.AccountLockedException; +import org.apache.archiva.redback.policy.MustChangePasswordException; +import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.UserManager; +import org.apache.archiva.redback.users.UserManagerException; import org.apache.archiva.redback.users.UserNotFoundException; -import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticationException; -import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator; +import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestHeader.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestHeader.java index 1e7082e..d941117 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestHeader.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authentication/digest/HttpDigestHeader.java @@ -20,9 +20,9 @@ package org.apache.archiva.redback.integration.filter.authentication.digest; */ -import org.apache.commons.codec.binary.Base64; import org.apache.archiva.redback.integration.HttpUtils; import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticationException; +import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authorization/SimpleAuthorizationFilter.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authorization/SimpleAuthorizationFilter.java index 40e772c..93d91bb 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authorization/SimpleAuthorizationFilter.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/filter/authorization/SimpleAuthorizationFilter.java @@ -20,9 +20,9 @@ package org.apache.archiva.redback.integration.filter.authorization; */ import org.apache.archiva.redback.authorization.AuthorizationException; +import org.apache.archiva.redback.integration.filter.SpringServletFilter; import org.apache.archiva.redback.system.SecuritySession; import org.apache.archiva.redback.system.SecuritySystem; -import org.apache.archiva.redback.integration.filter.SpringServletFilter; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java index 754edce..81f25d2 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/mail/MailerImpl.java @@ -19,20 +19,6 @@ package org.apache.archiva.redback.integration.mail; * under the License. */ -import java.io.UnsupportedEncodingException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import javax.inject.Inject; -import javax.inject.Named; -import javax.mail.Address; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.internet.AddressException; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeMessage; - import org.apache.archiva.redback.configuration.UserConfiguration; import org.apache.archiva.redback.configuration.UserConfigurationKeys; import org.apache.archiva.redback.keys.AuthenticationKey; @@ -45,6 +31,19 @@ import org.slf4j.LoggerFactory; import org.springframework.mail.javamail.JavaMailSender; import org.springframework.stereotype.Service; +import javax.inject.Inject; +import javax.inject.Named; +import javax.mail.Address; +import javax.mail.Message; +import javax.mail.MessagingException; +import javax.mail.internet.AddressException; +import javax.mail.internet.InternetAddress; +import javax.mail.internet.MimeMessage; +import java.io.UnsupportedEncodingException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + /** * Mailer * diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/EditUserCredentials.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/EditUserCredentials.java index 8f71c80..addfa95 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/EditUserCredentials.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/EditUserCredentials.java @@ -19,8 +19,8 @@ package org.apache.archiva.redback.integration.model; * under the License. */ -import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.integration.util.DateUtils; +import org.apache.archiva.redback.users.User; /** * EditUserCredentials diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/UserCredentials.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/UserCredentials.java index c43eaec..24fe3ff 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/UserCredentials.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/model/UserCredentials.java @@ -24,7 +24,6 @@ import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManagerException; import org.apache.commons.lang3.StringUtils; - import java.io.Serializable; /** diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/AutoLoginCookies.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/AutoLoginCookies.java index fe559aa..94095e4 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/AutoLoginCookies.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/AutoLoginCookies.java @@ -19,11 +19,6 @@ package org.apache.archiva.redback.integration.util; * under the License. */ -import javax.annotation.Resource; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.apache.archiva.redback.keys.AuthenticationKey; import org.apache.archiva.redback.keys.KeyManager; import org.apache.archiva.redback.keys.KeyManagerException; @@ -35,6 +30,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * AutoLoginCookies * diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/OperationSorter.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/OperationSorter.java index 6708c59..a4cc20c 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/OperationSorter.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/OperationSorter.java @@ -19,10 +19,10 @@ package org.apache.archiva.redback.integration.util; * under the License. */ -import java.util.Comparator; - import org.apache.archiva.redback.rbac.Operation; +import java.util.Comparator; + /** * OperationSorter * diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/PermissionSorter.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/PermissionSorter.java index cb8dc16..6b882e4 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/PermissionSorter.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/PermissionSorter.java @@ -19,10 +19,10 @@ package org.apache.archiva.redback.integration.util; * under the License. */ -import java.util.Comparator; - import org.apache.archiva.redback.rbac.Permission; +import java.util.Comparator; + /** * PermissionSorter * diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/ResourceSorter.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/ResourceSorter.java index 260e1b1..c2f898c 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/ResourceSorter.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/ResourceSorter.java @@ -19,10 +19,10 @@ package org.apache.archiva.redback.integration.util; * under the License. */ -import java.util.Comparator; - import org.apache.archiva.redback.rbac.Resource; +import java.util.Comparator; + /** * ResourceSorter * diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/RoleSorter.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/RoleSorter.java index 4807cdb..aa0a899 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/RoleSorter.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/RoleSorter.java @@ -19,10 +19,10 @@ package org.apache.archiva.redback.integration.util; * under the License. */ -import java.util.Comparator; - import org.apache.archiva.redback.rbac.Role; +import java.util.Comparator; + /** * RoleSorter * diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/TemplatedRoleSorter.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/TemplatedRoleSorter.java index 603e2f2..1b8ffa1 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/TemplatedRoleSorter.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/TemplatedRoleSorter.java @@ -19,10 +19,10 @@ package org.apache.archiva.redback.integration.util; * under the License. */ -import java.util.Comparator; - import org.apache.archiva.redback.rbac.TemplatedRole; +import java.util.Comparator; + /** * TemplatedRoleSorter * diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/UserComparator.java b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/UserComparator.java index 7fcb390..975786d 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/UserComparator.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/apache/archiva/redback/integration/util/UserComparator.java @@ -19,10 +19,10 @@ package org.apache.archiva.redback.integration.util; * under the License. */ -import java.util.Comparator; - import org.apache.archiva.redback.users.User; +import java.util.Comparator; + /** * UserComparator * diff --git a/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/HttpUtilsTest.java b/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/HttpUtilsTest.java index 13ad628..9458088 100644 --- a/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/HttpUtilsTest.java +++ b/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/HttpUtilsTest.java @@ -19,11 +19,9 @@ package org.apache.archiva.redback.integration; * under the License. */ -import java.util.Properties; - import junit.framework.TestCase; -import org.apache.archiva.redback.integration.HttpUtils; +import java.util.Properties; /** * HttpUtilsTest diff --git a/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MockJavaMailSender.java b/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MockJavaMailSender.java index 8d2c335..0e1a0f2 100644 --- a/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MockJavaMailSender.java +++ b/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MockJavaMailSender.java @@ -19,15 +19,14 @@ package org.apache.archiva.redback.integration.mail; * under the License. */ -import java.util.ArrayList; -import java.util.List; - -import javax.mail.internet.MimeMessage; - import org.springframework.mail.MailException; import org.springframework.mail.javamail.JavaMailSender; import org.springframework.mail.javamail.JavaMailSenderImpl; +import javax.mail.internet.MimeMessage; +import java.util.ArrayList; +import java.util.List; + /** * @author Olivier Lamy * @since 26 sept. 2008 diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/LdapGroupMapping.java b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/LdapGroupMapping.java index 2dd9000..0cefa08 100644 --- a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/LdapGroupMapping.java +++ b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/model/LdapGroupMapping.java @@ -21,7 +21,6 @@ package org.apache.archiva.redback.rest.api.model; import javax.xml.bind.annotation.XmlRootElement; import java.io.Serializable; import java.util.Collection; -import java.util.List; /** * @author Olivier Lamy diff --git a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/LdapGroupMappingService.java b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/LdapGroupMappingService.java index df3531b..6074a35 100644 --- a/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/LdapGroupMappingService.java +++ b/redback-integrations/redback-rest/redback-rest-api/src/main/java/org/apache/archiva/redback/rest/api/services/LdapGroupMappingService.java @@ -32,7 +32,6 @@ import javax.ws.rs.PUT; import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; import java.util.List; diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultLoginService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultLoginService.java index 954fe57..7dfbe4b 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultLoginService.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultLoginService.java @@ -24,7 +24,6 @@ import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.authentication.AuthenticationFailureCause; import org.apache.archiva.redback.authentication.EncryptionFailedException; import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource; -import org.apache.archiva.redback.authentication.TokenManager; import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator; import org.apache.archiva.redback.keys.AuthenticationKey; import org.apache.archiva.redback.keys.KeyManager; @@ -56,7 +55,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; import java.util.List; -import java.util.Map; import java.util.TimeZone; /** diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultPasswordService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultPasswordService.java index 46d1360..163fec5 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultPasswordService.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultPasswordService.java @@ -18,21 +18,21 @@ package org.apache.archiva.redback.rest.services; * under the License. */ +import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator; +import org.apache.archiva.redback.keys.AuthenticationKey; +import org.apache.archiva.redback.keys.KeyManagerException; import org.apache.archiva.redback.policy.PasswordEncoder; import org.apache.archiva.redback.policy.PasswordRuleViolationException; import org.apache.archiva.redback.policy.PasswordRuleViolations; -import org.apache.archiva.redback.users.User; -import org.apache.archiva.redback.users.UserManagerException; -import org.apache.commons.lang3.StringUtils; -import org.apache.archiva.redback.keys.AuthenticationKey; -import org.apache.archiva.redback.keys.KeyManagerException; -import org.apache.archiva.redback.system.SecuritySystem; -import org.apache.archiva.redback.users.UserNotFoundException; -import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator; import org.apache.archiva.redback.rest.api.model.ErrorMessage; import org.apache.archiva.redback.rest.api.services.PasswordService; import org.apache.archiva.redback.rest.api.services.RedbackServiceException; import org.apache.archiva.redback.rest.services.utils.PasswordValidator; +import org.apache.archiva.redback.system.SecuritySystem; +import org.apache.archiva.redback.users.User; +import org.apache.archiva.redback.users.UserManagerException; +import org.apache.archiva.redback.users.UserNotFoundException; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; 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 13c27b8..7f66637 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 @@ -18,11 +18,21 @@ package org.apache.archiva.redback.rest.services; * under the License. */ +import org.apache.archiva.redback.integration.model.AdminEditUserCredentials; +import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants; +import org.apache.archiva.redback.integration.util.RoleSorter; import org.apache.archiva.redback.rbac.Permission; import org.apache.archiva.redback.rbac.RBACManager; import org.apache.archiva.redback.rbac.RbacManagerException; import org.apache.archiva.redback.rbac.Resource; import org.apache.archiva.redback.rbac.UserAssignment; +import org.apache.archiva.redback.rest.api.model.Application; +import org.apache.archiva.redback.rest.api.model.ApplicationRoles; +import org.apache.archiva.redback.rest.api.model.ErrorMessage; +import org.apache.archiva.redback.rest.api.model.Role; +import org.apache.archiva.redback.rest.api.model.RoleTemplate; +import org.apache.archiva.redback.rest.api.services.RedbackServiceException; +import org.apache.archiva.redback.rest.api.services.RoleManagementService; import org.apache.archiva.redback.role.RoleManager; import org.apache.archiva.redback.role.RoleManagerException; import org.apache.archiva.redback.role.model.ModelApplication; @@ -33,16 +43,6 @@ import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManagerException; import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.commons.lang3.StringUtils; -import org.apache.archiva.redback.integration.model.AdminEditUserCredentials; -import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants; -import org.apache.archiva.redback.integration.util.RoleSorter; -import org.apache.archiva.redback.rest.api.model.Application; -import org.apache.archiva.redback.rest.api.model.ApplicationRoles; -import org.apache.archiva.redback.rest.api.model.ErrorMessage; -import org.apache.archiva.redback.rest.api.model.Role; -import org.apache.archiva.redback.rest.api.model.RoleTemplate; -import org.apache.archiva.redback.rest.api.services.RedbackServiceException; -import org.apache.archiva.redback.rest.api.services.RoleManagementService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; 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 5527458..b119c71 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 @@ -20,9 +20,9 @@ package org.apache.archiva.redback.rest.services; */ import net.sf.ehcache.CacheManager; +import org.apache.archiva.components.cache.Cache; import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.authentication.TokenBasedAuthenticationDataSource; -import org.apache.archiva.components.cache.Cache; import org.apache.archiva.redback.configuration.UserConfiguration; import org.apache.archiva.redback.configuration.UserConfigurationKeys; import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator; diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUtilServices.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUtilServices.java index 893a74d..3f8d190 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUtilServices.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUtilServices.java @@ -18,10 +18,10 @@ package org.apache.archiva.redback.rest.services; * under the License. */ -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; import org.apache.archiva.redback.rest.api.services.RedbackServiceException; import org.apache.archiva.redback.rest.api.services.UtilServices; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/AbstractInterceptor.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/AbstractInterceptor.java index 23eea62..bc9aac4 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/AbstractInterceptor.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/AbstractInterceptor.java @@ -25,8 +25,6 @@ import org.apache.archiva.redback.authorization.RedbackAuthorization; import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator; import org.apache.archiva.redback.policy.AccountLockedException; import org.apache.archiva.redback.policy.MustChangePasswordException; -import org.apache.cxf.jaxrs.model.OperationResourceInfo; -import org.apache.cxf.message.Message; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.annotation.AnnotationUtils; diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/DebugJAXRSInInterceptor.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/DebugJAXRSInInterceptor.java deleted file mode 100644 index 340d6a1..0000000 --- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/DebugJAXRSInInterceptor.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.apache.archiva.redback.rest.services.interceptors; - -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import org.apache.cxf.jaxrs.interceptor.JAXRSInInterceptor; -import org.apache.cxf.message.Message; - -/** - * @author Olivier Lamy - * @since 1.3 - */ -public class DebugJAXRSInInterceptor - extends JAXRSInInterceptor -{ - @Override - public void handleMessage( Message message ) - { - super.handleMessage( message ); - } -} diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/PermissionsInterceptor.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/PermissionsInterceptor.java index 798e1cf..2461f59 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/PermissionsInterceptor.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/PermissionsInterceptor.java @@ -19,14 +19,11 @@ package org.apache.archiva.redback.rest.services.interceptors; * under the License. */ -import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.authorization.AuthorizationException; import org.apache.archiva.redback.authorization.AuthorizationResult; import org.apache.archiva.redback.authorization.RedbackAuthorization; import org.apache.archiva.redback.integration.filter.authentication.basic.HttpBasicAuthentication; -import org.apache.archiva.redback.policy.AccountLockedException; -import org.apache.archiva.redback.policy.MustChangePasswordException; import org.apache.archiva.redback.system.SecuritySession; import org.apache.archiva.redback.system.SecuritySystem; import org.apache.commons.lang3.StringUtils; diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/RequestValidationInterceptor.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/RequestValidationInterceptor.java index cbdcad4..da2a44d 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/RequestValidationInterceptor.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/RequestValidationInterceptor.java @@ -19,7 +19,6 @@ package org.apache.archiva.redback.rest.services.interceptors; */ -import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.authentication.InvalidTokenException; import org.apache.archiva.redback.authentication.TokenData; @@ -27,10 +26,7 @@ import org.apache.archiva.redback.authentication.TokenManager; import org.apache.archiva.redback.authorization.RedbackAuthorization; import org.apache.archiva.redback.configuration.UserConfiguration; import org.apache.archiva.redback.configuration.UserConfigurationKeys; -import org.apache.archiva.redback.integration.filter.authentication.HttpAuthenticator; import org.apache.archiva.redback.integration.filter.authentication.basic.HttpBasicAuthentication; -import org.apache.archiva.redback.policy.AccountLockedException; -import org.apache.archiva.redback.policy.MustChangePasswordException; import org.apache.archiva.redback.users.User; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/ThreadLocalUserCleaner.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/ThreadLocalUserCleaner.java index 861ef0c..e879052 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/ThreadLocalUserCleaner.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/ThreadLocalUserCleaner.java @@ -19,6 +19,7 @@ package org.apache.archiva.redback.rest.services.interceptors; */ +import org.apache.archiva.redback.rest.services.RedbackAuthenticationThreadLocal; import org.apache.cxf.interceptor.Fault; import org.apache.cxf.jaxrs.interceptor.JAXRSInInterceptor; import org.apache.cxf.jaxrs.model.OperationResourceInfo; @@ -26,7 +27,6 @@ import org.apache.cxf.message.Message; import org.apache.cxf.phase.AbstractPhaseInterceptor; import org.apache.cxf.phase.Phase; import org.apache.cxf.phase.PhaseInterceptor; -import org.apache.archiva.redback.rest.services.RedbackAuthenticationThreadLocal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/utils/PasswordValidator.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/utils/PasswordValidator.java index b0510c9..666d8ae 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/utils/PasswordValidator.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/utils/PasswordValidator.java @@ -18,15 +18,15 @@ package org.apache.archiva.redback.rest.services.utils; * under the License. */ -import org.apache.archiva.redback.policy.PasswordRuleViolations; -import org.apache.archiva.redback.users.User; -import org.apache.archiva.redback.users.UserManagerException; -import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.policy.PasswordEncoder; import org.apache.archiva.redback.policy.PasswordRuleViolationException; -import org.apache.archiva.redback.system.SecuritySystem; +import org.apache.archiva.redback.policy.PasswordRuleViolations; import org.apache.archiva.redback.rest.api.model.ErrorMessage; import org.apache.archiva.redback.rest.api.services.RedbackServiceException; +import org.apache.archiva.redback.system.SecuritySystem; +import org.apache.archiva.redback.users.User; +import org.apache.archiva.redback.users.UserManagerException; +import org.apache.archiva.redback.users.UserNotFoundException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminServiceImpl.java b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminServiceImpl.java index 5560ecf..0b1cc19 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminServiceImpl.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/FakeCreateAdminServiceImpl.java @@ -21,9 +21,9 @@ package org.apache.archiva.redback.rest.services; import org.apache.archiva.redback.configuration.UserConfiguration; import org.apache.archiva.redback.rbac.RBACManager; -import org.apache.archiva.redback.users.UserManager; -import org.apache.archiva.redback.role.RoleManager; import org.apache.archiva.redback.rest.api.services.UserService; +import org.apache.archiva.redback.role.RoleManager; +import org.apache.archiva.redback.users.UserManager; import javax.inject.Inject; import javax.inject.Named; diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/UserServiceTest.java b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/UserServiceTest.java index 0bac7e2..0f76fdb 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/UserServiceTest.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/UserServiceTest.java @@ -25,7 +25,6 @@ import org.apache.archiva.redback.rest.api.model.Permission; import org.apache.archiva.redback.rest.api.model.ResetPasswordRequest; import org.apache.archiva.redback.rest.api.model.User; import org.apache.archiva.redback.rest.api.model.UserRegistrationRequest; -import org.apache.archiva.redback.rest.api.services.RedbackServiceException; import org.apache.archiva.redback.rest.api.services.UserService; import org.apache.archiva.redback.rest.services.mock.EmailMessage; import org.apache.archiva.redback.rest.services.mock.ServicesAssert; diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/resources/META-INF/spring-context.xml b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/META-INF/spring-context.xml index b4da721..13ce479 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/test/resources/META-INF/spring-context.xml +++ b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/META-INF/spring-context.xml @@ -20,7 +20,6 @@ --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:context="http://www.springframework.org/schema/context"; xmlns:jaxrs="http://cxf.apache.org/jaxrs"; xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
