You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by kr...@apache.org on 2019/01/10 14:18:42 UTC
[knox] branch master updated: Fix javadoc failures
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
The following commit(s) were added to refs/heads/master by this push:
new 68dd248 Fix javadoc failures
68dd248 is described below
commit 68dd248b8d6c89081c5e2403e3cc30be07e51f32
Author: Kevin Risden <kr...@apache.org>
AuthorDate: Thu Jan 10 09:18:26 2019 -0500
Fix javadoc failures
Signed-off-by: Kevin Risden <kr...@apache.org>
---
.../services/security/impl/X509CertificateUtil.java | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/X509CertificateUtil.java b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/X509CertificateUtil.java
index 7e051ee..8e0a370 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/X509CertificateUtil.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/X509CertificateUtil.java
@@ -25,8 +25,8 @@ import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
-import java.security.GeneralSecurityException;
import java.security.KeyPair;
import java.security.KeyStore;
import java.security.KeyStoreException;
@@ -40,14 +40,12 @@ import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import java.util.Date;
-import org.apache.knox.gateway.i18n.messages.MessagesFactory;
import org.apache.commons.codec.binary.Base64;
import org.apache.knox.gateway.i18n.GatewaySpiMessages;
+import org.apache.knox.gateway.i18n.messages.MessagesFactory;
public class X509CertificateUtil {
- public static final String END_CERTIFICATE = "-----END CERTIFICATE-----\n";
- public static final String BEGIN_CERTIFICATE = "-----BEGIN CERTIFICATE-----\n";
private static GatewaySpiMessages LOG = MessagesFactory.get(GatewaySpiMessages.class);
/**
@@ -58,8 +56,7 @@ public class X509CertificateUtil {
* @param algorithm the signing algorithm, eg "SHA1withRSA"
* @return self-signed X.509 certificate
*/
- public static X509Certificate generateCertificate(String dn, KeyPair pair,
- int days, String algorithm) throws GeneralSecurityException, IOException {
+ public static X509Certificate generateCertificate(String dn, KeyPair pair, int days, String algorithm) {
PrivateKey privkey = pair.getPrivate();
Object x509CertImplObject = null;
@@ -279,11 +276,11 @@ public class X509CertificateUtil {
public static void writeCertificateToFile(Certificate cert, final File file)
throws CertificateEncodingException, IOException {
byte[] bytes = cert.getEncoded();
- Base64 encoder = new Base64( 76, "\n".getBytes( "ASCII" ) );
+ Base64 encoder = new Base64( 76, "\n".getBytes( StandardCharsets.US_ASCII ) );
try(OutputStream out = Files.newOutputStream(file.toPath()) ) {
- out.write( BEGIN_CERTIFICATE.getBytes( "ASCII" ) );
- out.write( encoder.encodeToString( bytes ).getBytes( "ASCII" ) );
- out.write( END_CERTIFICATE.getBytes( "ASCII" ) );
+ out.write( "-----BEGIN CERTIFICATE-----\n".getBytes( StandardCharsets.US_ASCII ) );
+ out.write( encoder.encodeToString( bytes ).getBytes( StandardCharsets.US_ASCII ) );
+ out.write( "-----END CERTIFICATE-----\n".getBytes( StandardCharsets.US_ASCII ) );
}
}