From 1e2000a73b7fa6e024f11ca1357d0859be0aef94 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Mon, 21 Mar 2022 14:20:49 -0400 Subject: [PATCH] Upgrade Zip sample to the latest dependencies --- samples/zip/input-zip/test.zip | Bin 306 -> 0 bytes samples/zip/pom.xml | 16 +++---- .../integration/samples/zip/Main.java | 43 +++++++++--------- .../samples/zip/SpringIntegrationUtils.java | 8 ++-- .../SpringIntegrationProjectStartupTest.java | 2 +- 5 files changed, 34 insertions(+), 35 deletions(-) delete mode 100644 samples/zip/input-zip/test.zip diff --git a/samples/zip/input-zip/test.zip b/samples/zip/input-zip/test.zip deleted file mode 100644 index ee08a3f217cd5dd15797379523bfcf0a25e9b4fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 306 zcmWIWW@h1H00Fh2BwsKCO0YA?Fr?+@>y=cLgobc3FsH}di3Z`)3T_5QmamKq3@jo* zr2%jQG_V+ulvo5eARDL|gfR?YWRhdX UTF-8 - 1.0.2.RELEASE - 2.13.0 - 4.13.1 + 2.0.0 + 2.17.2 + 4.13.2 @@ -30,10 +30,10 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.10.1 - 1.6 - 1.6 + 1.8 + 1.8 -Xlint:all true true @@ -42,7 +42,7 @@ org.codehaus.mojo exec-maven-plugin - 1.6.0 + 3.0.0 org.springframework.integration.samples.zip.Main @@ -88,7 +88,7 @@ commons-io commons-io - 2.7 + 2.11.0 diff --git a/samples/zip/src/main/java/org/springframework/integration/samples/zip/Main.java b/samples/zip/src/main/java/org/springframework/integration/samples/zip/Main.java index 054e2db..a779b44 100644 --- a/samples/zip/src/main/java/org/springframework/integration/samples/zip/Main.java +++ b/samples/zip/src/main/java/org/springframework/integration/samples/zip/Main.java @@ -39,7 +39,8 @@ public final class Main { private static final Log LOGGER = LogFactory.getLog(Main.class); - private Main() { } + private Main() { + } /** * Load the Spring Integration Application Context @@ -50,13 +51,13 @@ public final class Main { if (LOGGER.isInfoEnabled()) { LOGGER.info("\n=========================================================" - + "\n " - + "\n Welcome to the Spring Integration Zip Sample " - + "\n " - + "\n For more information please visit: " - + "\n https://www.springsource.org/spring-integration " - + "\n " - + "\n=========================================================" ); + + "\n " + + "\n Welcome to the Spring Integration Zip Sample " + + "\n " + + "\n For more information please visit: " + + "\n https://www.springsource.org/spring-integration " + + "\n " + + "\n========================================================="); } final AbstractApplicationContext context = @@ -70,23 +71,21 @@ public final class Main { if (LOGGER.isInfoEnabled()) { LOGGER.info("\n=========================================================" - + "\n " - + "\n Please press 'q + Enter' to quit the application. " - + "\n " - + "\n=========================================================" ); + + "\n " + + "\n Please press 'q + Enter' to quit the application. " + + "\n " + + "\n========================================================="); } - while (!scanner.hasNext("q")) { - //Do nothing unless user presses 'q' to quit. + while (true) { + if (scanner.hasNext("q")) { + if (LOGGER.isInfoEnabled()) { + LOGGER.info("Exiting application...bye."); + } + scanner.close(); + System.exit(0); + } } - - if (LOGGER.isInfoEnabled()) { - LOGGER.info("Exiting application...bye."); - } - - scanner.close(); - System.exit(0); - } } diff --git a/samples/zip/src/main/java/org/springframework/integration/samples/zip/SpringIntegrationUtils.java b/samples/zip/src/main/java/org/springframework/integration/samples/zip/SpringIntegrationUtils.java index 7d09102..4da0428 100644 --- a/samples/zip/src/main/java/org/springframework/integration/samples/zip/SpringIntegrationUtils.java +++ b/samples/zip/src/main/java/org/springframework/integration/samples/zip/SpringIntegrationUtils.java @@ -50,9 +50,9 @@ public final class SpringIntegrationUtils { */ public static void displayDirectories(final ApplicationContext context) { - final Map fileReadingMessageSources = context.getBeansOfType(FileReadingMessageSource.class); + Map fileReadingMessageSources = context.getBeansOfType(FileReadingMessageSource.class); - final List inputDirectories = new ArrayList(); + List inputDirectories = new ArrayList<>(); for (FileReadingMessageSource source : fileReadingMessageSources.values()) { final File inDir = (File) new DirectFieldAccessor(source).getPropertyValue("directory"); @@ -60,9 +60,9 @@ public final class SpringIntegrationUtils { } - final Map fileWritingMessageHandlers = context.getBeansOfType(FileWritingMessageHandler.class); + Map fileWritingMessageHandlers = context.getBeansOfType(FileWritingMessageHandler.class); - final List outputDirectories = new ArrayList(); + List outputDirectories = new ArrayList<>(); for (final FileWritingMessageHandler messageHandler : fileWritingMessageHandlers.values()) { final Expression outDir = (Expression) new DirectFieldAccessor(messageHandler).getPropertyValue("destinationDirectoryExpression"); diff --git a/samples/zip/src/test/java/org/springframework/integration/samples/zip/SpringIntegrationProjectStartupTest.java b/samples/zip/src/test/java/org/springframework/integration/samples/zip/SpringIntegrationProjectStartupTest.java index c4ca0b6..a4425de 100644 --- a/samples/zip/src/test/java/org/springframework/integration/samples/zip/SpringIntegrationProjectStartupTest.java +++ b/samples/zip/src/test/java/org/springframework/integration/samples/zip/SpringIntegrationProjectStartupTest.java @@ -32,7 +32,7 @@ import org.springframework.integration.samples.zip.SpringIntegrationUtils; public class SpringIntegrationProjectStartupTest { @Test - public void testStartupOfSpringInegrationContext() throws Exception{ + public void testStartupOfSpringIntegrationContext() throws Exception{ final ApplicationContext context = new ClassPathXmlApplicationContext("/META-INF/spring/integration/spring-integration-context.xml", SpringIntegrationProjectStartupTest.class);