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

Start 5.2 version; upgrade dependencies; fixes

Browse Source
This commit is contained in:
Artem Bilan
2019-03-20 15:30:31 -04:00
parent 4f48dce420
commit 61c27bac20
9 changed files with 86 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
basic/jdbc/src/main/resources/META-INF/spring/integration/spring-integration-context.xml
View File

@@ -60,7 +60,7 @@
<bean id="replySource" class="org.springframework.integration.jdbc.ExpressionEvaluatingSqlParameterSourceFactory">
<property name="parameterExpressions">
<map>
<entry key="id" value="#this['SCOPE_IDENTITY()']"/>
<entry key="id" value="#this.ID"/>
</map>
</property>
</bean>

6
basic/sftp/src/test/java/org/springframework/integration/samples/sftp/EmbeddedSftpServer.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2017 the original author or authors.
* Copyright 2014-2019 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.
@@ -71,8 +71,8 @@ public class EmbeddedSftpServer implements InitializingBean, SmartLifecycle {
final PublicKey allowedKey = decodePublicKey();
this.server.setPublickeyAuthenticator((username, key, session) -> key.equals(allowedKey));
this.server.setPort(this.port);
this.server.setKeyPairProvider(new SimpleGeneratorHostKeyProvider(new File("hostkey.ser")));
this.server.setSubsystemFactories(Collections.singletonList(new SftpSubsystemFactory()));
this.server.setKeyPairProvider(new SimpleGeneratorHostKeyProvider(new File("hostkey.ser").toPath()));
server.setSubsystemFactories(Collections.singletonList(new SftpSubsystemFactory()));
final String pathname = System.getProperty("java.io.tmpdir") + File.separator + "sftptest" + File.separator;
new File(pathname).mkdirs();
server.setFileSystemFactory(new VirtualFileSystemFactory(Paths.get(pathname)));