diff --git a/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java b/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java index a9928ad78a..e08db4eed2 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java +++ b/spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -336,6 +336,7 @@ public class ScheduledTaskRegistrar implements ScheduledTaskHolder, Initializing * Schedule all registered tasks against the underlying * {@linkplain #setTaskScheduler(TaskScheduler) task scheduler}. */ + @SuppressWarnings("deprecation") protected void scheduleTasks() { if (this.taskScheduler == null) { this.localExecutor = Executors.newSingleThreadScheduledExecutor(); diff --git a/spring-context/src/test/java/org/springframework/format/datetime/DateFormatterTests.java b/spring-context/src/test/java/org/springframework/format/datetime/DateFormatterTests.java index 84f48658a8..cbeb4842f8 100644 --- a/spring-context/src/test/java/org/springframework/format/datetime/DateFormatterTests.java +++ b/spring-context/src/test/java/org/springframework/format/datetime/DateFormatterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -46,7 +46,7 @@ public class DateFormatterTests { private static final TimeZone UTC = TimeZone.getTimeZone("UTC"); @Rule - public ExpectedException thown = ExpectedException.none(); + public ExpectedException thrown = ExpectedException.none(); @Test @@ -175,8 +175,8 @@ public class DateFormatterTests { public void shouldThrowOnUnsupportedStylePattern() throws Exception { DateFormatter formatter = new DateFormatter(); formatter.setStylePattern("OO"); - thown.expect(IllegalStateException.class); - thown.expectMessage("Unsupported style pattern 'OO'"); + thrown.expect(IllegalStateException.class); + thrown.expectMessage("Unsupported style pattern 'OO'"); formatter.parse("2009", Locale.US); } diff --git a/spring-context/src/test/java/org/springframework/format/datetime/DateFormattingTests.java b/spring-context/src/test/java/org/springframework/format/datetime/DateFormattingTests.java index 2907ad2060..3759f724f9 100644 --- a/spring-context/src/test/java/org/springframework/format/datetime/DateFormattingTests.java +++ b/spring-context/src/test/java/org/springframework/format/datetime/DateFormattingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -52,12 +52,12 @@ public class DateFormattingTests { @Before - public void setUp() { + public void setup() { DateFormatterRegistrar registrar = new DateFormatterRegistrar(); - setUp(registrar); + setup(registrar); } - private void setUp(DateFormatterRegistrar registrar) { + private void setup(DateFormatterRegistrar registrar) { DefaultConversionService.addDefaultConverters(conversionService); registrar.registerFormatters(conversionService); @@ -193,7 +193,7 @@ public class DateFormattingTests { } @Test - public void dateToStringWithoutGlobalFormat() throws Exception { + public void dateToStringWithoutGlobalFormat() { Date date = new Date(); Object actual = this.conversionService.convert(date, TypeDescriptor.valueOf(Date.class), TypeDescriptor.valueOf(String.class)); String expected = date.toString(); @@ -201,33 +201,31 @@ public class DateFormattingTests { } @Test - public void dateToStringWithGlobalFormat() throws Exception { + public void dateToStringWithGlobalFormat() { DateFormatterRegistrar registrar = new DateFormatterRegistrar(); registrar.setFormatter(new DateFormatter()); - setUp(registrar); + setup(registrar); Date date = new Date(); Object actual = this.conversionService.convert(date, TypeDescriptor.valueOf(Date.class), TypeDescriptor.valueOf(String.class)); String expected = new DateFormatter().print(date, Locale.US); assertEquals(expected, actual); } - @Test + @Test // SPR-10105 @SuppressWarnings("deprecation") - public void stringToDateWithoutGlobalFormat() throws Exception { - // SPR-10105 + public void stringToDateWithoutGlobalFormat() { String string = "Sat, 12 Aug 1995 13:30:00 GM"; Date date = this.conversionService.convert(string, Date.class); assertThat(date, equalTo(new Date(string))); } - @Test - public void stringToDateWithGlobalFormat() throws Exception { - // SPR-10105 + @Test // SPR-10105 + public void stringToDateWithGlobalFormat() { DateFormatterRegistrar registrar = new DateFormatterRegistrar(); DateFormatter dateFormatter = new DateFormatter(); dateFormatter.setIso(ISO.DATE_TIME); registrar.setFormatter(dateFormatter); - setUp(registrar); + setup(registrar); // This is a format that cannot be parsed by new Date(String) String string = "2009-06-01T14:23:05.003+00:00"; Date date = this.conversionService.convert(string, Date.class); diff --git a/spring-context/src/test/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryBeanTests.java index 6539bc4599..7a3e884db4 100644 --- a/spring-context/src/test/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryBeanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2018 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. @@ -29,27 +29,28 @@ import static org.junit.Assert.*; */ public class DateTimeFormatterFactoryBeanTests { - private DateTimeFormatterFactoryBean factory = new DateTimeFormatterFactoryBean(); + private final DateTimeFormatterFactoryBean factory = new DateTimeFormatterFactoryBean(); + @Test - public void isSingleton() throws Exception { + public void isSingleton() { assertThat(factory.isSingleton(), is(true)); } @Test @SuppressWarnings("rawtypes") - public void getObjectType() throws Exception { + public void getObjectType() { assertThat(factory.getObjectType(), is(equalTo((Class) DateTimeFormatter.class))); } @Test - public void getObject() throws Exception { + public void getObject() { factory.afterPropertiesSet(); assertThat(factory.getObject(), is(equalTo(DateTimeFormat.mediumDateTime()))); } @Test - public void getObjectIsAlwaysSingleton() throws Exception { + public void getObjectIsAlwaysSingleton() { factory.afterPropertiesSet(); DateTimeFormatter formatter = factory.getObject(); assertThat(formatter, is(equalTo(DateTimeFormat.mediumDateTime()))); diff --git a/spring-context/src/test/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryTests.java b/spring-context/src/test/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryTests.java index 122d3218b4..341b88e48b 100644 --- a/spring-context/src/test/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/format/datetime/joda/DateTimeFormatterFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2018 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. @@ -50,32 +50,32 @@ public class DateTimeFormatterFactoryTests { @Test - public void createDateTimeFormatter() throws Exception { + public void createDateTimeFormatter() { assertThat(factory.createDateTimeFormatter(), is(equalTo(DateTimeFormat.mediumDateTime()))); } @Test - public void createDateTimeFormatterWithPattern() throws Exception { + public void createDateTimeFormatterWithPattern() { factory = new DateTimeFormatterFactory("yyyyMMddHHmmss"); DateTimeFormatter formatter = factory.createDateTimeFormatter(); assertThat(formatter.print(dateTime), is("20091021121000")); } @Test - public void createDateTimeFormatterWithNullFallback() throws Exception { + public void createDateTimeFormatterWithNullFallback() { DateTimeFormatter formatter = factory.createDateTimeFormatter(null); assertThat(formatter, is(nullValue())); } @Test - public void createDateTimeFormatterWithFallback() throws Exception { + public void createDateTimeFormatterWithFallback() { DateTimeFormatter fallback = DateTimeFormat.forStyle("LL"); DateTimeFormatter formatter = factory.createDateTimeFormatter(fallback); assertThat(formatter, is(sameInstance(fallback))); } @Test - public void createDateTimeFormatterInOrderOfPropertyPriority() throws Exception { + public void createDateTimeFormatterInOrderOfPropertyPriority() { factory.setStyle("SS"); String value = applyLocale(factory.createDateTimeFormatter()).print(dateTime); assertTrue(value.startsWith("10/21/09")); @@ -89,7 +89,7 @@ public class DateTimeFormatterFactoryTests { } @Test - public void createDateTimeFormatterWithTimeZone() throws Exception { + public void createDateTimeFormatterWithTimeZone() { factory.setPattern("yyyyMMddHHmmss Z"); factory.setTimeZone(TEST_TIMEZONE); DateTimeZone dateTimeZone = DateTimeZone.forTimeZone(TEST_TIMEZONE); diff --git a/spring-context/src/test/java/org/springframework/format/datetime/joda/JodaTimeFormattingTests.java b/spring-context/src/test/java/org/springframework/format/datetime/joda/JodaTimeFormattingTests.java index 3ac3e45f1b..e86a4093b3 100644 --- a/spring-context/src/test/java/org/springframework/format/datetime/joda/JodaTimeFormattingTests.java +++ b/spring-context/src/test/java/org/springframework/format/datetime/joda/JodaTimeFormattingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -62,12 +62,12 @@ public class JodaTimeFormattingTests { @Before - public void setUp() { + public void setup() { JodaTimeFormatterRegistrar registrar = new JodaTimeFormatterRegistrar(); - setUp(registrar); + setup(registrar); } - private void setUp(JodaTimeFormatterRegistrar registrar) { + private void setup(JodaTimeFormatterRegistrar registrar) { conversionService = new FormattingConversionService(); DefaultConversionService.addDefaultConverters(conversionService); registrar.registerFormatters(conversionService); @@ -84,7 +84,7 @@ public class JodaTimeFormattingTests { } @After - public void tearDown() { + public void cleanup() { LocaleContextHolder.setLocale(null); JodaTimeContextHolder.setJodaTimeContext(null); } @@ -108,10 +108,10 @@ public class JodaTimeFormattingTests { } @Test - public void testBindLocalDateWithSpecificStyle() throws Exception { + public void testBindLocalDateWithSpecificStyle() { JodaTimeFormatterRegistrar registrar = new JodaTimeFormatterRegistrar(); registrar.setDateStyle("L"); - setUp(registrar); + setup(registrar); MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("localDate", "October 31, 2009"); binder.bind(propertyValues); @@ -120,10 +120,10 @@ public class JodaTimeFormattingTests { } @Test - public void testBindLocalDateWithSpecificFormatter() throws Exception { + public void testBindLocalDateWithSpecificFormatter() { JodaTimeFormatterRegistrar registrar = new JodaTimeFormatterRegistrar(); registrar.setDateFormatter(org.joda.time.format.DateTimeFormat.forPattern("yyyyMMdd")); - setUp(registrar); + setup(registrar); MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("localDate", "20091031"); binder.bind(propertyValues); @@ -196,10 +196,10 @@ public class JodaTimeFormattingTests { } @Test - public void testBindLocalTimeWithSpecificStyle() throws Exception { + public void testBindLocalTimeWithSpecificStyle() { JodaTimeFormatterRegistrar registrar = new JodaTimeFormatterRegistrar(); registrar.setTimeStyle("M"); - setUp(registrar); + setup(registrar); MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("localTime", "12:00:00 PM"); binder.bind(propertyValues); @@ -208,10 +208,10 @@ public class JodaTimeFormattingTests { } @Test - public void testBindLocalTimeWithSpecificFormatter() throws Exception { + public void testBindLocalTimeWithSpecificFormatter() { JodaTimeFormatterRegistrar registrar = new JodaTimeFormatterRegistrar(); registrar.setTimeFormatter(org.joda.time.format.DateTimeFormat.forPattern("HHmmss")); - setUp(registrar); + setup(registrar); MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("localTime", "130000"); binder.bind(propertyValues); @@ -261,10 +261,10 @@ public class JodaTimeFormattingTests { } @Test - public void testBindDateTimeWithSpecificStyle() throws Exception { + public void testBindDateTimeWithSpecificStyle() { JodaTimeFormatterRegistrar registrar = new JodaTimeFormatterRegistrar(); registrar.setDateTimeStyle("MM"); - setUp(registrar); + setup(registrar); MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("localDateTime", new LocalDateTime(2009, 10, 31, 12, 0)); binder.bind(propertyValues); @@ -275,10 +275,10 @@ public class JodaTimeFormattingTests { } @Test - public void testBindDateTimeISO() throws Exception { + public void testBindDateTimeISO() { JodaTimeFormatterRegistrar registrar = new JodaTimeFormatterRegistrar(); registrar.setUseIsoFormat(true); - setUp(registrar); + setup(registrar); MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("dateTime", "2009-10-31T12:00:00.000Z"); binder.bind(propertyValues); @@ -287,10 +287,10 @@ public class JodaTimeFormattingTests { } @Test - public void testBindDateTimeWithSpecificFormatter() throws Exception { + public void testBindDateTimeWithSpecificFormatter() { JodaTimeFormatterRegistrar registrar = new JodaTimeFormatterRegistrar(); registrar.setDateTimeFormatter(org.joda.time.format.DateTimeFormat.forPattern("yyyyMMddHHmmss")); - setUp(registrar); + setup(registrar); MutablePropertyValues propertyValues = new MutablePropertyValues(); propertyValues.add("dateTime", "20091031130000"); binder.bind(propertyValues); @@ -435,33 +435,31 @@ public class JodaTimeFormattingTests { } @Test - public void dateToStringWithFormat() throws Exception { + public void dateToStringWithFormat() { JodaTimeFormatterRegistrar registrar = new JodaTimeFormatterRegistrar(); registrar.setDateTimeFormatter(org.joda.time.format.DateTimeFormat.shortDateTime()); - setUp(registrar); + setup(registrar); Date date = new Date(); Object actual = this.conversionService.convert(date, TypeDescriptor.valueOf(Date.class), TypeDescriptor.valueOf(String.class)); String expected = JodaTimeContextHolder.getFormatter(org.joda.time.format.DateTimeFormat.shortDateTime(), Locale.US).print(new DateTime(date)); assertEquals(expected, actual); } - @Test + @Test // SPR-10105 @SuppressWarnings("deprecation") - public void stringToDateWithoutGlobalFormat() throws Exception { - // SPR-10105 + public void stringToDateWithoutGlobalFormat() { String string = "Sat, 12 Aug 1995 13:30:00 GM"; Date date = this.conversionService.convert(string, Date.class); assertThat(date, equalTo(new Date(string))); } - @Test - public void stringToDateWithGlobalFormat() throws Exception { - // SPR-10105 + @Test // SPR-10105 + public void stringToDateWithGlobalFormat() { JodaTimeFormatterRegistrar registrar = new JodaTimeFormatterRegistrar(); DateTimeFormatterFactory factory = new DateTimeFormatterFactory(); factory.setIso(ISO.DATE_TIME); registrar.setDateTimeFormatter(factory.createDateTimeFormatter()); - setUp(registrar); + setup(registrar); // This is a format that cannot be parsed by new Date(String) String string = "2009-10-31T07:00:00.000-05:00"; Date date = this.conversionService.convert(string, Date.class); diff --git a/spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormatterFactoryBeanTests.java b/spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormatterFactoryBeanTests.java index 536921b387..860b1df730 100644 --- a/spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormatterFactoryBeanTests.java +++ b/spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormatterFactoryBeanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2018 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. @@ -30,31 +30,32 @@ import static org.junit.Assert.*; */ public class DateTimeFormatterFactoryBeanTests { - private DateTimeFormatterFactoryBean factory = new DateTimeFormatterFactoryBean(); + private final DateTimeFormatterFactoryBean factory = new DateTimeFormatterFactoryBean(); + @Test - public void isSingleton() throws Exception { + public void isSingleton() { assertThat(factory.isSingleton(), is(true)); } @Test - @SuppressWarnings("rawtypes") - public void getObjectType() throws Exception { - assertThat(factory.getObjectType(), is(equalTo((Class) DateTimeFormatter.class))); + public void getObjectType() { + assertThat(factory.getObjectType(), is(equalTo(DateTimeFormatter.class))); } @Test - public void getObject() throws Exception { + public void getObject() { factory.afterPropertiesSet(); assertThat(factory.getObject().toString(), is(equalTo(DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM).toString()))); } @Test - public void getObjectIsAlwaysSingleton() throws Exception { + public void getObjectIsAlwaysSingleton() { factory.afterPropertiesSet(); DateTimeFormatter formatter = factory.getObject(); assertThat(formatter.toString(), is(equalTo(DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM).toString()))); factory.setStylePattern("LL"); assertThat(factory.getObject(), is(sameInstance(formatter))); } + } diff --git a/spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormatterFactoryTests.java b/spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormatterFactoryTests.java index 9c01af8657..b33d18e50d 100644 --- a/spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormatterFactoryTests.java +++ b/spring-context/src/test/java/org/springframework/format/datetime/standard/DateTimeFormatterFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2018 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. @@ -51,32 +51,32 @@ public class DateTimeFormatterFactoryTests { @Test - public void createDateTimeFormatter() throws Exception { + public void createDateTimeFormatter() { assertThat(factory.createDateTimeFormatter().toString(), is(equalTo(DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM).toString()))); } @Test - public void createDateTimeFormatterWithPattern() throws Exception { + public void createDateTimeFormatterWithPattern() { factory = new DateTimeFormatterFactory("yyyyMMddHHmmss"); DateTimeFormatter formatter = factory.createDateTimeFormatter(); assertThat(formatter.format(dateTime), is("20091021121000")); } @Test - public void createDateTimeFormatterWithNullFallback() throws Exception { + public void createDateTimeFormatterWithNullFallback() { DateTimeFormatter formatter = factory.createDateTimeFormatter(null); assertThat(formatter, is(nullValue())); } @Test - public void createDateTimeFormatterWithFallback() throws Exception { + public void createDateTimeFormatterWithFallback() { DateTimeFormatter fallback = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.LONG); DateTimeFormatter formatter = factory.createDateTimeFormatter(fallback); assertThat(formatter, is(sameInstance(fallback))); } @Test - public void createDateTimeFormatterInOrderOfPropertyPriority() throws Exception { + public void createDateTimeFormatterInOrderOfPropertyPriority() { factory.setStylePattern("SS"); String value = applyLocale(factory.createDateTimeFormatter()).format(dateTime); assertTrue(value.startsWith("10/21/09")); @@ -90,7 +90,7 @@ public class DateTimeFormatterFactoryTests { } @Test - public void createDateTimeFormatterWithTimeZone() throws Exception { + public void createDateTimeFormatterWithTimeZone() { factory.setPattern("yyyyMMddHHmmss Z"); factory.setTimeZone(TEST_TIMEZONE); ZoneId dateTimeZone = TEST_TIMEZONE.toZoneId();