diff --git a/etc/migrate-to-1.0.sh b/etc/migrate-to-1.0.sh index ed59d63b..b81f8d37 100755 --- a/etc/migrate-to-1.0.sh +++ b/etc/migrate-to-1.0.sh @@ -45,7 +45,7 @@ s/hateoas\.LinkBuilder/hateoas.server.LinkBuilder/g;\ s/hateoas\.LinkDiscoverer/hateoas.client.LinkDiscoverer/g;\ s/hateoas\.LinkDiscoverers/hateoas.client.LinkDiscoverers/g;\ s/hateoas\.MethodLinkBuilderFactory/hateoas.server.MethodLinkBuilderFactory/g;\ -s/hateoas\.RelProvider/hateoas.server.RelProvider/g;\ +s/hateoas\.RelProvider/hateoas.server.LinkRelationProvider/g;\ s/hateoas\.ResourceAssembler/hateoas.server.ResourceAssembler/g;\ s/hateoas\.ResourceProcessor/hateoas.server.ResourceProcessor/g;\ s/hateoas\.VndErrors/hateoas.mediatype.vnderror.VndErrors/g;\ @@ -56,9 +56,9 @@ s/hateoas\.alps/hateoas.mediatype.alps/g;\ s/hateoas\.core\.AbstractEntityLinks/hateoas.server.core.AbstractEntityLinks/g;\ s/hateoas\.core\.AnnotationAttribute/hateoas.server.core.AnnotationAttribute/g;\ s/hateoas\.core\.AnnotationMappingDiscoverer/hateoas.server.core.AnnotationMappingDiscoverer/g;\ -s/hateoas\.core\.DefaultRelProvider/hateoas.server.core.DefaultRelProvider/g;\ +s/hateoas\.core\.DefaultRelProvider/hateoas.server.core.DefaultLinkRelationProvider/g;\ s/hateoas\.core\.EmbeddedWrapper/hateoas.server.core.EmbeddedWrapper/g;\ -s/hateoas\.core\.EvoInflectorRelProvider/hateoas.server.core.EvoInflectorRelProvider/g;\ +s/hateoas\.core\.EvoInflectorRelProvider/hateoas.server.core.EvoInflectorLinkRelationProvider/g;\ s/hateoas\.core\.JsonPathLinkDiscoverer/hateoas.client.JsonPathLinkDiscoverer/g;\ s/hateoas\.core\.LinkBuilderSupport/hateoas.server.core.LinkBuilderSupport/g;\ s/hateoas\.core\.MethodParameters/hateoas.server.core.MethodParameters/g;\ @@ -86,10 +86,11 @@ s/IdentifiableResourceAssemblerSupport/IdentifiableRepresentationModelAssemblerS s/toResource(/toModel(/g;\ s/toResources(/toCollectionModel(/g;\ \ -s/\([^a-z]\)ResourceSupport\([ ><,#();\.]\)/\1RepresentationModel\2/g;\ -s/\([^a-z]\)PagedResources\([ ><,#();\.]\)/\1PagedModel\2/g;\ -s/\([^a-z]\)Resources\([ ><,#();\.]\)/\1CollectionModel\2/g;\ -s/\([^a-z]\)Resource\([ ><,#();\.]\)/\1EntityModel\2/g;\ +s/\([^a-z]\)ResourceSupport\([ ><,#();:\.]\)/\1RepresentationModel\2/g;\ +s/\([^a-z]\)PagedResources\([ ><,#();:\.]\)/\1PagedModel\2/g;\ +s/\([^a-z]\)Resources\([ ><,#();:\.]\)/\1CollectionModel\2/g;\ +s/\([^a-z]\)Resource\([ ><,#();:\.]\)/\1EntityModel\2/g;\ +s/\([^a-z]\)RelProvider\([ ><,#();:\.]\)/\1LinkRelationProvider\2/g;\ \ s/linkForSingleResource/linkForItemResource/g;\ s/linkToSingleResource/linkToItemResource/g;\ diff --git a/src/main/java/org/springframework/hateoas/config/HateoasConfiguration.java b/src/main/java/org/springframework/hateoas/config/HateoasConfiguration.java index 972edf5a..0652860b 100644 --- a/src/main/java/org/springframework/hateoas/config/HateoasConfiguration.java +++ b/src/main/java/org/springframework/hateoas/config/HateoasConfiguration.java @@ -23,11 +23,11 @@ import org.springframework.context.support.MessageSourceAccessor; import org.springframework.context.support.ReloadableResourceBundleMessageSource; import org.springframework.hateoas.client.LinkDiscoverer; import org.springframework.hateoas.client.LinkDiscoverers; -import org.springframework.hateoas.server.RelProvider; -import org.springframework.hateoas.server.core.AnnotationRelProvider; -import org.springframework.hateoas.server.core.DefaultRelProvider; -import org.springframework.hateoas.server.core.DelegatingRelProvider; -import org.springframework.hateoas.server.core.EvoInflectorRelProvider; +import org.springframework.hateoas.server.LinkRelationProvider; +import org.springframework.hateoas.server.core.AnnotationLinkRelationProvider; +import org.springframework.hateoas.server.core.DefaultLinkRelationProvider; +import org.springframework.hateoas.server.core.DelegatingLinkRelationProvider; +import org.springframework.hateoas.server.core.EvoInflectorLinkRelationProvider; import org.springframework.http.MediaType; import org.springframework.plugin.core.PluginRegistry; import org.springframework.plugin.core.config.EnablePluginRegistries; @@ -69,31 +69,31 @@ class HateoasConfiguration { // RelProvider @Bean - RelProvider defaultRelProvider() { + LinkRelationProvider defaultRelProvider() { return ClassUtils.isPresent("org.atteo.evo.inflector.English", null) // - ? new EvoInflectorRelProvider() - : new DefaultRelProvider(); + ? new EvoInflectorLinkRelationProvider() + : new DefaultLinkRelationProvider(); } @Bean - AnnotationRelProvider annotationRelProvider() { - return new AnnotationRelProvider(); + AnnotationLinkRelationProvider annotationRelProvider() { + return new AnnotationLinkRelationProvider(); } @Primary @Bean - DelegatingRelProvider _relProvider(PluginRegistry> relProviderPluginRegistry) { - return new DelegatingRelProvider(relProviderPluginRegistry); + DelegatingLinkRelationProvider _relProvider(PluginRegistry> relProviderPluginRegistry) { + return new DelegatingLinkRelationProvider(relProviderPluginRegistry); } @Bean - PluginRegistryFactoryBean> relProviderPluginRegistry() { + PluginRegistryFactoryBean> relProviderPluginRegistry() { - PluginRegistryFactoryBean> factory = new PluginRegistryFactoryBean<>(); + PluginRegistryFactoryBean> factory = new PluginRegistryFactoryBean<>(); - factory.setType(RelProvider.class); - factory.setExclusions(new Class[] { DelegatingRelProvider.class }); + factory.setType(LinkRelationProvider.class); + factory.setExclusions(new Class[] { DelegatingLinkRelationProvider.class }); return factory; } diff --git a/src/main/java/org/springframework/hateoas/mediatype/hal/HalEmbeddedBuilder.java b/src/main/java/org/springframework/hateoas/mediatype/hal/HalEmbeddedBuilder.java index f4533ac2..1d13a167 100644 --- a/src/main/java/org/springframework/hateoas/mediatype/hal/HalEmbeddedBuilder.java +++ b/src/main/java/org/springframework/hateoas/mediatype/hal/HalEmbeddedBuilder.java @@ -24,7 +24,7 @@ import java.util.Map; import org.springframework.hateoas.LinkRelation; import org.springframework.hateoas.EntityModel; -import org.springframework.hateoas.server.RelProvider; +import org.springframework.hateoas.server.LinkRelationProvider; import org.springframework.hateoas.server.core.EmbeddedWrapper; import org.springframework.hateoas.server.core.EmbeddedWrappers; import org.springframework.util.Assert; @@ -42,17 +42,17 @@ class HalEmbeddedBuilder { private static final String INVALID_EMBEDDED_WRAPPER = "Embedded wrapper %s returned null for both the static rel and the rel target type! Make sure one of the two returns a non-null value!"; private final Map embeddeds = new HashMap<>(); - private final RelProvider provider; + private final LinkRelationProvider provider; private final CurieProvider curieProvider; private final EmbeddedWrappers wrappers; /** - * Creates a new {@link HalEmbeddedBuilder} using the given {@link RelProvider} and prefer collection rels flag. + * Creates a new {@link HalEmbeddedBuilder} using the given {@link LinkRelationProvider} and prefer collection rels flag. * * @param provider can be {@literal null}. * @param preferCollectionRels whether to prefer to ask the provider for collection rels. */ - public HalEmbeddedBuilder(RelProvider provider, CurieProvider curieProvider, boolean preferCollectionRels) { + public HalEmbeddedBuilder(LinkRelationProvider provider, CurieProvider curieProvider, boolean preferCollectionRels) { Assert.notNull(provider, "Relprovider must not be null!"); diff --git a/src/main/java/org/springframework/hateoas/mediatype/hal/HalMediaTypeConfiguration.java b/src/main/java/org/springframework/hateoas/mediatype/hal/HalMediaTypeConfiguration.java index 988aebfb..9feda5cd 100644 --- a/src/main/java/org/springframework/hateoas/mediatype/hal/HalMediaTypeConfiguration.java +++ b/src/main/java/org/springframework/hateoas/mediatype/hal/HalMediaTypeConfiguration.java @@ -25,7 +25,7 @@ import org.springframework.context.support.MessageSourceAccessor; import org.springframework.hateoas.client.LinkDiscoverer; import org.springframework.hateoas.config.EnableHypermediaSupport.HypermediaType; import org.springframework.hateoas.config.HypermediaMappingInformation; -import org.springframework.hateoas.server.RelProvider; +import org.springframework.hateoas.server.LinkRelationProvider; import org.springframework.http.MediaType; import com.fasterxml.jackson.databind.DeserializationFeature; @@ -40,7 +40,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; @Configuration public class HalMediaTypeConfiguration implements HypermediaMappingInformation { - private final RelProvider relProvider; + private final LinkRelationProvider relProvider; private final ObjectProvider curieProvider; private final ObjectProvider halConfiguration; private final MessageSourceAccessor messageSourceAccessor; @@ -51,7 +51,7 @@ public class HalMediaTypeConfiguration implements HypermediaMappingInformation { * @param halConfiguration * @param messageSourceAccessor */ - public HalMediaTypeConfiguration(RelProvider relProvider, ObjectProvider curieProvider, + public HalMediaTypeConfiguration(LinkRelationProvider relProvider, ObjectProvider curieProvider, ObjectProvider halConfiguration, @Qualifier("linkRelationMessageSource") MessageSourceAccessor messageSourceAccessor) { diff --git a/src/main/java/org/springframework/hateoas/mediatype/hal/Jackson2HalModule.java b/src/main/java/org/springframework/hateoas/mediatype/hal/Jackson2HalModule.java index 92d72999..8723aa29 100644 --- a/src/main/java/org/springframework/hateoas/mediatype/hal/Jackson2HalModule.java +++ b/src/main/java/org/springframework/hateoas/mediatype/hal/Jackson2HalModule.java @@ -36,7 +36,7 @@ import org.springframework.hateoas.LinkRelation; import org.springframework.hateoas.Links; import org.springframework.hateoas.RepresentationModel; import org.springframework.hateoas.mediatype.hal.HalConfiguration.RenderSingleLinks; -import org.springframework.hateoas.server.RelProvider; +import org.springframework.hateoas.server.LinkRelationProvider; import org.springframework.util.Assert; import com.fasterxml.jackson.annotation.JsonInclude; @@ -664,13 +664,13 @@ public class Jackson2HalModule extends SimpleModule { private final Map, Object> serializers = new HashMap<>(); private final AutowireCapableBeanFactory delegate; - public HalHandlerInstantiator(RelProvider provider, CurieProvider curieProvider, + public HalHandlerInstantiator(LinkRelationProvider provider, CurieProvider curieProvider, MessageSourceAccessor messageSourceAccessor) { this(provider, curieProvider, messageSourceAccessor, new HalConfiguration()); } /** - * Creates a new {@link HalHandlerInstantiator} using the given {@link RelProvider}, {@link CurieProvider} and + * Creates a new {@link HalHandlerInstantiator} using the given {@link LinkRelationProvider}, {@link CurieProvider} and * {@link MessageSourceAccessor}. Registers a prepared {@link HalResourcesSerializer} and * {@link HalLinkListSerializer} falling back to instantiation expecting a default constructor. * @@ -678,13 +678,13 @@ public class Jackson2HalModule extends SimpleModule { * @param curieProvider can be {@literal null}. * @param messageSourceAccessor can be {@literal null}. */ - public HalHandlerInstantiator(RelProvider provider, CurieProvider curieProvider, + public HalHandlerInstantiator(LinkRelationProvider provider, CurieProvider curieProvider, MessageSourceAccessor messageSourceAccessor, HalConfiguration halConfiguration) { this(provider, curieProvider, messageSourceAccessor, true, halConfiguration); } /** - * Creates a new {@link HalHandlerInstantiator} using the given {@link RelProvider}, {@link CurieProvider} and + * Creates a new {@link HalHandlerInstantiator} using the given {@link LinkRelationProvider}, {@link CurieProvider} and * {@link MessageSourceAccessor} and whether to enforce embedded collections. Registers a prepared * {@link HalResourcesSerializer} and {@link HalLinkListSerializer} falling back to instantiation expecting a * default constructor. @@ -694,12 +694,12 @@ public class Jackson2HalModule extends SimpleModule { * @param accessor can be {@literal null}. * @param enforceEmbeddedCollections */ - public HalHandlerInstantiator(RelProvider provider, CurieProvider curieProvider, MessageSourceAccessor accessor, + public HalHandlerInstantiator(LinkRelationProvider provider, CurieProvider curieProvider, MessageSourceAccessor accessor, boolean enforceEmbeddedCollections, HalConfiguration halConfiguration) { this(provider, curieProvider, accessor, enforceEmbeddedCollections, null, halConfiguration); } - private HalHandlerInstantiator(RelProvider provider, CurieProvider curieProvider, MessageSourceAccessor accessor, + private HalHandlerInstantiator(LinkRelationProvider provider, CurieProvider curieProvider, MessageSourceAccessor accessor, boolean enforceEmbeddedCollections, AutowireCapableBeanFactory delegate, HalConfiguration halConfiguration) { Assert.notNull(provider, "RelProvider must not be null!"); @@ -830,19 +830,19 @@ public class Jackson2HalModule extends SimpleModule { */ public static class EmbeddedMapper { - private RelProvider relProvider; + private LinkRelationProvider relProvider; private CurieProvider curieProvider; private boolean preferCollectionRels; /** - * Creates a new {@link EmbeddedMapper} for the given {@link RelProvider}, {@link CurieProvider} and flag whether to + * Creates a new {@link EmbeddedMapper} for the given {@link LinkRelationProvider}, {@link CurieProvider} and flag whether to * prefer collection relations. * * @param relProvider must not be {@literal null}. * @param curieProvider can be {@literal null}. * @param preferCollectionRels */ - public EmbeddedMapper(RelProvider relProvider, CurieProvider curieProvider, boolean preferCollectionRels) { + public EmbeddedMapper(LinkRelationProvider relProvider, CurieProvider curieProvider, boolean preferCollectionRels) { Assert.notNull(relProvider, "RelProvider must not be null!"); diff --git a/src/main/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsMediaTypeConfiguration.java b/src/main/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsMediaTypeConfiguration.java index cd5f543f..77cc2d98 100644 --- a/src/main/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsMediaTypeConfiguration.java +++ b/src/main/java/org/springframework/hateoas/mediatype/hal/forms/HalFormsMediaTypeConfiguration.java @@ -27,7 +27,7 @@ import org.springframework.hateoas.config.EnableHypermediaSupport.HypermediaType import org.springframework.hateoas.mediatype.hal.CurieProvider; import org.springframework.hateoas.client.LinkDiscoverer; import org.springframework.hateoas.config.HypermediaMappingInformation; -import org.springframework.hateoas.server.core.DelegatingRelProvider; +import org.springframework.hateoas.server.core.DelegatingLinkRelationProvider; import org.springframework.http.MediaType; import com.fasterxml.jackson.databind.DeserializationFeature; @@ -43,7 +43,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; @RequiredArgsConstructor class HalFormsMediaTypeConfiguration implements HypermediaMappingInformation { - private final DelegatingRelProvider relProvider; + private final DelegatingLinkRelationProvider relProvider; private final ObjectProvider curieProvider; private final ObjectProvider halFormsConfiguration; private final MessageSourceAccessor messageSourceAccessor; diff --git a/src/main/java/org/springframework/hateoas/mediatype/hal/forms/Jackson2HalFormsModule.java b/src/main/java/org/springframework/hateoas/mediatype/hal/forms/Jackson2HalFormsModule.java index f5431708..361fee07 100644 --- a/src/main/java/org/springframework/hateoas/mediatype/hal/forms/Jackson2HalFormsModule.java +++ b/src/main/java/org/springframework/hateoas/mediatype/hal/forms/Jackson2HalFormsModule.java @@ -37,7 +37,7 @@ import org.springframework.hateoas.mediatype.hal.RepresentationModelMixin; import org.springframework.hateoas.mediatype.hal.forms.HalFormsDeserializers.HalFormsResourcesDeserializer; import org.springframework.hateoas.mediatype.hal.forms.HalFormsSerializers.HalFormsResourceSerializer; import org.springframework.hateoas.mediatype.hal.forms.HalFormsSerializers.HalFormsResourcesSerializer; -import org.springframework.hateoas.server.RelProvider; +import org.springframework.hateoas.server.LinkRelationProvider; import org.springframework.hateoas.server.mvc.JacksonSerializers.MediaTypeDeserializer; import org.springframework.http.MediaType; @@ -148,21 +148,20 @@ class Jackson2HalFormsModule extends SimpleModule { private final Map, Object> serializers = new HashMap<>(); - public HalFormsHandlerInstantiator(RelProvider resolver, CurieProvider curieProvider, - MessageSourceAccessor messageSource, boolean enforceEmbeddedCollections, + public HalFormsHandlerInstantiator(LinkRelationProvider resolver, CurieProvider curieProvider, + MessageSourceAccessor accessor, boolean enforceEmbeddedCollections, HalFormsConfiguration halFormsConfiguration) { - super(resolver, curieProvider, messageSource, enforceEmbeddedCollections, - halFormsConfiguration.toHalConfiguration()); + super(resolver, curieProvider, accessor, enforceEmbeddedCollections, halFormsConfiguration.toHalConfiguration()); EmbeddedMapper mapper = new EmbeddedMapper(resolver, curieProvider, enforceEmbeddedCollections); this.serializers.put(HalFormsResourcesSerializer.class, new HalFormsResourcesSerializer(mapper)); this.serializers.put(HalLinkListSerializer.class, - new HalLinkListSerializer(curieProvider, mapper, messageSource, halFormsConfiguration.toHalConfiguration())); + new HalLinkListSerializer(curieProvider, mapper, accessor, halFormsConfiguration.toHalConfiguration())); } - public HalFormsHandlerInstantiator(RelProvider relProvider, CurieProvider curieProvider, + public HalFormsHandlerInstantiator(LinkRelationProvider relProvider, CurieProvider curieProvider, MessageSourceAccessor messageSource, boolean enforceEmbeddedCollections, AutowireCapableBeanFactory beanFactory) { this(relProvider, curieProvider, messageSource, enforceEmbeddedCollections, diff --git a/src/main/java/org/springframework/hateoas/server/RelProvider.java b/src/main/java/org/springframework/hateoas/server/LinkRelationProvider.java similarity index 85% rename from src/main/java/org/springframework/hateoas/server/RelProvider.java rename to src/main/java/org/springframework/hateoas/server/LinkRelationProvider.java index 9a1fdf1b..21098a26 100644 --- a/src/main/java/org/springframework/hateoas/server/RelProvider.java +++ b/src/main/java/org/springframework/hateoas/server/LinkRelationProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2014 the original author or authors. + * Copyright 2013-2019 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. @@ -19,11 +19,11 @@ import org.springframework.hateoas.LinkRelation; import org.springframework.plugin.core.Plugin; /** - * API to provide relation types for collections and items of the given type. + * API to provide {@link LinkRelation}s for collections and items of the given type. * * @author Oliver Gierke */ -public interface RelProvider extends Plugin> { +public interface LinkRelationProvider extends Plugin> { /** * Returns the relation type to be used to point to an item resource of the given type. diff --git a/src/main/java/org/springframework/hateoas/server/core/AnnotationRelProvider.java b/src/main/java/org/springframework/hateoas/server/core/AnnotationLinkRelationProvider.java similarity index 85% rename from src/main/java/org/springframework/hateoas/server/core/AnnotationRelProvider.java rename to src/main/java/org/springframework/hateoas/server/core/AnnotationLinkRelationProvider.java index 340dd732..1e183643 100644 --- a/src/main/java/org/springframework/hateoas/server/core/AnnotationRelProvider.java +++ b/src/main/java/org/springframework/hateoas/server/core/AnnotationLinkRelationProvider.java @@ -21,20 +21,20 @@ import java.util.Map; import org.springframework.core.Ordered; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.hateoas.LinkRelation; -import org.springframework.hateoas.server.RelProvider; +import org.springframework.hateoas.server.LinkRelationProvider; /** * @author Oliver Gierke * @author Alexander Baetz * @author Greg Turnquist */ -public class AnnotationRelProvider implements RelProvider, Ordered { +public class AnnotationLinkRelationProvider implements LinkRelationProvider, Ordered { private final Map, Relation> annotationCache = new HashMap<>(); /* * (non-Javadoc) - * @see org.springframework.hateoas.RelProvider#getRelForCollectionResource(java.lang.Class) + * @see org.springframework.hateoas.server.LinkRelationProvider#getCollectionResourceRelFor(java.lang.Class) */ @Override public LinkRelation getCollectionResourceRelFor(Class type) { @@ -50,7 +50,7 @@ public class AnnotationRelProvider implements RelProvider, Ordered { /* * (non-Javadoc) - * @see org.springframework.hateoas.RelProvider#getRelForSingleResource(java.lang.Object) + * @see org.springframework.hateoas.server.LinkRelationProvider#getItemResourceRelFor(java.lang.Class) */ @Override public LinkRelation getItemResourceRelFor(Class type) { diff --git a/src/main/java/org/springframework/hateoas/server/core/DefaultRelProvider.java b/src/main/java/org/springframework/hateoas/server/core/DefaultLinkRelationProvider.java similarity index 65% rename from src/main/java/org/springframework/hateoas/server/core/DefaultRelProvider.java rename to src/main/java/org/springframework/hateoas/server/core/DefaultLinkRelationProvider.java index 5c715e3b..f54980e8 100644 --- a/src/main/java/org/springframework/hateoas/server/core/DefaultRelProvider.java +++ b/src/main/java/org/springframework/hateoas/server/core/DefaultLinkRelationProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2014 the original author or authors. + * Copyright 2013-2019 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. @@ -17,18 +17,41 @@ package org.springframework.hateoas.server.core; import org.springframework.core.Ordered; import org.springframework.hateoas.LinkRelation; -import org.springframework.hateoas.server.RelProvider; +import org.springframework.hateoas.server.LinkRelationProvider; import org.springframework.util.StringUtils; /** - * Default implementation of {@link RelProvider} to simply use the uncapitalized version of the given type's name as - * single resource rel as well as an appended {@code List} for the collection resource rel. + * Default implementation of {@link LinkRelationProvider} to simply use the uncapitalized version of the given type's + * name as item resource {@link LinkRelation} as well as an appended {@code List} for the collection resource + * {@link LinkRelation}. * * @author Oliver Gierke * @author Greg Turnquist */ -public class DefaultRelProvider implements RelProvider, Ordered { +public class DefaultLinkRelationProvider implements LinkRelationProvider, Ordered { + /* + * (non-Javadoc) + * @see org.springframework.hateoas.server.LinkRelationProvider#getCollectionResourceRelFor(java.lang.Class) + */ + @Override + public LinkRelation getCollectionResourceRelFor(Class type) { + return LinkRelation.of(StringUtils.uncapitalize(type.getSimpleName()) + "List"); + } + + /* + * (non-Javadoc) + * @see org.springframework.hateoas.server.LinkRelationProvider#getItemResourceRelFor(java.lang.Class) + */ + @Override + public LinkRelation getItemResourceRelFor(Class type) { + return LinkRelation.of(StringUtils.uncapitalize(type.getSimpleName())); + } + + /* + * (non-Javadoc) + * @see org.springframework.core.Ordered#getOrder() + */ @Override public int getOrder() { return Ordered.LOWEST_PRECEDENCE; @@ -42,22 +65,4 @@ public class DefaultRelProvider implements RelProvider, Ordered { public boolean supports(Class delimiter) { return true; } - - /* - * (non-Javadoc) - * @see org.springframework.hateoas.RelProvider#getRelForCollectionResource(java.lang.Class) - */ - @Override - public LinkRelation getCollectionResourceRelFor(Class type) { - return LinkRelation.of(StringUtils.uncapitalize(type.getSimpleName()) + "List"); - } - - /* - * (non-Javadoc) - * @see org.springframework.hateoas.RelProvider#getRelForSingleResource(java.lang.Class) - */ - @Override - public LinkRelation getItemResourceRelFor(Class type) { - return LinkRelation.of(StringUtils.uncapitalize(type.getSimpleName())); - } } diff --git a/src/main/java/org/springframework/hateoas/server/core/DelegatingRelProvider.java b/src/main/java/org/springframework/hateoas/server/core/DelegatingLinkRelationProvider.java similarity index 68% rename from src/main/java/org/springframework/hateoas/server/core/DelegatingRelProvider.java rename to src/main/java/org/springframework/hateoas/server/core/DelegatingLinkRelationProvider.java index db49d00f..218f409d 100644 --- a/src/main/java/org/springframework/hateoas/server/core/DelegatingRelProvider.java +++ b/src/main/java/org/springframework/hateoas/server/core/DelegatingLinkRelationProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2014 the original author or authors. + * Copyright 2013-2019 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. @@ -15,27 +15,24 @@ */ package org.springframework.hateoas.server.core; +import lombok.NonNull; +import lombok.RequiredArgsConstructor; + import org.springframework.hateoas.LinkRelation; -import org.springframework.hateoas.server.RelProvider; +import org.springframework.hateoas.server.LinkRelationProvider; import org.springframework.plugin.core.PluginRegistry; -import org.springframework.util.Assert; /** * @author Oliver Gierke */ -public class DelegatingRelProvider implements RelProvider { +@RequiredArgsConstructor +public class DelegatingLinkRelationProvider implements LinkRelationProvider { - private final PluginRegistry> providers; - - public DelegatingRelProvider(PluginRegistry> providers) { - - Assert.notNull(providers, "RelProviders must not be null!"); - this.providers = providers; - } + private final @NonNull PluginRegistry> providers; /* * (non-Javadoc) - * @see org.springframework.hateoas.RelProvider#getRelForSingleResource(java.lang.Class) + * @see org.springframework.hateoas.server.LinkRelationProvider#getItemResourceRelFor(java.lang.Class) */ @Override public LinkRelation getItemResourceRelFor(Class type) { @@ -44,7 +41,7 @@ public class DelegatingRelProvider implements RelProvider { /* * (non-Javadoc) - * @see org.springframework.hateoas.RelProvider#getRelForCollectionResource(java.lang.Class) + * @see org.springframework.hateoas.server.LinkRelationProvider#getCollectionResourceRelFor(java.lang.Class) */ @Override public LinkRelation getCollectionResourceRelFor(java.lang.Class type) { diff --git a/src/main/java/org/springframework/hateoas/server/core/EvoInflectorRelProvider.java b/src/main/java/org/springframework/hateoas/server/core/EvoInflectorLinkRelationProvider.java similarity index 68% rename from src/main/java/org/springframework/hateoas/server/core/EvoInflectorRelProvider.java rename to src/main/java/org/springframework/hateoas/server/core/EvoInflectorLinkRelationProvider.java index c9ef0abd..fda0b803 100644 --- a/src/main/java/org/springframework/hateoas/server/core/EvoInflectorRelProvider.java +++ b/src/main/java/org/springframework/hateoas/server/core/EvoInflectorLinkRelationProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2014 the original author or authors. + * Copyright 2013-2019 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. @@ -17,20 +17,20 @@ package org.springframework.hateoas.server.core; import org.atteo.evo.inflector.English; import org.springframework.hateoas.LinkRelation; -import org.springframework.hateoas.server.RelProvider; +import org.springframework.hateoas.server.LinkRelationProvider; /** - * {@link RelProvider} implementation using the Evo Inflector implementation of an algorithmic approach to English - * plurals. + * {@link LinkRelationProvider} implementation using the Evo Inflector implementation of an algorithmic approach to + * English plurals. * * @see http://www.csse.monash.edu.au/~damian/papers/HTML/Plurals.html * @author Oliver Gierke */ -public class EvoInflectorRelProvider extends DefaultRelProvider { +public class EvoInflectorLinkRelationProvider extends DefaultLinkRelationProvider { /* * (non-Javadoc) - * @see org.springframework.hateoas.core.DefaultRelProvider#getCollectionResourceRelFor(java.lang.Class) + * @see org.springframework.hateoas.server.core.DefaultLinkRelationProvider#getCollectionResourceRelFor(java.lang.Class) */ @Override public LinkRelation getCollectionResourceRelFor(Class type) { diff --git a/src/main/java/org/springframework/hateoas/server/mvc/ControllerRelProvider.java b/src/main/java/org/springframework/hateoas/server/mvc/ControllerLinkRelationProvider.java similarity index 76% rename from src/main/java/org/springframework/hateoas/server/mvc/ControllerRelProvider.java rename to src/main/java/org/springframework/hateoas/server/mvc/ControllerLinkRelationProvider.java index 98149709..b379c34b 100644 --- a/src/main/java/org/springframework/hateoas/server/mvc/ControllerRelProvider.java +++ b/src/main/java/org/springframework/hateoas/server/mvc/ControllerLinkRelationProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2017 the original author or authors. + * Copyright 2013-2019 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. @@ -18,24 +18,25 @@ package org.springframework.hateoas.server.mvc; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.hateoas.LinkRelation; import org.springframework.hateoas.server.ExposesResourceFor; -import org.springframework.hateoas.server.RelProvider; +import org.springframework.hateoas.server.LinkRelationProvider; import org.springframework.plugin.core.PluginRegistry; import org.springframework.util.Assert; /** * @author Oliver Gierke */ -public class ControllerRelProvider implements RelProvider { +public class ControllerLinkRelationProvider implements LinkRelationProvider { private final Class controllerType; private final Class entityType; - private final PluginRegistry> providers; + private final PluginRegistry> providers; - public ControllerRelProvider(Class controller, PluginRegistry> providers) { + public ControllerLinkRelationProvider(Class controller, PluginRegistry> providers) { Assert.notNull(controller, "Controller must not be null!"); ExposesResourceFor annotation = AnnotationUtils.findAnnotation(controller, ExposesResourceFor.class); + Assert.notNull(annotation, "Controller must be annotated with ExposesResourceFor!"); this.controllerType = controller; @@ -45,22 +46,22 @@ public class ControllerRelProvider implements RelProvider { /* * (non-Javadoc) - * @see org.springframework.hateoas.RelProvider#getRelForCollectionResource(java.lang.Class) - */ - @Override - public LinkRelation getCollectionResourceRelFor(Class resource) { - return providers.getRequiredPluginFor(entityType).getCollectionResourceRelFor(resource); - } - - /* - * (non-Javadoc) - * @see org.springframework.hateoas.RelProvider#getRelForSingleResource(java.lang.Class) + * @see org.springframework.hateoas.server.LinkRelationProvider#getItemResourceRelFor(java.lang.Class) */ @Override public LinkRelation getItemResourceRelFor(Class resource) { return providers.getRequiredPluginFor(entityType).getItemResourceRelFor(resource); } + /* + * (non-Javadoc) + * @see org.springframework.hateoas.server.LinkRelationProvider#getCollectionResourceRelFor(java.lang.Class) + */ + @Override + public LinkRelation getCollectionResourceRelFor(Class resource) { + return providers.getRequiredPluginFor(entityType).getCollectionResourceRelFor(resource); + } + /* * (non-Javadoc) * @see org.springframework.plugin.core.Plugin#supports(java.lang.Object) diff --git a/src/test/java/org/springframework/hateoas/client/Server.java b/src/test/java/org/springframework/hateoas/client/Server.java index 6ec30bae..fb5a4901 100644 --- a/src/test/java/org/springframework/hateoas/client/Server.java +++ b/src/test/java/org/springframework/hateoas/client/Server.java @@ -32,8 +32,8 @@ import org.springframework.hateoas.MediaTypes; import org.springframework.hateoas.EntityModel; import org.springframework.hateoas.CollectionModel; import org.springframework.hateoas.mediatype.hal.Jackson2HalModule; -import org.springframework.hateoas.server.RelProvider; -import org.springframework.hateoas.server.core.EvoInflectorRelProvider; +import org.springframework.hateoas.server.LinkRelationProvider; +import org.springframework.hateoas.server.core.EvoInflectorLinkRelationProvider; import org.springframework.http.MediaType; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; @@ -51,13 +51,13 @@ import com.fasterxml.jackson.databind.ObjectMapper; public class Server implements Closeable { private final ObjectMapper mapper; - private final RelProvider relProvider; + private final LinkRelationProvider relProvider; private final MultiValueMap baseResources = new LinkedMultiValueMap<>(); public Server() { - this.relProvider = new EvoInflectorRelProvider(); + this.relProvider = new EvoInflectorLinkRelationProvider(); this.mapper = new ObjectMapper(); this.mapper.registerModule(new Jackson2HalModule()); diff --git a/src/test/java/org/springframework/hateoas/config/EnableHypermediaSupportIntegrationTest.java b/src/test/java/org/springframework/hateoas/config/EnableHypermediaSupportIntegrationTest.java index a212ea7a..a0d59fcb 100755 --- a/src/test/java/org/springframework/hateoas/config/EnableHypermediaSupportIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/config/EnableHypermediaSupportIntegrationTest.java @@ -43,9 +43,9 @@ import org.springframework.hateoas.mediatype.hal.HalLinkDiscoverer; import org.springframework.hateoas.mediatype.hal.forms.HalFormsLinkDiscoverer; import org.springframework.hateoas.mediatype.uber.UberLinkDiscoverer; import org.springframework.hateoas.server.EntityLinks; -import org.springframework.hateoas.server.RelProvider; +import org.springframework.hateoas.server.LinkRelationProvider; import org.springframework.hateoas.server.core.DelegatingEntityLinks; -import org.springframework.hateoas.server.core.DelegatingRelProvider; +import org.springframework.hateoas.server.core.DelegatingLinkRelationProvider; import org.springframework.hateoas.server.mvc.TypeConstrainedMappingJackson2HttpMessageConverter; import org.springframework.http.MediaType; import org.springframework.http.converter.HttpMessageConverter; @@ -530,8 +530,8 @@ public class EnableHypermediaSupportIntegrationTest { private static void assertRelProvidersSetUp(ApplicationContext context) { - assertThat(context.getBeansOfType(RelProvider.class).values()) // - .anySatisfy(it -> assertThat(it).isInstanceOf(DelegatingRelProvider.class)); + assertThat(context.getBeansOfType(LinkRelationProvider.class).values()) // + .anySatisfy(it -> assertThat(it).isInstanceOf(DelegatingLinkRelationProvider.class)); } private static void assertHalSetupForConfigClass(Class configClass) { diff --git a/src/test/java/org/springframework/hateoas/config/XmlConfigurationIntegrationTest.java b/src/test/java/org/springframework/hateoas/config/XmlConfigurationIntegrationTest.java index 840397e0..d197caa3 100755 --- a/src/test/java/org/springframework/hateoas/config/XmlConfigurationIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/config/XmlConfigurationIntegrationTest.java @@ -22,7 +22,7 @@ import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.hateoas.config.EnableHypermediaSupport.HypermediaType; -import org.springframework.hateoas.server.RelProvider; +import org.springframework.hateoas.server.LinkRelationProvider; /** * Integration tests for using {@link EnableHypermediaSupport} from within XML documents. @@ -39,7 +39,7 @@ public class XmlConfigurationIntegrationTest { ConfigurableApplicationContext context = new ClassPathXmlApplicationContext("application-context.xml", getClass()); - assertThat(context.getBean(RelProvider.class)).isNotNull(); + assertThat(context.getBean(LinkRelationProvider.class)).isNotNull(); context.close(); } diff --git a/src/test/java/org/springframework/hateoas/mediatype/hal/HalEmbeddedBuilderUnitTest.java b/src/test/java/org/springframework/hateoas/mediatype/hal/HalEmbeddedBuilderUnitTest.java index 73743e9f..580a5938 100755 --- a/src/test/java/org/springframework/hateoas/mediatype/hal/HalEmbeddedBuilderUnitTest.java +++ b/src/test/java/org/springframework/hateoas/mediatype/hal/HalEmbeddedBuilderUnitTest.java @@ -30,10 +30,10 @@ import org.springframework.hateoas.mediatype.hal.CurieProvider; import org.springframework.hateoas.mediatype.hal.DefaultCurieProvider; import org.springframework.hateoas.mediatype.hal.HalEmbeddedBuilder; import org.springframework.hateoas.mediatype.hal.HalLinkRelation; -import org.springframework.hateoas.server.RelProvider; +import org.springframework.hateoas.server.LinkRelationProvider; import org.springframework.hateoas.server.core.EmbeddedWrapper; import org.springframework.hateoas.server.core.EmbeddedWrappers; -import org.springframework.hateoas.server.core.EvoInflectorRelProvider; +import org.springframework.hateoas.server.core.EvoInflectorLinkRelationProvider; /** * Unit tests for {@link HalEmbeddedBuilder}. @@ -43,12 +43,12 @@ import org.springframework.hateoas.server.core.EvoInflectorRelProvider; */ public class HalEmbeddedBuilderUnitTest { - RelProvider provider; + LinkRelationProvider provider; CurieProvider curieProvider; @Before public void setUp() { - provider = new EvoInflectorRelProvider(); + provider = new EvoInflectorLinkRelationProvider(); curieProvider = new DefaultCurieProvider("curie", new UriTemplate("http://localhost/{rel}")); } diff --git a/src/test/java/org/springframework/hateoas/mediatype/hal/Jackson2HalIntegrationTest.java b/src/test/java/org/springframework/hateoas/mediatype/hal/Jackson2HalIntegrationTest.java index b52a95a8..dda31775 100755 --- a/src/test/java/org/springframework/hateoas/mediatype/hal/Jackson2HalIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/mediatype/hal/Jackson2HalIntegrationTest.java @@ -43,7 +43,7 @@ import org.springframework.hateoas.RepresentationModel; import org.springframework.hateoas.UriTemplate; import org.springframework.hateoas.mediatype.hal.HalConfiguration.RenderSingleLinks; import org.springframework.hateoas.mediatype.hal.Jackson2HalModule.HalHandlerInstantiator; -import org.springframework.hateoas.server.core.AnnotationRelProvider; +import org.springframework.hateoas.server.core.AnnotationLinkRelationProvider; import org.springframework.hateoas.server.core.EmbeddedWrappers; import com.fasterxml.jackson.databind.ObjectMapper; @@ -90,7 +90,7 @@ public class Jackson2HalIntegrationTest extends AbstractJackson2MarshallingInteg mapper.registerModule(new Jackson2HalModule()); mapper.setHandlerInstantiator( - new HalHandlerInstantiator(new AnnotationRelProvider(), null, null, new HalConfiguration())); + new HalHandlerInstantiator(new AnnotationLinkRelationProvider(), null, null, new HalConfiguration())); } /** @@ -456,7 +456,7 @@ public class Jackson2HalIntegrationTest extends AbstractJackson2MarshallingInteg @Test public void rendersSingleLinkAsArrayWhenConfigured() throws Exception { - mapper.setHandlerInstantiator(new HalHandlerInstantiator(new AnnotationRelProvider(), null, null, + mapper.setHandlerInstantiator(new HalHandlerInstantiator(new AnnotationLinkRelationProvider(), null, null, new HalConfiguration().withRenderSingleLinks(RenderSingleLinks.AS_ARRAY))); RepresentationModel resourceSupport = new RepresentationModel<>(); @@ -488,7 +488,7 @@ public class Jackson2HalIntegrationTest extends AbstractJackson2MarshallingInteg @Test // #811 public void rendersSpecificRelWithSingleLinkAsArrayIfConfigured() throws Exception { - mapper.setHandlerInstantiator(new HalHandlerInstantiator(new AnnotationRelProvider(), null, null, + mapper.setHandlerInstantiator(new HalHandlerInstantiator(new AnnotationLinkRelationProvider(), null, null, new HalConfiguration().withRenderSingleLinksFor("foo", RenderSingleLinks.AS_ARRAY))); RepresentationModel resource = new RepresentationModel<>(); @@ -550,7 +550,7 @@ public class Jackson2HalIntegrationTest extends AbstractJackson2MarshallingInteg ObjectMapper mapper = new ObjectMapper(); mapper.registerModule(new Jackson2HalModule()); - mapper.setHandlerInstantiator(new HalHandlerInstantiator(new AnnotationRelProvider(), provider, + mapper.setHandlerInstantiator(new HalHandlerInstantiator(new AnnotationLinkRelationProvider(), provider, messageSource == null ? null : new MessageSourceAccessor(messageSource))); return mapper; diff --git a/src/test/java/org/springframework/hateoas/mediatype/hal/forms/Jackson2HalFormsIntegrationTest.java b/src/test/java/org/springframework/hateoas/mediatype/hal/forms/Jackson2HalFormsIntegrationTest.java index 454c3595..bc39eb44 100644 --- a/src/test/java/org/springframework/hateoas/mediatype/hal/forms/Jackson2HalFormsIntegrationTest.java +++ b/src/test/java/org/springframework/hateoas/mediatype/hal/forms/Jackson2HalFormsIntegrationTest.java @@ -46,7 +46,7 @@ import org.springframework.hateoas.mediatype.hal.DefaultCurieProvider; import org.springframework.hateoas.mediatype.hal.SimpleAnnotatedPojo; import org.springframework.hateoas.mediatype.hal.SimplePojo; import org.springframework.hateoas.mediatype.hal.forms.Jackson2HalFormsModule.HalFormsHandlerInstantiator; -import org.springframework.hateoas.server.core.AnnotationRelProvider; +import org.springframework.hateoas.server.core.AnnotationLinkRelationProvider; import org.springframework.hateoas.server.core.EmbeddedWrappers; import org.springframework.hateoas.support.MappingUtils; @@ -69,7 +69,7 @@ public class Jackson2HalFormsIntegrationTest extends AbstractJackson2Marshalling mapper.registerModule(new Jackson2HalFormsModule()); mapper.setHandlerInstantiator(new HalFormsHandlerInstantiator( // - new AnnotationRelProvider(), null, null, true, new HalFormsConfiguration())); + new AnnotationLinkRelationProvider(), null, null, true, new HalFormsConfiguration())); mapper.configure(SerializationFeature.INDENT_OUTPUT, true); } @@ -443,7 +443,7 @@ public class Jackson2HalFormsIntegrationTest extends AbstractJackson2Marshalling ObjectMapper mapper = new ObjectMapper(); mapper.registerModule(new Jackson2HalFormsModule()); - mapper.setHandlerInstantiator(new HalFormsHandlerInstantiator(new AnnotationRelProvider(), provider, + mapper.setHandlerInstantiator(new HalFormsHandlerInstantiator(new AnnotationLinkRelationProvider(), provider, messageSource == null ? null : new MessageSourceAccessor(messageSource), true, new HalFormsConfiguration())); mapper.configure(SerializationFeature.INDENT_OUTPUT, true); mapper.setSerializationInclusion(Include.NON_NULL); diff --git a/src/test/java/org/springframework/hateoas/mediatype/vnderror/VndErrorsMarshallingTest.java b/src/test/java/org/springframework/hateoas/mediatype/vnderror/VndErrorsMarshallingTest.java index 377dbb3a..1d84354f 100755 --- a/src/test/java/org/springframework/hateoas/mediatype/vnderror/VndErrorsMarshallingTest.java +++ b/src/test/java/org/springframework/hateoas/mediatype/vnderror/VndErrorsMarshallingTest.java @@ -30,8 +30,8 @@ import org.springframework.hateoas.Link; import org.springframework.hateoas.mediatype.hal.Jackson2HalModule; import org.springframework.hateoas.mediatype.vnderrors.VndErrors; import org.springframework.hateoas.mediatype.vnderrors.VndErrors.VndError; -import org.springframework.hateoas.server.RelProvider; -import org.springframework.hateoas.server.core.EvoInflectorRelProvider; +import org.springframework.hateoas.server.LinkRelationProvider; +import org.springframework.hateoas.server.core.EvoInflectorLinkRelationProvider; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; @@ -46,7 +46,7 @@ public class VndErrorsMarshallingTest { ObjectMapper jackson2Mapper; - RelProvider relProvider = new EvoInflectorRelProvider(); + LinkRelationProvider relProvider = new EvoInflectorLinkRelationProvider(); VndErrors errors; String jsonReference; diff --git a/src/test/java/org/springframework/hateoas/server/core/DelegatingRelProviderUnitTest.java b/src/test/java/org/springframework/hateoas/server/core/DelegatingRelProviderUnitTest.java index 2220879e..258da357 100755 --- a/src/test/java/org/springframework/hateoas/server/core/DelegatingRelProviderUnitTest.java +++ b/src/test/java/org/springframework/hateoas/server/core/DelegatingRelProviderUnitTest.java @@ -19,16 +19,16 @@ import static org.assertj.core.api.Assertions.*; import org.junit.Test; import org.springframework.hateoas.LinkRelation; -import org.springframework.hateoas.server.RelProvider; -import org.springframework.hateoas.server.core.AnnotationRelProvider; -import org.springframework.hateoas.server.core.DefaultRelProvider; -import org.springframework.hateoas.server.core.DelegatingRelProvider; +import org.springframework.hateoas.server.LinkRelationProvider; +import org.springframework.hateoas.server.core.AnnotationLinkRelationProvider; +import org.springframework.hateoas.server.core.DefaultLinkRelationProvider; +import org.springframework.hateoas.server.core.DelegatingLinkRelationProvider; import org.springframework.hateoas.server.core.Relation; import org.springframework.plugin.core.OrderAwarePluginRegistry; import org.springframework.plugin.core.PluginRegistry; /** - * Unit tests for {@link DelegatingRelProvider}. + * Unit tests for {@link DelegatingLinkRelationProvider}. * * @author Oliver Gierke */ @@ -37,10 +37,10 @@ public class DelegatingRelProviderUnitTest { @Test public void foo() { - PluginRegistry> registry = OrderAwarePluginRegistry.of(new AnnotationRelProvider(), - new DefaultRelProvider()); + PluginRegistry> registry = OrderAwarePluginRegistry.of(new AnnotationLinkRelationProvider(), + new DefaultLinkRelationProvider()); - RelProvider delegatingProvider = new DelegatingRelProvider(registry); + LinkRelationProvider delegatingProvider = new DelegatingLinkRelationProvider(registry); assertThat(delegatingProvider.supports(Sample.class)).isTrue(); assertThat(delegatingProvider.getItemResourceRelFor(Sample.class)).isEqualTo(LinkRelation.of("foo")); diff --git a/src/test/java/org/springframework/hateoas/server/core/EvoInflectorRelProviderUnitTest.java b/src/test/java/org/springframework/hateoas/server/core/EvoInflectorRelProviderUnitTest.java index 72a8bb98..e48e3f94 100755 --- a/src/test/java/org/springframework/hateoas/server/core/EvoInflectorRelProviderUnitTest.java +++ b/src/test/java/org/springframework/hateoas/server/core/EvoInflectorRelProviderUnitTest.java @@ -19,17 +19,17 @@ import static org.assertj.core.api.Assertions.*; import org.junit.Test; import org.springframework.hateoas.LinkRelation; -import org.springframework.hateoas.server.RelProvider; -import org.springframework.hateoas.server.core.EvoInflectorRelProvider; +import org.springframework.hateoas.server.LinkRelationProvider; +import org.springframework.hateoas.server.core.EvoInflectorLinkRelationProvider; /** - * Unit tests for {@link EvoInflectorRelProvider}. + * Unit tests for {@link EvoInflectorLinkRelationProvider}. * * @author Oliver Gierke */ public class EvoInflectorRelProviderUnitTest { - RelProvider provider = new EvoInflectorRelProvider(); + LinkRelationProvider provider = new EvoInflectorLinkRelationProvider(); @Test public void buildsCollectionRelCorrectly() {