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

DATACASS-633 - Silently traverse CassandraPersistentEntity associations.

Browse Source 
BasicCassandraPersistentEntity.doWithAssociations(…) now no longer throws UnsupportedCassandraOperationException when trying to traverse associations. Calling doWithAssociations results in a no-op as there are no associations.

Related ticket: DATAREST-1337.
This commit is contained in:
Mark Paluch
2019-02-26 14:51:03 +01:00
parent 00734b67ea
commit 314bbb1261
2 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntity.java
View File

@@ -143,7 +143,6 @@ public class BasicCassandraPersistentEntity<T> extends BasicPersistentEntity<T,
*/
@Override
public void doWithAssociations(AssociationHandler<CassandraPersistentProperty> handler) {
throw new UnsupportedCassandraOperationException("Cassandra does not support associations");
}
/* (non-Javadoc)

37
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntityUnitTests.java
View File

@@ -15,19 +15,14 @@
*/
package org.springframework.data.cassandra.core.mapping;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.util.Optional;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -38,6 +33,8 @@ import org.springframework.beans.DirectFieldAccessor;
import org.springframework.context.ApplicationContext;
import org.springframework.core.annotation.AliasFor;
import org.springframework.data.cassandra.core.cql.CqlIdentifier;
import org.springframework.data.mapping.Association;
import org.springframework.data.mapping.AssociationHandler;
import org.springframework.data.util.ClassTypeInformation;
/**
@@ -151,6 +148,30 @@ public class BasicCassandraPersistentEntityUnitTests {
assertThat(entity.isCompositePrimaryKey()).isTrue();
}
@Test // DATACASS-633
@SuppressWarnings("unchecked")
public void shouldRejectAssociationCreation() {
BasicCassandraPersistentEntity<PrimaryKeyClassWithComposedAnnotation> entity = new BasicCassandraPersistentEntity<>(
ClassTypeInformation.from(PrimaryKeyClassWithComposedAnnotation.class));
assertThatThrownBy(() -> entity.addAssociation(mock(Association.class)))
.isInstanceOf(UnsupportedCassandraOperationException.class);
}
@Test // DATACASS-633
@SuppressWarnings("unchecked")
public void shouldNoOpOnDoWithAssociations() {
BasicCassandraPersistentEntity<PrimaryKeyClassWithComposedAnnotation> entity = new BasicCassandraPersistentEntity<>(
ClassTypeInformation.from(PrimaryKeyClassWithComposedAnnotation.class));
AssociationHandler<CassandraPersistentProperty> handlerMock = mock(AssociationHandler.class);
entity.doWithAssociations(handlerMock);
verifyZeroInteractions(handlerMock);
}
@Table("messages")
static class Message {}