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

DATAREST-1381 - Polishing.

Browse Source
This commit is contained in:
Oliver Drotbohm
2019-06-04 23:32:33 +02:00
parent f3b1d92c22
commit cf18d6aff7
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestHandlerMapping.java
View File

@@ -19,6 +19,7 @@ import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
@@ -73,7 +74,7 @@ public class RepositoryRestHandlerMapping extends BasePathAwareHandlerMapping {
private final Optional<Repositories> repositories;
private RepositoryCorsConfigurationAccessor corsConfigurationAccessor;
private JpaHelper jpaHelper;
private Optional<JpaHelper> jpaHelper = Optional.empty();
/**
* Creates a new {@link RepositoryRestHandlerMapping} for the given {@link ResourceMappings} and
@@ -120,7 +121,7 @@ public class RepositoryRestHandlerMapping extends BasePathAwareHandlerMapping {
* @param jpaHelper the jpaHelper to set
*/
public void setJpaHelper(JpaHelper jpaHelper) {
this.jpaHelper = jpaHelper;
this.jpaHelper = Optional.ofNullable(jpaHelper);
}
/*
@@ -195,11 +196,10 @@ public class RepositoryRestHandlerMapping extends BasePathAwareHandlerMapping {
*/
@Override
protected void extendInterceptors(List<Object> interceptors) {
if (null != jpaHelper) {
for (Object o : jpaHelper.getInterceptors()) {
interceptors.add(o);
}
}
jpaHelper.map(JpaHelper::getInterceptors) //
.orElseGet(() -> Collections.emptyList()) //
.forEach(interceptors::add);
}
/*