You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by lg...@apache.org on 2018/05/22 13:35:08 UTC
mina-sshd git commit: Upgraded various artifacts versions
Repository: mina-sshd
Updated Branches:
refs/heads/master 0e3da6857 -> 51822113d
Upgraded various artifacts versions
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/51822113
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/51822113
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/51822113
Branch: refs/heads/master
Commit: 51822113d5517f3fefa14008c4bc678cb4981808
Parents: 0e3da68
Author: Goldstein Lyor <ly...@c-b4.com>
Authored: Tue May 22 14:20:43 2018 +0300
Committer: Goldstein Lyor <ly...@c-b4.com>
Committed: Tue May 22 16:35:00 2018 +0300
----------------------------------------------------------------------
pom.xml | 14 ++--
.../java/org/apache/sshd/client/SshClient.java | 2 +-
.../auth/AuthenticationIdentitiesProvider.java | 2 +-
.../auth/password/PasswordIdentityProvider.java | 8 +-
.../client/session/AbstractClientSession.java | 2 +-
.../common/channel/ChannelRequestHandler.java | 4 +-
.../common/keyprovider/KeyIdentityProvider.java | 8 +-
.../ConnectionServiceRequestHandler.java | 4 +-
.../apache/sshd/common/util/GenericUtils.java | 23 ++++--
.../apache/sshd/common/util/Transformer.java | 57 --------------
.../apache/sshd/common/util/buffer/Buffer.java | 7 +-
.../auth/PasswordIdentityProviderTest.java | 2 +-
.../common/config/SshConfigFileReaderTest.java | 3 +-
.../sshd/common/util/TransformerTest.java | 79 --------------------
sshd-netty/pom.xml | 2 +-
sshd-spring-sftp/pom.xml | 2 +-
16 files changed, 43 insertions(+), 176 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/51822113/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8b40fd6..1198af7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,7 @@
<javac.source>${java.major.version}.${java.minor.version}</javac.source>
<project.build.java.source>${javac.source}</project.build.java.source>
<maven.compiler.source>${javac.source}</maven.compiler.source>
- <ant.version>1.10.1</ant.version>
+ <ant.version>1.10.3</ant.version>
<ant.build.javac.source>${javac.source}</ant.build.javac.source>
<javac.target>${javac.source}</javac.target>
@@ -110,12 +110,12 @@
<bouncycastle.version>1.59</bouncycastle.version>
<slf4j.version>1.7.25</slf4j.version>
- <spring.version>5.0.5.RELEASE</spring.version>
+ <spring.version>5.0.6.RELEASE</spring.version>
<jgit.version>4.11.0.201803080745-r</jgit.version>
<junit.version>4.12</junit.version>
- <surefire.plugin.version>2.20.1</surefire.plugin.version>
+ <surefire.plugin.version>2.21.0</surefire.plugin.version>
<!-- See https://pmd.github.io/ for available latest version -->
- <pmd.version>6.2.0</pmd.version>
+ <pmd.version>6.3.0</pmd.version>
</properties>
<profiles>
@@ -205,7 +205,7 @@
<dependency>
<groupId>net.i2p.crypto</groupId>
<artifactId>eddsa</artifactId>
- <version>0.2.0</version>
+ <version>0.3.0</version>
</dependency>
<dependency>
@@ -307,7 +307,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>2.15.0</version>
+ <version>2.18.3</version>
</dependency>
<dependency>
<groupId>net.sf.jpam</groupId>
@@ -579,7 +579,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
- <version>8.9</version>
+ <version>8.10</version>
<exclusions>
<!-- MCHECKSTYLE-156 -->
<exclusion>
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/51822113/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java b/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java
index e387bb6..31e4234 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java
@@ -167,7 +167,7 @@ public class SshClient extends AbstractFactoryManager implements ClientFactoryMa
private final AtomicBoolean started = new AtomicBoolean(false);
public SshClient() {
- identitiesProvider = AuthenticationIdentitiesProvider.wrap(identities);
+ identitiesProvider = AuthenticationIdentitiesProvider.wrapIdentities(identities);
}
public SessionFactory getSessionFactory() {
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/51822113/sshd-core/src/main/java/org/apache/sshd/client/auth/AuthenticationIdentitiesProvider.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/auth/AuthenticationIdentitiesProvider.java b/sshd-core/src/main/java/org/apache/sshd/client/auth/AuthenticationIdentitiesProvider.java
index 8bc175b..cfd1f85 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/auth/AuthenticationIdentitiesProvider.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/auth/AuthenticationIdentitiesProvider.java
@@ -83,7 +83,7 @@ public interface AuthenticationIdentitiesProvider extends KeyIdentityProvider, P
* @param identities The {@link Iterable} identities - OK if {@code null}/empty
* @return An {@link AuthenticationIdentitiesProvider} wrapping the identities
*/
- static AuthenticationIdentitiesProvider wrap(Iterable<?> identities) {
+ static AuthenticationIdentitiesProvider wrapIdentities(Iterable<?> identities) {
return new AuthenticationIdentitiesProvider() {
@Override
public Iterable<KeyPair> loadKeys() {
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/51822113/sshd-core/src/main/java/org/apache/sshd/client/auth/password/PasswordIdentityProvider.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/auth/password/PasswordIdentityProvider.java b/sshd-core/src/main/java/org/apache/sshd/client/auth/password/PasswordIdentityProvider.java
index 1662764..6af6696 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/auth/password/PasswordIdentityProvider.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/auth/password/PasswordIdentityProvider.java
@@ -144,7 +144,7 @@ public interface PasswordIdentityProvider {
* @return The wrapping provider
*/
static PasswordIdentityProvider multiProvider(Collection<? extends PasswordIdentityProvider> providers) {
- return GenericUtils.isEmpty(providers) ? EMPTY_PASSWORDS_PROVIDER : wrap(iterableOf(providers));
+ return GenericUtils.isEmpty(providers) ? EMPTY_PASSWORDS_PROVIDER : wrapPasswords(iterableOf(providers));
}
/**
@@ -166,8 +166,8 @@ public interface PasswordIdentityProvider {
* (i.e., returns {@link #EMPTY_PASSWORDS_PROVIDER})
* @return The provider wrapper
*/
- static PasswordIdentityProvider wrap(String... passwords) {
- return wrap(GenericUtils.asList(passwords));
+ static PasswordIdentityProvider wrapPasswords(String... passwords) {
+ return wrapPasswords(GenericUtils.asList(passwords));
}
/**
@@ -177,7 +177,7 @@ public interface PasswordIdentityProvider {
* (i.e., returns {@link #EMPTY_PASSWORDS_PROVIDER})
* @return The provider wrapper
*/
- static PasswordIdentityProvider wrap(Iterable<String> passwords) {
+ static PasswordIdentityProvider wrapPasswords(Iterable<String> passwords) {
return (passwords == null) ? EMPTY_PASSWORDS_PROVIDER : () -> passwords;
}
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/51822113/sshd-core/src/main/java/org/apache/sshd/client/session/AbstractClientSession.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/session/AbstractClientSession.java b/sshd-core/src/main/java/org/apache/sshd/client/session/AbstractClientSession.java
index 1cb309a..8d37879 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/session/AbstractClientSession.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/session/AbstractClientSession.java
@@ -83,7 +83,7 @@ public abstract class AbstractClientSession extends AbstractSession implements C
protected AbstractClientSession(ClientFactoryManager factoryManager, IoSession ioSession) {
super(false, factoryManager, ioSession);
- identitiesProvider = AuthenticationIdentitiesProvider.wrap(identities);
+ identitiesProvider = AuthenticationIdentitiesProvider.wrapIdentities(identities);
}
@Override
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/51822113/sshd-core/src/main/java/org/apache/sshd/common/channel/ChannelRequestHandler.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/channel/ChannelRequestHandler.java b/sshd-core/src/main/java/org/apache/sshd/common/channel/ChannelRequestHandler.java
index c852834..2b97bc0 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/channel/ChannelRequestHandler.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/channel/ChannelRequestHandler.java
@@ -21,7 +21,7 @@ package org.apache.sshd.common.channel;
import java.util.function.Function;
-import org.apache.sshd.common.util.Transformer;
+import org.apache.sshd.common.util.GenericUtils;
import org.apache.sshd.common.util.buffer.Buffer;
/**
@@ -30,7 +30,7 @@ import org.apache.sshd.common.util.buffer.Buffer;
public interface ChannelRequestHandler extends RequestHandler<Channel> {
// required because of generics issues
- Function<ChannelRequestHandler, RequestHandler<Channel>> CHANN2HNDLR = Transformer.identity();
+ Function<ChannelRequestHandler, RequestHandler<Channel>> CHANN2HNDLR = GenericUtils.downcast();
@Override
Result process(Channel channel, String request, boolean wantReply, Buffer buffer) throws Exception;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/51822113/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/KeyIdentityProvider.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/KeyIdentityProvider.java b/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/KeyIdentityProvider.java
index 626c706..2ef4fa2 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/KeyIdentityProvider.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/keyprovider/KeyIdentityProvider.java
@@ -164,7 +164,7 @@ public interface KeyIdentityProvider {
* @return The wrapping provider
*/
static KeyIdentityProvider multiProvider(Collection<? extends KeyIdentityProvider> providers) {
- return GenericUtils.isEmpty(providers) ? EMPTY_KEYS_PROVIDER : wrap(iterableOf(providers));
+ return GenericUtils.isEmpty(providers) ? EMPTY_KEYS_PROVIDER : wrapKeyPairs(iterableOf(providers));
}
/**
@@ -187,8 +187,8 @@ public interface KeyIdentityProvider {
* {@link #EMPTY_KEYS_PROVIDER}).
* @return The provider wrapper
*/
- static KeyIdentityProvider wrap(KeyPair... pairs) {
- return wrap(GenericUtils.asList(pairs));
+ static KeyIdentityProvider wrapKeyPairs(KeyPair... pairs) {
+ return wrapKeyPairs(GenericUtils.asList(pairs));
}
/**
@@ -198,7 +198,7 @@ public interface KeyIdentityProvider {
* {@link #EMPTY_KEYS_PROVIDER}).
* @return The provider wrapper
*/
- static KeyIdentityProvider wrap(final Iterable<KeyPair> pairs) {
+ static KeyIdentityProvider wrapKeyPairs(Iterable<KeyPair> pairs) {
return (pairs == null) ? EMPTY_KEYS_PROVIDER : () -> pairs;
}
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/51822113/sshd-core/src/main/java/org/apache/sshd/common/session/ConnectionServiceRequestHandler.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/session/ConnectionServiceRequestHandler.java b/sshd-core/src/main/java/org/apache/sshd/common/session/ConnectionServiceRequestHandler.java
index e5c6ac7..21cbac1 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/session/ConnectionServiceRequestHandler.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/session/ConnectionServiceRequestHandler.java
@@ -22,7 +22,7 @@ package org.apache.sshd.common.session;
import java.util.function.Function;
import org.apache.sshd.common.channel.RequestHandler;
-import org.apache.sshd.common.util.Transformer;
+import org.apache.sshd.common.util.GenericUtils;
import org.apache.sshd.common.util.buffer.Buffer;
/**
@@ -31,7 +31,7 @@ import org.apache.sshd.common.util.buffer.Buffer;
public interface ConnectionServiceRequestHandler extends RequestHandler<ConnectionService> {
// required because of generics issues
- Function<ConnectionServiceRequestHandler, RequestHandler<ConnectionService>> SVC2HNDLR = Transformer.identity();
+ Function<ConnectionServiceRequestHandler, RequestHandler<ConnectionService>> SVC2HNDLR = GenericUtils.downcast();
@Override
Result process(ConnectionService service, String request, boolean wantReply, Buffer buffer) throws Exception;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/51822113/sshd-core/src/main/java/org/apache/sshd/common/util/GenericUtils.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/GenericUtils.java b/sshd-core/src/main/java/org/apache/sshd/common/util/GenericUtils.java
index 4646e5c..f22043a 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/util/GenericUtils.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/util/GenericUtils.java
@@ -814,6 +814,15 @@ public final class GenericUtils {
}
/**
+ * @param <B> Generic base class
+ * @param <D> Generic child class
+ * @return An identity {@link Function} that returns its input child class as a base class
+ */
+ public static <B, D extends B> Function<D, B> downcast() {
+ return t -> t;
+ }
+
+ /**
* Resolves to an always non-{@code null} iterator
*
* @param <T> Type of value being iterated
@@ -825,17 +834,16 @@ public final class GenericUtils {
return (iter == null) ? Collections.emptyIterator() : iter;
}
- public static <U, V> Iterable<V> wrapIterable(Iterable<? extends U> iter, Function<U, V> mapper) {
+ public static <U, V> Iterable<V> wrapIterable(Iterable<? extends U> iter, Function<? super U, ? extends V> mapper) {
return () -> wrapIterator(iter, mapper);
}
- public static <U, V> Iterator<V> wrapIterator(Iterable<? extends U> iter, Function<U, V> mapper) {
- return stream(iter)
- .map(mapper::apply)
- .iterator();
+ @SuppressWarnings({ "unchecked", "rawtypes" })
+ public static <U, V> Iterator<V> wrapIterator(Iterable<? extends U> iter, Function<? super U, ? extends V> mapper) {
+ return (Iterator) stream(iter).map(mapper).iterator();
}
- public static <U, V> Iterator<V> wrapIterator(Iterator<? extends U> iter, Function<U, V> mapper) {
+ public static <U, V> Iterator<V> wrapIterator(Iterator<? extends U> iter, Function<? super U, ? extends V> mapper) {
Iterator<? extends U> iterator = iteratorOf(iter);
return new Iterator<V>() {
@Override
@@ -845,7 +853,8 @@ public final class GenericUtils {
@Override
public V next() {
- return mapper.apply(iterator.next());
+ U value = iterator.next();
+ return mapper.apply(value);
}
};
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/51822113/sshd-core/src/main/java/org/apache/sshd/common/util/Transformer.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/Transformer.java b/sshd-core/src/main/java/org/apache/sshd/common/util/Transformer.java
deleted file mode 100644
index b7e3084..0000000
--- a/sshd-core/src/main/java/org/apache/sshd/common/util/Transformer.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.apache.sshd.common.util;
-
-import java.util.Objects;
-import java.util.function.Function;
-
-/**
- * @param <I> Input type
- * @param <O> Output type
- * @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
- */
-@FunctionalInterface
-public interface Transformer<I, O> extends Function<I, O> {
- /**
- * Invokes {@link Objects#toString(Object, String)} on the argument
- * with {@code null} as the value to return if argument is {@code null}
- */
- Function<Object, String> TOSTRING = input -> Objects.toString(input, null);
-
- /**
- * Returns {@link Enum#name()} or {@code null} if argument is {@code null}
- */
- Function<Enum<?>, String> ENUM_NAME_EXTRACTOR = input -> (input == null) ? null : input.name();
-
- @Override
- default O apply(I input) {
- return transform(input);
- }
-
- /**
- * @param input Input value
- * @return Transformed output value
- */
- O transform(I input);
-
- static <U extends V, V> Transformer<U, V> identity() {
- return input -> input;
- }
-}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/51822113/sshd-core/src/main/java/org/apache/sshd/common/util/buffer/Buffer.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/buffer/Buffer.java b/sshd-core/src/main/java/org/apache/sshd/common/util/buffer/Buffer.java
index 3180b09..7023662 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/util/buffer/Buffer.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/util/buffer/Buffer.java
@@ -63,7 +63,6 @@ import org.apache.sshd.common.keyprovider.KeyPairProvider;
import org.apache.sshd.common.util.GenericUtils;
import org.apache.sshd.common.util.NumberUtils;
import org.apache.sshd.common.util.Readable;
-import org.apache.sshd.common.util.Transformer;
import org.apache.sshd.common.util.buffer.keys.BufferPublicKeyParser;
import org.apache.sshd.common.util.logging.SimplifiedLog;
import org.apache.sshd.common.util.security.SecurityUtils;
@@ -80,10 +79,6 @@ public abstract class Buffer implements Readable {
super();
}
- /*======================
- Global methods
- ======================*/
-
public abstract int rpos();
public abstract void rpos(int rpos);
@@ -607,7 +602,7 @@ public abstract class Buffer implements Readable {
return;
}
- objects.forEach(o -> putString(Transformer.TOSTRING.apply(o), charset));
+ objects.forEach(o -> putString(Objects.toString(o, null), charset));
}
public void putString(String string) {
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/51822113/sshd-core/src/test/java/org/apache/sshd/client/auth/PasswordIdentityProviderTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/client/auth/PasswordIdentityProviderTest.java b/sshd-core/src/test/java/org/apache/sshd/client/auth/PasswordIdentityProviderTest.java
index db69a5f..4eaeed6 100644
--- a/sshd-core/src/test/java/org/apache/sshd/client/auth/PasswordIdentityProviderTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/client/auth/PasswordIdentityProviderTest.java
@@ -57,7 +57,7 @@ public class PasswordIdentityProviderTest extends BaseTestSupport {
Collection<String> passwords = Arrays.asList(va);
expected.addAll(passwords);
- PasswordIdentityProvider p = PasswordIdentityProvider.wrap(passwords);
+ PasswordIdentityProvider p = PasswordIdentityProvider.wrapPasswords(passwords);
assertProviderContents("Wrapped", p, passwords);
providers.add(p);
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/51822113/sshd-core/src/test/java/org/apache/sshd/common/config/SshConfigFileReaderTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/common/config/SshConfigFileReaderTest.java b/sshd-core/src/test/java/org/apache/sshd/common/config/SshConfigFileReaderTest.java
index 6f39ad7..1cb11ba 100644
--- a/sshd-core/src/test/java/org/apache/sshd/common/config/SshConfigFileReaderTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/common/config/SshConfigFileReaderTest.java
@@ -48,7 +48,6 @@ import org.apache.sshd.common.mac.Mac;
import org.apache.sshd.common.signature.BuiltinSignatures;
import org.apache.sshd.common.signature.Signature;
import org.apache.sshd.common.util.GenericUtils;
-import org.apache.sshd.common.util.Transformer;
import org.apache.sshd.util.test.BaseTestSupport;
import org.apache.sshd.util.test.NoIoTestCase;
import org.junit.FixMethodOrder;
@@ -229,7 +228,7 @@ public class SshConfigFileReaderTest extends BaseTestSupport {
@Test
public void testConfigureCompressionFromStringAcceptsCombinedValues() {
- testConfigureCompressionFromStringAcceptsCombinedValues(CompressionConfigValue.class, Transformer.ENUM_NAME_EXTRACTOR);
+ testConfigureCompressionFromStringAcceptsCombinedValues(CompressionConfigValue.class, e -> (e == null) ? null : e.name());
testConfigureCompressionFromStringAcceptsCombinedValues(BuiltinCompressions.class, NamedResource.NAME_EXTRACTOR);
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/51822113/sshd-core/src/test/java/org/apache/sshd/common/util/TransformerTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/common/util/TransformerTest.java b/sshd-core/src/test/java/org/apache/sshd/common/util/TransformerTest.java
deleted file mode 100644
index 5082275..0000000
--- a/sshd-core/src/test/java/org/apache/sshd/common/util/TransformerTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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.apache.sshd.common.util;
-
-import java.util.Date;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.sshd.util.test.BaseTestSupport;
-import org.apache.sshd.util.test.NoIoTestCase;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runners.MethodSorters;
-
-/**
- * @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
- */
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-@Category({ NoIoTestCase.class })
-public class TransformerTest extends BaseTestSupport {
- public TransformerTest() {
- super();
- }
-
- @Test
- public void testToString() {
- assertNull("Invalid null result", Transformer.TOSTRING.apply(null));
-
- for (Object o : new Object[] {"", getClass(), new Date()}) {
- String expected = o.toString();
- String actual = Transformer.TOSTRING.apply(o);
- assertEquals("Mismatched result for type=" + o.getClass().getSimpleName(), expected, actual);
- }
- }
-
- @Test
- public void testExtractEnumName() {
- assertNull("Invalid null result", Transformer.ENUM_NAME_EXTRACTOR.apply(null));
-
- for (TimeUnit u : TimeUnit.values()) {
- String expected = u.name();
- String actual = Transformer.ENUM_NAME_EXTRACTOR.apply(u);
- assertEquals("Mismatched name", expected, actual);
- }
- }
-
- @Test
- public void testSingletonIdentityInstance() {
- Transformer<Date, Date> dateTransformer = Transformer.identity();
- Transformer<String, String> stringTransformer = Transformer.identity();
- assertSame("Mismatched identity instance", dateTransformer, stringTransformer);
- }
-
- @Test
- public void testIdentity() {
- Transformer<Object, Object> identity = Transformer.identity();
- for (Object expected : new Object[]{null, getClass(), getCurrentTestName()}) {
- Object actual = identity.transform(expected);
- assertSame("Mismatched identity result", expected, actual);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/51822113/sshd-netty/pom.xml
----------------------------------------------------------------------
diff --git a/sshd-netty/pom.xml b/sshd-netty/pom.xml
index 36f516c..264a75c 100644
--- a/sshd-netty/pom.xml
+++ b/sshd-netty/pom.xml
@@ -35,7 +35,7 @@
<properties>
<projectRoot>${project.basedir}/..</projectRoot>
- <netty.version>4.1.1.Final</netty.version>
+ <netty.version>4.1.25.Final</netty.version>
</properties>
<dependencies>
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/51822113/sshd-spring-sftp/pom.xml
----------------------------------------------------------------------
diff --git a/sshd-spring-sftp/pom.xml b/sshd-spring-sftp/pom.xml
index 36115cb..d3bc7b1 100644
--- a/sshd-spring-sftp/pom.xml
+++ b/sshd-spring-sftp/pom.xml
@@ -34,7 +34,7 @@
<properties>
<projectRoot>${project.basedir}/..</projectRoot>
- <spring.integration.version>5.0.4.RELEASE</spring.integration.version>
+ <spring.integration.version>5.0.5.RELEASE</spring.integration.version>
</properties>
<dependencyManagement>