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

Return empty collection instead of null

pull/30/head
Richard Körber 2016-12-21 23:28:25 +01:00
parent 2ce40ec971
commit 4a2d7c4178
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
acme4j-client/src/main/java/org/shredzone/acme4j/Authorization.java
View File

@ -20,6 +20,7 @@ import java.net.URI;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.List;
@ -114,14 +115,14 @@ public class Authorization extends AcmeResource {
* @param type
* Challenge name (e.g. "http-01")
* @return {@link Challenge} matching that name, or {@code null} if there is no such
* challenge, or the challenge alone is not sufficient for authorization.
* challenge, or if the challenge alone is not sufficient for authorization.
* @throws ClassCastException
* if the type does not match the expected Challenge class type
*/
@SuppressWarnings("unchecked")
public <T extends Challenge> T findChallenge(String type) {
Collection<Challenge> result = findCombination(type);
return result != null ? (T) result.iterator().next() : null;
return !result.isEmpty() ? (T) result.iterator().next() : null;
}
/**
@ -134,21 +135,17 @@ public class Authorization extends AcmeResource {
* Challenge name or names (e.g. "http-01"), in no particular order.
* Basically this is a collection of all challenge types supported by your
* implementation.
* @return Matching {@link Challenge} combination, or {@code null} if the ACME server
* does not support any of your challenges. The challenges are returned in no
* particular order. The result may be a subset of the types you have
* @return Matching {@link Challenge} combination, or an empty collection if the ACME
* server does not support any of your challenges. The challenges are returned
* in no particular order. The result may be a subset of the types you have
* provided, if fewer challenges are actually required for a successful
* validation.
*/
public Collection<Challenge> findCombination(String... types) {
if (getCombinations() == null) {
return null;
}
Collection<String> available = Arrays.asList(types);
Collection<String> combinationTypes = new ArrayList<>();
Collection<Challenge> result = null;
Collection<Challenge> result = Collections.emptyList();
for (List<Challenge> combination : getCombinations()) {
combinationTypes.clear();
@ -157,12 +154,12 @@ public class Authorization extends AcmeResource {
}
if (available.containsAll(combinationTypes) &&
(result == null || result.size() > combination.size())) {
(result.isEmpty() || result.size() > combination.size())) {
result = combination;
}
}
return result;
return Collections.unmodifiableCollection(result);
}
/**

4
acme4j-client/src/test/java/org/shredzone/acme4j/AuthorizationTest.java
View File

@ -106,11 +106,11 @@ public class AuthorizationTest {
// Finds only entire combinations
Collection<Challenge> c6 = authorization.findCombination(Dns01Challenge.TYPE);
assertThat(c6, is(nullValue()));
assertThat(c6, is(empty()));
// Does not find challenges that have not been provided
Collection<Challenge> c7 = authorization.findCombination(SNAILMAIL_TYPE);
assertThat(c7, is(nullValue()));
assertThat(c7, is(empty()));
}
/**