diff options
author | Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com> | 2020-03-18 09:38:27 +0100 |
---|---|---|
committer | Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com> | 2020-03-18 09:38:27 +0100 |
commit | c85a8965e876fde2089582a6468eb02ce18bafd5 (patch) | |
tree | 1ab921ecfb1221f1e58d9ea7fd9d2be6e58acd47 /certService/src/main/java/org/onap/aaf/certservice/cmpv2client/external | |
parent | 15b97eff96d424102f1ced9d5bd37616260414a3 (diff) |
Resolve all checkstyle warnings
Issue-ID: AAF-1107
Signed-off-by: Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com>
Change-Id: I28cfc2b82f1a4800a984e30f59ff36fe90bebb38
Diffstat (limited to 'certService/src/main/java/org/onap/aaf/certservice/cmpv2client/external')
-rw-r--r-- | certService/src/main/java/org/onap/aaf/certservice/cmpv2client/external/CsrMeta.java (renamed from certService/src/main/java/org/onap/aaf/certservice/cmpv2client/external/CSRMeta.java) | 14 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/aaf/certservice/cmpv2client/external/Factory.java | 18 | ||||
-rw-r--r-- | certService/src/main/java/org/onap/aaf/certservice/cmpv2client/external/Rdn.java (renamed from certService/src/main/java/org/onap/aaf/certservice/cmpv2client/external/RDN.java) | 35 |
3 files changed, 36 insertions, 31 deletions
diff --git a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/external/CSRMeta.java b/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/external/CsrMeta.java index 470a070f..4c4e784c 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/external/CSRMeta.java +++ b/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/external/CsrMeta.java @@ -20,17 +20,19 @@ * ============LICENSE_END==================================================== * */ + package org.onap.aaf.certservice.cmpv2client.external; import java.security.KeyPair; import java.util.ArrayList; import java.util.List; + import org.bouncycastle.asn1.x500.X500Name; import org.bouncycastle.asn1.x500.X500NameBuilder; import org.bouncycastle.asn1.x500.style.BCStyle; import org.bouncycastle.asn1.x509.Certificate; -public class CSRMeta { +public class CsrMeta { private String cn; private String mechID; @@ -41,7 +43,7 @@ public class CSRMeta { private String issuerEmail; private String password; private String caUrl; - private List<RDN> rdns; + private List<Rdn> rdns; private ArrayList<String> sanList = new ArrayList<>(); private KeyPair keyPair; private X500Name name; @@ -49,7 +51,7 @@ public class CSRMeta { private Certificate certificate; private String senderKid; - public CSRMeta(List<RDN> rdns) { + public CsrMeta(List<Rdn> rdns) { this.rdns = rdns; } @@ -65,7 +67,7 @@ public class CSRMeta { nameBuilder.addRDN(BCStyle.OU, mechID + ':' + environment); } } - for (RDN rdn : rdns) { + for (Rdn rdn : rdns) { nameBuilder.addRDN(rdn.getAoi(), rdn.getValue()); } name = nameBuilder.build(); @@ -85,8 +87,8 @@ public class CSRMeta { return issuerName; } - public void addSan(String v) { - sanList.add(v); + public void addSan(String san) { + sanList.add(san); } public List<String> getSans() { diff --git a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/external/Factory.java b/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/external/Factory.java index e570f9ab..9e95ab2f 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/external/Factory.java +++ b/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/external/Factory.java @@ -20,6 +20,7 @@ * ============LICENSE_END==================================================== * */ + package org.onap.aaf.certservice.cmpv2client.external; import org.slf4j.Logger; @@ -30,30 +31,31 @@ import java.security.KeyPairGenerator; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; -public class Factory { +public final class Factory { private static final Logger LOGGER = LoggerFactory.getLogger(Factory.class); - private static final KeyPairGenerator keygen; - private static final SecureRandom random; + private static final KeyPairGenerator KEY_PAIR_GENERATOR; + private static final SecureRandom SECURE_RANDOM; private static final String KEY_ALGORITHM = "RSA"; private static final int KEY_LENGTH = 2048; static { - random = new SecureRandom(); + SECURE_RANDOM = new SecureRandom(); KeyPairGenerator tempKeygen; try { tempKeygen = KeyPairGenerator.getInstance(KEY_ALGORITHM); - tempKeygen.initialize(KEY_LENGTH, random); + tempKeygen.initialize(KEY_LENGTH, SECURE_RANDOM); } catch (NoSuchAlgorithmException e) { tempKeygen = null; LOGGER.error("Given KEY_ALGORITHM is invalid.", e); } - keygen = tempKeygen; + KEY_PAIR_GENERATOR = tempKeygen; } - private Factory() { } + private Factory() { + } public static KeyPair generateKeyPair() { - return keygen.generateKeyPair(); + return KEY_PAIR_GENERATOR.generateKeyPair(); } } diff --git a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/external/RDN.java b/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/external/Rdn.java index 229fd76b..25017b8a 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/external/RDN.java +++ b/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/external/Rdn.java @@ -20,6 +20,7 @@ * ============LICENSE_END==================================================== * */ + package org.onap.aaf.certservice.cmpv2client.external; import java.util.ArrayList; @@ -31,7 +32,7 @@ import org.bouncycastle.asn1.ASN1ObjectIdentifier; import org.bouncycastle.asn1.x500.style.BCStyle; import org.bouncycastle.cert.CertException; -public class RDN { +public class Rdn { private String tag; private String value; @@ -41,18 +42,14 @@ public class RDN { return value; } - public ASN1ObjectIdentifier getAoi() { - return aoi; - } - - public RDN(final String tag, final String value) throws CertException { + public Rdn(final String tag, final String value) throws CertException { this.tag = tag; this.value = value; this.aoi = getAoi(tag); } - public RDN(final String tagValue) throws CertException { - List<String> tv = parseRDN("=", tagValue); + public Rdn(final String tagValue) throws CertException { + List<String> tv = parseRdn("=", tagValue); this.tag = tv.get(0); this.value = tv.get(1); this.aoi = getAoi(this.tag); @@ -65,7 +62,7 @@ public class RDN { * @param value Value to be splitted * @return List of splitted and trimmed strings */ - public static List<String> parseRDN(String splitBy, String value) { + static List<String> parseRdn(String splitBy, String value) { String[] splitted = value.split(splitBy); return Arrays.stream(splitted) .map(String::trim) @@ -80,24 +77,24 @@ public class RDN { * @throws CertException */ - public static List<RDN> parse(final char delim, final String dnString) throws CertException { - List<RDN> lrnd = new ArrayList<>(); + public static List<Rdn> parse(final char delim, final String dnString) throws CertException { + List<Rdn> lrnd = new ArrayList<>(); StringBuilder sb = new StringBuilder(); boolean inQuotes = false; for (int i = 0; i < dnString.length(); ++i) { - char c = dnString.charAt(i); + char currentCharacter = dnString.charAt(i); if (inQuotes) { - if ('"' == c) { + if ('"' == currentCharacter) { inQuotes = false; } else { sb.append(dnString.charAt(i)); } } else { - if ('"' == c) { + if ('"' == currentCharacter) { inQuotes = true; - } else if (delim == c) { + } else if (delim == currentCharacter) { if (sb.length() > 0) { - lrnd.add(new RDN(sb.toString())); + lrnd.add(new Rdn(sb.toString())); sb.setLength(0); } } else { @@ -106,7 +103,7 @@ public class RDN { } } if (sb.indexOf("=") > 0) { - lrnd.add(new RDN(sb.toString())); + lrnd.add(new Rdn(sb.toString())); } return lrnd; } @@ -116,6 +113,10 @@ public class RDN { return tag + '=' + value; } + ASN1ObjectIdentifier getAoi() { + return aoi; + } + ASN1ObjectIdentifier getAoi(String tag) throws CertException { switch (tag.toLowerCase()) { case "cn": |