diff options
author | Michal Banka <michal.banka@nokia.com> | 2020-03-12 14:00:51 +0100 |
---|---|---|
committer | Michal Banka <michal.banka@nokia.com> | 2020-03-16 12:08:59 +0100 |
commit | 1b3f9cbabdabe43588bcf8e3b92c89bd87272ef6 (patch) | |
tree | e2fd70d1e0d176134d9e50f9019751b256f699d9 /certService/src/main/java/org/onap/aaf/certservice/certification/adapter | |
parent | 4082234ea6ee3dd48a8418837a9bc127dec9eb36 (diff) |
Fixed sonar issues in Split class and refactor it0.0.1
Removed unnecesary conversion: bouncle castle RDN -> String -> CertService RDN.
Now it's: Bouncle castle RDN -> CertService RDN.
Class Split rewritten on streams, tested.
Signed-off-by: Michal Banka <michal.banka@nokia.com>
Change-Id: I04e10fd6e4ab619124b93db7193c94f54b4b08ef
Issue-ID: AAF-997
Diffstat (limited to 'certService/src/main/java/org/onap/aaf/certservice/certification/adapter')
-rw-r--r-- | certService/src/main/java/org/onap/aaf/certservice/certification/adapter/CSRMetaBuilder.java | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/certService/src/main/java/org/onap/aaf/certservice/certification/adapter/CSRMetaBuilder.java b/certService/src/main/java/org/onap/aaf/certservice/certification/adapter/CSRMetaBuilder.java index f768dabb..1959d638 100644 --- a/certService/src/main/java/org/onap/aaf/certservice/certification/adapter/CSRMetaBuilder.java +++ b/certService/src/main/java/org/onap/aaf/certservice/certification/adapter/CSRMetaBuilder.java @@ -22,9 +22,10 @@ package org.onap.aaf.certservice.certification.adapter; import java.security.KeyPair; import java.util.Arrays; -import java.util.Objects; import java.util.Optional; import java.util.stream.Collectors; + +import org.bouncycastle.asn1.x500.AttributeTypeAndValue; import org.bouncycastle.asn1.x500.style.BCStyle; import org.bouncycastle.asn1.x500.style.IETFUtils; import org.bouncycastle.cert.CertException; @@ -69,19 +70,21 @@ class CSRMetaBuilder { csrModel.getSans().forEach(csrMeta::addSan); } - private String convertRDNToString(org.bouncycastle.asn1.x500.RDN rdn) { - return BCStyle.INSTANCE.oidToDisplayName(rdn.getFirst().getType()) + "=" + IETFUtils.valueToString( - rdn.getFirst().getValue()); - } - private Optional<RDN> convertFromBcRDN(org.bouncycastle.asn1.x500.RDN rdn) { RDN result = null; try { - result = new RDN(convertRDNToString(rdn)); + result = convertRDN(rdn); } catch (CertException e) { LOGGER.error("Exception occurred during convert of RDN", e); } return Optional.ofNullable(result); } + private RDN convertRDN(org.bouncycastle.asn1.x500.RDN rdn) throws CertException { + AttributeTypeAndValue rdnData = rdn.getFirst(); + String tag = BCStyle.INSTANCE.oidToDisplayName(rdnData.getType()); + String value = IETFUtils.valueToString(rdnData.getValue()); + return new RDN(tag, value); + } + } |