Skip to content

Commit 01c5fae

Browse files
committed
#1505 - Improve signatures of HalFormsOptions.inline(…).
A bit of generics ♥️ for HalFormsOptions.inline(…) to avoid compiler warnings.
1 parent 759785f commit 01c5fae

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ public interface HalFormsOptions {
4343
* @param values must not be {@literal null}.
4444
* @return will never be {@literal null}.
4545
*/
46-
public static Inline inline(Object... values) {
46+
@SuppressWarnings("unchecked")
47+
public static <T> Inline inline(T... values) {
4748

4849
Assert.notNull(values, "Values must not be null!");
4950

@@ -56,7 +57,7 @@ public static Inline inline(Object... values) {
5657
* @param values must not be {@literal null}.
5758
* @return will never be {@literal null}.
5859
*/
59-
public static Inline inline(Collection<Object> values) {
60+
public static Inline inline(Collection<? extends Object> values) {
6061

6162
Assert.notNull(values, "Values must not be null!");
6263

@@ -253,14 +254,14 @@ protected abstract T with(@Nullable String promptRef, @Nullable String valueRef,
253254

254255
public static class Inline extends AbstractHalFormsOptions<Inline> {
255256

256-
private final Collection<Object> inline;
257+
private final Collection<? extends Object> inline;
257258

258259
/**
259260
* @param values
260261
* @param promptRef
261262
* @param valueRef
262263
*/
263-
private Inline(Collection<Object> values, @Nullable String promptRef, @Nullable String valueRef,
264+
private Inline(Collection<? extends Object> values, @Nullable String promptRef, @Nullable String valueRef,
264265
@Nullable Long minItems, @Nullable Long maxItems) {
265266

266267
super(promptRef, valueRef, minItems, maxItems);
@@ -276,7 +277,7 @@ private Inline(Collection<Object> values, @Nullable String promptRef, @Nullable
276277
* @return
277278
*/
278279
@JsonProperty
279-
public Collection<Object> getInline() {
280+
public Collection<? extends Object> getInline() {
280281
return inline;
281282
}
282283

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ void exposesInputMediaTypeAsContentType() {
160160
@Test // #1483
161161
void rendersRegisteredSuggest() {
162162

163-
List<Object> values = Arrays.asList("1234123412341234", "4321432143214321");
163+
List<String> values = Arrays.asList("1234123412341234", "4321432143214321");
164164

165165
HalFormsConfiguration configuration = new HalFormsConfiguration()
166166
.withOptions(PatternExample.class, "number", metadata -> HalFormsOptions.inline(values));

0 commit comments

Comments
 (0)