Spring/spring-data-rest
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAREST-83 - Controller classes aren't annotated with @Controller anymore.

Browse Source 
This is to prevent a parallel Spring MVC setup from picking up the controller classes in addition to the custom RequestHandlerMapping we deploy.

Polished some compiler warnings on the way.
This commit is contained in:
Oliver Gierke
2013-06-05 17:38:34 +02:00
parent 7c6bebfbe9
commit f1cf2d5069
4 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/AbstractRepositoryRestController.java
View File

@@ -195,7 +195,6 @@ public class AbstractRepositoryRestController implements ApplicationContextAware
* @param ex
* @return
*/
@SuppressWarnings({"unchecked"})
@ExceptionHandler({
OptimisticLockingFailureException.class,
DataIntegrityViolationException.class

4
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryController.java
View File

@@ -7,7 +7,6 @@ import org.springframework.data.repository.support.Repositories;
import org.springframework.data.rest.config.RepositoryRestConfiguration;
import org.springframework.data.rest.config.ResourceMapping;
import org.springframework.hateoas.EntityLinks;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -17,14 +16,13 @@ import static org.springframework.data.rest.repository.support.ResourceMappingUt
/**
* @author Jon Brisbin
*/
@Controller
@RequestMapping("/")
public class RepositoryController extends AbstractRepositoryRestController {
@Autowired
public RepositoryController(Repositories repositories,
RepositoryRestConfiguration config,
DomainClassConverter domainClassConverter,
DomainClassConverter<?> domainClassConverter,
ConversionService conversionService,
EntityLinks entityLinks) {
super(repositories,

3
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryEntityController.java
View File

@@ -22,7 +22,6 @@ import org.springframework.hateoas.*;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionCallbackWithoutResult;
import org.springframework.web.HttpRequestMethodNotSupportedException;
@@ -40,7 +39,6 @@ import java.util.List;
/**
* @author Jon Brisbin
*/
@Controller
@RequestMapping("/{repository}")
@SuppressWarnings({"rawtypes"})
public class RepositoryEntityController extends AbstractRepositoryRestController {
@@ -74,7 +72,6 @@ public class RepositoryEntityController extends AbstractRepositoryRestController
return jsonSchemaConverter.convert(repoRequest.getPersistentEntity().getType());
}
@SuppressWarnings({"unchecked"})
@RequestMapping(
method = RequestMethod.GET,
produces = {

17
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositorySearchController.java
View File

@@ -24,7 +24,6 @@ import org.springframework.hateoas.Link;
import org.springframework.hateoas.Resource;
import org.springframework.hateoas.ResourceSupport;
import org.springframework.hateoas.Resources;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -33,13 +32,12 @@ import org.springframework.web.bind.annotation.ResponseBody;
/**
* @author Jon Brisbin
*/
@Controller
@RequestMapping("/{repository}/search")
public class RepositorySearchController extends AbstractRepositoryRestController {
public RepositorySearchController(Repositories repositories,
RepositoryRestConfiguration config,
DomainClassConverter domainClassConverter,
DomainClassConverter<?> domainClassConverter,
ConversionService conversionService,
EntityLinks entityLinks) {
super(repositories,
@@ -67,7 +65,6 @@ public class RepositorySearchController extends AbstractRepositoryRestController
return new Resource<Object>(Collections.emptyList(), links);
}
@SuppressWarnings({"unchecked"})
@RequestMapping(
value = "/{method}",
method = RequestMethod.GET,
@@ -137,10 +134,10 @@ public class RepositorySearchController extends AbstractRepositoryRestController
Link prevLink = null;
Link nextLink = null;
if(result instanceof Page) {
if(((Page)result).hasPreviousPage() && pageSort.getPageNumber() > 0) {
if(((Page<?>)result).hasPreviousPage() && pageSort.getPageNumber() > 0) {
prevLink = searchLink(repoRequest, 0, method, "page.previous");
}
if(((Page)result).hasNextPage()) {
if(((Page<?>)result).hasNextPage()) {
nextLink = searchLink(repoRequest, 1, method, "page.next");
}
}
@@ -164,15 +161,15 @@ public class RepositorySearchController extends AbstractRepositoryRestController
ResourceSupport resource = query(repoRequest, repository, method);
links.addAll(resource.getLinks());
if(resource instanceof Resources && ((Resources)resource).getContent() != null) {
for(Object obj : ((Resources)resource).getContent()) {
if(resource instanceof Resources && ((Resources<?>) resource).getContent() != null) {
for(Object obj : ((Resources<?>) resource).getContent()) {
if(null != obj && obj instanceof Resource) {
Resource res = (Resource)obj;
Resource<?> res = (Resource<?>)obj;
links.add(resourceLink(repoRequest, res));
}
}
} else if(resource instanceof Resource) {
Resource res = (Resource)resource;
Resource<?> res = (Resource<?>) resource;
links.add(resourceLink(repoRequest, res));
}