import org.onap.aaf.certservice.client.certification.CsrFactory;
import org.onap.aaf.certservice.client.certification.KeyPairFactory;
import org.onap.aaf.certservice.client.certification.PrivateKeyToPemEncoder;
-import org.onap.aaf.certservice.client.certification.conversion.KeystoreTruststoreCreator;
-import org.onap.aaf.certservice.client.certification.conversion.KeystoreTruststoreCreatorFactory;
+import org.onap.aaf.certservice.client.certification.conversion.ArtifactsCreatorProvider;
import org.onap.aaf.certservice.client.common.Base64Encoder;
import org.onap.aaf.certservice.client.configuration.EnvsForClient;
import org.onap.aaf.certservice.client.configuration.EnvsForCsr;
base64Encoder.encode(csrFactory.createCsrInPem(keyPair)),
base64Encoder.encode(pkEncoder.encodePrivateKeyToPem(keyPair.getPrivate())));
- KeystoreTruststoreCreator filesCreator = new KeystoreTruststoreCreatorFactory(
- clientConfiguration.getCertsOutputPath()).create();
- filesCreator.createKeystore(certServiceData.getCertificateChain(), keyPair.getPrivate());
- filesCreator.createTruststore(certServiceData.getTrustedCertificates());
+ ArtifactsCreatorProvider
+ .getCreator(clientConfiguration.getOutputType(),
+ clientConfiguration.getCertsOutputPath())
+ .create(certServiceData.getCertificateChain(),
+ certServiceData.getTrustedCertificates(),
+ keyPair.getPrivate());
+
} catch (ExitableException e) {
- LOGGER.error("Cert Service Client fail in execution: ", e);
+ LOGGER.error("Cert Service Client fails in execution: ", e);
appExitHandler.exit(e.applicationExitStatus());
}
appExitHandler.exit(SUCCESS);