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

INT-1916 fixed inability to configure locker/nio-locker with poller on File Inbound Channel Adapter

Browse Source
This commit is contained in:
Oleg Zhurakousky
2011-05-25 15:54:22 -04:00
parent 1ab977f84c
commit 30c0a57a17
3 changed files with 117 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-2.0.xsd
View File

@@ -26,13 +26,22 @@
</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:choice>
<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
<xsd:choice minOccurs="0" maxOccurs="1">
<xsd:element ref="locker" minOccurs="0" maxOccurs="1"/>
<xsd:element ref="nio-locker" minOccurs="0" maxOccurs="1"/>
</xsd:choice>
</xsd:choice>
<xsd:sequence>
<xsd:choice>
<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
<xsd:choice minOccurs="0" maxOccurs="1">
<xsd:element ref="locker" minOccurs="0" maxOccurs="1"/>
<xsd:element ref="nio-locker" minOccurs="0" maxOccurs="1"/>
</xsd:choice>
</xsd:choice>
<xsd:choice>
<xsd:choice minOccurs="0" maxOccurs="1">
<xsd:element ref="locker" minOccurs="0" maxOccurs="1"/>
<xsd:element ref="nio-locker" minOccurs="0" maxOccurs="1"/>
</xsd:choice>
<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
</xsd:choice>
</xsd:sequence>
<xsd:attribute name="id" type="xsd:string"/>
<xsd:attribute name="channel" type="xsd:string">
<xsd:annotation>

48
spring-integration-file/src/test/java/org/springframework/integration/file/config/InboundAdapterWithLockersTests-context.xml Normal file
View File

@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:int-file="http://www.springframework.org/schema/integration/file"
xmlns:int="http://www.springframework.org/schema/integration"
xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file-2.0.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<int-file:inbound-channel-adapter id="inputWithLockerA"
channel="input"
directory="${java.io.tmpdir}"
auto-startup="false">
<int-file:locker ref="locker"/>
<int:poller fixed-rate="5000"/>
</int-file:inbound-channel-adapter>
<int-file:inbound-channel-adapter id="inputWithLockerB"
channel="input"
directory="${java.io.tmpdir}"
auto-startup="false">
<int:poller fixed-rate="5000"/>
<int-file:locker ref="locker"/>
</int-file:inbound-channel-adapter>
<int-file:inbound-channel-adapter id="inputWithLockerC"
channel="input"
directory="${java.io.tmpdir}"
auto-startup="false">
<int-file:nio-locker/>
<int:poller fixed-rate="5000"/>
</int-file:inbound-channel-adapter>
<int-file:inbound-channel-adapter id="inputWithLockerD"
channel="input"
directory="${java.io.tmpdir}"
auto-startup="false">
<int:poller fixed-rate="5000"/>
<int-file:nio-locker/>
</int-file:inbound-channel-adapter>
<int:channel id="input"/>
<bean id="locker" class="org.mockito.Mockito" factory-method="mock">
<constructor-arg value="org.springframework.integration.file.locking.AbstractFileLockerFilter"/>
</bean>
</beans>

53
spring-integration-file/src/test/java/org/springframework/integration/file/config/InboundAdapterWithLockersTests.java Normal file
View File

@@ -0,0 +1,53 @@
/*
* Copyright 2002-2011 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
*
* http://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.file.config;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertNotNull;
import static junit.framework.Assert.assertTrue;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.integration.file.locking.NioFileLocker;
import org.springframework.integration.test.util.TestUtils;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
/**
* @author Oleg Zhurakousky
*
*/
@ContextConfiguration
@RunWith(SpringJUnit4ClassRunner.class)
public class InboundAdapterWithLockersTests {
@Autowired(required = true)
private ApplicationContext context;
@Test
public void testAdaptersWithLockers() {
assertEquals(context.getBean("locker"),
TestUtils.getPropertyValue(context.getBean("inputWithLockerA"), "source.scanner.locker"));
assertEquals(context.getBean("locker"),
TestUtils.getPropertyValue(context.getBean("inputWithLockerB"), "source.scanner.locker"));
assertTrue(TestUtils.getPropertyValue(context.getBean("inputWithLockerC"), "source.scanner.locker")
instanceof NioFileLocker);
assertTrue(TestUtils.getPropertyValue(context.getBean("inputWithLockerD"), "source.scanner.locker")
instanceof NioFileLocker);
}
}