diff --git a/src/main/java/org/springframework/hateoas/config/EnableEntityLinks.java b/src/main/java/org/springframework/hateoas/config/EnableEntityLinks.java deleted file mode 100644 index 9523c866..00000000 --- a/src/main/java/org/springframework/hateoas/config/EnableEntityLinks.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2012-2018 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.config; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import org.springframework.context.annotation.Import; -import org.springframework.hateoas.server.LinkBuilder; -import org.springframework.hateoas.server.core.DelegatingEntityLinks; - -/** - * Enables the collection of {@link LinkBuilder} instances from the application context. All found ones will be exposed - * through an instance of {@link DelegatingEntityLinks}. - * - * @author Oliver Gierke - * @deprecated since 1.0 RC, to be removed in 1.0 RC2. EntityLinks are enabled by {@link EnableHypermediaSupport} - * automatically, so there's no need to explicitly activate them. - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.TYPE) -@Inherited -@Documented -@Import({ EntityLinksConfiguration.class, WebMvcEntityLinksConfiguration.class }) -@Deprecated -public @interface EnableEntityLinks { -} diff --git a/src/test/java/org/springframework/hateoas/config/EnableEntityLinksIntegrationTest.java b/src/test/java/org/springframework/hateoas/config/EnableEntityLinksIntegrationTest.java deleted file mode 100755 index ccd94251..00000000 --- a/src/test/java/org/springframework/hateoas/config/EnableEntityLinksIntegrationTest.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright 2012 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.config; - -import static org.assertj.core.api.Assertions.*; - -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.hateoas.server.ExposesResourceFor; -import org.springframework.hateoas.server.core.DelegatingEntityLinks; -import org.springframework.stereotype.Controller; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit.jupiter.SpringExtension; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * Integration test for {@link EnableEntityLinks} annotation. - * - * @author Oliver Gierke - */ -@ExtendWith(SpringExtension.class) -@ContextConfiguration -class EnableEntityLinksIntegrationTest { - - @Configuration - @EnableEntityLinks - static class Config { - - @Bean - public SampleController controller() { - return new SampleController(); - } - } - - @Autowired DelegatingEntityLinks builder; - - @Test - void initializesDelegatingEntityLinks() { - - assertThat(builder).isNotNull(); - assertThat(builder.supports(Person.class)).isTrue(); - assertThat(builder.supports(Address.class)).isFalse(); - assertThat(builder.supports(Object.class)).isFalse(); - } - - @Controller - @ExposesResourceFor(Person.class) - @RequestMapping("/person") - static class SampleController { - - } - - static class Person { - - } - - static class Address { - - } - -}