Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-04-01 12:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove javax.annotation Usage

Browse Source 
Closes gh-9415
This commit is contained in:
Josh Cummings 2021-02-05 14:09:06 -07:00
parent 3d6c5bf04a
commit ccfbff4954
No known key found for this signature in database
GPG Key ID: 49EF60DD7FF83443
3 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ldap/src/integration-test/java/org/springframework/security/ldap/ApacheDsContainerConfig.java
View File

@ -16,8 +16,7 @@
package org.springframework.security.ldap; package org.springframework.security.ldap;
import javax.annotation.PreDestroy; import org.springframework.beans.factory.DisposableBean;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.ldap.core.ContextSource; import org.springframework.ldap.core.ContextSource;
@ -27,7 +26,7 @@ import org.springframework.security.ldap.server.ApacheDSContainer;
* @author Eddú Meléndez * @author Eddú Meléndez
*/ */
@Configuration @Configuration
public class ApacheDsContainerConfig { public class ApacheDsContainerConfig implements DisposableBean {
private ApacheDSContainer container; private ApacheDSContainer container;
@ -44,8 +43,8 @@ public class ApacheDsContainerConfig {
"ldap://127.0.0.1:" + ldapContainer.getLocalPort() + "/dc=springframework,dc=org"); "ldap://127.0.0.1:" + ldapContainer.getLocalPort() + "/dc=springframework,dc=org");
} }
@PreDestroy @Override
void shutdown() { public void destroy() throws Exception {
this.container.stop(); this.container.stop();
} }

33
ldap/src/integration-test/java/org/springframework/security/ldap/server/UnboundIdContainerLdifTests.java
View File

@ -16,11 +16,10 @@
package org.springframework.security.ldap.server; package org.springframework.security.ldap.server;
import javax.annotation.PreDestroy;
import org.junit.After; import org.junit.After;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@ -92,7 +91,7 @@ public class UnboundIdContainerLdifTests {
} }
@Configuration @Configuration
static class CustomLdifConfig { static class CustomLdifConfig implements DisposableBean {
private UnboundIdContainer container = new UnboundIdContainer("dc=springframework,dc=org", private UnboundIdContainer container = new UnboundIdContainer("dc=springframework,dc=org",
"classpath:test-server.ldif"); "classpath:test-server.ldif");
@ -109,15 +108,15 @@ public class UnboundIdContainerLdifTests {
"ldap://127.0.0.1:" + container.getPort() + "/dc=springframework,dc=org"); "ldap://127.0.0.1:" + container.getPort() + "/dc=springframework,dc=org");
} }
@PreDestroy @Override
void shutdown() { public void destroy() throws Exception {
this.container.stop(); this.container.stop();
} }
} }
@Configuration @Configuration
static class WildcardLdifConfig { static class WildcardLdifConfig implements DisposableBean {
private UnboundIdContainer container = new UnboundIdContainer("dc=springframework,dc=org", private UnboundIdContainer container = new UnboundIdContainer("dc=springframework,dc=org",
"classpath*:test-server.ldif"); "classpath*:test-server.ldif");
@ -134,15 +133,15 @@ public class UnboundIdContainerLdifTests {
"ldap://127.0.0.1:" + container.getPort() + "/dc=springframework,dc=org"); "ldap://127.0.0.1:" + container.getPort() + "/dc=springframework,dc=org");
} }
@PreDestroy @Override
void shutdown() { public void destroy() throws Exception {
this.container.stop(); this.container.stop();
} }
} }
@Configuration @Configuration
static class MalformedLdifConfig { static class MalformedLdifConfig implements DisposableBean {
private UnboundIdContainer container = new UnboundIdContainer("dc=springframework,dc=org", private UnboundIdContainer container = new UnboundIdContainer("dc=springframework,dc=org",
"classpath:test-server-malformed.txt"); "classpath:test-server-malformed.txt");
@ -153,15 +152,15 @@ public class UnboundIdContainerLdifTests {
return this.container; return this.container;
} }
@PreDestroy @Override
void shutdown() { public void destroy() throws Exception {
this.container.stop(); this.container.stop();
} }
} }
@Configuration @Configuration
static class MissingLdifConfig { static class MissingLdifConfig implements DisposableBean {
private UnboundIdContainer container = new UnboundIdContainer("dc=springframework,dc=org", private UnboundIdContainer container = new UnboundIdContainer("dc=springframework,dc=org",
"classpath:does-not-exist.ldif"); "classpath:does-not-exist.ldif");
@ -172,15 +171,15 @@ public class UnboundIdContainerLdifTests {
return this.container; return this.container;
} }
@PreDestroy @Override
void shutdown() { public void destroy() throws Exception {
this.container.stop(); this.container.stop();
} }
} }
@Configuration @Configuration
static class WildcardNoLdifConfig { static class WildcardNoLdifConfig implements DisposableBean {
private UnboundIdContainer container = new UnboundIdContainer("dc=springframework,dc=org", private UnboundIdContainer container = new UnboundIdContainer("dc=springframework,dc=org",
"classpath*:*.test.ldif"); "classpath*:*.test.ldif");
@ -191,8 +190,8 @@ public class UnboundIdContainerLdifTests {
return this.container; return this.container;
} }
@PreDestroy @Override
void shutdown() { public void destroy() throws Exception {
this.container.stop(); this.container.stop();
} }

9
ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManagerModifyPasswordTests.java
View File

@ -16,12 +16,11 @@
package org.springframework.security.ldap.userdetails; package org.springframework.security.ldap.userdetails;
import javax.annotation.PreDestroy;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@ -81,7 +80,7 @@ public class LdapUserDetailsManagerModifyPasswordTests {
} }
@Configuration @Configuration
static class UnboundIdContainerConfiguration { static class UnboundIdContainerConfiguration implements DisposableBean {
private UnboundIdContainer container = new UnboundIdContainer("dc=springframework,dc=org", private UnboundIdContainer container = new UnboundIdContainer("dc=springframework,dc=org",
"classpath:test-server.ldif"); "classpath:test-server.ldif");
@ -98,8 +97,8 @@ public class LdapUserDetailsManagerModifyPasswordTests {
"ldap://127.0.0.1:" + container.getPort() + "/dc=springframework,dc=org"); "ldap://127.0.0.1:" + container.getPort() + "/dc=springframework,dc=org");
} }
@PreDestroy @Override
void shutdown() { public void destroy() throws Exception {
this.container.stop(); this.container.stop();
} }