Skip to content
This repository was archived by the owner on Jun 5, 2025. It is now read-only.

Avoiding duplicated code in Connector classes #95

Merged
marcos-albornoz merged 3 commits into from
Mar 3, 2022
Merged

Avoiding duplicated code in Connector classes #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6bd4c79
Avoiding duplicated code in Connector classes
marcos-albornoz Mar 2, 2022
2f85ef6
Removing unneeded references to tppAPI
marcos-albornoz Mar 2, 2022
c3e5f8f
Merge branch 'master' into SonarCloud-Duplications
marcos-albornoz Mar 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 23 additions & 15 deletions src/main/java/com/venafi/vcert/sdk/VCertClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,28 +29,36 @@

public class VCertClient implements Connector {

private Connector connector;
protected Connector connector;

public VCertClient(Config config) throws VCertException {
Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
switch (config.connectorType()) {
case TPP:
if (isBlank(config.baseUrl()))
throw new VCertException("TPP client requires a base url");

connector = new TppConnector(Tpp.connect(config));
break;

case CLOUD:
connector = new CloudConnector(Cloud.connect(config));
break;
default:
throw new VCertException("ConnectorType is not defined");
}

this.connector = createConnector(config);

connector.setVendorAndProductName(isBlank(config.appInfo()) ? VCertConstants.DEFAULT_VENDOR_AND_PRODUCT_NAME :
config.appInfo());
}

protected Connector createConnector(Config config) throws VCertException {
Connector connector;
switch (config.connectorType()) {
case TPP:
if (isBlank(config.baseUrl()))
throw new VCertException("TPP client requires a base url");

connector = new TppConnector(Tpp.connect(config));
break;

case CLOUD:
connector = new CloudConnector(Cloud.connect(config));
break;
default:
throw new VCertException("ConnectorType is not defined");
}

return connector;
}

@VisibleForTesting
VCertClient(Connector connector) {
Expand Down
277 changes: 26 additions & 251 deletions src/main/java/com/venafi/vcert/sdk/VCertTknClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,101 +1,47 @@
package com.venafi.vcert.sdk;

import static org.apache.commons.lang3.StringUtils.isBlank;

import java.security.Security;

import com.google.common.annotations.VisibleForTesting;

import com.venafi.vcert.sdk.policy.domain.PolicySpecification;
import feign.FeignException;

import com.venafi.vcert.sdk.certificate.CertificateRequest;
import com.venafi.vcert.sdk.certificate.ImportRequest;
import com.venafi.vcert.sdk.certificate.ImportResponse;
import com.venafi.vcert.sdk.certificate.PEMCollection;
import com.venafi.vcert.sdk.certificate.RenewalRequest;
import com.venafi.vcert.sdk.certificate.RevocationRequest;
import com.venafi.vcert.sdk.certificate.SshCaTemplateRequest;
import com.venafi.vcert.sdk.certificate.SshCertRetrieveDetails;
import com.venafi.vcert.sdk.certificate.SshCertificateRequest;
import com.venafi.vcert.sdk.certificate.SshConfig;
import com.venafi.vcert.sdk.connectors.Policy;
import com.venafi.vcert.sdk.connectors.Connector;
import com.venafi.vcert.sdk.connectors.TokenConnector;
import com.venafi.vcert.sdk.connectors.ZoneConfiguration;
import com.venafi.vcert.sdk.connectors.tpp.TokenInfo;
import com.venafi.vcert.sdk.connectors.tpp.Tpp;
import com.venafi.vcert.sdk.connectors.tpp.TppTokenConnector;
import com.venafi.vcert.sdk.endpoint.Authentication;
import com.venafi.vcert.sdk.endpoint.ConnectorType;
import com.venafi.vcert.sdk.utils.VCertConstants;


public class VCertTknClient implements TokenConnector {

private TokenConnector connector;
public class VCertTknClient extends VCertClient implements TokenConnector {

public VCertTknClient(Config config) throws VCertException {
Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
switch (config.connectorType()) {
case TPP_TOKEN:{
connector = new TppTokenConnector(Tpp.connect(config));
((TppTokenConnector) connector).credentials(config.credentials());
break;
}
default:
throw new VCertException("ConnectorType is not defined");
}
connector.setVendorAndProductName(isBlank(config.appInfo()) ? VCertConstants.DEFAULT_VENDOR_AND_PRODUCT_NAME :
config.appInfo());
}

@VisibleForTesting
VCertTknClient(TokenConnector connector) {
this.connector = connector;
super(config);
}

/**
* {@inheritDoc}
*/
@Override
public ConnectorType getType() {
return connector.getType();
}

/**
* Method not implemented yet.
* Guaranteed to throw an exception.
*
* @throws UnsupportedOperationException always
*/
@Override
public void setBaseUrl(String url) throws VCertException {
connector.setBaseUrl(url);
}
protected Connector createConnector(Config config) throws VCertException {
Connector connector;
switch (config.connectorType()) {
case TPP_TOKEN:{
connector = new TppTokenConnector(Tpp.connect(config));
((TppTokenConnector) connector).credentials(config.credentials());
break;
}
default:
throw new VCertException("ConnectorType is not defined");
}

/**
* {@inheritDoc}
*/
@Override
public void setZone(String zone) {
connector.setZone(zone);
return connector;
}

/**
* {@inheritDoc}
*/
@Override
public void setVendorAndProductName(String vendorAndProductName) {
connector.setVendorAndProductName(vendorAndProductName);
@VisibleForTesting
VCertTknClient(TokenConnector connector) {
super(connector);
}

/**
* {@inheritDoc}
*/
@Override
public String getVendorAndProductName() {
return connector.getVendorAndProductName();
}
@Override
public TokenInfo getTokenInfo() throws VCertException {
return ((TokenConnector)connector).getTokenInfo();
}

//=========================================================================================\\
//=============================== VENAFI 20.2 OAUTH METHODS ===============================\\
Expand All @@ -104,7 +50,7 @@ public String getVendorAndProductName() {
@Override
public TokenInfo getAccessToken(Authentication auth) throws VCertException{
try {
return connector.getAccessToken(auth);
return ((TokenConnector)connector).getAccessToken(auth);
} catch (FeignException e) {
throw VCertException.fromFeignException(e);
}
Expand All @@ -113,190 +59,19 @@ public TokenInfo getAccessToken(Authentication auth) throws VCertException{
@Override
public TokenInfo getAccessToken() throws VCertException{
try {
return connector.getAccessToken();
return ((TokenConnector)connector).getAccessToken();
} catch (FeignException e) {
throw VCertException.fromFeignException(e);
}
}

@Override
public TokenInfo refreshAccessToken(String applicationId) throws VCertException {
return connector.refreshAccessToken(applicationId);
return ((TokenConnector)connector).refreshAccessToken(applicationId);
}

@Override
public int revokeAccessToken() throws VCertException {
return connector.revokeAccessToken();
}

/**
* {@inheritDoc}
*/
@Override
public void ping() throws VCertException {
try {
connector.ping();
} catch (FeignException e) {
throw VCertException.fromFeignException(e);
}
}

/**
* {@inheritDoc}
*/
@Override
public ZoneConfiguration readZoneConfiguration(String zone) throws VCertException {
try {
return connector.readZoneConfiguration(zone);
} catch (FeignException e) {
throw VCertException.fromFeignException(e);
}
}

/**
* {@inheritDoc}
*/
@Override
public CertificateRequest generateRequest(ZoneConfiguration config, CertificateRequest request)
throws VCertException {
try {
return connector.generateRequest(config, request);
} catch (FeignException e) {
throw VCertException.fromFeignException(e);
}
}

@Override
public String requestCertificate(CertificateRequest request, String zone) throws VCertException {
try {
return connector.requestCertificate(request, zone);
} catch (FeignException e) {
throw VCertException.fromFeignException(e);
}
}

/**
* {@inheritDoc}
*/
@Override
public String requestCertificate(CertificateRequest request, ZoneConfiguration zoneConfiguration)
throws VCertException {
try {
return connector.requestCertificate(request, zoneConfiguration);
} catch (FeignException e) {
throw VCertException.fromFeignException(e);
}
}

/**
* {@inheritDoc}
*/
@Override
public PEMCollection retrieveCertificate(CertificateRequest request) throws VCertException {
try {
return connector.retrieveCertificate(request);
} catch (FeignException e) {
throw VCertException.fromFeignException(e);
}
}

/**
* {@inheritDoc}
*/
@Override
public void revokeCertificate(RevocationRequest request) throws VCertException {
try {
connector.revokeCertificate(request);
} catch (FeignException e) {
throw VCertException.fromFeignException(e);
}
}

/**
* {@inheritDoc}
*/
@Override
public String renewCertificate(RenewalRequest request) throws VCertException {
try {
return connector.renewCertificate(request);
} catch (FeignException e) {
throw VCertException.fromFeignException(e);
}
}

/**
* {@inheritDoc}
*/
@Override
public ImportResponse importCertificate(ImportRequest request) throws VCertException {
try {
return connector.importCertificate(request);
} catch (FeignException e) {
throw VCertException.fromFeignException(e);
}
}

/**
* {@inheritDoc}
*/
@Override
public Policy readPolicyConfiguration(String zone) throws VCertException {
try {
return connector.readPolicyConfiguration(zone);
} catch (FeignException e) {
throw VCertException.fromFeignException(e);
}
}

/**
* {@inheritDoc}
*/
@Override
public void setPolicy(String policyName, PolicySpecification policySpecification) throws VCertException {
try {
connector.setPolicy(policyName, policySpecification);
} catch (FeignException e) {
throw VCertException.fromFeignException(e);
}
}

/**
* {@inheritDoc}
*/
@Override
public PolicySpecification getPolicy(String policyName) throws VCertException {
try {
return connector.getPolicy(policyName);
} catch (FeignException e) {
throw VCertException.fromFeignException(e);
}
}

@Override
public String requestSshCertificate(SshCertificateRequest sshCertificateRequest) throws VCertException {
try {
return connector.requestSshCertificate(sshCertificateRequest);
} catch (FeignException e) {
throw VCertException.fromFeignException(e);
}
}

@Override
public SshCertRetrieveDetails retrieveSshCertificate(SshCertificateRequest sshCertificateRequest)
throws VCertException {
try {
return connector.retrieveSshCertificate(sshCertificateRequest);
} catch (FeignException e) {
throw VCertException.fromFeignException(e);
}
}

@Override
public SshConfig retrieveSshConfig(SshCaTemplateRequest sshCaTemplateRequest) throws VCertException {
try {
return connector.retrieveSshConfig(sshCaTemplateRequest);
} catch (FeignException e) {
throw VCertException.fromFeignException(e);
}
return ((TokenConnector)connector).revokeAccessToken();
}
}
Loading