#297 - Upgraded to Boot 2.0 and Spring Data Kay.

Bumped version number to 2.0. Upgraded to Spring Boot 2.0.

Stuff disabled in the meantime:

- Cassandra: needs API adaptions in configuration
- JPA > Security: test fails with weird Hibernate error
- Redis > Reactive: API updates needed
- Solr: configration updates necessary

adjust versions

Updated elastic search to the new version.

Fixed the reactor version to Bismuth-BUILD-SNAPSHOT. This probably should be undone when boot references the proper bom.
This commit is contained in:
Oliver Gierke
2017-05-04 19:28:40 +02:00
parent 90546357c7
commit 4164bc4607
98 changed files with 319 additions and 368 deletions

View File

@@ -18,9 +18,8 @@ package example.springdata.rest.uris;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import java.io.Serializable;
import java.util.Optional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.rest.core.support.EntityLookup;
import org.springframework.data.rest.core.support.EntityLookupSupport;
@@ -33,7 +32,7 @@ import org.springframework.data.rest.core.support.EntityLookupSupport;
* @author Oliver Gierke
* @see SpringDataRestCustomization#configureRepositoryRestConfiguration(org.springframework.data.rest.core.config.RepositoryRestConfiguration)
*/
@RequiredArgsConstructor(onConstructor = @__(@Autowired) )
@RequiredArgsConstructor
public class UserEntityLookup extends EntityLookupSupport<User> {
private final @NonNull UserRepository repository;
@@ -43,16 +42,16 @@ public class UserEntityLookup extends EntityLookupSupport<User> {
* @see org.springframework.data.rest.core.support.EntityLookup#getId(java.lang.Object)
*/
@Override
public Serializable getResourceIdentifier(User entity) {
public Object getResourceIdentifier(User entity) {
return entity.getUsername();
}
/*
* (non-Javadoc)
* @see org.springframework.data.rest.core.support.EntityLookup#lookupEntity(java.io.Serializable)
* @see org.springframework.data.rest.core.support.EntityLookup#lookupEntity(java.lang.Object)
*/
@Override
public Object lookupEntity(Serializable id) {
public Optional<User> lookupEntity(Object id) {
return repository.findByUsername(id.toString());
}
}