From 552c5464c49fe5960372016150d461893025ceca Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 3 May 2017 15:58:01 +0200 Subject: [PATCH] DATACASS-441 - Adapt to API changes in repository interfaces. Related ticket: DATACMNS-944. --- .../convert/MappingCassandraConverter.java | 2 +- .../repository/CassandraRepository.java | 9 ++- .../data/cassandra/repository/MapId.java | 5 +- .../ReactiveCassandraRepository.java | 4 +- .../TypedIdCassandraRepository.java | 19 +++--- .../query/CassandraEntityInformation.java | 5 +- .../query/PartTreeCassandraQuery.java | 9 ++- .../query/ReactivePartTreeCassandraQuery.java | 9 ++- .../repository/support/BasicMapId.java | 25 ++++---- .../support/CassandraRepositoryFactory.java | 5 +- .../CassandraRepositoryFactoryBean.java | 7 +-- .../support/MapIdProxyDelegate.java | 3 +- .../MappingCassandraEntityInformation.java | 3 +- .../ReactiveCassandraRepositoryFactory.java | 5 +- ...eactiveCassandraRepositoryFactoryBean.java | 4 +- .../support/SimpleCassandraRepository.java | 25 ++++---- .../SimpleReactiveCassandraRepository.java | 49 +++++++-------- ...rtingReactiveCassandraRepositoryTests.java | 14 ++--- ...veCassandraRepositoryIntegrationTests.java | 9 +-- .../support/BasicMapIdUnitTests.java | 7 ++- ...leCassandraRepositoryIntegrationTests.java | 40 ++++++------ ...veCassandraRepositoryIntegrationTests.java | 61 ++++++++++--------- ...tedCompositePrimaryKeyRepositoryTests.java | 17 +++--- .../config/ForceQuotedRepositoryTests.java | 25 ++++---- .../repo/RepositoryMapIdIntegrationTests.java | 15 ++--- .../repository/cdi/CdiRepositoryTests.java | 10 +-- .../repository/cdi/CdiUserRepository.java | 2 +- .../UserRepositoryIntegrationTests.java | 14 ++--- ...omRepositoryBaseClassIntegrationTests.java | 4 +- 29 files changed, 201 insertions(+), 205 deletions(-) diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java index d008bc57c..03072004e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java @@ -492,7 +492,7 @@ public class MappingCassandraConverter extends AbstractCassandraConverter Collection clauses = new ArrayList<>(); - for (Entry entry : id.entrySet()) { + for (Entry entry : id.entrySet()) { Optional lookup = entity.getPersistentProperty(entry.getKey()); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/CassandraRepository.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/CassandraRepository.java index b1bb5cb39..b437d15d3 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/CassandraRepository.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/CassandraRepository.java @@ -1,7 +1,5 @@ package org.springframework.data.cassandra.repository; -import java.io.Serializable; - import org.springframework.data.cassandra.mapping.PrimaryKeyColumn; import org.springframework.data.cassandra.repository.support.BasicMapId; import org.springframework.data.repository.NoRepositoryBean; @@ -21,17 +19,18 @@ import org.springframework.data.repository.NoRepositoryBean; *
  • Define your repository interface to be a subinterface of this interface, which uses a provided id type, * {@link MapId} (implemented by {@link BasicMapId}).
    • *
  • Whenever you need a {@link MapId}, you can use the static factory method {@link BasicMapId#id()} (which is - * convenient if you import statically) and the builder method {@link MapId#with(String, Serializable)} to easily - * construct an id.
    • + * convenient if you import statically) and the builder method {@link MapId#with(String, Object)} to easily construct an + * id. *
  • Optionally, entity class authors can have their entities implement {@link MapIdentifiable}, to make it easier and * quicker for entity clients to get the entity's identity.
    • * - * + * * @param The type of the persistent entity. * @see TypedIdCassandraRepository * @see MapId * @See {@link MapIdentifiable} * @author Matthew T. Adams + * @author Mark Paluch */ @NoRepositoryBean public interface CassandraRepository extends TypedIdCassandraRepository {} diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/MapId.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/MapId.java index 188ff0488..36f481ab7 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/MapId.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/MapId.java @@ -23,8 +23,9 @@ import java.util.Map; * properties. * * @author Matthew T. Adams + * @author Mark Paluch */ -public interface MapId extends Serializable, Map { +public interface MapId extends Serializable, Map { /** * Builder method that adds the value for the named property, then returns {@code this}. @@ -33,5 +34,5 @@ public interface MapId extends Serializable, Map { * @param value The property value. * @return {@code this} */ - MapId with(String name, Serializable value); + MapId with(String name, Object value); } diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/ReactiveCassandraRepository.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/ReactiveCassandraRepository.java index 90b4385cf..02f620c66 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/ReactiveCassandraRepository.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/ReactiveCassandraRepository.java @@ -18,8 +18,6 @@ package org.springframework.data.cassandra.repository; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import java.io.Serializable; - import org.reactivestreams.Publisher; import org.springframework.data.repository.NoRepositoryBean; import org.springframework.data.repository.reactive.ReactiveCrudRepository; @@ -31,7 +29,7 @@ import org.springframework.data.repository.reactive.ReactiveCrudRepository; * @since 2.0 */ @NoRepositoryBean -public interface ReactiveCassandraRepository extends ReactiveCrudRepository { +public interface ReactiveCassandraRepository extends ReactiveCrudRepository { /** * Inserts the given entity. Assumes the instance to be new to be able to apply insertion optimizations. Use the diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/TypedIdCassandraRepository.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/TypedIdCassandraRepository.java index 2d188ebd1..20e5b5e0d 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/TypedIdCassandraRepository.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/TypedIdCassandraRepository.java @@ -15,7 +15,6 @@ */ package org.springframework.data.cassandra.repository; -import java.io.Serializable; import java.util.List; import org.springframework.data.cassandra.mapping.PrimaryKey; @@ -58,8 +57,8 @@ import org.springframework.data.repository.NoRepositoryBean; *
  • Define your repository interface to be a subinterface of {@link CassandraRepository}, which uses a provided id * type, {@link MapId} (implemented by {@link BasicMapId}).
    • *
  • Whenever you need a {@link MapId}, you can use the static factory method {@link BasicMapId#id()} (which is - * convenient if you import statically) and the builder method {@link MapId#with(String, Serializable)} to easily - * construct an id.
    • + * convenient if you import statically) and the builder method {@link MapId#with(String, Object)} to easily construct an + * id. * * * @@ -68,14 +67,14 @@ import org.springframework.data.repository.NoRepositoryBean; * @author Mark Paluch */ @NoRepositoryBean -public interface TypedIdCassandraRepository extends CrudRepository { +public interface TypedIdCassandraRepository extends CrudRepository { /* * (non-Javadoc) - * @see org.springframework.data.repository.CrudRepository#save(java.lang.Iterable) + * @see org.springframework.data.repository.CrudRepository#saveAll(java.lang.Iterable) */ @Override - List save(Iterable entites); + List saveAll(Iterable entites); /* * (non-Javadoc) @@ -86,10 +85,10 @@ public interface TypedIdCassandraRepository extends /* * (non-Javadoc) - * @see org.springframework.data.repository.CrudRepository#findAll(java.lang.Iterable) + * @see org.springframework.data.repository.CrudRepository#findAllById(java.lang.Iterable) */ @Override - List findAll(Iterable ids); + List findAllById(Iterable ids); /** * Inserts the given entity. Assumes the instance to be new to be able to apply insertion optimizations. Use the @@ -104,8 +103,8 @@ public interface TypedIdCassandraRepository extends /** * Inserts the given entities. Assumes the given entities to have not been persisted yet and thus will optimize the - * insert over a call to {@link #save(Iterable)}. Prefer using {@link #save(Iterable)} to avoid the usage of store - * specific API. + * insert over a call to {@link #saveAll(Iterable)}. Prefer using {@link #saveAll(Iterable)} to avoid the usage of + * store specific API. * * @param entities must not be {@literal null}. * @return the saved entities diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraEntityInformation.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraEntityInformation.java index 466dd4f3b..3bd2e8bc2 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraEntityInformation.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraEntityInformation.java @@ -15,8 +15,6 @@ */ package org.springframework.data.cassandra.repository.query; -import java.io.Serializable; - import org.springframework.data.repository.core.EntityInformation; /** @@ -25,8 +23,7 @@ import org.springframework.data.repository.core.EntityInformation; * @author Alex Shvid * @author Mark Paluch */ -public interface CassandraEntityInformation - extends EntityInformation, CassandraEntityMetadata { +public interface CassandraEntityInformation extends EntityInformation, CassandraEntityMetadata { /** * Return {@literal true} if the persistent entity consists entirely of primary key properties (a single Id property, diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/PartTreeCassandraQuery.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/PartTreeCassandraQuery.java index 23834d2bc..9d3d9b189 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/PartTreeCassandraQuery.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/PartTreeCassandraQuery.java @@ -18,6 +18,7 @@ package org.springframework.data.cassandra.repository.query; import org.springframework.data.cassandra.core.CassandraOperations; import org.springframework.data.cassandra.core.CassandraTemplate; import org.springframework.data.cassandra.mapping.CassandraMappingContext; +import org.springframework.data.repository.query.QueryCreationException; import org.springframework.data.repository.query.QueryMethod; import org.springframework.data.repository.query.RepositoryQuery; import org.springframework.data.repository.query.parser.PartTree; @@ -44,8 +45,12 @@ public class PartTreeCassandraQuery extends AbstractCassandraQuery { super(queryMethod, operations); - this.tree = new PartTree(queryMethod.getName(), queryMethod.getEntityInformation().getJavaType()); - this.mappingContext = operations.getConverter().getMappingContext(); + try { + this.tree = new PartTree(queryMethod.getName(), queryMethod.getEntityInformation().getJavaType()); + this.mappingContext = operations.getConverter().getMappingContext(); + } catch (Exception e) { + throw QueryCreationException.create(queryMethod, e); + } } /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactivePartTreeCassandraQuery.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactivePartTreeCassandraQuery.java index ffbeb3a3c..031d10364 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactivePartTreeCassandraQuery.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ReactivePartTreeCassandraQuery.java @@ -17,6 +17,7 @@ package org.springframework.data.cassandra.repository.query; import org.springframework.data.cassandra.core.ReactiveCassandraOperations; import org.springframework.data.cassandra.mapping.CassandraMappingContext; +import org.springframework.data.repository.query.QueryCreationException; import org.springframework.data.repository.query.RepositoryQuery; import org.springframework.data.repository.query.parser.PartTree; @@ -44,8 +45,12 @@ public class ReactivePartTreeCassandraQuery extends AbstractReactiveCassandraQue super(queryMethod, operations); - this.tree = new PartTree(queryMethod.getName(), queryMethod.getEntityInformation().getJavaType()); - this.mappingContext = operations.getConverter().getMappingContext(); + try { + this.tree = new PartTree(queryMethod.getName(), queryMethod.getEntityInformation().getJavaType()); + this.mappingContext = operations.getConverter().getMappingContext(); + } catch (Exception e) { + throw QueryCreationException.create(queryMethod, e); + } } /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/BasicMapId.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/BasicMapId.java index 2dfc26414..f1e9b7a46 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/BasicMapId.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/BasicMapId.java @@ -15,7 +15,6 @@ */ package org.springframework.data.cassandra.repository.support; -import java.io.Serializable; import java.util.Collection; import java.util.HashMap; import java.util.Map; @@ -39,7 +38,7 @@ import org.springframework.util.Assert; @SuppressWarnings("serial") public class BasicMapId implements MapId { - private final Map map = new HashMap(); + private final Map map = new HashMap<>(); /** * Create a new and empty {@link BasicMapId}. @@ -51,7 +50,7 @@ public class BasicMapId implements MapId { * * @param map must not be {@literal null}. */ - public BasicMapId(Map map) { + public BasicMapId(Map map) { Assert.notNull(map, "Map must not be null"); this.map.putAll(map); @@ -71,7 +70,7 @@ public class BasicMapId implements MapId { * * @return {@link BasicMapId} */ - public static MapId id(String name, Serializable value) { + public static MapId id(String name, Object value) { return new BasicMapId().with(name, value); } @@ -85,10 +84,10 @@ public class BasicMapId implements MapId { } /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.MapId#with(java.lang.String, java.io.Serializable) + * @see org.springframework.data.cassandra.repository.MapId#with(java.lang.String, java.io.Object) */ @Override - public BasicMapId with(String name, Serializable value) { + public BasicMapId with(String name, Object value) { put(name, value); return this; } @@ -121,7 +120,7 @@ public class BasicMapId implements MapId { * @see java.util.Map#entrySet() */ @Override - public Set> entrySet() { + public Set> entrySet() { return map.entrySet(); } @@ -146,7 +145,7 @@ public class BasicMapId implements MapId { * @see java.util.Map#get(java.lang.Object) */ @Override - public Serializable get(Object name) { + public Object get(Object name) { return map.get(name); } @@ -178,7 +177,7 @@ public class BasicMapId implements MapId { * @see java.util.Map#put(java.lang.Object, java.lang.Object) */ @Override - public Serializable put(String name, Serializable value) { + public Object put(String name, Object value) { return map.put(name, value); } @@ -186,7 +185,7 @@ public class BasicMapId implements MapId { * @see java.util.Map#putAll(java.util.Map) */ @Override - public void putAll(Map source) { + public void putAll(Map source) { map.putAll(source); } @@ -194,7 +193,7 @@ public class BasicMapId implements MapId { * @see java.util.Map#remove(java.lang.Object) */ @Override - public Serializable remove(Object name) { + public Object remove(Object name) { return map.remove(name); } @@ -210,7 +209,7 @@ public class BasicMapId implements MapId { * @see java.util.Map#values() */ @Override - public Collection values() { + public Collection values() { return map.values(); } @@ -223,7 +222,7 @@ public class BasicMapId implements MapId { StringBuilder s = new StringBuilder("{ "); boolean first = true; - for (Map.Entry entry : map.entrySet()) { + for (Map.Entry entry : map.entrySet()) { if (first) { first = false; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactory.java index 07a55bdc8..7ba4297fa 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactory.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactory.java @@ -15,7 +15,6 @@ */ package org.springframework.data.cassandra.repository.support; -import java.io.Serializable; import java.lang.reflect.Method; import java.util.Optional; @@ -83,7 +82,7 @@ public class CassandraRepositoryFactory extends RepositoryFactorySupport { @Override protected Object getTargetRepository(RepositoryInformation information) { - CassandraEntityInformation entityInformation = getEntityInformation(information.getDomainType()); + CassandraEntityInformation entityInformation = getEntityInformation(information.getDomainType()); return getTargetRepositoryViaReflection(information, entityInformation, operations); } @@ -93,7 +92,7 @@ public class CassandraRepositoryFactory extends RepositoryFactorySupport { */ @Override @SuppressWarnings("unchecked") - public CassandraEntityInformation getEntityInformation(Class domainClass) { + public CassandraEntityInformation getEntityInformation(Class domainClass) { CassandraPersistentEntity entity = mappingContext.getRequiredPersistentEntity(domainClass); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactoryBean.java index dd27c08fc..d9ab2f3e6 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactoryBean.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/CassandraRepositoryFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2016 the original author or authors + * Copyright 2013-2017 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. @@ -15,8 +15,6 @@ */ package org.springframework.data.cassandra.repository.support; -import java.io.Serializable; - import org.springframework.data.cassandra.core.CassandraTemplate; import org.springframework.data.cassandra.repository.TypedIdCassandraRepository; import org.springframework.data.repository.Repository; @@ -30,11 +28,10 @@ import org.springframework.util.Assert; * @author Alex Shvid * @author John Blum * @author Oliver Gierke - * @see java.io.Serializable * @see org.springframework.data.repository.Repository * @see org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport */ -public class CassandraRepositoryFactoryBean, S, ID extends Serializable> +public class CassandraRepositoryFactoryBean, S, ID> extends RepositoryFactoryBeanSupport { private CassandraTemplate cassandraTemplate; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/MapIdProxyDelegate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/MapIdProxyDelegate.java index e4d5b73ec..97ab97c30 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/MapIdProxyDelegate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/MapIdProxyDelegate.java @@ -31,6 +31,7 @@ import org.springframework.util.StringUtils; * @see MapIdFactory#id(Class) * @see MapIdFactory#id(Class, ClassLoader) * @author Matthew T. Adams + * @author Mark Paluch */ class MapIdProxyDelegate implements InvocationHandler { @@ -74,7 +75,7 @@ class MapIdProxyDelegate implements InvocationHandler { return MAP_ID_SIGNATURES.containsKey(new Signature(method, true)); } - public Serializable invokeGetter(Method method) { + public Object invokeGetter(Method method) { String name = method.getName(); if (name.startsWith("get")) { if (name.length() == 3) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/MappingCassandraEntityInformation.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/MappingCassandraEntityInformation.java index 3f0efbe7f..5fb047e80 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/MappingCassandraEntityInformation.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/MappingCassandraEntityInformation.java @@ -15,7 +15,6 @@ */ package org.springframework.data.cassandra.repository.support; -import java.io.Serializable; import java.util.Optional; import java.util.concurrent.atomic.AtomicReference; @@ -38,7 +37,7 @@ import org.springframework.util.Assert; * @author Matthew T. Adams * @author Mark Paluch */ -public class MappingCassandraEntityInformation extends AbstractEntityInformation +public class MappingCassandraEntityInformation extends AbstractEntityInformation implements CassandraEntityInformation { private final CassandraPersistentEntity entityMetadata; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/ReactiveCassandraRepositoryFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/ReactiveCassandraRepositoryFactory.java index 12a28af19..64ee62d61 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/ReactiveCassandraRepositoryFactory.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/ReactiveCassandraRepositoryFactory.java @@ -15,7 +15,6 @@ */ package org.springframework.data.cassandra.repository.support; -import java.io.Serializable; import java.lang.reflect.Method; import java.util.Optional; @@ -79,7 +78,7 @@ public class ReactiveCassandraRepositoryFactory extends ReactiveRepositoryFactor @Override protected Object getTargetRepository(RepositoryInformation information) { - CassandraEntityInformation entityInformation = getEntityInformation(information.getDomainType()); + CassandraEntityInformation entityInformation = getEntityInformation(information.getDomainType()); return getTargetRepositoryViaReflection(information, entityInformation, operations); } @@ -97,7 +96,7 @@ public class ReactiveCassandraRepositoryFactory extends ReactiveRepositoryFactor * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getEntityInformation(java.lang.Class) */ @SuppressWarnings("unchecked") - public CassandraEntityInformation getEntityInformation(Class domainClass) { + public CassandraEntityInformation getEntityInformation(Class domainClass) { CassandraPersistentEntity entity = mappingContext.getRequiredPersistentEntity(domainClass); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/ReactiveCassandraRepositoryFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/ReactiveCassandraRepositoryFactoryBean.java index 6285c45d2..53cb3c7e8 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/ReactiveCassandraRepositoryFactoryBean.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/ReactiveCassandraRepositoryFactoryBean.java @@ -15,8 +15,6 @@ */ package org.springframework.data.cassandra.repository.support; -import java.io.Serializable; - import org.springframework.data.cassandra.core.ReactiveCassandraOperations; import org.springframework.data.mapping.context.MappingContext; import org.springframework.data.repository.Repository; @@ -33,7 +31,7 @@ import org.springframework.util.Assert; * @see org.springframework.data.repository.reactive.ReactiveSortingRepository * @see org.springframework.data.repository.reactive.RxJava1SortingRepository */ -public class ReactiveCassandraRepositoryFactoryBean, S, ID extends Serializable> +public class ReactiveCassandraRepositoryFactoryBean, S, ID> extends RepositoryFactoryBeanSupport { private boolean mappingContextConfigured = false; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleCassandraRepository.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleCassandraRepository.java index 00a5b1d8b..a2224f98a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleCassandraRepository.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleCassandraRepository.java @@ -15,7 +15,6 @@ */ package org.springframework.data.cassandra.repository.support; -import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -36,7 +35,7 @@ import com.datastax.driver.core.querybuilder.Select; * @author Matthew T. Adams * @author Mark Paluch */ -public class SimpleCassandraRepository implements TypedIdCassandraRepository { +public class SimpleCassandraRepository implements TypedIdCassandraRepository { private CassandraEntityInformation entityInformation; @@ -80,7 +79,7 @@ public class SimpleCassandraRepository implements Ty * @see org.springframework.data.repository.CrudRepository#save(java.lang.Iterable) */ @Override - public List save(Iterable entities) { + public List saveAll(Iterable entities) { Assert.notNull(entities, "The given Iterable of entities must not be null"); List result = new ArrayList<>(); @@ -136,10 +135,10 @@ public class SimpleCassandraRepository implements Ty } /* (non-Javadoc) - * @see org.springframework.data.repository.CrudRepository#findOne(java.io.Serializable) + * @see org.springframework.data.repository.CrudRepository#findById(java.lang.Object) */ @Override - public Optional findOne(ID id) { + public Optional findById(ID id) { Assert.notNull(id, "The given id must not be null"); @@ -147,10 +146,10 @@ public class SimpleCassandraRepository implements Ty } /* (non-Javadoc) - * @see org.springframework.data.repository.CrudRepository#exists(java.io.Serializable) + * @see org.springframework.data.repository.CrudRepository#existsById(java.lang.Object) */ @Override - public boolean exists(ID id) { + public boolean existsById(ID id) { Assert.notNull(id, "The given id must not be null"); @@ -180,7 +179,7 @@ public class SimpleCassandraRepository implements Ty * @see org.springframework.data.repository.CrudRepository#findAll(java.lang.Iterable) */ @Override - public List findAll(Iterable ids) { + public List findAllById(Iterable ids) { Assert.notNull(ids, "The given Iterable of id's must not be null"); @@ -188,10 +187,10 @@ public class SimpleCassandraRepository implements Ty } /* (non-Javadoc) - * @see org.springframework.data.repository.CrudRepository#delete(java.io.Serializable) + * @see org.springframework.data.repository.CrudRepository#deleteById(java.lang.Object) */ @Override - public void delete(ID id) { + public void deleteById(ID id) { Assert.notNull(id, "The given id must not be null"); @@ -206,15 +205,15 @@ public class SimpleCassandraRepository implements Ty Assert.notNull(entity, "The given entity must not be null"); - delete(entityInformation.getId(entity) + deleteById(entityInformation.getId(entity) .orElseThrow(() -> new IllegalArgumentException(String.format("Cannot obtain Id from [%s]", entity)))); } /* (non-Javadoc) - * @see org.springframework.data.repository.CrudRepository#delete(java.lang.Iterable) + * @see org.springframework.data.repository.CrudRepository#deleteAll(java.lang.Iterable) */ @Override - public void delete(Iterable entities) { + public void deleteAll(Iterable entities) { Assert.notNull(entities, "The given Iterable of entities must not be null"); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleReactiveCassandraRepository.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleReactiveCassandraRepository.java index b30ac16fb..b83039d38 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleReactiveCassandraRepository.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleReactiveCassandraRepository.java @@ -18,8 +18,6 @@ package org.springframework.data.cassandra.repository.support; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import java.io.Serializable; - import org.reactivestreams.Publisher; import org.springframework.data.cassandra.core.ReactiveCassandraOperations; import org.springframework.data.cassandra.repository.ReactiveCassandraRepository; @@ -35,8 +33,7 @@ import com.datastax.driver.core.querybuilder.Select; * @author Mark Paluch * @since 2.0 */ -public class SimpleReactiveCassandraRepository - implements ReactiveCassandraRepository { +public class SimpleReactiveCassandraRepository implements ReactiveCassandraRepository { protected CassandraEntityInformation entityInformation; @@ -82,18 +79,18 @@ public class SimpleReactiveCassandraRepository * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#save(java.lang.Iterable) */ @Override - public Flux save(Iterable entities) { + public Flux saveAll(Iterable entities) { Assert.notNull(entities, "The given Iterable of entities must not be null"); - return save(Flux.fromIterable(entities)); + return saveAll(Flux.fromIterable(entities)); } /* (non-Javadoc) * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#save(org.reactivestreams.Publisher) */ @Override - public Flux save(Publisher entityStream) { + public Flux saveAll(Publisher entityStream) { Assert.notNull(entityStream, "The given Publisher of entities must not be null"); @@ -141,10 +138,10 @@ public class SimpleReactiveCassandraRepository } /* (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findOne(java.io.Serializable) + * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findById(java.lang.Object) */ @Override - public Mono findOne(ID id) { + public Mono findById(ID id) { Assert.notNull(id, "The given id must not be null"); @@ -152,10 +149,10 @@ public class SimpleReactiveCassandraRepository } /* (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findOne(reactor.core.publisher.Mono) + * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findById(reactor.core.publisher.Mono) */ @Override - public Mono findOne(Mono mono) { + public Mono findById(Mono mono) { Assert.notNull(mono, "The given id must not be null"); @@ -163,10 +160,10 @@ public class SimpleReactiveCassandraRepository } /* (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#exists(java.io.Serializable) + * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#existsById(java.lang.Object) */ @Override - public Mono exists(ID id) { + public Mono existsById(ID id) { Assert.notNull(id, "The given id must not be null"); @@ -174,10 +171,10 @@ public class SimpleReactiveCassandraRepository } /* (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#exists(reactor.core.publisher.Mono) + * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#existsById(reactor.core.publisher.Mono) */ @Override - public Mono exists(Mono mono) { + public Mono existsById(Mono mono) { Assert.notNull(mono, "The given id must not be null"); @@ -195,21 +192,21 @@ public class SimpleReactiveCassandraRepository } /* (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findAll(java.lang.Iterable) + * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findAllById(java.lang.Iterable) */ @Override - public Flux findAll(Iterable iterable) { + public Flux findAllById(Iterable iterable) { Assert.notNull(iterable, "The given Iterable of id's must not be null"); - return findAll(Flux.fromIterable(iterable)); + return findAllById(Flux.fromIterable(iterable)); } /* (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findAll(org.reactivestreams.Publisher) + * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findAllById(org.reactivestreams.Publisher) */ @Override - public Flux findAll(Publisher idStream) { + public Flux findAllById(Publisher idStream) { Assert.notNull(idStream, "The given Publisher of id's must not be null"); @@ -225,10 +222,10 @@ public class SimpleReactiveCassandraRepository } /* (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#delete(java.io.Serializable) + * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#deleteById(java.lang.Object) */ @Override - public Mono delete(ID id) { + public Mono deleteById(ID id) { Assert.notNull(id, "The given id must not be null"); @@ -247,10 +244,10 @@ public class SimpleReactiveCassandraRepository } /* (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#delete(java.lang.Iterable) + * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#deleteAll(java.lang.Iterable) */ @Override - public Mono delete(Iterable entities) { + public Mono deleteAll(Iterable entities) { Assert.notNull(entities, "The given Iterable of entities must not be null"); @@ -258,10 +255,10 @@ public class SimpleReactiveCassandraRepository } /* (non-Javadoc) - * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#delete(org.reactivestreams.Publisher) + * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#deleteAll(org.reactivestreams.Publisher) */ @Override - public Mono delete(Publisher entityStream) { + public Mono deleteAll(Publisher entityStream) { Assert.notNull(entityStream, "The given Publisher of entities must not be null"); diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/ConvertingReactiveCassandraRepositoryTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/ConvertingReactiveCassandraRepositoryTests.java index 9ee5386b7..310119005 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/ConvertingReactiveCassandraRepositoryTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/ConvertingReactiveCassandraRepositoryTests.java @@ -99,13 +99,13 @@ public class ConvertingReactiveCassandraRepositoryTests extends AbstractKeyspace carter = new Person("49", "Carter", "Beauford"); boyd = new Person("45", "Boyd", "Tinsley"); - StepVerifier.create(reactiveRepository.save(Arrays.asList(oliver, dave, carter, boyd))).expectNextCount(4) + StepVerifier.create(reactiveRepository.saveAll(Arrays.asList(oliver, dave, carter, boyd))).expectNextCount(4) .verifyComplete(); } @Test // DATACASS-335 public void reactiveStreamsMethodsShouldWork() { - StepVerifier.create(reactivePersonRepostitory.exists(dave.getId())).expectNext(true).verifyComplete(); + StepVerifier.create(reactivePersonRepostitory.existsById(dave.getId())).expectNext(true).verifyComplete(); } @Test // DATACASS-335 @@ -127,7 +127,7 @@ public class ConvertingReactiveCassandraRepositoryTests extends AbstractKeyspace @Test // DATACASS-335 public void simpleRxJava1MethodsShouldWork() { - rxJava1PersonRepostitory.exists(dave.getId()) // + rxJava1PersonRepostitory.existsById(dave.getId()) // .test() // .awaitTerminalEvent() // .assertResult(true) // @@ -138,7 +138,7 @@ public class ConvertingReactiveCassandraRepositoryTests extends AbstractKeyspace @Test // DATACASS-335 public void existsWithSingleRxJava1IdMethodsShouldWork() { - rxJava1PersonRepostitory.exists(Single.just(dave.getId())) // + rxJava1PersonRepostitory.existsById(Single.just(dave.getId())) // .test() // .awaitTerminalEvent() // .assertResult(true) // @@ -186,7 +186,7 @@ public class ConvertingReactiveCassandraRepositoryTests extends AbstractKeyspace @Test // DATACASS-398 public void simpleRxJava2MethodsShouldWork() { - rxJava2PersonRepostitory.exists(dave.getId()) // + rxJava2PersonRepostitory.existsById(dave.getId()) // .test()// .assertValue(true) // .assertNoErrors() // @@ -197,7 +197,7 @@ public class ConvertingReactiveCassandraRepositoryTests extends AbstractKeyspace @Test // DATACASS-398 public void existsWithSingleRxJava2IdMethodsShouldWork() { - rxJava2PersonRepostitory.exists(io.reactivex.Single.just(dave.getId())).test() // + rxJava2PersonRepostitory.existsById(io.reactivex.Single.just(dave.getId())).test() // .assertValue(true) // .assertNoErrors() // .assertComplete() // @@ -266,7 +266,7 @@ public class ConvertingReactiveCassandraRepositoryTests extends AbstractKeyspace } @Test // DATACASS-335 - public void shouldFindOneByPublisherOfLastName() { + public void shouldFindByIdByPublisherOfLastName() { StepVerifier.create(reactiveRepository.findByLastname(Single.just(this.carter.getLastname()))) // .expectNext(carter) // diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/ReactiveCassandraRepositoryIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/ReactiveCassandraRepositoryIntegrationTests.java index ca4bf6404..9b774b959 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/ReactiveCassandraRepositoryIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/ReactiveCassandraRepositoryIntegrationTests.java @@ -116,7 +116,8 @@ public class ReactiveCassandraRepositoryIntegrationTests extends AbstractKeyspac carter = new Person("49", "Carter", "Beauford"); boyd = new Person("45", "Boyd", "Tinsley"); - StepVerifier.create(repository.save(Arrays.asList(oliver, dave, carter, boyd))).expectNextCount(4).verifyComplete(); + StepVerifier.create(repository.saveAll(Arrays.asList(oliver, dave, carter, boyd))).expectNextCount(4) + .verifyComplete(); } @Test // DATACASS-335 @@ -125,12 +126,12 @@ public class ReactiveCassandraRepositoryIntegrationTests extends AbstractKeyspac } @Test // DATACASS-335 - public void shouldFindOneByLastName() { + public void shouldFindByIdByLastName() { StepVerifier.create(repository.findOneByLastname(carter.getLastname())).expectNext(carter).verifyComplete(); } @Test // DATACASS-335 - public void shouldFindOneByPublisherOfLastName() { + public void shouldFindByIdByPublisherOfLastName() { StepVerifier.create(repository.findByLastname(Mono.just(carter.getLastname()))).expectNext(carter).verifyComplete(); } @@ -145,7 +146,7 @@ public class ReactiveCassandraRepositoryIntegrationTests extends AbstractKeyspac GroupKey key1 = new GroupKey("Simpsons", "hash", "Bart"); GroupKey key2 = new GroupKey("Simpsons", "hash", "Homer"); - StepVerifier.create(groupRepostitory.save(Flux.just(new Group(key1), new Group(key2)))).expectNextCount(2) + StepVerifier.create(groupRepostitory.saveAll(Flux.just(new Group(key1), new Group(key2)))).expectNextCount(2) .verifyComplete(); StepVerifier diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/BasicMapIdUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/BasicMapIdUnitTests.java index de4034aa4..69173b732 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/BasicMapIdUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/BasicMapIdUnitTests.java @@ -13,12 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.data.cassandra.repository.support; import static org.assertj.core.api.Assertions.*; -import java.io.Serializable; import java.util.HashMap; import java.util.Map; @@ -28,11 +26,14 @@ import org.junit.Test; * Unit tests for {@link BasicMapId}. * * @author Matthew T. Adams + * @author Mark Paluch */ public class BasicMapIdUnitTests { + @Test public void testMapConstructor() { - Map map = new HashMap<>(); + + Map map = new HashMap<>(); map.put("field1", "value1"); map.put("field2", 2); diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/SimpleCassandraRepositoryIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/SimpleCassandraRepositoryIntegrationTests.java index 0779404bc..e24bb26d1 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/SimpleCassandraRepositoryIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/SimpleCassandraRepositoryIntegrationTests.java @@ -95,13 +95,13 @@ public class SimpleCassandraRepositoryIntegrationTests extends AbstractKeyspaceC carter = new Person("49", "Carter", "Beauford"); boyd = new Person("45", "Boyd", "Tinsley"); - repository.save(Arrays.asList(oliver, dave, carter, boyd)); + repository.saveAll(Arrays.asList(oliver, dave, carter, boyd)); } @Test // DATACASS-396 public void existsByIdShouldReturnTrueForExistingObject() { - Boolean exists = repository.exists(dave.getId()); + Boolean exists = repository.existsById(dave.getId()); assertThat(exists).isTrue(); } @@ -109,7 +109,7 @@ public class SimpleCassandraRepositoryIntegrationTests extends AbstractKeyspaceC @Test // DATACASS-396 public void existsByIdShouldReturnFalseForAbsentObject() { - boolean exists = repository.exists("unknown"); + boolean exists = repository.existsById("unknown"); assertThat(exists).isFalse(); } @@ -117,23 +117,23 @@ public class SimpleCassandraRepositoryIntegrationTests extends AbstractKeyspaceC @Test // DATACASS-396 public void existsByMonoOfIdShouldReturnTrueForExistingObject() { - boolean exists = repository.exists(dave.getId()); + boolean exists = repository.existsById(dave.getId()); assertThat(exists).isTrue(); } @Test // DATACASS-396 - public void findOneShouldReturnObject() { + public void findByIdShouldReturnObject() { - Optional person = repository.findOne(dave.getId()); + Optional person = repository.findById(dave.getId()); assertThat(person).contains(dave); } @Test // DATACASS-396 - public void findOneShouldCompleteWithoutValueForAbsentObject() { + public void findByIdShouldCompleteWithoutValueForAbsentObject() { - Optional person = repository.findOne("unknown"); + Optional person = repository.findById("unknown"); assertThat(person).isEmpty(); } @@ -149,7 +149,7 @@ public class SimpleCassandraRepositoryIntegrationTests extends AbstractKeyspaceC @Test // DATACASS-396, DATACASS-416 public void findAllByIterableOfIdShouldReturnResults() { - List persons = repository.findAll(Arrays.asList(dave.getId(), boyd.getId())); + List persons = repository.findAllById(Arrays.asList(dave.getId(), boyd.getId())); assertThat(persons).hasSize(2); } @@ -194,7 +194,7 @@ public class SimpleCassandraRepositoryIntegrationTests extends AbstractKeyspaceC assertThat(saved).isEqualTo(saved); - Optional loaded = repository.findOne(dave.getId()); + Optional loaded = repository.findById(dave.getId()); assertThat(loaded).isPresent(); @@ -213,7 +213,7 @@ public class SimpleCassandraRepositoryIntegrationTests extends AbstractKeyspaceC assertThat(saved).isEqualTo(person); - Optional loaded = repository.findOne(person.getId()); + Optional loaded = repository.findById(person.getId()); assertThat(loaded).contains(person); } @@ -223,7 +223,7 @@ public class SimpleCassandraRepositoryIntegrationTests extends AbstractKeyspaceC repository.deleteAll(); - List saved = repository.save(Arrays.asList(dave, oliver, boyd)); + List saved = repository.saveAll(Arrays.asList(dave, oliver, boyd)); assertThat(saved).hasSize(3); @@ -238,14 +238,14 @@ public class SimpleCassandraRepositoryIntegrationTests extends AbstractKeyspaceC dave.setFirstname("Hello, Dave"); dave.setLastname("Bowman"); - List saved = repository.save(Arrays.asList(person, dave)); + List saved = repository.saveAll(Arrays.asList(person, dave)); assertThat(saved).hasSize(2); - Optional persistentDave = repository.findOne(dave.getId()); + Optional persistentDave = repository.findById(dave.getId()); assertThat(persistentDave).contains(dave); - Optional persistentHomer = repository.findOne(person.getId()); + Optional persistentHomer = repository.findById(person.getId()); assertThat(persistentHomer).contains(person); } @@ -262,9 +262,9 @@ public class SimpleCassandraRepositoryIntegrationTests extends AbstractKeyspaceC @Test // DATACASS-396 public void deleteByIdShouldRemoveEntity() { - repository.delete(dave.getId()); + repository.deleteById(dave.getId()); - Optional loaded = repository.findOne(dave.getId()); + Optional loaded = repository.findById(dave.getId()); assertThat(loaded).isEmpty(); } @@ -274,7 +274,7 @@ public class SimpleCassandraRepositoryIntegrationTests extends AbstractKeyspaceC repository.delete(dave); - Optional loaded = repository.findOne(dave.getId()); + Optional loaded = repository.findById(dave.getId()); assertThat(loaded).isEmpty(); } @@ -282,9 +282,9 @@ public class SimpleCassandraRepositoryIntegrationTests extends AbstractKeyspaceC @Test // DATACASS-396 public void deleteIterableOfEntitiesShouldRemoveEntities() { - repository.delete(Arrays.asList(dave, boyd)); + repository.deleteAll(Arrays.asList(dave, boyd)); - Optional loaded = repository.findOne(boyd.getId()); + Optional loaded = repository.findById(boyd.getId()); assertThat(loaded).isEmpty(); } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/SimpleReactiveCassandraRepositoryIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/SimpleReactiveCassandraRepositoryIntegrationTests.java index 1b979f9c3..f21a9400d 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/SimpleReactiveCassandraRepositoryIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/SimpleReactiveCassandraRepositoryIntegrationTests.java @@ -99,7 +99,8 @@ public class SimpleReactiveCassandraRepositoryIntegrationTests extends AbstractK } private void insertTestData() { - StepVerifier.create(repository.save(Arrays.asList(oliver, dave, carter, boyd))).expectNextCount(4).verifyComplete(); + StepVerifier.create(repository.saveAll(Arrays.asList(oliver, dave, carter, boyd))).expectNextCount(4) + .verifyComplete(); } private void deleteAll() { @@ -111,12 +112,12 @@ public class SimpleReactiveCassandraRepositoryIntegrationTests extends AbstractK insertTestData(); - StepVerifier.create(repository.exists(dave.getId())).expectNext(true).verifyComplete(); + StepVerifier.create(repository.existsById(dave.getId())).expectNext(true).verifyComplete(); } @Test // DATACASS-335 public void existsByIdShouldReturnFalseForAbsentObject() { - StepVerifier.create(repository.exists("unknown")).expectNext(false).verifyComplete(); + StepVerifier.create(repository.existsById("unknown")).expectNext(false).verifyComplete(); } @Test // DATACASS-335 @@ -124,38 +125,38 @@ public class SimpleReactiveCassandraRepositoryIntegrationTests extends AbstractK insertTestData(); - StepVerifier.create(repository.exists(Mono.just(dave.getId()))).expectNext(true).verifyComplete(); + StepVerifier.create(repository.existsById(Mono.just(dave.getId()))).expectNext(true).verifyComplete(); } @Test // DATACASS-335 public void existsByEmptyMonoOfIdShouldReturnEmptyMono() { - StepVerifier.create(repository.exists(Mono.empty())).verifyComplete(); + StepVerifier.create(repository.existsById(Mono.empty())).verifyComplete(); } @Test // DATACASS-335 - public void findOneShouldReturnObject() { + public void findByIdShouldReturnObject() { insertTestData(); - StepVerifier.create(repository.findOne(dave.getId())).expectNext(dave).verifyComplete(); + StepVerifier.create(repository.findById(dave.getId())).expectNext(dave).verifyComplete(); } @Test // DATACASS-335 - public void findOneShouldCompleteWithoutValueForAbsentObject() { - StepVerifier.create(repository.findOne("unknown")).verifyComplete(); + public void findByIdShouldCompleteWithoutValueForAbsentObject() { + StepVerifier.create(repository.findById("unknown")).verifyComplete(); } @Test // DATACASS-335 - public void findOneByMonoOfIdShouldReturnTrueForExistingObject() { + public void findByIdByMonoOfIdShouldReturnTrueForExistingObject() { insertTestData(); - StepVerifier.create(repository.findOne(Mono.just(dave.getId()))).expectNext(dave).verifyComplete(); + StepVerifier.create(repository.findById(Mono.just(dave.getId()))).expectNext(dave).verifyComplete(); } @Test // DATACASS-335 - public void findOneByEmptyMonoOfIdShouldReturnEmptyMono() { - StepVerifier.create(repository.findOne(Mono.empty())).verifyComplete(); + public void findByIdByEmptyMonoOfIdShouldReturnEmptyMono() { + StepVerifier.create(repository.findById(Mono.empty())).verifyComplete(); } @Test // DATACASS-335 @@ -171,7 +172,7 @@ public class SimpleReactiveCassandraRepositoryIntegrationTests extends AbstractK insertTestData(); - StepVerifier.create(repository.findAll(Arrays.asList(dave.getId(), boyd.getId()))) // + StepVerifier.create(repository.findAllById(Arrays.asList(dave.getId(), boyd.getId()))) // .expectNextCount(2) // .verifyComplete(); } @@ -181,14 +182,14 @@ public class SimpleReactiveCassandraRepositoryIntegrationTests extends AbstractK insertTestData(); - StepVerifier.create(repository.findAll(Flux.just(dave.getId(), boyd.getId()))) // + StepVerifier.create(repository.findAllById(Flux.just(dave.getId(), boyd.getId()))) // .expectNextCount(2) // .verifyComplete(); } @Test // DATACASS-335 public void findAllByEmptyPublisherOfIdShouldReturnResults() { - StepVerifier.create(repository.findAll(Flux.empty())).verifyComplete(); + StepVerifier.create(repository.findAllById(Flux.empty())).verifyComplete(); } @Test // DATACASS-335 @@ -243,7 +244,7 @@ public class SimpleReactiveCassandraRepositoryIntegrationTests extends AbstractK StepVerifier.create(repository.save(dave)).expectNextCount(1).verifyComplete(); - StepVerifier.create(repository.findOne(dave.getId())).consumeNextWith(actual -> { + StepVerifier.create(repository.findById(dave.getId())).consumeNextWith(actual -> { assertThat(actual.getFirstname()).isEqualTo(dave.getFirstname()); assertThat(actual.getLastname()).isEqualTo(dave.getLastname()); @@ -257,13 +258,13 @@ public class SimpleReactiveCassandraRepositoryIntegrationTests extends AbstractK StepVerifier.create(repository.save(person)).expectNextCount(1).verifyComplete(); - StepVerifier.create(repository.findOne(person.getId())).expectNext(person).verifyComplete(); + StepVerifier.create(repository.findById(person.getId())).expectNext(person).verifyComplete(); } @Test // DATACASS-335 public void saveIterableOfNewEntitiesShouldInsertEntity() { - StepVerifier.create(repository.save(Arrays.asList(dave, oliver, boyd))).expectNextCount(3).verifyComplete(); + StepVerifier.create(repository.saveAll(Arrays.asList(dave, oliver, boyd))).expectNextCount(3).verifyComplete(); StepVerifier.create(repository.findAll()).expectNextCount(3L).verifyComplete(); } @@ -276,17 +277,17 @@ public class SimpleReactiveCassandraRepositoryIntegrationTests extends AbstractK dave.setFirstname("Hello, Dave"); dave.setLastname("Bowman"); - StepVerifier.create(repository.save(Arrays.asList(person, dave))).expectNextCount(2).verifyComplete(); + StepVerifier.create(repository.saveAll(Arrays.asList(person, dave))).expectNextCount(2).verifyComplete(); - StepVerifier.create(repository.findOne(dave.getId())).expectNext(dave).verifyComplete(); + StepVerifier.create(repository.findById(dave.getId())).expectNext(dave).verifyComplete(); - StepVerifier.create(repository.findOne(person.getId())).expectNext(person).verifyComplete(); + StepVerifier.create(repository.findById(person.getId())).expectNext(person).verifyComplete(); } @Test // DATACASS-335 public void savePublisherOfEntitiesShouldInsertEntity() { - StepVerifier.create(repository.save(Flux.just(dave, oliver, boyd))).expectNextCount(3).verifyComplete(); + StepVerifier.create(repository.saveAll(Flux.just(dave, oliver, boyd))).expectNextCount(3).verifyComplete(); StepVerifier.create(repository.findAll()).expectNextCount(3L).verifyComplete(); } @@ -304,9 +305,9 @@ public class SimpleReactiveCassandraRepositoryIntegrationTests extends AbstractK @Test // DATACASS-335 public void deleteByIdShouldRemoveEntity() { - StepVerifier.create(repository.delete(dave.getId())).verifyComplete(); + StepVerifier.create(repository.deleteById(dave.getId())).verifyComplete(); - StepVerifier.create(repository.findOne(dave.getId())).expectNextCount(0).verifyComplete(); + StepVerifier.create(repository.findById(dave.getId())).expectNextCount(0).verifyComplete(); } @Test // DATACASS-335 @@ -314,23 +315,23 @@ public class SimpleReactiveCassandraRepositoryIntegrationTests extends AbstractK StepVerifier.create(repository.delete(dave)).verifyComplete(); - StepVerifier.create(repository.findOne(dave.getId())).expectNextCount(0).verifyComplete(); + StepVerifier.create(repository.findById(dave.getId())).expectNextCount(0).verifyComplete(); } @Test // DATACASS-335 public void deleteIterableOfEntitiesShouldRemoveEntities() { - StepVerifier.create(repository.delete(Arrays.asList(dave, boyd))).verifyComplete(); + StepVerifier.create(repository.deleteAll(Arrays.asList(dave, boyd))).verifyComplete(); - StepVerifier.create(repository.findOne(boyd.getId())).expectNextCount(0).verifyComplete(); + StepVerifier.create(repository.findById(boyd.getId())).expectNextCount(0).verifyComplete(); } @Test // DATACASS-335 public void deletePublisherOfEntitiesShouldRemoveEntities() { - StepVerifier.create(repository.delete(Flux.just(dave, boyd))).verifyComplete(); + StepVerifier.create(repository.deleteAll(Flux.just(dave, boyd))).verifyComplete(); - StepVerifier.create(repository.findOne(boyd.getId())).expectNextCount(0).verifyComplete(); + StepVerifier.create(repository.findById(boyd.getId())).expectNextCount(0).verifyComplete(); } interface PersonRepostitory extends ReactiveCassandraRepository {} diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryTests.java index 12c931f83..8a98b09bf 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryTests.java @@ -23,6 +23,7 @@ import org.springframework.data.cassandra.core.CassandraTemplate; /** * @author Matthew T. Adams + * @author Mark Paluch */ public class ForceQuotedCompositePrimaryKeyRepositoryTests { @@ -52,7 +53,7 @@ public class ForceQuotedCompositePrimaryKeyRepositoryTests { assertThat(entity).isSameAs(s); // select - Implicit f = implicitRepository.findOne(key).get(); + Implicit f = implicitRepository.findById(key).get(); assertThat(entity).isNotSameAs(f); String stringValue = query("stringvalue", "\"Implicit\"", "\"keyZero\"", f.getPrimaryKey().getKeyZero(), "\"keyOne\"", f.getPrimaryKey().getKeyOne()); @@ -62,13 +63,13 @@ public class ForceQuotedCompositePrimaryKeyRepositoryTests { f.setStringValue(f.getStringValue() + "X"); Implicit u = implicitRepository.save(f); assertThat(f).isSameAs(u); - f = implicitRepository.findOne(u.getPrimaryKey()).get(); + f = implicitRepository.findById(u.getPrimaryKey()).get(); assertThat(u).isNotSameAs(f); assertThat(f.getStringValue()).isEqualTo(u.getStringValue()); // delete - implicitRepository.delete(key); - assertThat(implicitRepository.findOne(key)).isNotPresent(); + implicitRepository.deleteById(key); + assertThat(implicitRepository.findById(key)).isNotPresent(); } public void testExplicit(String tableName, String stringValueColumnName, String keyZeroColumnName, @@ -81,7 +82,7 @@ public class ForceQuotedCompositePrimaryKeyRepositoryTests { assertThat(entity).isSameAs(s); // select - Explicit f = explicitRepository.findOne(key).get(); + Explicit f = explicitRepository.findById(key).get(); assertThat(entity).isNotSameAs(f); String stringValue = query(stringValueColumnName, tableName, keyZeroColumnName, f.getPrimaryKey().getKeyZero(), keyOneColumnName, f.getPrimaryKey().getKeyOne()); @@ -91,12 +92,12 @@ public class ForceQuotedCompositePrimaryKeyRepositoryTests { f.setStringValue(f.getStringValue() + "X"); Explicit u = explicitRepository.save(f); assertThat(f).isSameAs(u); - f = explicitRepository.findOne(u.getPrimaryKey()).get(); + f = explicitRepository.findById(u.getPrimaryKey()).get(); assertThat(u).isNotSameAs(f); assertThat(f.getStringValue()).isEqualTo(u.getStringValue()); // delete - explicitRepository.delete(key); - assertThat(explicitRepository.findOne(key)).isNotPresent(); + explicitRepository.deleteById(key); + assertThat(explicitRepository.findById(key)).isNotPresent(); } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ForceQuotedRepositoryTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ForceQuotedRepositoryTests.java index 89d677302..f13973d0e 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ForceQuotedRepositoryTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/forcequote/config/ForceQuotedRepositoryTests.java @@ -23,6 +23,7 @@ import org.springframework.data.cassandra.core.CassandraOperations; * Tests to be executed using Java/XML configuration. * * @author Matthew T. Adams + * @author Mark Paluch */ public class ForceQuotedRepositoryTests { @@ -48,15 +49,15 @@ public class ForceQuotedRepositoryTests { Implicit s = implicitRepository.save(entity); assertThat(entity).isSameAs(s); - Implicit f = implicitRepository.findOne(key).get(); + Implicit f = implicitRepository.findById(key).get(); assertThat(entity).isNotSameAs(f); String stringValue = query("stringvalue", "\"Implicit\"", "primarykey", f.getPrimaryKey()); assertThat(stringValue).isEqualTo(f.getStringValue()); - implicitRepository.delete(key); + implicitRepository.deleteById(key); - assertThat(implicitRepository.findOne(key)).isNotPresent(); + assertThat(implicitRepository.findById(key)).isNotPresent(); } public void testExplicit(String tableName) { @@ -66,15 +67,15 @@ public class ForceQuotedRepositoryTests { Explicit s = explicitRepository.save(entity); assertThat(entity).isSameAs(s); - Explicit f = explicitRepository.findOne(key).get(); + Explicit f = explicitRepository.findById(key).get(); assertThat(entity).isNotSameAs(f); String stringValue = query("stringvalue", String.format("\"%s\"", tableName), "primarykey", f.getPrimaryKey()); assertThat(stringValue).isEqualTo(f.getStringValue()); - explicitRepository.delete(key); + explicitRepository.deleteById(key); - assertThat(explicitRepository.findOne(key)).isNotPresent(); + assertThat(explicitRepository.findById(key)).isNotPresent(); } public void testImplicitProperties() { @@ -84,15 +85,15 @@ public class ForceQuotedRepositoryTests { ImplicitProperties s = implicitPropertiesRepository.save(entity); assertThat(entity).isSameAs(s); - ImplicitProperties f = implicitPropertiesRepository.findOne(key).get(); + ImplicitProperties f = implicitPropertiesRepository.findById(key).get(); assertThat(entity).isNotSameAs(f); String stringValue = query("\"stringValue\"", "implicitproperties", "\"primaryKey\"", f.getPrimaryKey()); assertThat(stringValue).isEqualTo(f.getStringValue()); - implicitPropertiesRepository.delete(key); + implicitPropertiesRepository.deleteById(key); - assertThat(implicitPropertiesRepository.findOne(key)).isNotPresent(); + assertThat(implicitPropertiesRepository.findById(key)).isNotPresent(); } public void testExplicitProperties(String stringValueColumnName, String primaryKeyColumnName) { @@ -102,15 +103,15 @@ public class ForceQuotedRepositoryTests { ExplicitProperties s = explicitPropertiesRepository.save(entity); assertThat(entity).isSameAs(s); - ExplicitProperties f = explicitPropertiesRepository.findOne(key).get(); + ExplicitProperties f = explicitPropertiesRepository.findById(key).get(); assertThat(entity).isNotSameAs(f); String stringValue = query(String.format("\"%s\"", stringValueColumnName), "explicitproperties", String.format("\"%s\"", primaryKeyColumnName), f.getPrimaryKey()); assertThat(stringValue).isEqualTo(f.getStringValue()); - implicitPropertiesRepository.delete(key); + implicitPropertiesRepository.deleteById(key); - assertThat(implicitPropertiesRepository.findOne(key)).isNotPresent(); + assertThat(implicitPropertiesRepository.findById(key)).isNotPresent(); } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/repo/RepositoryMapIdIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/repo/RepositoryMapIdIntegrationTests.java index 72127e7f3..a6906b1cf 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/repo/RepositoryMapIdIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/repo/RepositoryMapIdIntegrationTests.java @@ -34,7 +34,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** * Integration tests for repositories using {@link MapId}. * - * @author Matthew T. Adams. + * @author Matthew T. Adams + * @author Mark Paluch */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration @@ -72,7 +73,7 @@ public class RepositoryMapIdIntegrationTests extends AbstractSpringDataEmbeddedC // select MapId id = id("key", saved.getKey()); - SinglePrimaryKeyColumn selected = singlePrimaryKecColumnRepository.findOne(id).get(); + SinglePrimaryKeyColumn selected = singlePrimaryKecColumnRepository.findById(id).get(); assertThat(saved).isNotSameAs(selected); assertThat(selected.getKey()).isEqualTo(saved.getKey()); assertThat(selected.getValue()).isEqualTo(saved.getValue()); @@ -82,13 +83,13 @@ public class RepositoryMapIdIntegrationTests extends AbstractSpringDataEmbeddedC SinglePrimaryKeyColumn updated = singlePrimaryKecColumnRepository.save(selected); assertThat(selected).isSameAs(updated); - selected = singlePrimaryKecColumnRepository.findOne(id).get(); + selected = singlePrimaryKecColumnRepository.findById(id).get(); assertThat(updated).isNotSameAs(selected); assertThat(selected.getValue()).isEqualTo(updated.getValue()); // delete singlePrimaryKecColumnRepository.delete(selected); - assertThat(singlePrimaryKecColumnRepository.findOne(id)).isEmpty(); + assertThat(singlePrimaryKecColumnRepository.findById(id)).isEmpty(); } @Test @@ -102,7 +103,7 @@ public class RepositoryMapIdIntegrationTests extends AbstractSpringDataEmbeddedC // select MapId id = id("key0", saved.getKey0()).with("key1", saved.getKey1()); - MultiPrimaryKeyColumns selected = multiPrimaryKeyColumnsRepository.findOne(id).get(); + MultiPrimaryKeyColumns selected = multiPrimaryKeyColumnsRepository.findById(id).get(); assertThat(saved).isNotSameAs(selected); assertThat(selected.getKey0()).isEqualTo(saved.getKey0()); assertThat(selected.getKey1()).isEqualTo(saved.getKey1()); @@ -113,13 +114,13 @@ public class RepositoryMapIdIntegrationTests extends AbstractSpringDataEmbeddedC MultiPrimaryKeyColumns updated = multiPrimaryKeyColumnsRepository.save(selected); assertThat(selected).isSameAs(updated); - selected = multiPrimaryKeyColumnsRepository.findOne(id).get(); + selected = multiPrimaryKeyColumnsRepository.findById(id).get(); assertThat(updated).isNotSameAs(selected); assertThat(selected.getValue()).isEqualTo(updated.getValue()); // delete template.delete(selected); - assertThat(multiPrimaryKeyColumnsRepository.findOne(id)).isEmpty(); + assertThat(multiPrimaryKeyColumnsRepository.findById(id)).isEmpty(); } } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/cdi/CdiRepositoryTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/cdi/CdiRepositoryTests.java index b94ddeed0..c90acf0db 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/cdi/CdiRepositoryTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/cdi/CdiRepositoryTests.java @@ -81,9 +81,9 @@ public class CdiRepositoryTests extends AbstractEmbeddedCassandraIntegrationTest repository.save(bean); - assertThat(repository.exists(bean.getUsername())).isTrue(); + assertThat(repository.existsById(bean.getUsername())).isTrue(); - Optional retrieved = repository.findOne(bean.getUsername()); + Optional retrieved = repository.findById(bean.getUsername()); assertThat(retrieved).hasValueSatisfying(actual -> { assertThat(actual.getUsername()).isEqualTo(bean.getUsername()); @@ -92,12 +92,12 @@ public class CdiRepositoryTests extends AbstractEmbeddedCassandraIntegrationTest }); assertThat(repository.count()).isEqualTo(1); - assertThat(repository.exists(bean.getUsername())).isTrue(); + assertThat(repository.existsById(bean.getUsername())).isTrue(); repository.delete(bean); assertThat(repository.count()).isEqualTo(0); - assertThat(repository.findOne(bean.getUsername())).isNotPresent(); + assertThat(repository.findById(bean.getUsername())).isNotPresent(); } @Test // DATACASS-249 @@ -113,7 +113,7 @@ public class CdiRepositoryTests extends AbstractEmbeddedCassandraIntegrationTest qualifiedUserRepository.save(bean); - assertThat(qualifiedUserRepository.exists(bean.getUsername())).isTrue(); + assertThat(qualifiedUserRepository.existsById(bean.getUsername())).isTrue(); } @Test // DATACASS-149 diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/cdi/CdiUserRepository.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/cdi/CdiUserRepository.java index cb9732c59..e8ebc3212 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/cdi/CdiUserRepository.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/cdi/CdiUserRepository.java @@ -27,5 +27,5 @@ import org.springframework.data.repository.CrudRepository; */ public interface CdiUserRepository extends CrudRepository { - Optional findOne(String id); + Optional findById(String id); } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/simple/UserRepositoryIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/simple/UserRepositoryIntegrationTests.java index ad370d19e..a244e729a 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/simple/UserRepositoryIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/simple/UserRepositoryIntegrationTests.java @@ -113,7 +113,7 @@ public class UserRepositoryIntegrationTests { public void findsUserById() throws Exception { - Optional user = repository.findOne(tom.getUsername()); + Optional user = repository.findById(tom.getUsername()); assertThat(user).isNotNull().contains(tom); } @@ -128,7 +128,7 @@ public class UserRepositoryIntegrationTests { public void findsAllWithGivenIds() { - Iterable result = repository.findAll(Arrays.asList(bob.getUsername(), tom.getUsername())); + Iterable result = repository.findAllById(Arrays.asList(bob.getUsername(), tom.getUsername())); assertThat(result).contains(bob, tom); assertThat(result).doesNotContain(alice, scott); @@ -146,7 +146,7 @@ public class UserRepositoryIntegrationTests { public void deletesUserByIdCorrectly() { - repository.delete(tom.getUsername()); + repository.deleteById(tom.getUsername()); List result = Lists.newArrayList(repository.findAll()); @@ -158,11 +158,11 @@ public class UserRepositoryIntegrationTests { String id = "tom"; - assertThat(repository.exists(id)).isTrue(); + assertThat(repository.existsById(id)).isTrue(); - repository.delete(id); + repository.deleteById(id); - assertThat(repository.exists(id)).isFalse(); + assertThat(repository.existsById(id)).isFalse(); } // DATACASS-182 @@ -173,7 +173,7 @@ public class UserRepositoryIntegrationTests { repository.save(tom); - Optional loadedTom = repository.findOne(tom.getUsername()); + Optional loadedTom = repository.findById(tom.getUsername()); assertThat(loadedTom).hasValueSatisfying(actual -> { diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/simple/UserRepositoryJavaConfigCustomRepositoryBaseClassIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/simple/UserRepositoryJavaConfigCustomRepositoryBaseClassIntegrationTests.java index be7c9418a..3c10fd606 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/simple/UserRepositoryJavaConfigCustomRepositoryBaseClassIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/simple/UserRepositoryJavaConfigCustomRepositoryBaseClassIntegrationTests.java @@ -17,8 +17,6 @@ package org.springframework.data.cassandra.test.integration.repository.simple; import static org.assertj.core.api.Assertions.*; -import java.io.Serializable; - import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.aop.framework.Advised; @@ -57,7 +55,7 @@ public class UserRepositoryJavaConfigCustomRepositoryBaseClassIntegrationTests assertThat(((Advised) repository).getTargetSource().getTarget()).isInstanceOf(CustomCassandraRepository.class); } - public static class CustomCassandraRepository extends SimpleCassandraRepository { + public static class CustomCassandraRepository extends SimpleCassandraRepository { public CustomCassandraRepository(CassandraEntityInformation metadata, CassandraOperations operations) { super(metadata, operations);