to get rid of "magic" time constants

Author: igor-suhorukov

spring-context-support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java

@@ -20,6 +20,7 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.Executor;
+import java.util.concurrent.TimeUnit;
 import javax.sql.DataSource;
 
 import org.quartz.Scheduler;
@@ -697,7 +698,7 @@ protected void startScheduler(final Scheduler scheduler, final int startupDelay)
 				@Override
 				public void run() {
 					try {
-						Thread.sleep(startupDelay * 1000);
+						Thread.sleep(TimeUnit.SECONDS.toMillis(startupDelay));
 					}
 					catch (InterruptedException ex) {
 						Thread.currentThread().interrupt();

spring-jdbc/src/main/java/org/springframework/jdbc/support/DatabaseStartupValidator.java

@@ -19,6 +19,7 @@
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.util.concurrent.TimeUnit;
 import javax.sql.DataSource;
 
 import org.apache.commons.logging.Log;
@@ -108,7 +109,7 @@ public void afterPropertiesSet() {
 		try {
 			boolean validated = false;
 			long beginTime = System.currentTimeMillis();
-			long deadLine = beginTime + this.timeout * 1000;
+			long deadLine = beginTime + TimeUnit.SECONDS.toMillis(this.timeout);
 			SQLException latestEx = null;
 
 			while (!validated && System.currentTimeMillis() < deadLine) {
@@ -139,7 +140,7 @@ public void afterPropertiesSet() {
 				}
 
 				if (!validated) {
-					Thread.sleep(this.interval * 1000);
+					Thread.sleep(TimeUnit.SECONDS.toMillis(this.interval));
 				}
 			}
 
@@ -148,7 +149,7 @@ public void afterPropertiesSet() {
 						"Database has not started up within " + this.timeout + " seconds", latestEx);
 			}
 
-			float duration = (System.currentTimeMillis() - beginTime) / 1000;
+			float duration = (System.currentTimeMillis() - beginTime)*1f / 1000;
 			if (logger.isInfoEnabled()) {
 				logger.info("Database startup detected after " + duration + " seconds");
 			}

spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/DefaultStompSession.java

@@ -25,6 +25,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.commons.logging.Log;
@@ -87,7 +88,7 @@ public class DefaultStompSession implements ConnectionHandlingStompSession {
 	@Nullable
 	private TaskScheduler taskScheduler;
 
-	private long receiptTimeLimit = 15 * 1000;
+	private long receiptTimeLimit = TimeUnit.SECONDS.toMillis(15);
 
 	private volatile boolean autoReceiptEnabled;
 

spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompClientSupport.java

@@ -17,6 +17,7 @@
 package org.springframework.messaging.simp.stomp;
 
 import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
 
 import org.springframework.lang.Nullable;
 import org.springframework.messaging.converter.MessageConverter;
@@ -48,7 +49,7 @@ public abstract class StompClientSupport {
 
 	private long[] defaultHeartbeat = new long[] {10000, 10000};
 
-	private long receiptTimeLimit = 15 * 1000;
+	private long receiptTimeLimit = TimeUnit.SECONDS.toMillis(15);
 
 
 	/**

spring-messaging/src/main/java/org/springframework/messaging/simp/user/UserRegistryMessageHandler.java

@@ -17,6 +17,7 @@
 package org.springframework.messaging.simp.user;
 
 import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
 
 import org.springframework.context.ApplicationListener;
 import org.springframework.lang.Nullable;
@@ -56,7 +57,7 @@ public class UserRegistryMessageHandler implements MessageHandler, ApplicationLi
 	@Nullable
 	private volatile ScheduledFuture<?> scheduledFuture;
 
-	private long registryExpirationPeriod = 20 * 1000;
+	private long registryExpirationPeriod = TimeUnit.SECONDS.toMillis(20);
 
 
 	/**

spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketMessageBrokerStats.java

@@ -75,7 +75,7 @@ public class WebSocketMessageBrokerStats {
 	@Nullable
 	private ScheduledFuture<?> loggingTask;
 
-	private long loggingPeriod = 30 * 60 * 1000;
+	private long loggingPeriod = TimeUnit.MINUTES.toMillis(30);
 
 
 	public void setSubProtocolWebSocketHandler(SubProtocolWebSocketHandler webSocketHandler) {
@@ -114,7 +114,7 @@ public void setOutboundChannelExecutor(ThreadPoolTaskExecutor outboundChannelExe
 
 	public void setSockJsTaskScheduler(ThreadPoolTaskScheduler sockJsTaskScheduler) {
 		this.sockJsTaskScheduler = sockJsTaskScheduler.getScheduledThreadPoolExecutor();
-		this.loggingTask = initLoggingTask(60 * 1000);
+		this.loggingTask = initLoggingTask(TimeUnit.MINUTES.toMillis(1));
 	}
 
 	@Nullable

spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java

@@ -87,9 +87,9 @@ public abstract class AbstractSockJsService implements SockJsService, CorsConfig
 
 	private boolean sessionCookieNeeded = true;
 
-	private long heartbeatTime = 25 * 1000;
+	private long heartbeatTime = TimeUnit.SECONDS.toMillis(25);
 
-	private long disconnectDelay = 5 * 1000;
+	private long disconnectDelay = TimeUnit.SECONDS.toMillis(5 );
 
 	private int httpMessageCacheSize = 100;