Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing

Browse Source
This commit is contained in:
Juergen Hoeller
2014-04-17 21:19:47 +02:00
parent 28887750b0
commit 48c977afdc
4 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-context/src/test/java/org/springframework/context/annotation/NestedConfigurationClassTests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2013 the original author or authors. * Copyright 2002-2014 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -123,6 +123,7 @@ public class NestedConfigurationClassTests {
@Configuration @Configuration
static class L0Config { static class L0Config {
@Bean @Bean
public TestBean l0Bean() { public TestBean l0Bean() {
return new TestBean("l0"); return new TestBean("l0");
@@ -135,6 +136,7 @@ public class NestedConfigurationClassTests {
@Configuration @Configuration
static class L1Config { static class L1Config {
@Bean @Bean
public TestBean l1Bean() { public TestBean l1Bean() {
return new TestBean("l1"); return new TestBean("l1");
@@ -147,6 +149,7 @@ public class NestedConfigurationClassTests {
@Configuration @Configuration
protected static class L2Config { protected static class L2Config {
@Bean @Bean
public TestBean l2Bean() { public TestBean l2Bean() {
return new TestBean("l2"); return new TestBean("l2");
@@ -163,6 +166,7 @@ public class NestedConfigurationClassTests {
@Component @Component
static class L0ConfigLight { static class L0ConfigLight {
@Bean @Bean
public TestBean l0Bean() { public TestBean l0Bean() {
return new TestBean("l0"); return new TestBean("l0");
@@ -175,6 +179,7 @@ public class NestedConfigurationClassTests {
@Component @Component
static class L1ConfigLight { static class L1ConfigLight {
@Bean @Bean
public TestBean l1Bean() { public TestBean l1Bean() {
return new TestBean("l1"); return new TestBean("l1");
@@ -187,6 +192,7 @@ public class NestedConfigurationClassTests {
@Component @Component
protected static class L2ConfigLight { protected static class L2ConfigLight {
@Bean @Bean
public TestBean l2Bean() { public TestBean l2Bean() {
return new TestBean("l2"); return new TestBean("l2");
@@ -216,6 +222,7 @@ public class NestedConfigurationClassTests {
@Configuration @Configuration
static class S1Config extends L0Config { static class S1Config extends L0Config {
@Override @Override
@Bean @Bean
public TestBean overrideBean() { public TestBean overrideBean() {

10
spring-context/src/test/java/org/springframework/tests/sample/beans/Employee.java
View File

@@ -1,4 +1,3 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2012 the original author or authors.
* *
@@ -17,19 +16,10 @@
package org.springframework.tests.sample.beans; package org.springframework.tests.sample.beans;
import org.springframework.tests.sample.beans.TestBean;
public class Employee extends TestBean { public class Employee extends TestBean {
private String co; private String co;
/**
* Constructor for Employee.
*/
public Employee() {
super();
}
public String getCompany() { public String getCompany() {
return co; return co;
} }

3
spring-core/src/main/java/org/springframework/core/convert/support/ObjectToStringConverter.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2012 the original author or authors. * Copyright 2002-2014 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ import org.springframework.core.convert.converter.Converter;
/** /**
* Simply calls {@link Object#toString()} to convert a source Object to a String. * Simply calls {@link Object#toString()} to convert a source Object to a String.
*
* @author Keith Donald * @author Keith Donald
* @since 3.0 * @since 3.0
*/ */

2
spring-websocket/src/main/java/org/springframework/web/socket/handler/SessionLimitExceededException.java
View File

@@ -23,7 +23,7 @@ import org.springframework.web.socket.CloseStatus;
* for, e.g. timeout, buffer size, etc. * for, e.g. timeout, buffer size, etc.
* *
* @author Rossen Stoyanchev * @author Rossen Stoyanchev
* @since 3.0.4 * @since 4.0.3
*/ */
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class SessionLimitExceededException extends RuntimeException { public class SessionLimitExceededException extends RuntimeException {