github
/
acme4j
mirror of https://github.com/shred/acme4j
1
0
Fork 0
Code Issues Releases Wiki Activity

Add null checks

pull/81/head
Richard Körber 2018-08-20 23:09:54 +02:00
parent 9e4ba4fcb1
commit e67d0c1361
No known key found for this signature in database
GPG Key ID: AAB9FD19C78AA3E0
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
acme4j-utils/src/main/java/org/shredzone/acme4j/util/CSRBuilder.java
View File

@ -13,6 +13,7 @@
*/ */
package org.shredzone.acme4j.util; package org.shredzone.acme4j.util;
import static java.util.Objects.requireNonNull;
import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.joining;
import static org.shredzone.acme4j.toolbox.AcmeUtils.toAce; import static org.shredzone.acme4j.toolbox.AcmeUtils.toAce;
@ -76,7 +77,7 @@ public class CSRBuilder {
* Domain name to add * Domain name to add
*/ */
public void addDomain(String domain) { public void addDomain(String domain) {
String ace = toAce(domain); String ace = toAce(requireNonNull(domain));
if (namelist.isEmpty()) { if (namelist.isEmpty()) {
namebuilder.addRDN(BCStyle.CN, ace); namebuilder.addRDN(BCStyle.CN, ace);
} }
@ -113,7 +114,7 @@ public class CSRBuilder {
* Note that it is at the discretion of the ACME server to accept this parameter. * Note that it is at the discretion of the ACME server to accept this parameter.
*/ */
public void setOrganization(String o) { public void setOrganization(String o) {
namebuilder.addRDN(BCStyle.O, o); namebuilder.addRDN(BCStyle.O, requireNonNull(o));
} }
/** /**
@ -122,7 +123,7 @@ public class CSRBuilder {
* Note that it is at the discretion of the ACME server to accept this parameter. * Note that it is at the discretion of the ACME server to accept this parameter.
*/ */
public void setOrganizationalUnit(String ou) { public void setOrganizationalUnit(String ou) {
namebuilder.addRDN(BCStyle.OU, ou); namebuilder.addRDN(BCStyle.OU, requireNonNull(ou));
} }
/** /**
@ -131,7 +132,7 @@ public class CSRBuilder {
* Note that it is at the discretion of the ACME server to accept this parameter. * Note that it is at the discretion of the ACME server to accept this parameter.
*/ */
public void setLocality(String l) { public void setLocality(String l) {
namebuilder.addRDN(BCStyle.L, l); namebuilder.addRDN(BCStyle.L, requireNonNull(l));
} }
/** /**
@ -140,7 +141,7 @@ public class CSRBuilder {
* Note that it is at the discretion of the ACME server to accept this parameter. * Note that it is at the discretion of the ACME server to accept this parameter.
*/ */
public void setState(String st) { public void setState(String st) {
namebuilder.addRDN(BCStyle.ST, st); namebuilder.addRDN(BCStyle.ST, requireNonNull(st));
} }
/** /**
@ -149,7 +150,7 @@ public class CSRBuilder {
* Note that it is at the discretion of the ACME server to accept this parameter. * Note that it is at the discretion of the ACME server to accept this parameter.
*/ */
public void setCountry(String c) { public void setCountry(String c) {
namebuilder.addRDN(BCStyle.C, c); namebuilder.addRDN(BCStyle.C, requireNonNull(c));
} }
/** /**