Spring/spring-hateoas
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#1505 - Improve signatures of HalFormsOptions.inline(…).

Browse Source 
A bit of generics ♥️ for HalFormsOptions.inline(…) to avoid compiler warnings.
This commit is contained in:
Oliver Drotbohm
2021-03-31 15:44:54 +02:00
parent 759785f98e
commit 01c5fae3f0
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsOptions.java
View File

@@ -43,7 +43,8 @@ public interface HalFormsOptions {
* @param values must not be {@literal null}.
* @return will never be {@literal null}.
*/
public static Inline inline(Object... values) {
@SuppressWarnings("unchecked")
public static <T> Inline inline(T... values) {
Assert.notNull(values, "Values must not be null!");
@@ -56,7 +57,7 @@ public interface HalFormsOptions {
* @param values must not be {@literal null}.
* @return will never be {@literal null}.
*/
public static Inline inline(Collection<Object> values) {
public static Inline inline(Collection<? extends Object> values) {
Assert.notNull(values, "Values must not be null!");
@@ -253,14 +254,14 @@ public interface HalFormsOptions {
public static class Inline extends AbstractHalFormsOptions<Inline> {
private final Collection<Object> inline;
private final Collection<? extends Object> inline;
/**
* @param values
* @param promptRef
* @param valueRef
*/
private Inline(Collection<Object> values, @Nullable String promptRef, @Nullable String valueRef,
private Inline(Collection<? extends Object> values, @Nullable String promptRef, @Nullable String valueRef,
@Nullable Long minItems, @Nullable Long maxItems) {
super(promptRef, valueRef, minItems, maxItems);
@@ -276,7 +277,7 @@ public interface HalFormsOptions {
* @return
*/
@JsonProperty
public Collection<Object> getInline() {
public Collection<? extends Object> getInline() {
return inline;
}

2
src/test/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsTemplateBuilderUnitTest.java
View File

@@ -160,7 +160,7 @@ class HalFormsTemplateBuilderUnitTest {
@Test // #1483
void rendersRegisteredSuggest() {
List<Object> values = Arrays.asList("1234123412341234", "4321432143214321");
List<String> values = Arrays.asList("1234123412341234", "4321432143214321");
HalFormsConfiguration configuration = new HalFormsConfiguration()
.withOptions(PatternExample.class, "number", metadata -> HalFormsOptions.inline(values));