diff --git a/spring-context/src/test/java/org/springframework/context/annotation/NestedConfigurationClassTests.java b/spring-context/src/test/java/org/springframework/context/annotation/NestedConfigurationClassTests.java index bd6d55a1dd9..f56510d2eba 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/NestedConfigurationClassTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/NestedConfigurationClassTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -123,6 +123,7 @@ public class NestedConfigurationClassTests { @Configuration static class L0Config { + @Bean public TestBean l0Bean() { return new TestBean("l0"); @@ -135,6 +136,7 @@ public class NestedConfigurationClassTests { @Configuration static class L1Config { + @Bean public TestBean l1Bean() { return new TestBean("l1"); @@ -147,6 +149,7 @@ public class NestedConfigurationClassTests { @Configuration protected static class L2Config { + @Bean public TestBean l2Bean() { return new TestBean("l2"); @@ -163,6 +166,7 @@ public class NestedConfigurationClassTests { @Component static class L0ConfigLight { + @Bean public TestBean l0Bean() { return new TestBean("l0"); @@ -175,6 +179,7 @@ public class NestedConfigurationClassTests { @Component static class L1ConfigLight { + @Bean public TestBean l1Bean() { return new TestBean("l1"); @@ -187,6 +192,7 @@ public class NestedConfigurationClassTests { @Component protected static class L2ConfigLight { + @Bean public TestBean l2Bean() { return new TestBean("l2"); @@ -216,6 +222,7 @@ public class NestedConfigurationClassTests { @Configuration static class S1Config extends L0Config { + @Override @Bean public TestBean overrideBean() { diff --git a/spring-context/src/test/java/org/springframework/tests/sample/beans/Employee.java b/spring-context/src/test/java/org/springframework/tests/sample/beans/Employee.java index 7bed71f394b..40301c7a24b 100644 --- a/spring-context/src/test/java/org/springframework/tests/sample/beans/Employee.java +++ b/spring-context/src/test/java/org/springframework/tests/sample/beans/Employee.java @@ -1,4 +1,3 @@ - /* * Copyright 2002-2012 the original author or authors. * @@ -17,19 +16,10 @@ package org.springframework.tests.sample.beans; -import org.springframework.tests.sample.beans.TestBean; - public class Employee extends TestBean { private String co; - /** - * Constructor for Employee. - */ - public Employee() { - super(); - } - public String getCompany() { return co; } diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToStringConverter.java b/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToStringConverter.java index f9c3c8174e8..e5fd8419e10 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToStringConverter.java +++ b/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToStringConverter.java @@ -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"); * 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. + * * @author Keith Donald * @since 3.0 */ diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/handler/SessionLimitExceededException.java b/spring-websocket/src/main/java/org/springframework/web/socket/handler/SessionLimitExceededException.java index 96c3b3a6ae1..04470f84938 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/handler/SessionLimitExceededException.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/handler/SessionLimitExceededException.java @@ -23,7 +23,7 @@ import org.springframework.web.socket.CloseStatus; * for, e.g. timeout, buffer size, etc. * * @author Rossen Stoyanchev - * @since 3.0.4 + * @since 4.0.3 */ @SuppressWarnings("serial") public class SessionLimitExceededException extends RuntimeException {