[spring-projects#1300] Fix several test switching generics order

Author: Patouche

src/main/java/org/springframework/hateoas/AbstractCollectionModel.java

@@ -20,20 +20,18 @@
 import org.springframework.util.Assert;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.Objects;
-import java.util.function.Supplier;
 
 /**
  * General helper to easily create a wrapper for a collection of entities.
  *
  * @author Oliver Gierke
  * @author Greg Turnquist
  */
-public class AbstractCollectionModel<S extends AbstractCollectionModel<S,T>, T> extends RepresentationModel<S> implements Iterable<T> {
+public class AbstractCollectionModel<T, S extends AbstractCollectionModel<T, S>> extends RepresentationModel<S> implements Iterable<T> {
 
 	private final Collection<T> content;
 
@@ -98,7 +96,7 @@ public boolean equals(@Nullable Object obj) {
 			return false;
 		}
 
-		AbstractCollectionModel<?, ?> that = (AbstractCollectionModel<?,?>) obj;
+		AbstractCollectionModel<?, ?> that = (AbstractCollectionModel<?, ?>) obj;
 		return Objects.equals(this.content, that.content);
 	}
 

src/main/java/org/springframework/hateoas/CollectionModel.java

@@ -17,22 +17,17 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Collections;
-import java.util.Iterator;
 
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 /**
  * General helper to easily create a wrapper for a collection of entities.
  *
  * @author Oliver Gierke
  * @author Greg Turnquist
  */
-public class CollectionModel<T> extends AbstractCollectionModel<CollectionModel<T>, T> implements Iterable<T> {
+public class CollectionModel<T> extends AbstractCollectionModel<T, CollectionModel<T>> implements Iterable<T> {
 
 	/**
 	 * Creates an empty {@link CollectionModel} instance.

src/main/java/org/springframework/hateoas/PagedModel.java

@@ -34,7 +34,7 @@
  * @author Oliver Gierke
  * @author Greg Turnquist
  */
-public class PagedModel<T> extends AbstractCollectionModel<PagedModel<T>, T> {
+public class PagedModel<T> extends AbstractCollectionModel<T, PagedModel<T>> {
 
 	public static PagedModel<?> NO_PAGE = new PagedModel<>();
 

src/main/java/org/springframework/hateoas/mediatype/collectionjson/Jackson2CollectionJsonModule.java

@@ -915,7 +915,7 @@ private CollectionJsonPagedResourcesDeserializer(JavaType contentType) {
 		}
 	}
 
-	private static List<CollectionJsonItem<Object>> resourcesToCollectionJsonItems(AbstractCollectionModel<?,?> resources) {
+	private static List<CollectionJsonItem<Object>> resourcesToCollectionJsonItems(AbstractCollectionModel<?, ?> resources) {
 
 		return resources.getContent().stream().map(content -> {
 

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

@@ -210,7 +210,7 @@ public JsonSerializer<?> createContextual(SerializerProvider prov, BeanProperty
 	/**
 	 * Serializer for {@link CollectionModel}
 	 */
-	static class HalFormsCollectionModelSerializer extends ContainerSerializer<AbstractCollectionModel<?,?>>
+	static class HalFormsCollectionModelSerializer extends ContainerSerializer<AbstractCollectionModel<?, ?>>
 			implements ContextualSerializer {
 
 		private static final long serialVersionUID = -3601146866067500734L;
@@ -243,7 +243,7 @@ static class HalFormsCollectionModelSerializer extends ContainerSerializer<Abstr
 		 */
 		@Override
 		@SuppressWarnings("null")
-		public void serialize(AbstractCollectionModel<?,?> value, JsonGenerator gen, SerializerProvider provider) throws IOException {
+		public void serialize(AbstractCollectionModel<?, ?> value, JsonGenerator gen, SerializerProvider provider) throws IOException {
 
 			EmbeddedMapper mapper = configuration.isApplyPropertyNamingStrategy() //
 					? embeddedMapper.with(provider.getConfig().getPropertyNamingStrategy()) //
@@ -298,7 +298,7 @@ public JsonSerializer<?> getContentSerializer() {
 		 */
 		@Override
 		@SuppressWarnings("null")
-		public boolean hasSingleElement(AbstractCollectionModel<?,?> resources) {
+		public boolean hasSingleElement(AbstractCollectionModel<?, ?> resources) {
 			return resources.getContent().size() == 1;
 		}
 

src/main/java/org/springframework/hateoas/mediatype/uber/UberData.java

@@ -204,7 +204,7 @@ static List<UberData> extractLinksAndContent(EntityModel<?> resource) {
 	 * @param resources
 	 * @return
 	 */
-	private static List<UberData> extractLinksAndCollectionContent(AbstractCollectionModel<?,?> resources) {
+	private static List<UberData> extractLinksAndCollectionContent(AbstractCollectionModel<?, ?> resources) {
 
 		List<UberData> data = extractLinks(resources);
 

src/main/java/org/springframework/hateoas/server/mvc/RepresentationModelProcessorInvoker.java

@@ -385,7 +385,7 @@ public boolean supports(ResolvableType type, Object value) {
 		 * @return
 		 */
 
-		static boolean isValueTypeMatch(@Nullable AbstractCollectionModel<?,?> collectionModel, ResolvableType target) {
+		static boolean isValueTypeMatch(@Nullable AbstractCollectionModel<?, ?> collectionModel, ResolvableType target) {
 
 			if (collectionModel == null) {
 				return false;
@@ -413,7 +413,7 @@ static boolean isValueTypeMatch(@Nullable AbstractCollectionModel<?,?> collectio
 			}
 
 			Object element = content.iterator().next();
-			ResolvableType resourceType = superType.getGeneric(1);
+			ResolvableType resourceType = superType.getGeneric(0);
 
 			if (element instanceof EntityModel) {
 				return EntityModelProcessorWrapper.isValueTypeMatch((EntityModel<?>) element, resourceType);

src/test/java/org/springframework/hateoas/mediatype/uber/Jackson2UberIntegrationTest.java

@@ -538,13 +538,13 @@ void handleTemplatedLinksOnDeserialization() throws IOException {
 		assertThat(deserialized).isEqualTo(original);
 	}
 
-	private static AbstractCollectionModel<?, EntityModel<Employee>> setupAnnotatedPagedResources() {
+	private static AbstractCollectionModel<EntityModel<Employee>, ?> setupAnnotatedPagedResources() {
 
 		return setupAnnotatedPagedResources(2, 4);
 	}
 
 	@NotNull
-	private static AbstractCollectionModel<?, EntityModel<Employee>> setupAnnotatedPagedResources(int size, int totalElements) {
+	private static AbstractCollectionModel<EntityModel<Employee>, ?> setupAnnotatedPagedResources(int size, int totalElements) {
 
 		List<EntityModel<Employee>> content = new ArrayList<>();
 		Employee employee = new Employee("Frodo", "ring bearer");