Combine all mediatypes under a parent package

Author: gregturn

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

@@ -15,6 +15,7 @@
  */
 package org.springframework.hateoas;
 
+import org.springframework.hateoas.mediatype.MediaTypes;
 import org.springframework.http.MediaType;
 import org.springframework.plugin.core.PluginRegistry;
 import org.springframework.util.Assert;

src/main/java/org/springframework/hateoas/client/Traverson.java

@@ -35,11 +35,11 @@
 import org.springframework.hateoas.Link;
 import org.springframework.hateoas.LinkDiscoverer;
 import org.springframework.hateoas.LinkDiscoverers;
-import org.springframework.hateoas.MediaTypes;
+import org.springframework.hateoas.mediatype.MediaTypes;
 import org.springframework.hateoas.UriTemplate;
 import org.springframework.hateoas.client.Rels.Rel;
-import org.springframework.hateoas.hal.HalLinkDiscoverer;
-import org.springframework.hateoas.hal.Jackson2HalModule;
+import org.springframework.hateoas.mediatype.hal.HalLinkDiscoverer;
+import org.springframework.hateoas.mediatype.hal.Jackson2HalModule;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;

src/main/java/org/springframework/hateoas/config/ConverterRegisteringBeanPostProcessor.java

@@ -21,7 +21,7 @@
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.context.ApplicationContext;
-import org.springframework.hateoas.hal.Jackson2HalModule;
+import org.springframework.hateoas.mediatype.hal.Jackson2HalModule;
 import org.springframework.web.client.RestTemplate;
 
 import com.fasterxml.jackson.databind.ObjectMapper;

src/main/java/org/springframework/hateoas/config/ConverterRegisteringWebMvcConfigurer.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.hateoas.config;
 
-import static org.springframework.hateoas.MediaTypes.*;
+import static org.springframework.hateoas.mediatype.MediaTypes.*;
 
 import lombok.RequiredArgsConstructor;
 
@@ -31,15 +31,15 @@
 import org.springframework.context.support.MessageSourceAccessor;
 import org.springframework.hateoas.RelProvider;
 import org.springframework.hateoas.ResourceSupport;
-import org.springframework.hateoas.collectionjson.Jackson2CollectionJsonModule;
+import org.springframework.hateoas.mediatype.collectionjson.Jackson2CollectionJsonModule;
 import org.springframework.hateoas.config.EnableHypermediaSupport.HypermediaType;
 import org.springframework.hateoas.core.DelegatingRelProvider;
-import org.springframework.hateoas.hal.CurieProvider;
-import org.springframework.hateoas.hal.HalConfiguration;
-import org.springframework.hateoas.hal.Jackson2HalModule;
-import org.springframework.hateoas.hal.Jackson2HalModule.HalHandlerInstantiator;
-import org.springframework.hateoas.hal.forms.HalFormsConfiguration;
-import org.springframework.hateoas.hal.forms.Jackson2HalFormsModule;
+import org.springframework.hateoas.mediatype.hal.CurieProvider;
+import org.springframework.hateoas.mediatype.hal.HalConfiguration;
+import org.springframework.hateoas.mediatype.hal.Jackson2HalModule;
+import org.springframework.hateoas.mediatype.hal.Jackson2HalModule.HalHandlerInstantiator;
+import org.springframework.hateoas.mediatype.halforms.HalFormsConfiguration;
+import org.springframework.hateoas.mediatype.halforms.Jackson2HalFormsModule;
 import org.springframework.hateoas.mvc.TypeConstrainedMappingJackson2HttpMessageConverter;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;

src/main/java/org/springframework/hateoas/config/HypermediaSupportBeanDefinitionRegistrar.java

@@ -33,10 +33,10 @@
 import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.hateoas.EntityLinks;
 import org.springframework.hateoas.LinkDiscoverer;
-import org.springframework.hateoas.collectionjson.CollectionJsonLinkDiscoverer;
+import org.springframework.hateoas.mediatype.collectionjson.CollectionJsonLinkDiscoverer;
 import org.springframework.hateoas.config.EnableHypermediaSupport.HypermediaType;
-import org.springframework.hateoas.hal.HalLinkDiscoverer;
-import org.springframework.hateoas.hal.forms.HalFormsLinkDiscoverer;
+import org.springframework.hateoas.mediatype.hal.HalLinkDiscoverer;
+import org.springframework.hateoas.mediatype.halforms.HalFormsLinkDiscoverer;
 import org.springframework.util.ClassUtils;
 
 /**

src/main/java/org/springframework/hateoas/core/JsonPathLinkDiscoverer.java

@@ -29,11 +29,10 @@
 
 import org.springframework.hateoas.Link;
 import org.springframework.hateoas.LinkDiscoverer;
-import org.springframework.hateoas.MediaTypes;
+import org.springframework.hateoas.mediatype.MediaTypes;
 import org.springframework.http.MediaType;
 import org.springframework.util.Assert;
 import org.springframework.util.ReflectionUtils;
-import org.springframework.util.StringUtils;
 
 import com.jayway.jsonpath.InvalidPathException;
 import com.jayway.jsonpath.JsonPath;

src/main/java/org/springframework/hateoas/MediaTypes.java renamed to src/main/java/org/springframework/hateoas/mediatype/MediaTypes.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.hateoas;
+package org.springframework.hateoas.mediatype;
 
 import org.springframework.http.MediaType;
 

src/main/java/org/springframework/hateoas/alps/Alps.java renamed to src/main/java/org/springframework/hateoas/mediatype/alps/Alps.java

@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.hateoas.alps;
+package org.springframework.hateoas.mediatype.alps;
 
 import lombok.Builder;
 import lombok.Value;
 
 import java.util.List;
 
-import org.springframework.hateoas.alps.Descriptor.DescriptorBuilder;
-import org.springframework.hateoas.alps.Doc.DocBuilder;
-import org.springframework.hateoas.alps.Ext.ExtBuilder;
+import org.springframework.hateoas.mediatype.alps.Descriptor.DescriptorBuilder;
+import org.springframework.hateoas.mediatype.alps.Doc.DocBuilder;
+import org.springframework.hateoas.mediatype.alps.Ext.ExtBuilder;
 
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 

src/main/java/org/springframework/hateoas/alps/AlpsLinkDiscoverer.java renamed to src/main/java/org/springframework/hateoas/mediatype/alps/AlpsLinkDiscoverer.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.hateoas.alps;
+package org.springframework.hateoas.mediatype.alps;
 
 import org.springframework.hateoas.LinkDiscoverer;
-import org.springframework.hateoas.MediaTypes;
+import org.springframework.hateoas.mediatype.MediaTypes;
 import org.springframework.hateoas.core.JsonPathLinkDiscoverer;
 
 /**

src/main/java/org/springframework/hateoas/alps/Descriptor.java renamed to src/main/java/org/springframework/hateoas/mediatype/alps/Descriptor.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.hateoas.alps;
+package org.springframework.hateoas.mediatype.alps;
 
 import lombok.Builder;
 import lombok.Value;

src/main/java/org/springframework/hateoas/alps/Doc.java renamed to src/main/java/org/springframework/hateoas/mediatype/alps/Doc.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.hateoas.alps;
+package org.springframework.hateoas.mediatype.alps;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/org/springframework/hateoas/alps/Ext.java renamed to src/main/java/org/springframework/hateoas/mediatype/alps/Ext.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.hateoas.alps;
+package org.springframework.hateoas.mediatype.alps;
 
 import lombok.Builder;
 import lombok.Value;

src/main/java/org/springframework/hateoas/alps/Format.java renamed to src/main/java/org/springframework/hateoas/mediatype/alps/Format.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.hateoas.alps;
+package org.springframework.hateoas.mediatype.alps;
 
 import java.util.Locale;
 

src/main/java/org/springframework/hateoas/alps/Type.java renamed to src/main/java/org/springframework/hateoas/mediatype/alps/Type.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.hateoas.alps;
+package org.springframework.hateoas.mediatype.alps;
 
 import java.util.Locale;
 

src/main/java/org/springframework/hateoas/alps/package-info.java renamed to src/main/java/org/springframework/hateoas/mediatype/alps/package-info.java

@@ -3,5 +3,5 @@
  * 
  * @see https://alps.io
  */
-package org.springframework.hateoas.alps;
+package org.springframework.hateoas.mediatype.alps;
 

src/main/java/org/springframework/hateoas/collectionjson/CollectionJson.java renamed to src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJson.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.hateoas.collectionjson;
+package org.springframework.hateoas.mediatype.collectionjson;
 
 import lombok.AccessLevel;
 import lombok.Value;

src/main/java/org/springframework/hateoas/collectionjson/CollectionJsonAffordanceModel.java renamed to src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonAffordanceModel.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.hateoas.collectionjson;
+package org.springframework.hateoas.mediatype.collectionjson;
 
 import lombok.Getter;
 
@@ -26,7 +26,7 @@
 import org.springframework.core.ResolvableType;
 import org.springframework.hateoas.Affordance;
 import org.springframework.hateoas.AffordanceModel;
-import org.springframework.hateoas.MediaTypes;
+import org.springframework.hateoas.mediatype.MediaTypes;
 import org.springframework.hateoas.QueryParameter;
 import org.springframework.hateoas.support.PropertyUtils;
 import org.springframework.http.HttpMethod;

src/main/java/org/springframework/hateoas/collectionjson/CollectionJsonAffordanceModelFactory.java renamed to src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonAffordanceModelFactory.java

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.hateoas.collectionjson;
+package org.springframework.hateoas.mediatype.collectionjson;
 
 import lombok.Getter;
 
 import org.springframework.hateoas.Affordance;
 import org.springframework.hateoas.AffordanceModel;
-import org.springframework.hateoas.MediaTypes;
+import org.springframework.hateoas.mediatype.MediaTypes;
 import org.springframework.hateoas.core.AffordanceModelFactory;
 import org.springframework.hateoas.core.DummyInvocationUtils.MethodInvocation;
 import org.springframework.http.MediaType;

src/main/java/org/springframework/hateoas/collectionjson/CollectionJsonData.java renamed to src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonData.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.hateoas.collectionjson;
+package org.springframework.hateoas.mediatype.collectionjson;
 
 import lombok.AccessLevel;
 import lombok.Value;

src/main/java/org/springframework/hateoas/collectionjson/CollectionJsonDocument.java renamed to src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonDocument.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.hateoas.collectionjson;
+package org.springframework.hateoas.mediatype.collectionjson;
 
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;

src/main/java/org/springframework/hateoas/collectionjson/CollectionJsonError.java renamed to src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonError.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.hateoas.collectionjson;
+package org.springframework.hateoas.mediatype.collectionjson;
 
 import lombok.AccessLevel;
 import lombok.Value;

src/main/java/org/springframework/hateoas/collectionjson/CollectionJsonItem.java renamed to src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonItem.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.hateoas.collectionjson;
+package org.springframework.hateoas.mediatype.collectionjson;
 
 import lombok.AccessLevel;
 import lombok.Getter;

src/main/java/org/springframework/hateoas/collectionjson/CollectionJsonLinkDiscoverer.java renamed to src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonLinkDiscoverer.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.hateoas.collectionjson;
+package org.springframework.hateoas.mediatype.collectionjson;
 
 import java.io.InputStream;
 import java.util.List;
@@ -22,7 +22,7 @@
 
 import org.springframework.hateoas.Link;
 import org.springframework.hateoas.LinkDiscoverer;
-import org.springframework.hateoas.MediaTypes;
+import org.springframework.hateoas.mediatype.MediaTypes;
 import org.springframework.hateoas.core.JsonPathLinkDiscoverer;
 
 /**

src/main/java/org/springframework/hateoas/collectionjson/CollectionJsonQuery.java renamed to src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonQuery.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.hateoas.collectionjson;
+package org.springframework.hateoas.mediatype.collectionjson;
 
 import static com.fasterxml.jackson.annotation.JsonInclude.*;
 

src/main/java/org/springframework/hateoas/collectionjson/CollectionJsonTemplate.java renamed to src/main/java/org/springframework/hateoas/mediatype/collectionjson/CollectionJsonTemplate.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.hateoas.collectionjson;
+package org.springframework.hateoas.mediatype.collectionjson;
 
 import lombok.Value;
 import lombok.experimental.Wither;

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.hateoas.collectionjson;
+package org.springframework.hateoas.mediatype.collectionjson;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -30,7 +30,7 @@
 import org.springframework.context.support.MessageSourceAccessor;
 import org.springframework.hateoas.Affordance;
 import org.springframework.hateoas.Link;
-import org.springframework.hateoas.MediaTypes;
+import org.springframework.hateoas.mediatype.MediaTypes;
 import org.springframework.hateoas.PagedResources;
 import org.springframework.hateoas.Resource;
 import org.springframework.hateoas.ResourceSupport;

src/main/java/org/springframework/hateoas/collectionjson/PagedResourcesMixin.java renamed to src/main/java/org/springframework/hateoas/mediatype/collectionjson/PagedResourcesMixin.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.hateoas.collectionjson;
+package org.springframework.hateoas.mediatype.collectionjson;
 
-import static org.springframework.hateoas.collectionjson.Jackson2CollectionJsonModule.*;
+import static org.springframework.hateoas.mediatype.collectionjson.Jackson2CollectionJsonModule.*;
 
 import org.springframework.hateoas.PagedResources;
 

src/main/java/org/springframework/hateoas/collectionjson/ResourceMixin.java renamed to src/main/java/org/springframework/hateoas/mediatype/collectionjson/ResourceMixin.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.hateoas.collectionjson;
+package org.springframework.hateoas.mediatype.collectionjson;
 
-import static org.springframework.hateoas.collectionjson.Jackson2CollectionJsonModule.*;
+import static org.springframework.hateoas.mediatype.collectionjson.Jackson2CollectionJsonModule.*;
 
 import org.springframework.hateoas.Resource;
 

src/main/java/org/springframework/hateoas/collectionjson/ResourceSupportMixin.java renamed to src/main/java/org/springframework/hateoas/mediatype/collectionjson/ResourceSupportMixin.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.hateoas.collectionjson;
+package org.springframework.hateoas.mediatype.collectionjson;
 
-import static org.springframework.hateoas.collectionjson.Jackson2CollectionJsonModule.*;
+import static org.springframework.hateoas.mediatype.collectionjson.Jackson2CollectionJsonModule.*;
 
 import java.util.List;
 

src/main/java/org/springframework/hateoas/collectionjson/ResourcesMixin.java renamed to src/main/java/org/springframework/hateoas/mediatype/collectionjson/ResourcesMixin.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.hateoas.collectionjson;
+package org.springframework.hateoas.mediatype.collectionjson;
 
-import static org.springframework.hateoas.collectionjson.Jackson2CollectionJsonModule.*;
+import static org.springframework.hateoas.mediatype.collectionjson.Jackson2CollectionJsonModule.*;
 
 import org.springframework.hateoas.Resources;
 

src/main/java/org/springframework/hateoas/hal/CurieProvider.java renamed to src/main/java/org/springframework/hateoas/mediatype/hal/CurieProvider.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.hateoas.hal;
+package org.springframework.hateoas.mediatype.hal;
 
 import java.util.Collection;
 

src/main/java/org/springframework/hateoas/hal/DefaultCurieProvider.java renamed to src/main/java/org/springframework/hateoas/mediatype/hal/DefaultCurieProvider.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.hateoas.hal;
+package org.springframework.hateoas.mediatype.hal;
 
 import lombok.Getter;
 

src/main/java/org/springframework/hateoas/hal/HalConfiguration.java renamed to src/main/java/org/springframework/hateoas/mediatype/hal/HalConfiguration.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.hateoas.hal;
+package org.springframework.hateoas.mediatype.hal;
 
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;