You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by gn...@apache.org on 2017/08/03 08:26:04 UTC
mina-sshd git commit: [SSHD-760] Fixed some checkstyle issues
Repository: mina-sshd
Updated Branches:
refs/heads/master 072215ea8 -> 33555f14e
[SSHD-760] Fixed some checkstyle issues
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/33555f14
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/33555f14
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/33555f14
Branch: refs/heads/master
Commit: 33555f14e0b64d1ac5292bf6c89823237f42731b
Parents: 072215e
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Thu Aug 3 10:19:53 2017 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Thu Aug 3 10:19:53 2017 +0200
----------------------------------------------------------------------
.../loader/pem/PKCS8PEMResourceKeyPairParser.java | 1 -
.../loader/pem/PemKeyPairResourceParserTest.java | 17 +++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/33555f14/sshd-core/src/main/java/org/apache/sshd/common/config/keys/loader/pem/PKCS8PEMResourceKeyPairParser.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/config/keys/loader/pem/PKCS8PEMResourceKeyPairParser.java b/sshd-core/src/main/java/org/apache/sshd/common/config/keys/loader/pem/PKCS8PEMResourceKeyPairParser.java
index cc28967..91a65b4 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/config/keys/loader/pem/PKCS8PEMResourceKeyPairParser.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/config/keys/loader/pem/PKCS8PEMResourceKeyPairParser.java
@@ -38,7 +38,6 @@ import org.apache.sshd.common.config.keys.KeyUtils;
import org.apache.sshd.common.util.GenericUtils;
import org.apache.sshd.common.util.ValidateUtils;
import org.apache.sshd.common.util.io.IoUtils;
-import org.apache.sshd.common.util.io.NoCloseInputStream;
import org.apache.sshd.common.util.io.der.ASN1Object;
import org.apache.sshd.common.util.io.der.DERParser;
import org.apache.sshd.common.util.security.SecurityUtils;
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/33555f14/sshd-core/src/test/java/org/apache/sshd/common/config/keys/loader/pem/PemKeyPairResourceParserTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/common/config/keys/loader/pem/PemKeyPairResourceParserTest.java b/sshd-core/src/test/java/org/apache/sshd/common/config/keys/loader/pem/PemKeyPairResourceParserTest.java
index 3cf60e0..ba5c6a9 100644
--- a/sshd-core/src/test/java/org/apache/sshd/common/config/keys/loader/pem/PemKeyPairResourceParserTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/common/config/keys/loader/pem/PemKeyPairResourceParserTest.java
@@ -18,11 +18,6 @@
*/
package org.apache.sshd.common.config.keys.loader.pem;
-import org.apache.commons.ssl.PEMItem;
-import org.apache.commons.ssl.PEMUtil;
-import org.apache.sshd.common.util.security.SecurityUtils;
-import org.junit.Test;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.security.KeyPair;
@@ -30,9 +25,15 @@ import java.security.KeyPairGenerator;
import java.util.ArrayList;
import java.util.Collection;
-import static org.junit.Assert.assertEquals;
+import org.apache.commons.ssl.PEMItem;
+import org.apache.commons.ssl.PEMUtil;
+import org.apache.sshd.common.util.security.SecurityUtils;
+import org.junit.Assert;
+import org.junit.Test;
public class PemKeyPairResourceParserTest {
+ public PemKeyPairResourceParserTest() {
+ }
@Test
public void testPkcs8() throws Exception {
@@ -51,7 +52,7 @@ public class PemKeyPairResourceParserTest {
KeyPair kp2 = SecurityUtils.loadKeyPairIdentity("the-key", new ByteArrayInputStream(os.toByteArray()), null);
- assertEquals(kp.getPublic(), kp2.getPublic());
- assertEquals(kp.getPrivate(), kp2.getPrivate());
+ Assert.assertEquals(kp.getPublic(), kp2.getPublic());
+ Assert.assertEquals(kp.getPrivate(), kp2.getPrivate());
}
}