From 699e71e76b15081baf746c6ce9c9144f7e5f1ff9 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 30 Sep 2013 10:11:28 -0400
Subject: [PATCH] Trim trailing whitespace and organize imports
---
src/main/java/com/gitblit/authority/NewCertificateConfig.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/gitblit/authority/NewCertificateConfig.java b/src/main/java/com/gitblit/authority/NewCertificateConfig.java
index ca047c8..b6ba6e6 100644
--- a/src/main/java/com/gitblit/authority/NewCertificateConfig.java
+++ b/src/main/java/com/gitblit/authority/NewCertificateConfig.java
@@ -26,11 +26,12 @@
/**
* Certificate config file parser.
- *
+ *
* @author James Moger
*/
public class NewCertificateConfig {
public static final SectionParser<NewCertificateConfig> KEY = new SectionParser<NewCertificateConfig>() {
+ @Override
public NewCertificateConfig parse(final Config cfg) {
return new NewCertificateConfig(cfg);
}
@@ -41,18 +42,18 @@
public String L;
public String ST;
public String C;
-
+
public int duration;
-
+
private NewCertificateConfig(final Config c) {
duration = c.getInt("new", null, "duration", 0);
OU = c.getString("new", null, "organizationalUnit");
O = c.getString("new", null, "organization");
L = c.getString("new", null, "locality");
ST = c.getString("new", null, "stateProvince");
- C = c.getString("new", null, "countryCode");
+ C = c.getString("new", null, "countryCode");
}
-
+
public void update(X509Metadata metadata) {
update(metadata, "OU", OU);
update(metadata, "O", O);
@@ -63,13 +64,13 @@
metadata.notAfter = new Date(System.currentTimeMillis() + duration*TimeUtils.ONEDAY);
}
}
-
+
private void update(X509Metadata metadata, String oid, String value) {
if (!StringUtils.isEmpty(value)) {
metadata.oids.put(oid, value);
}
}
-
+
public void store(Config c, X509Metadata metadata) {
store(c, "new", "organizationalUnit", metadata.getOID("OU", null));
store(c, "new", "organization", metadata.getOID("O", null));
@@ -82,7 +83,7 @@
c.setInt("new", null, "duration", duration);
}
}
-
+
private void store(Config c, String section, String name, String value) {
if (StringUtils.isEmpty(value)) {
c.unset(section, null, name);
--
Gitblit v1.9.1