#1281 - Fix in invocation of generic RepresentationModelProcessor.

This commit is contained in:
Oliver Drotbohm
2020-04-29 17:04:36 +02:00
parent 962b9a03ec
commit e1f751caf1
2 changed files with 56 additions and 7 deletions

View File

@@ -171,13 +171,7 @@ public class RepresentationModelProcessorInvoker {
}
private static Class<?> getRawType(@Nullable ResolvableType type) {
if (type == null) {
return Object.class;
}
Class<?> rawType = type.getRawClass();
return rawType == null ? Object.class : rawType;
return type == null ? Object.class : type.resolve(Object.class);
}
/**

View File

@@ -0,0 +1,55 @@
/*
* Copyright 2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.hateoas.server.mvc;
import static org.assertj.core.api.Assertions.*;
import java.util.Collections;
import org.junit.jupiter.api.Test;
import org.springframework.hateoas.CollectionModel;
import org.springframework.hateoas.RepresentationModel;
import org.springframework.hateoas.server.RepresentationModelProcessor;
/**
* Unit tests for {@link RepresentationModelProcessorInvoker}.
*
* @author Oliver Drotbohm
*/
public class RepresentationModelProcessorInvokerUnitTests {
@Test // #1280
void doesNotInvokeGenericProcessorForCollectionModel() {
RepresentationModelProcessorInvoker invoker = new RepresentationModelProcessorInvoker(
Collections.singletonList(new GenericPostProcessor<>()));
assertThatCode(() -> invoker.invokeProcessorsFor(new CollectionModel<>(Collections.emptyList()))) //
.doesNotThrowAnyException();
}
// #1280
static class GenericPostProcessor<T extends GenericModel<T>> implements RepresentationModelProcessor<T> {
@Override
public T process(T model) {
return model;
}
}
static class GenericModel<T extends RepresentationModel<T>> extends RepresentationModel<T> {}
}