Polishing.

Use shorter field names. See #1449
spring-projects · Nov 13, 2023 · ee7def1 · ee7def1
1 parent 75cb544
commit ee7def1
Show file tree

Hide file tree

Showing 3 changed files with 101 additions and 100 deletions.
diff --git a/...gframework/data/cassandra/core/convert/MappingCassandraConverterMappedTupleUnitTests.java b/...gframework/data/cassandra/core/convert/MappingCassandraConverterMappedTupleUnitTests.java
@@ -50,31 +50,31 @@ class MappingCassandraConverterMappedTupleUnitTests {
 
 	private CassandraMappingContext mappingContext;
 
-	private MappingCassandraConverter mappingCassandraConverter;
+	private MappingCassandraConverter converter;
 
 	private Row rowMock;
 
 	@BeforeEach
 	void setUp() {
 
 		this.mappingContext = new CassandraMappingContext();
-		this.mappingCassandraConverter = new MappingCassandraConverter(mappingContext);
-		this.mappingCassandraConverter.afterPropertiesSet();
+		this.converter = new MappingCassandraConverter(mappingContext);
+		this.converter.afterPropertiesSet();
 	}
 
 	@Test // DATACASS-523
 	void shouldReadMappedTupleValue() {
 
 		BasicCassandraPersistentEntity<?> entity = this.mappingContext.getRequiredPersistentEntity(MappedTuple.class);
 
-		CassandraColumnType type = mappingCassandraConverter.getColumnTypeResolver().resolve(entity.getTypeInformation());
+		CassandraColumnType type = converter.getColumnTypeResolver().resolve(entity.getTypeInformation());
 
 		TupleValue value = ((TupleType) type.getDataType()).newValue("hello", 1);
 
 		this.rowMock = RowMockUtil.newRowMock(column("name", "Jon Doe", DataTypes.TEXT),
 				column("tuple", value, type.getDataType()));
 
-		Person person = this.mappingCassandraConverter.read(Person.class, rowMock);
+		Person person = this.converter.read(Person.class, rowMock);
 
 		assertThat(person).isNotNull();
 		assertThat(person.name()).isEqualTo("Jon Doe");
@@ -93,7 +93,7 @@ void shouldWriteMappedTuple() {
 
 		Map<CqlIdentifier, Object> insert = new LinkedHashMap<>();
 
-		this.mappingCassandraConverter.write(person, insert);
+		this.converter.write(person, insert);
 
 		TupleValue tupleValue = (TupleValue) insert.get(CqlIdentifier.fromCql("tuple"));
 		assertThat(tupleValue.getFormattedContents()).contains("('hello',1)");

diff --git a/...rg/springframework/data/cassandra/core/convert/MappingCassandraConverterUDTUnitTests.java b/...rg/springframework/data/cassandra/core/convert/MappingCassandraConverterUDTUnitTests.java
@@ -61,7 +61,7 @@
 @MockitoSettings(strictness = Strictness.LENIENT)
 class MappingCassandraConverterUDTUnitTests {
 
-	@Mock UserTypeResolver userTypeResolver;
+	@Mock UserTypeResolver typeResolver;
 
 	private com.datastax.oss.driver.api.core.type.UserDefinedType manufacturer = UserDefinedTypeBuilder
 			.forName("manufacturer").withField("name", DataTypes.TEXT).withField("displayname", DataTypes.TEXT).build();
@@ -93,23 +93,23 @@ class MappingCassandraConverterUDTUnitTests {
 	void setUp() {
 
 		mappingContext = new CassandraMappingContext();
-		mappingContext.setUserTypeResolver(userTypeResolver);
+		mappingContext.setUserTypeResolver(typeResolver);
 
 		CassandraCustomConversions cassandraCustomConversions = new CassandraCustomConversions(
-				Arrays.asList(new UDTToCurrencyConverter(), new CurrencyToUDTConverter(userTypeResolver)));
+				Arrays.asList(new UDTToCurrencyConverter(), new CurrencyToUDTConverter(typeResolver)));
 		mappingContext.setSimpleTypeHolder(cassandraCustomConversions.getSimpleTypeHolder());
 
 		converter = new MappingCassandraConverter(mappingContext);
 		converter.setCustomConversions(cassandraCustomConversions);
 		converter.afterPropertiesSet();
 
-		when(userTypeResolver.resolveType(CqlIdentifier.fromCql("address"))).thenReturn(address);
-		when(userTypeResolver.resolveType(CqlIdentifier.fromCql("engine"))).thenReturn(engine);
-		when(userTypeResolver.resolveType(CqlIdentifier.fromCql("manufacturer"))).thenReturn(manufacturer);
-		when(userTypeResolver.resolveType(CqlIdentifier.fromCql("currency"))).thenReturn(currency);
-		when(userTypeResolver.resolveType(CqlIdentifier.fromCql("withnullableembeddedtype")))
+		when(typeResolver.resolveType(CqlIdentifier.fromCql("address"))).thenReturn(address);
+		when(typeResolver.resolveType(CqlIdentifier.fromCql("engine"))).thenReturn(engine);
+		when(typeResolver.resolveType(CqlIdentifier.fromCql("manufacturer"))).thenReturn(manufacturer);
+		when(typeResolver.resolveType(CqlIdentifier.fromCql("currency"))).thenReturn(currency);
+		when(typeResolver.resolveType(CqlIdentifier.fromCql("withnullableembeddedtype")))
 				.thenReturn(withnullableembeddedtype);
-		when(userTypeResolver.resolveType(CqlIdentifier.fromCql("withprefixednullableembeddedtype")))
+		when(typeResolver.resolveType(CqlIdentifier.fromCql("withprefixednullableembeddedtype")))
 				.thenReturn(withprefixednullableembeddedtype);
 	}
 
@@ -476,7 +476,7 @@ void shouldWriteNestedUdt() {
 	@Test // #1098
 	void shouldWriteMapWithTypeHintToUdtValue() {
 
-		when(userTypeResolver.resolveType(CqlIdentifier.fromCql("udt"))).thenReturn(manufacturer);
+		when(typeResolver.resolveType(CqlIdentifier.fromCql("udt"))).thenReturn(manufacturer);
 
 		MapWithUdt mapWithUdt = new MapWithUdt();
 		mapWithUdt.map = Collections.singletonMap("key", new Manufacturer("name", "display"));