Use switch expression; some other clean up

Author: artembilan

spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpMessageSource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2023 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.
@@ -276,17 +276,11 @@ public void acknowledge(Status status) {
 			try {
 				long deliveryTag = this.ackInfo.getGetResponse().getEnvelope().getDeliveryTag();
 				switch (status) {
-					case ACCEPT:
-						this.ackInfo.getChannel().basicAck(deliveryTag, false);
-						break;
-					case REJECT:
-						this.ackInfo.getChannel().basicReject(deliveryTag, false);
-						break;
-					case REQUEUE:
-						this.ackInfo.getChannel().basicReject(deliveryTag, true);
-						break;
-					default:
-						break;
+					case ACCEPT -> this.ackInfo.getChannel().basicAck(deliveryTag, false);
+					case REJECT -> this.ackInfo.getChannel().basicReject(deliveryTag, false);
+					case REQUEUE -> this.ackInfo.getChannel().basicReject(deliveryTag, true);
+					default -> {
+					}
 				}
 				if (this.ackInfo.isTransacted()) {
 					this.ackInfo.getChannel().txCommit();

spring-integration-core/src/main/java/org/springframework/integration/channel/FluxMessageChannel.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 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.
@@ -78,21 +78,15 @@ protected boolean doSend(Message<?> message, long timeout) {
 	}
 
 	private boolean tryEmitMessage(Message<?> message) {
-		switch (this.sink.tryEmitNext(message)) {
-			case OK:
-				return true;
-			case FAIL_NON_SERIALIZED:
-			case FAIL_OVERFLOW:
-				return false;
-			case FAIL_ZERO_SUBSCRIBER:
-				throw new IllegalStateException("The [" + this + "] doesn't have subscribers to accept messages");
-			case FAIL_TERMINATED:
-			case FAIL_CANCELLED:
-				throw new IllegalStateException("Cannot emit messages into the cancelled or terminated sink: "
-						+ this.sink);
-			default:
-				throw new UnsupportedOperationException();
-		}
+		return switch (this.sink.tryEmitNext(message)) {
+			case OK -> true;
+			case FAIL_NON_SERIALIZED, FAIL_OVERFLOW -> false;
+			case FAIL_ZERO_SUBSCRIBER ->
+					throw new IllegalStateException("The [" + this + "] doesn't have subscribers to accept messages");
+			case FAIL_TERMINATED, FAIL_CANCELLED ->
+					throw new IllegalStateException("Cannot emit messages into the cancelled or terminated sink: "
+							+ this.sink);
+		};
 	}
 
 	@Override

spring-integration-core/src/main/java/org/springframework/integration/handler/LoggingHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -151,7 +151,7 @@ public void setLoggerName(String loggerName) {
 
 	/**
 	 * Specify whether to log the full Message. Otherwise, only the payload will be logged. This value is
-	 * <code>false</code> by default.
+	 * {@code false} by default.
 	 * @param shouldLogFullMessage true if the complete message should be logged.
 	 */
 	public void setShouldLogFullMessage(boolean shouldLogFullMessage) {
@@ -178,26 +178,13 @@ protected void onInit() {
 	protected void handleMessageInternal(Message<?> message) {
 		Supplier<CharSequence> logMessage = () -> createLogMessage(message);
 		switch (this.level) {
-			case FATAL:
-				this.messageLogger.fatal(logMessage);
-				break;
-			case ERROR:
-				this.messageLogger.error(logMessage);
-				break;
-			case WARN:
-				this.messageLogger.warn(logMessage);
-				break;
-			case INFO:
-				this.messageLogger.info(logMessage);
-				break;
-			case DEBUG:
-				this.messageLogger.debug(logMessage);
-				break;
-			case TRACE:
-				this.messageLogger.trace(logMessage);
-				break;
-			default:
-				throw new IllegalStateException("Level '" + this.level + "' is not supported");
+			case FATAL -> this.messageLogger.fatal(logMessage);
+			case ERROR -> this.messageLogger.error(logMessage);
+			case WARN -> this.messageLogger.warn(logMessage);
+			case INFO -> this.messageLogger.info(logMessage);
+			case DEBUG -> this.messageLogger.debug(logMessage);
+			case TRACE -> this.messageLogger.trace(logMessage);
+			default -> throw new IllegalStateException("Level '" + this.level + "' is not supported");
 		}
 	}
 
@@ -209,7 +196,7 @@ private String createLogMessage(Message<?> message) {
 				: Objects.toString(logMessage);
 	}
 
-	private String createLogMessage(Throwable throwable) {
+	private static String createLogMessage(Throwable throwable) {
 		StringWriter stringWriter = new StringWriter();
 		if (throwable instanceof AggregateMessageDeliveryException) {
 			stringWriter.append(throwable.getMessage());
@@ -223,7 +210,7 @@ private String createLogMessage(Throwable throwable) {
 		return stringWriter.toString();
 	}
 
-	private void printStackTrace(Throwable throwable, Writer writer) {
+	private static void printStackTrace(Throwable throwable, Writer writer) {
 		throwable.printStackTrace(new PrintWriter(writer, true));
 	}
 

spring-integration-file/src/main/java/org/springframework/integration/file/remote/gateway/AbstractRemoteFileOutboundGateway.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -579,24 +579,16 @@ private void setupLocalDirectory() {
 	@Override
 	protected Object handleRequestMessage(final Message<?> requestMessage) {
 		if (this.command != null) {
-			switch (this.command) {
-				case LS:
-					return doLs(requestMessage);
-				case NLST:
-					return doNlst(requestMessage);
-				case GET:
-					return doGet(requestMessage);
-				case MGET:
-					return doMget(requestMessage);
-				case RM:
-					return doRm(requestMessage);
-				case MV:
-					return doMv(requestMessage);
-				case PUT:
-					return doPut(requestMessage);
-				case MPUT:
-					return doMput(requestMessage);
-			}
+			return switch (this.command) {
+				case LS -> doLs(requestMessage);
+				case NLST -> doNlst(requestMessage);
+				case GET -> doGet(requestMessage);
+				case MGET -> doMget(requestMessage);
+				case RM -> doRm(requestMessage);
+				case MV -> doMv(requestMessage);
+				case PUT -> doPut(requestMessage);
+				case MPUT -> doMput(requestMessage);
+			};
 		}
 		return this.remoteFileTemplate.execute(session ->
 				AbstractRemoteFileOutboundGateway.this.messageSessionCallback.doInSession(session, requestMessage));

spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/AbstractFtpSessionFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -216,18 +216,12 @@ private T createClient() throws IOException {
 	}
 
 	/**
-	 * Sets the mode of the connection. Only local modes are supported.
+	 * Set the mode of the connection. Only local modes are supported.
 	 */
 	private void updateClientMode(FTPClient client) {
 		switch (this.clientMode) {
-			case FTPClient.ACTIVE_LOCAL_DATA_CONNECTION_MODE:
-				client.enterLocalActiveMode();
-				break;
-			case FTPClient.PASSIVE_LOCAL_DATA_CONNECTION_MODE:
-				client.enterLocalPassiveMode();
-				break;
-			default:
-				break;
+			case FTPClient.ACTIVE_LOCAL_DATA_CONNECTION_MODE -> client.enterLocalActiveMode();
+			case FTPClient.PASSIVE_LOCAL_DATA_CONNECTION_MODE -> client.enterLocalPassiveMode();
 		}
 	}
 

spring-integration-hazelcast/src/main/java/org/springframework/integration/hazelcast/inbound/HazelcastDistributedSQLMessageSource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 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.
@@ -32,6 +32,8 @@
  * distributed query in the cluster and returns results in the light of iteration type.
  *
  * @author Eren Avsarogullari
+ * @author Artem Bilan
+ *
  * @since 6.0
  */
 @SuppressWarnings("rawtypes")
@@ -63,30 +65,20 @@ public String getComponentType() {
 	@Override
 	@SuppressWarnings("unchecked")
 	protected Collection<?> doReceive() {
-		switch (this.iterationType) {
-			case ENTRY:
-				return getDistributedSQLResultSet(Collections
-						.unmodifiableCollection(this.distributedMap.entrySet(new SqlPredicate(this.distributedSql))));
-
-			case KEY:
-				return getDistributedSQLResultSet(Collections
-						.unmodifiableCollection(this.distributedMap.keySet(new SqlPredicate(this.distributedSql))));
-
-			case LOCAL_KEY:
-				return getDistributedSQLResultSet(Collections
-						.unmodifiableCollection(this.distributedMap.localKeySet(new SqlPredicate(this.distributedSql))));
-
-			default:
-				return getDistributedSQLResultSet(this.distributedMap.values(new SqlPredicate(this.distributedSql)));
-		}
-	}
+		final SqlPredicate predicate = new SqlPredicate(this.distributedSql);
+		Collection<?> collection =
+				switch (this.iterationType) {
+					case ENTRY -> this.distributedMap.entrySet(predicate);
+					case KEY -> this.distributedMap.keySet(predicate);
+					case LOCAL_KEY -> this.distributedMap.localKeySet(predicate);
+					default -> this.distributedMap.values(predicate);
+				};
 
-	private Collection<?> getDistributedSQLResultSet(Collection<?> collection) {
 		if (CollectionUtils.isEmpty(collection)) {
 			return null;
 		}
 
-		return collection;
+		return Collections.unmodifiableCollection(collection);
 	}
 
 }

spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioConnection.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -22,7 +22,6 @@
 import java.io.OutputStream;
 import java.io.UncheckedIOException;
 import java.net.SocketTimeoutException;
-import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.channels.ClosedChannelException;
 import java.nio.channels.SelectionKey;
@@ -224,14 +223,7 @@ protected InputStream inputStream() {
 	 * @return The buffer.
 	 */
 	protected ByteBuffer allocate(int length) {
-		ByteBuffer buffer;
-		if (this.usingDirectBuffers) {
-			buffer = ByteBuffer.allocateDirect(length);
-		}
-		else {
-			buffer = ByteBuffer.allocate(length);
-		}
-		return buffer;
+		return this.usingDirectBuffers ? ByteBuffer.allocateDirect(length) : ByteBuffer.allocate(length);
 	}
 
 	/**
@@ -447,7 +439,7 @@ private void doRead() throws IOException {
 			if (logger.isTraceEnabled()) {
 				logger.trace("After read: " + this.rawBuffer.position() + '/' + this.rawBuffer.limit());
 			}
-			((Buffer) this.rawBuffer).flip();
+			this.rawBuffer.flip();
 			if (logger.isTraceEnabled()) {
 				logger.trace("After flip: " + this.rawBuffer.position() + '/' + this.rawBuffer.limit());
 			}
@@ -472,7 +464,7 @@ protected void sendToPipe(ByteBuffer rawBufferToSend) throws IOException {
 			logger.trace(getConnectionId() + " Sending " + rawBufferToSend.limit() + " to pipe");
 		}
 		this.channelInputStream.write(rawBufferToSend);
-		((Buffer) rawBufferToSend).clear();
+		rawBufferToSend.clear();
 	}
 
 	private void checkForAssembler() {