Merge branch 'master' into master-rx-java-2

This commit is contained in:
gorodeckii 2017-07-05 15:04:31 +03:00
commit c79a77f52a
1 changed files with 10 additions and 0 deletions

View File

@ -35,10 +35,17 @@ public class LoganSquareEnumConverter<T extends Enum & LoganSquareEnum> extends
@NonNull
private final T[] enumValues;
@Nullable
private final T defaultValue;
public LoganSquareEnumConverter(@NonNull final T[] enumValues) {
this(enumValues, null);
}
public LoganSquareEnumConverter(@NonNull final T[] enumValues, @Nullable final T defaultValue) {
super();
this.enumValues = enumValues;
this.defaultValue = defaultValue;
}
@Nullable
@ -52,6 +59,9 @@ public class LoganSquareEnumConverter<T extends Enum & LoganSquareEnum> extends
return value;
}
}
if (defaultValue != null) {
return defaultValue;
}
throw new ShouldNotHappenException();
}