Spring/spring-integration-samples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to the latest deps; fix compatibility

Browse Source
This commit is contained in:
Artem Bilan
2022-07-12 17:25:34 -04:00
parent 0b83398a9c
commit ceeebd7be7
72 changed files with 143 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intermediate/async-gateway/pom.xml
View File

@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
intermediate/dynamic-poller/pom.xml
View File

@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

159
intermediate/dynamic-poller/src/main/java/org/springframework/integration/samples/poller/DynamicPeriodicTrigger.java
View File

@@ -1,159 +0,0 @@
/*
* Copyright 2002-2012 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.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.integration.samples.poller;
import java.util.Date;
import java.util.concurrent.TimeUnit;
import org.springframework.scheduling.Trigger;
import org.springframework.scheduling.TriggerContext;
import org.springframework.scheduling.support.PeriodicTrigger;
import org.springframework.util.Assert;
/**
* This is a dynamically changeable {@link Trigger}. It is based on the
* {@link PeriodicTrigger} implementations. However, the fields of this dynamic
* trigger are not final and the properties can be inspected and set via
* explicit getters and setters.
*
* @author Gunnar Hillert
*
*/
public class DynamicPeriodicTrigger implements Trigger {
private volatile long period;
private volatile TimeUnit timeUnit;
private volatile long initialDelay = 0;
private volatile boolean fixedRate = false;
/**
* Create a trigger with the given period in milliseconds. The underlying
* {@link TimeUnit} will be initialized to TimeUnit.MILLISECONDS.
*
* @param period Must not be negative
*/
public DynamicPeriodicTrigger(long period) {
this(period, TimeUnit.MILLISECONDS);
}
/**
* Create a trigger with the given period and time unit. The time unit will
* apply not only to the period but also to any 'initialDelay' value, if
* configured on this Trigger later via {@link #setInitialDelay(long)}.
*
* @param period Must not be negative
* @param timeUnit Must not be null
*
*/
public DynamicPeriodicTrigger(long period, TimeUnit timeUnit) {
Assert.isTrue(period >= 0, "period must not be negative");
Assert.notNull(timeUnit, "timeUnit must not be null");
this.timeUnit = timeUnit;
this.period = this.timeUnit.toMillis(period);
}
/**
* Specify the delay for the initial execution. It will be evaluated in
* terms of this trigger's {@link TimeUnit}. If no time unit was explicitly
* provided upon instantiation, the default is milliseconds.
*/
public void setInitialDelay(long initialDelay) {
Assert.isTrue(initialDelay >= 0, "initialDelay must not be negative");
this.initialDelay = this.timeUnit.toMillis(initialDelay);
}
/**
* Specify whether the periodic interval should be measured between the
* scheduled start times rather than between actual completion times.
* The latter, "fixed delay" behavior, is the default.
*/
public void setFixedRate(boolean fixedRate) {
this.fixedRate = fixedRate;
}
/**
* Returns the time after which a task should run again.
*/
public Date nextExecutionTime(TriggerContext triggerContext) {
if (triggerContext.lastScheduledExecutionTime() == null) {
return new Date(System.currentTimeMillis() + this.initialDelay);
}
else if (this.fixedRate) {
return new Date(triggerContext.lastScheduledExecutionTime().getTime() + this.period);
}
return new Date(triggerContext.lastCompletionTime().getTime() + this.period);
}
public long getPeriod() {
return period;
}
/**
* Specify the period of the trigger. It will be evaluated in
* terms of this trigger's {@link TimeUnit}. If no time unit was explicitly
* provided upon instantiation, the default is milliseconds.
*
* @param period Must not be negative
*/
public void setPeriod(long period) {
Assert.isTrue(period >= 0, "period must not be negative");
this.period = this.timeUnit.toMillis(period);
}
public TimeUnit getTimeUnit() {
return timeUnit;
}
public void setTimeUnit(TimeUnit timeUnit) {
Assert.notNull(timeUnit, "timeUnit must not be null");
this.timeUnit = timeUnit;
}
public long getInitialDelay() {
return initialDelay;
}
public boolean isFixedRate() {
return fixedRate;
}
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
}
if (!(obj instanceof DynamicPeriodicTrigger)) {
return false;
}
DynamicPeriodicTrigger other = (DynamicPeriodicTrigger) obj;
return this.fixedRate == other.fixedRate
&& this.initialDelay == other.initialDelay
&& this.period == other.period;
}
@Override
public int hashCode() {
return (this.fixedRate ? 14 : 41) +
(int) (38 * this.period) +
(int) (43 * this.initialDelay);
}
}

9
intermediate/dynamic-poller/src/main/java/org/springframework/integration/samples/poller/Main.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2022 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.
@@ -13,8 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.integration.samples.poller;
import java.time.Duration;
import java.util.Scanner;
import org.apache.commons.logging.Log;
@@ -22,12 +24,15 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.integration.util.DynamicPeriodicTrigger;
/**
* Starts the Spring Context and will initialize the Spring Integration routes.
*
* @author Gunnar Hillert
* @author Gary Russell
* @author Artem Bilan
*
* @version 1.0
*
*/
@@ -85,7 +90,7 @@ public final class Main {
System.out.println(String.format("Setting trigger period to '%s' ms", triggerPeriod));
trigger.setPeriod(triggerPeriod);
trigger.setDuration(Duration.ofMillis(triggerPeriod));
}
catch (Exception e) {

4
intermediate/dynamic-poller/src/main/resources/META-INF/spring/integration/spring-integration-context.xml
View File

@@ -14,8 +14,8 @@
</int:inbound-channel-adapter>
<bean id="dynamicTrigger"
class="org.springframework.integration.samples.poller.DynamicPeriodicTrigger">
<constructor-arg name="period" value="5000" />
class="org.springframework.integration.util.DynamicPeriodicTrigger">
<constructor-arg name="duration" value="#{T(java.time.Duration).ofMillis(5000)}" />
</bean>
<int:logging-channel-adapter id="logger"

4
intermediate/errorhandling/pom.xml
View File

@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
intermediate/file-processing/pom.xml
View File

@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
intermediate/mail-attachments/pom.xml
View File

@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -150,7 +150,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
intermediate/monitoring/pom.xml
View File

@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -187,7 +187,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
intermediate/multipart-http/pom.xml
View File

@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -187,7 +187,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
intermediate/rest-http/pom.xml
View File

@@ -107,7 +107,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -218,7 +218,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
intermediate/retry-and-more/pom.xml
View File

@@ -93,7 +93,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -166,7 +166,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
intermediate/splitter-aggregator-reaper/pom.xml
View File

@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
intermediate/stored-procedures-derby/pom.xml
View File

@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -139,7 +139,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
intermediate/stored-procedures-ms/pom.xml
View File

@@ -72,7 +72,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -145,7 +145,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
intermediate/stored-procedures-oracle/pom.xml
View File

@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -139,7 +139,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
intermediate/stored-procedures-postgresql/pom.xml
View File

@@ -78,7 +78,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -151,7 +151,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

2
intermediate/tcp-async-bi-directional/pom.xml
View File

@@ -145,7 +145,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
intermediate/tcp-client-server-multiplex/pom.xml
View File

@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

2
intermediate/testcontainers-rabbitmq/pom.xml
View File

@@ -179,7 +179,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
intermediate/travel/pom.xml
View File

@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -143,7 +143,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
intermediate/tx-synch/pom.xml
View File

@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
<version>2.17.2</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -144,7 +144,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>6.0.0-M3</version>
<version>6.0.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>