Skip to content

Remove memory leaks of RepositoryRestMvcConfig #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 12, 2013
Merged

Remove memory leaks of RepositoryRestMvcConfig #102

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 17 additions & 16 deletions ...main/java/org/springframework/data/rest/webmvc/config/RepositoryRestMvcConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.core.convert.support.ConfigurableConversionService;
import org.springframework.data.repository.support.DomainClassConverter;
import org.springframework.data.repository.support.Repositories;
import org.springframework.data.rest.config.RepositoryRestConfiguration;
import org.springframework.data.rest.convert.ISO8601DateConverter;
import org.springframework.data.rest.convert.UUIDConverter;
Expand Down Expand Up @@ -145,9 +146,9 @@ public class RepositoryRestMvcConfiguration {
*
* @throws Exception
*/
@Bean public DomainObjectMerger domainObjectMerger() throws Exception {
@Bean public DomainObjectMerger domainObjectMerger(Repositories repositories) throws Exception {
return new DomainObjectMerger(
repositories().getObject(),
repositories,
defaultConversionService()
);
}
Expand All @@ -159,13 +160,13 @@ public class RepositoryRestMvcConfiguration {
*
* @throws Exception
*/
@Bean public RepositoryController repositoryController() throws Exception {
@Bean public RepositoryController repositoryController(Repositories repositories, EntityLinks entityLinks) throws Exception {
return new RepositoryController(
repositories().getObject(),
repositories,
config(),
domainClassConverter(),
defaultConversionService(),
entityLinks()
entityLinks
);
}

Expand All @@ -176,13 +177,13 @@ public class RepositoryRestMvcConfiguration {
*
* @throws Exception
*/
@Bean public RepositoryEntityController repositoryEntityController() throws Exception {
@Bean public RepositoryEntityController repositoryEntityController(Repositories repositories, EntityLinks entityLinks) throws Exception {
return new RepositoryEntityController(
repositories().getObject(),
repositories,
config(),
domainClassConverter(),
defaultConversionService(),
entityLinks()
entityLinks
);
}

Expand All @@ -193,13 +194,13 @@ public class RepositoryRestMvcConfiguration {
*
* @throws Exception
*/
@Bean public RepositoryPropertyReferenceController propertyReferenceController() throws Exception {
@Bean public RepositoryPropertyReferenceController propertyReferenceController(Repositories repositories, EntityLinks entityLinks) throws Exception {
return new RepositoryPropertyReferenceController(
repositories().getObject(),
repositories,
config(),
domainClassConverter(),
defaultConversionService(),
entityLinks()
entityLinks
);
}

Expand All @@ -210,13 +211,13 @@ public class RepositoryRestMvcConfiguration {
*
* @throws Exception
*/
@Bean public RepositorySearchController repositorySearchController() throws Exception {
@Bean public RepositorySearchController repositorySearchController(Repositories repositories, EntityLinks entityLinks) throws Exception {
return new RepositorySearchController(
repositories().getObject(),
repositories,
config(),
domainClassConverter(),
defaultConversionService(),
entityLinks()
entityLinks
);
}

Expand Down Expand Up @@ -273,8 +274,8 @@ public class RepositoryRestMvcConfiguration {
*
* @throws Exception
*/
@Bean public EntityLinks entityLinks() throws Exception {
return new RepositoryEntityLinks(repositories().getObject(), config());
@Bean public EntityLinks entityLinks(Repositories repositories) throws Exception {
return new RepositoryEntityLinks(repositories, config());
}

/**
Expand Down