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

Commit 8ab9738

Browse files
achuchevtr1ck3r
achuchev
authored and
tr1ck3r
committed
Code style formatting and reorganization of imports (#5)
* This commit contains only code style formatting and reorganization of imports according to Venafi Coding Standards for Java.
1 parent 16fd063 commit 8ab9738

57 files changed

Lines changed: 4623 additions & 4513 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎examples/TppClient.java‎

Lines changed: 41 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,62 @@
1+
import java.security.cert.CertificateEncodingException;
2+
import java.util.Arrays;
3+
import java.util.Collections;
14
import com.venafi.vcert.sdk.Config;
2-
import com.venafi.vcert.sdk.VCertException;
35
import com.venafi.vcert.sdk.VCertClient;
4-
6+
import com.venafi.vcert.sdk.VCertException;
57
import com.venafi.vcert.sdk.certificate.CertificateRequest;
68
import com.venafi.vcert.sdk.certificate.KeyType;
79
import com.venafi.vcert.sdk.certificate.PEMCollection;
8-
import com.venafi.vcert.sdk.certificate.RenewalRequest;
910
import com.venafi.vcert.sdk.connectors.tpp.ZoneConfiguration;
1011
import com.venafi.vcert.sdk.endpoint.Authentication;
1112
import com.venafi.vcert.sdk.endpoint.ConnectorType;
12-
import org.apache.commons.codec.digest.DigestUtils;
1313

14-
import java.security.cert.CertificateEncodingException;
15-
import java.security.cert.X509Certificate;
16-
import java.util.Arrays;
17-
import java.util.Collections;
14+
public class TppClient {
15+
public static void main(String... args) throws VCertException, CertificateEncodingException {
16+
String tpp_user = System.getenv("TPP_USER");
17+
String tpp_passwd = System.getenv("TPP_PASSWORD");
18+
String url = System.getenv("VENAFI_URL");
19+
String zone = System.getenv("VENAFI_ZONE");
1820

19-
public class TppClient
20-
{
21-
public static void main(String ... args) throws VCertException, CertificateEncodingException
22-
{
23-
String tpp_user = System.getenv("TPP_USER");
24-
String tpp_passwd = System.getenv("TPP_PASSWORD");
25-
String url = System.getenv("VENAFI_URL");
26-
String zone = System.getenv("VENAFI_ZONE");
21+
if (tpp_user == null)
22+
tpp_user = "local:admin";
23+
if (tpp_passwd == null)
24+
tpp_passwd = "Passw0rd";
25+
if (url == null)
26+
url = "https://tpp.venafi.example/vedsdk";
27+
if (zone == null)
28+
zone = "Default";
2729

28-
if ( tpp_user == null ) tpp_user = "local:admin";
29-
if ( tpp_passwd == null ) tpp_passwd = "Passw0rd";
30-
if ( url == null ) url = "https://tpp.venafi.example/vedsdk";
31-
if ( zone == null ) zone = "Default";
30+
final Config config = Config.builder().connectorType(ConnectorType.TPP).baseUrl(url).build();
3231

33-
final Config config = Config.builder()
34-
.connectorType(ConnectorType.TPP)
35-
.baseUrl(url)
36-
.build();
32+
final VCertClient client = new VCertClient(config);
3733

38-
final VCertClient client = new VCertClient(config);
34+
final Authentication auth =
35+
Authentication.builder().user(tpp_user).password(tpp_passwd).build();
3936

40-
final Authentication auth = Authentication.builder()
41-
.user(tpp_user)
42-
.password(tpp_passwd)
43-
.build();
37+
client.authenticate(auth);
4438

45-
client.authenticate(auth);
46-
47-
final ZoneConfiguration zoneConfiguration = client.readZoneConfiguration(zone);
39+
final ZoneConfiguration zoneConfiguration = client.readZoneConfiguration(zone);
4840

49-
// Generate a certificate
50-
CertificateRequest certificateRequest = new CertificateRequest().subject(
51-
new CertificateRequest.PKIXName()
52-
.commonName("vcert-java.venafi.example")
53-
.organization(Collections.singletonList("Venafi, Inc."))
54-
.organizationalUnit(Arrays.asList("Product Management"))
55-
.country(Collections.singletonList("US"))
56-
.locality(Collections.singletonList("Salt Lake City"))
57-
.province(Collections.singletonList("Utah")))
41+
// Generate a certificate
42+
CertificateRequest certificateRequest = new CertificateRequest()
43+
.subject(new CertificateRequest.PKIXName().commonName("vcert-java.venafi.example")
44+
.organization(Collections.singletonList("Venafi, Inc."))
45+
.organizationalUnit(Arrays.asList("Product Management"))
46+
.country(Collections.singletonList("US"))
47+
.locality(Collections.singletonList("Salt Lake City"))
48+
.province(Collections.singletonList("Utah")))
5849

59-
.keyType(KeyType.RSA)
60-
.keyLength(2048);
50+
.keyType(KeyType.RSA).keyLength(2048);
6151

62-
certificateRequest = client.generateRequest(zoneConfiguration, certificateRequest);
52+
certificateRequest = client.generateRequest(zoneConfiguration, certificateRequest);
6353

64-
// Submit the certificate request
65-
String newCertId = client.requestCertificate(certificateRequest, zone);
54+
// Submit the certificate request
55+
String newCertId = client.requestCertificate(certificateRequest, zone);
6656

67-
// Retrieve PEM collection from Venafi
68-
final CertificateRequest pickupRequest = new CertificateRequest().pickupId(newCertId);
69-
PEMCollection pemCollection = client.retrieveCertificate(pickupRequest);
70-
System.out.println(pemCollection.certificate());
71-
}
57+
// Retrieve PEM collection from Venafi
58+
final CertificateRequest pickupRequest = new CertificateRequest().pickupId(newCertId);
59+
PEMCollection pemCollection = client.retrieveCertificate(pickupRequest);
60+
System.out.println(pemCollection.certificate());
61+
}
7262
}

‎pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<groupId>com.venafi.vcert.sdk</groupId>
8-
<artifactId>venafi-vcert-java</artifactId>
9-
<version>1.0-SNAPSHOT</version>
8+
<artifactId>vcert-java</artifactId>
9+
<version>0.1.1</version>
1010

1111
<properties>
1212
<lombok.version>1.18.6</lombok.version>
@@ -164,4 +164,4 @@
164164
</repository>
165165
</repositories>
166166

167-
</project>
167+
</project>

‎src/main/java/com/venafi/vcert/sdk/Config.java‎

Lines changed: 78 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,101 +1,103 @@
11
package com.venafi.vcert.sdk;
22

3-
import com.venafi.vcert.sdk.endpoint.Authentication;
4-
import com.venafi.vcert.sdk.endpoint.ConnectorType;
5-
import lombok.Builder;
6-
import lombok.Data;
7-
import org.ini4j.Profile;
8-
import org.ini4j.Wini;
9-
3+
import static java.util.Arrays.asList;
104
import java.io.IOException;
115
import java.nio.file.Path;
126
import java.util.List;
137
import java.util.Objects;
14-
15-
import static java.util.Arrays.asList;
8+
import org.ini4j.Profile;
9+
import org.ini4j.Wini;
10+
import lombok.Builder;
11+
import lombok.Data;
12+
import com.venafi.vcert.sdk.endpoint.Authentication;
13+
import com.venafi.vcert.sdk.endpoint.ConnectorType;
1614

1715
@Data
1816
@Builder
1917
public class Config {
20-
public static final String DEFAULT_SECTION = "?";
21-
public static final List<String> VALID_TPP_KEYS =
22-
asList("tpp_url", "tpp_user", "tpp_password", "tpp_zone", "trust_bundle");
18+
public static final String DEFAULT_SECTION = "?";
19+
public static final List<String> VALID_TPP_KEYS =
20+
asList("tpp_url", "tpp_user", "tpp_password", "tpp_zone", "trust_bundle");
2321

24-
public static final List<String> VALID_CLOUD_KEYS =
25-
asList("cloud_url", "cloud_apikey", "cloud_zone", "trust_bundle");
22+
public static final List<String> VALID_CLOUD_KEYS =
23+
asList("cloud_url", "cloud_apikey", "cloud_zone", "trust_bundle");
2624

27-
private ConnectorType connectorType;
28-
private String baseUrl;
29-
private String zone;
30-
private Authentication credentials;
31-
private String connectionTrust;
32-
private boolean logVerbose;
33-
private String configFile;
34-
private String configSection;
25+
private ConnectorType connectorType;
26+
private String baseUrl;
27+
private String zone;
28+
private Authentication credentials;
29+
private String connectionTrust;
30+
private boolean logVerbose;
31+
private String configFile;
32+
private String configSection;
3533

3634

37-
public static Config loadConfigFromFile(Path path) throws VCertException {
38-
final ConfigBuilder builder = Config.builder();
39-
final Authentication.AuthenticationBuilder authBuilder = Authentication.builder();
35+
public static Config loadConfigFromFile(Path path) throws VCertException {
36+
final ConfigBuilder builder = Config.builder();
37+
final Authentication.AuthenticationBuilder authBuilder = Authentication.builder();
4038

41-
try {
42-
final Wini ini = new Wini(path.toFile());
43-
final Profile.Section defaultSection = ini.get(DEFAULT_SECTION);
44-
validateConfigFile(defaultSection);
39+
try {
40+
final Wini ini = new Wini(path.toFile());
41+
final Profile.Section defaultSection = ini.get(DEFAULT_SECTION);
42+
validateConfigFile(defaultSection);
4543

46-
if (defaultSection.containsKey("tpp_url")) {
47-
builder.connectorType(ConnectorType.TPP);
48-
builder.baseUrl(defaultSection.get("tpp_url"));
49-
authBuilder.user(defaultSection.get("tpp_user"));
50-
authBuilder.password(defaultSection.get("tpp_password"));
44+
if (defaultSection.containsKey("tpp_url")) {
45+
builder.connectorType(ConnectorType.TPP);
46+
builder.baseUrl(defaultSection.get("tpp_url"));
47+
authBuilder.user(defaultSection.get("tpp_user"));
48+
authBuilder.password(defaultSection.get("tpp_password"));
5149

52-
if (defaultSection.containsKey("tpp_zone")) {
53-
builder.zone(defaultSection.get("tpp_zone"));
54-
}
55-
} else if (defaultSection.containsKey("cloud_apikey")) {
56-
authBuilder.apiKey(defaultSection.get("cloud_apikey"));
57-
if (defaultSection.containsKey("cloud_url")) {
58-
builder.baseUrl(defaultSection.get("cloud_url"));
59-
}
60-
if (defaultSection.containsKey("cloud_zone")) {
61-
builder.zone(defaultSection.get("cloud_zone"));
62-
}
63-
}
64-
builder.credentials(authBuilder.build());
65-
return builder.build();
66-
} catch (IOException e) {
67-
throw new VCertException(String.format("Access error to the configuration file: %s", path.toString()));
50+
if (defaultSection.containsKey("tpp_zone")) {
51+
builder.zone(defaultSection.get("tpp_zone"));
6852
}
53+
} else if (defaultSection.containsKey("cloud_apikey")) {
54+
authBuilder.apiKey(defaultSection.get("cloud_apikey"));
55+
if (defaultSection.containsKey("cloud_url")) {
56+
builder.baseUrl(defaultSection.get("cloud_url"));
57+
}
58+
if (defaultSection.containsKey("cloud_zone")) {
59+
builder.zone(defaultSection.get("cloud_zone"));
60+
}
61+
}
62+
builder.credentials(authBuilder.build());
63+
return builder.build();
64+
} catch (IOException e) {
65+
throw new VCertException(
66+
String.format("Access error to the configuration file: %s", path.toString()));
6967
}
68+
}
7069

71-
private static void validateConfigFile(Profile.Section defaultSection) throws VCertException {
72-
if (Objects.isNull(defaultSection)) {
73-
throw new VCertException("The configuration file is empty");
74-
}
70+
private static void validateConfigFile(Profile.Section defaultSection) throws VCertException {
71+
if (Objects.isNull(defaultSection)) {
72+
throw new VCertException("The configuration file is empty");
73+
}
7574

76-
if (defaultSection.containsKey("tpp_url")) {
77-
for (String key : defaultSection.keySet()) {
78-
if (!VALID_TPP_KEYS.contains(key)) {
79-
throw new VCertException(String.format("illegal key %s in section %s", key, defaultSection.getName()));
80-
}
81-
}
82-
if (!defaultSection.containsKey("tpp_user")) {
83-
throw new VCertException(String.format("configuration issue section %s: missing TTP user",
84-
defaultSection.getName()));
85-
}
86-
if (!defaultSection.containsKey("tpp_password")) {
87-
throw new VCertException(String.format("configuration issue section %s: missing TTP password",
88-
defaultSection.getName()));
89-
}
90-
} else if (defaultSection.containsKey("cloud_apikey")){
91-
for (String key : defaultSection.keySet()) {
92-
if (!VALID_CLOUD_KEYS.contains(key)) {
93-
throw new VCertException(String.format("illegal key %s in section %s", key, defaultSection.getName()));
94-
}
95-
}
96-
} else {
97-
throw new VCertException(String.format("Section %s requires 'tpp_url' or 'cloud_apikey'", defaultSection.getName()));
75+
if (defaultSection.containsKey("tpp_url")) {
76+
for (String key : defaultSection.keySet()) {
77+
if (!VALID_TPP_KEYS.contains(key)) {
78+
throw new VCertException(
79+
String.format("illegal key %s in section %s", key, defaultSection.getName()));
80+
}
81+
}
82+
if (!defaultSection.containsKey("tpp_user")) {
83+
throw new VCertException(String.format("configuration issue section %s: missing TPP user",
84+
defaultSection.getName()));
85+
}
86+
if (!defaultSection.containsKey("tpp_password")) {
87+
throw new VCertException(String.format(
88+
"configuration issue section %s: missing TPP password", defaultSection.getName()));
89+
}
90+
} else if (defaultSection.containsKey("cloud_apikey")) {
91+
for (String key : defaultSection.keySet()) {
92+
if (!VALID_CLOUD_KEYS.contains(key)) {
93+
throw new VCertException(
94+
String.format("illegal key %s in section %s", key, defaultSection.getName()));
9895
}
96+
}
97+
} else {
98+
throw new VCertException(String.format("Section %s requires 'tpp_url' or 'cloud_apikey'",
99+
defaultSection.getName()));
99100
}
101+
}
100102

101103
}

‎src/main/java/com/venafi/vcert/sdk/SignatureAlgorithm.java‎

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,33 @@
44

55
public enum SignatureAlgorithm {
66

7-
UnknownSignatureAlgorithm(""),
8-
MD2withRSA("MD2withRSA"),
9-
MD5WithRSA("MD5withRSA"),
10-
SHA1WithRSA("SHA1withRSA"),
11-
SHA256WithRSA("SHA256withRSA"),
12-
SHA384WithRSA("SHA384withRSA"),
13-
SHA512WithRSA("SHA512withRSA"),
14-
DSAWithSHA1("SHA1withDSA"),
15-
DSAWithSHA256("SHA256withDSA"),
16-
ECDSAWithSHA1("SHA1withECDSA"),
17-
ECDSAWithSHA256("SHA256withECDSA"),
18-
ECDSAWithSHA384("SHA384withECDSA"),
19-
ECDSAWithSHA512("SHA512withECDSA"),
20-
SHA256WithRSAPSS("RSAPSSwithSHA256"),
21-
SHA384WithRSAPSS("RSAPSSwithSHA384"),
22-
SHA512WithRSAPSS("RSAPSSwithSHA512");
7+
UnknownSignatureAlgorithm(""),
8+
MD2withRSA("MD2withRSA"),
9+
MD5WithRSA("MD5withRSA"),
10+
SHA1WithRSA("SHA1withRSA"),
11+
SHA256WithRSA("SHA256withRSA"),
12+
SHA384WithRSA("SHA384withRSA"),
13+
SHA512WithRSA("SHA512withRSA"),
14+
DSAWithSHA1("SHA1withDSA"),
15+
DSAWithSHA256("SHA256withDSA"),
16+
ECDSAWithSHA1("SHA1withECDSA"),
17+
ECDSAWithSHA256("SHA256withECDSA"),
18+
ECDSAWithSHA384("SHA384withECDSA"),
19+
ECDSAWithSHA512("SHA512withECDSA"),
20+
SHA256WithRSAPSS("RSAPSSwithSHA256"),
21+
SHA384WithRSAPSS("RSAPSSwithSHA384"),
22+
SHA512WithRSAPSS("RSAPSSwithSHA512");
2323

24-
/**
25-
* @param standardName
26-
* @see <a href="https://docs.oracle.com/javase/9/docs/specs/security/standard-names.html#signature-algorithms">Standard Signature Algorithm Names</a>
27-
*/
28-
SignatureAlgorithm(String standardName) {
29-
this.standardName = standardName;
30-
}
24+
/**
25+
* @param standardName
26+
* @see <a href=
27+
* "https://docs.oracle.com/javase/9/docs/specs/security/standard-names.html#signature-algorithms">Standard
28+
* Signature Algorithm Names</a>
29+
*/
30+
SignatureAlgorithm(String standardName) {
31+
this.standardName = standardName;
32+
}
3133

32-
@Getter
33-
private String standardName;
34+
@Getter
35+
private String standardName;
3436
}

0 commit comments

Comments
 (0)