#806 - Fixed package cycle between hateoas and hateoas.core packages.

Moved AffordanceModelFactory to the library's root package. Moved Kotlin extensions to hateoas.mvc package.

Added an ArchUnit based test for package cycles.

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

@@ -23,7 +23,6 @@ import java.util.Map;
 
 import org.springframework.core.ResolvableType;
 import org.springframework.core.io.support.SpringFactoriesLoader;
-import org.springframework.hateoas.core.AffordanceModelFactory;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 import org.springframework.util.Assert;
@@ -37,20 +36,23 @@ import org.springframework.util.Assert;
 @Value
 public class Affordance {
 
-	private static List<AffordanceModelFactory> factories = SpringFactoriesLoader.loadFactories(AffordanceModelFactory.class, Affordance.class.getClassLoader());
+	private static List<AffordanceModelFactory> factories = SpringFactoriesLoader
+			.loadFactories(AffordanceModelFactory.class, Affordance.class.getClassLoader());
 
 	/**
 	 * Collection of {@link AffordanceModel}s related to this affordance.
 	 */
 	private final Map<MediaType, AffordanceModel> affordanceModels = new HashMap<>();
 
-	public Affordance(String name, Link link, HttpMethod httpMethod, ResolvableType inputType, List<QueryParameter> queryMethodParameters, ResolvableType outputType) {
+	public Affordance(String name, Link link, HttpMethod httpMethod, ResolvableType inputType,
+			List<QueryParameter> queryMethodParameters, ResolvableType outputType) {
 
 		Assert.notNull(httpMethod, "httpMethod must not be null!");
 		Assert.notNull(queryMethodParameters, "queryMethodParameters must not be null!");
 
 		for (AffordanceModelFactory factory : factories) {
-			this.affordanceModels.put(factory.getMediaType(), factory.getAffordanceModel(name, link, httpMethod, inputType, queryMethodParameters, outputType));
+			this.affordanceModels.put(factory.getMediaType(),
+					factory.getAffordanceModel(name, link, httpMethod, inputType, queryMethodParameters, outputType));
 		}
 	}
 

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

@@ -13,15 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.hateoas.core;
+package org.springframework.hateoas;
 
 import java.util.List;
 import java.util.Optional;
 
 import org.springframework.core.ResolvableType;
-import org.springframework.hateoas.AffordanceModel;
-import org.springframework.hateoas.Link;
-import org.springframework.hateoas.QueryParameter;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 import org.springframework.plugin.core.Plugin;

src/main/java/org/springframework/hateoas/collectionjson/CollectionJsonAffordanceModelFactory.java

@@ -21,10 +21,10 @@ import java.util.List;
 
 import org.springframework.core.ResolvableType;
 import org.springframework.hateoas.AffordanceModel;
+import org.springframework.hateoas.AffordanceModelFactory;
 import org.springframework.hateoas.Link;
 import org.springframework.hateoas.MediaTypes;
 import org.springframework.hateoas.QueryParameter;
-import org.springframework.hateoas.core.AffordanceModelFactory;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 

src/main/java/org/springframework/hateoas/hal/forms/HalFormsAffordanceModelFactory.java

@@ -21,10 +21,10 @@ import java.util.List;
 
 import org.springframework.core.ResolvableType;
 import org.springframework.hateoas.AffordanceModel;
+import org.springframework.hateoas.AffordanceModelFactory;
 import org.springframework.hateoas.Link;
 import org.springframework.hateoas.MediaTypes;
 import org.springframework.hateoas.QueryParameter;
-import org.springframework.hateoas.core.AffordanceModelFactory;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 

src/main/java/org/springframework/hateoas/mvc/ControllerLinkBuilder.java

@@ -31,9 +31,9 @@ import javax.servlet.http.HttpServletRequest;
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.io.support.SpringFactoriesLoader;
 import org.springframework.hateoas.Affordance;
+import org.springframework.hateoas.AffordanceModelFactory;
 import org.springframework.hateoas.Link;
 import org.springframework.hateoas.TemplateVariables;
-import org.springframework.hateoas.core.AffordanceModelFactory;
 import org.springframework.hateoas.core.AnnotationMappingDiscoverer;
 import org.springframework.hateoas.core.DummyInvocationUtils;
 import org.springframework.hateoas.core.DummyInvocationUtils.MethodInvocation;

src/main/java/org/springframework/hateoas/mvc/SpringMvcAffordanceBuilder.java

@@ -22,9 +22,9 @@ import java.util.stream.Collectors;
 
 import org.springframework.core.ResolvableType;
 import org.springframework.hateoas.Affordance;
+import org.springframework.hateoas.AffordanceModelFactory;
 import org.springframework.hateoas.Link;
 import org.springframework.hateoas.QueryParameter;
-import org.springframework.hateoas.core.AffordanceModelFactory;
 import org.springframework.hateoas.core.DummyInvocationUtils.MethodInvocation;
 import org.springframework.hateoas.core.MappingDiscoverer;
 import org.springframework.hateoas.core.MethodParameters;

src/main/java/org/springframework/hateoas/uber/UberAffordanceModelFactory.java

@@ -21,10 +21,10 @@ import java.util.List;
 
 import org.springframework.core.ResolvableType;
 import org.springframework.hateoas.AffordanceModel;
+import org.springframework.hateoas.AffordanceModelFactory;
 import org.springframework.hateoas.Link;
 import org.springframework.hateoas.MediaTypes;
 import org.springframework.hateoas.QueryParameter;
-import org.springframework.hateoas.core.AffordanceModelFactory;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;