Skip to content

Commit d9740d0

Browse files
mp911demp911de
committed
Post-rebase.
1 parent 73fffec commit d9740d0

File tree

6 files changed

+36
-77
lines changed

6 files changed

+36
-77
lines changed

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/ReactiveResultSet.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ public interface ReactiveResultSet {
5252
* The {@link Flux} will stream over all records that in this {@link ReactiveResultSet} according to the reactive
5353
* demand and fetch next result chunks by issuing the underlying query with the current {@link java.nio.ByteBuffer
5454
* paging state} applied.
55-
* <p>
5655
*
5756
* @return a {@link Flux} of rows that will stream over all {@link Row rows} of the entire result.
5857
*/

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/ReactiveSession.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ public interface ReactiveSession extends Closeable {
6666
* <p>
6767
* If a metadata refresh triggers events (such as node added/removed, or schema events), then the new version of the
6868
* metadata is guaranteed to be visible by the time you receive these events.
69-
* <p>
7069
*
7170
* @return never {@code null}, but may be empty if metadata has been disabled in the configuration.
7271
* @since 3.2.2

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/MappingCassandraConverter.java

Lines changed: 19 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,8 @@
3737
import org.springframework.core.convert.ConversionService;
3838
import org.springframework.core.convert.support.DefaultConversionService;
3939
import org.springframework.dao.InvalidDataAccessApiUsageException;
40-
import org.springframework.data.cassandra.core.mapping.BasicCassandraPersistentEntity;
41-
import org.springframework.data.cassandra.core.mapping.BasicMapId;
42-
import org.springframework.data.cassandra.core.mapping.CassandraMappingContext;
43-
import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity;
44-
import org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty;
45-
import org.springframework.data.cassandra.core.mapping.Column;
46-
import org.springframework.data.cassandra.core.mapping.Element;
47-
import org.springframework.data.cassandra.core.mapping.Embedded;
40+
import org.springframework.data.cassandra.core.mapping.*;
4841
import org.springframework.data.cassandra.core.mapping.Embedded.OnEmpty;
49-
import org.springframework.data.cassandra.core.mapping.EmbeddedEntityOperations;
50-
import org.springframework.data.cassandra.core.mapping.MapId;
51-
import org.springframework.data.cassandra.core.mapping.MapIdentifiable;
52-
import org.springframework.data.cassandra.core.mapping.UserTypeResolver;
5342
import org.springframework.data.convert.CustomConversions;
5443
import org.springframework.data.mapping.AccessOptions;
5544
import org.springframework.data.mapping.MappingException;
@@ -143,22 +132,22 @@ public MappingCassandraConverter(CassandraMappingContext mappingContext) {
143132
this.mappingContext = mappingContext;
144133
this.setCodecRegistry(mappingContext.getCodecRegistry());
145134
this.setCustomConversions(mappingContext.getCustomConversions());
146-
this.cassandraTypeResolver = new DefaultColumnTypeResolver(mappingContext, userTypeResolver,
147-
this::getCodecRegistry, this::getCustomConversions);
135+
this.cassandraTypeResolver = new DefaultColumnTypeResolver(mappingContext, userTypeResolver, this::getCodecRegistry,
136+
this::getCustomConversions);
148137
this.embeddedEntityOperations = new EmbeddedEntityOperations(mappingContext);
149138
this.spELContext = new SpELContext(RowReaderPropertyAccessor.INSTANCE);
150139
}
151140

152141
/**
153-
* Constructs a new instance of {@link ConversionContext} with various converters to convert different Cassandra
154-
* value types.
142+
* Constructs a new instance of {@link ConversionContext} with various converters to convert different Cassandra value
143+
* types.
155144
*
156145
* @return the {@link ConversionContext}.
157146
* @see ConversionContext
158147
*/
159148
protected ConversionContext getConversionContext() {
160149

161-
return new ConversionContext(this::doReadRow, this::doReadTupleValue, this::doReadUdtValue,
150+
return new ConversionContext(getCustomConversions(), this::doReadRow, this::doReadTupleValue, this::doReadUdtValue,
162151
this::readCollectionOrArray, this::readMap, this::getPotentiallyConvertedSimpleRead);
163152
}
164153

@@ -184,7 +173,6 @@ private static CassandraMappingContext newDefaultMappingContext(CassandraCustomC
184173
return mappingContext;
185174
}
186175

187-
188176
/* (non-Javadoc)
189177
* @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
190178
*/
@@ -501,8 +489,8 @@ protected <S> S doReadEntity(ConversionContext context, CassandraValueProvider v
501489
return (S) getConversionService().convert(valueProvider.getSource(), rawType);
502490
}
503491

504-
CassandraPersistentEntity<S> entity =
505-
(CassandraPersistentEntity<S>) getMappingContext().getPersistentEntity(typeHint);
492+
CassandraPersistentEntity<S> entity = (CassandraPersistentEntity<S>) getMappingContext()
493+
.getPersistentEntity(typeHint);
506494

507495
if (entity == null) {
508496
throw new MappingException(
@@ -527,8 +515,8 @@ private static Class<?> getRawSourceType(CassandraValueProvider valueProvider) {
527515
return UdtValue.class;
528516
}
529517

530-
throw new InvalidDataAccessApiUsageException(String.format("Unsupported source type: %s",
531-
ClassUtils.getDescriptiveType(valueProvider.getSource())));
518+
throw new InvalidDataAccessApiUsageException(
519+
String.format("Unsupported source type: %s", ClassUtils.getDescriptiveType(valueProvider.getSource())));
532520
}
533521

534522
private <S> S doReadEntity(ConversionContext context, CassandraValueProvider valueProvider,
@@ -539,8 +527,8 @@ private <S> S doReadEntity(ConversionContext context, CassandraValueProvider val
539527

540528
if (persistenceConstructor != null && persistenceConstructor.hasParameters()) {
541529
SpELExpressionEvaluator evaluator = new DefaultSpELExpressionEvaluator(valueProvider.getSource(), spELContext);
542-
ParameterValueProvider<CassandraPersistentProperty> parameterValueProvider =
543-
newParameterValueProvider(context, entity, valueProvider);
530+
ParameterValueProvider<CassandraPersistentProperty> parameterValueProvider = newParameterValueProvider(context,
531+
entity, valueProvider);
544532
provider = new ConverterAwareSpELExpressionParameterValueProvider(evaluator, getConversionService(),
545533
parameterValueProvider, context);
546534
} else {
@@ -927,20 +915,17 @@ private Object getWriteValue(@Nullable Object value, ColumnType columnType) {
927915

928916
if (getCustomConversions().hasCustomWriteTarget(value.getClass(), requestedTargetType)) {
929917

930-
Class<?> resolvedTargetType = getCustomConversions()
931-
.getCustomWriteTarget(value.getClass(), requestedTargetType)
918+
Class<?> resolvedTargetType = getCustomConversions().getCustomWriteTarget(value.getClass(), requestedTargetType)
932919
.orElse(requestedTargetType);
933920

934921
return getConversionService().convert(value, resolvedTargetType);
935922
}
936923

937924
if (getCustomConversions().hasCustomWriteTarget(value.getClass())) {
938925

939-
Class<?> resolvedTargetType = getCustomConversions()
940-
.getCustomWriteTarget(value.getClass())
941-
.orElseThrow(() -> new IllegalStateException(
942-
String.format("Unable to determined custom write target for value type [%s]",
943-
value.getClass().getName())));
926+
Class<?> resolvedTargetType = getCustomConversions().getCustomWriteTarget(value.getClass())
927+
.orElseThrow(() -> new IllegalStateException(String
928+
.format("Unable to determined custom write target for value type [%s]", value.getClass().getName())));
944929

945930
return getConversionService().convert(value, resolvedTargetType);
946931
}
@@ -1318,10 +1303,9 @@ protected static class ConversionContext {
13181303
final ValueConverter<Object> elementConverter;
13191304

13201305
public ConversionContext(org.springframework.data.convert.CustomConversions conversions,
1321-
ContainerValueConverter<Row> rowConverter,
1322-
ContainerValueConverter<TupleValue> tupleConverter, ContainerValueConverter<UdtValue> udtConverter,
1323-
ContainerValueConverter<Collection<?>> collectionConverter, ContainerValueConverter<Map<?, ?>> mapConverter,
1324-
ValueConverter<Object> elementConverter) {
1306+
ContainerValueConverter<Row> rowConverter, ContainerValueConverter<TupleValue> tupleConverter,
1307+
ContainerValueConverter<UdtValue> udtConverter, ContainerValueConverter<Collection<?>> collectionConverter,
1308+
ContainerValueConverter<Map<?, ?>> mapConverter, ValueConverter<Object> elementConverter) {
13251309
this.conversions = conversions;
13261310
this.rowConverter = rowConverter;
13271311
this.tupleConverter = tupleConverter;

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/DefaultBridgedReactiveSession.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
* <p>
6262
* All CQL operations performed by this class are logged at debug level, using
6363
* {@code org.springframework.data.cassandra.core.cql.DefaultBridgedReactiveSession} as log category.
64-
* <p>
6564
*
6665
* @author Mark Paluch
6766
* @author Mateusz Stefek

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraMappingContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ protected CassandraPersistentProperty createPersistentProperty(Property property
414414
* Returns whether this mapping context has any entities mapped to the given table.
415415
*
416416
* @param name must not be {@literal null}.
417-
* @return @return {@literal true} is this {@literal TableMetadata} is used by a mapping.
417+
* @return {@literal true} is this {@literal TableMetadata} is used by a mapping.
418418
*/
419419
public boolean usesTable(CqlIdentifier name) {
420420

‎spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/MappingCassandraConverterUnitTests.java

Lines changed: 16 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,16 @@
1515
*/
1616
package org.springframework.data.cassandra.core.convert;
1717

18-
import static org.assertj.core.api.Assertions.assertThat;
19-
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
20-
import static org.springframework.data.cassandra.core.mapping.BasicMapId.id;
21-
import static org.springframework.data.cassandra.test.util.RowMockUtil.column;
18+
import static org.assertj.core.api.Assertions.*;
19+
import static org.springframework.data.cassandra.core.mapping.BasicMapId.*;
20+
import static org.springframework.data.cassandra.test.util.RowMockUtil.*;
21+
22+
import lombok.AllArgsConstructor;
23+
import lombok.Data;
24+
import lombok.EqualsAndHashCode;
25+
import lombok.NoArgsConstructor;
26+
import lombok.RequiredArgsConstructor;
27+
import lombok.ToString;
2228

2329
import java.io.Serializable;
2430
import java.math.BigDecimal;
@@ -30,18 +36,7 @@
3036
import java.time.LocalDateTime;
3137
import java.time.ZoneId;
3238
import java.time.ZoneOffset;
33-
import java.util.ArrayList;
34-
import java.util.Arrays;
35-
import java.util.Collection;
36-
import java.util.Collections;
37-
import java.util.Date;
38-
import java.util.HashSet;
39-
import java.util.LinkedHashMap;
40-
import java.util.LinkedHashSet;
41-
import java.util.List;
42-
import java.util.Map;
43-
import java.util.Set;
44-
import java.util.UUID;
39+
import java.util.*;
4540

4641
import org.json.simple.JSONObject;
4742
import org.json.simple.parser.JSONParser;
@@ -55,18 +50,8 @@
5550
import org.springframework.data.annotation.ReadOnlyProperty;
5651
import org.springframework.data.annotation.Transient;
5752
import org.springframework.data.cassandra.core.cql.PrimaryKeyType;
58-
import org.springframework.data.cassandra.core.mapping.BasicMapId;
59-
import org.springframework.data.cassandra.core.mapping.CassandraMappingContext;
60-
import org.springframework.data.cassandra.core.mapping.CassandraType;
53+
import org.springframework.data.cassandra.core.mapping.*;
6154
import org.springframework.data.cassandra.core.mapping.Column;
62-
import org.springframework.data.cassandra.core.mapping.Element;
63-
import org.springframework.data.cassandra.core.mapping.Embedded;
64-
import org.springframework.data.cassandra.core.mapping.MapId;
65-
import org.springframework.data.cassandra.core.mapping.PrimaryKey;
66-
import org.springframework.data.cassandra.core.mapping.PrimaryKeyClass;
67-
import org.springframework.data.cassandra.core.mapping.PrimaryKeyColumn;
68-
import org.springframework.data.cassandra.core.mapping.Table;
69-
import org.springframework.data.cassandra.core.mapping.Tuple;
7055
import org.springframework.data.cassandra.domain.AllPossibleTypes;
7156
import org.springframework.data.cassandra.domain.CompositeKey;
7257
import org.springframework.data.cassandra.domain.TypeWithCompositeKey;
@@ -85,13 +70,6 @@
8570
import com.datastax.oss.driver.internal.core.data.DefaultTupleValue;
8671
import com.datastax.oss.driver.internal.core.type.DefaultTupleType;
8772

88-
89-
import lombok.AllArgsConstructor;
90-
import lombok.EqualsAndHashCode;
91-
import lombok.NoArgsConstructor;
92-
import lombok.RequiredArgsConstructor;
93-
import lombok.ToString;
94-
9573
/**
9674
* Unit tests for {@link MappingCassandraConverter}.
9775
*
@@ -1194,9 +1172,8 @@ private static class TypeWithConvertedCollections {
11941172
@CassandraType(type = CassandraType.Name.SET,
11951173
typeArguments = CassandraType.Name.INT) private Set<Condition> conditionSet;
11961174

1197-
@CassandraType(type = CassandraType.Name.MAP,
1198-
typeArguments = { CassandraType.Name.INT,
1199-
CassandraType.Name.INT }) private Map<Condition, Condition> conditionMap;
1175+
@CassandraType(type = CassandraType.Name.MAP, typeArguments = { CassandraType.Name.INT,
1176+
CassandraType.Name.INT }) private Map<Condition, Condition> conditionMap;
12001177

12011178
}
12021179

@@ -1367,7 +1344,8 @@ void readPrefixedEmbeddedType() {
13671344
Row source = RowMockUtil.newRowMock(column("id", "id-1", DataTypes.TEXT), column("prefixage", 30, DataTypes.INT),
13681345
column("prefixfirstname", "fn", DataTypes.TEXT));
13691346

1370-
WithPrefixedNullableEmbeddedType target = mappingCassandraConverter.read(WithPrefixedNullableEmbeddedType.class, source);
1347+
WithPrefixedNullableEmbeddedType target = mappingCassandraConverter.read(WithPrefixedNullableEmbeddedType.class,
1348+
source);
13711349
assertThat(target.nested).isEqualTo(new EmbeddedWithSimpleTypes("fn", 30, null));
13721350
}
13731351

0 commit comments

Comments
 (0)