Skip to content

Commit f2c5fc3

Browse files
committed
Use toString in StringValues
1 parent cfa0ca1 commit f2c5fc3

File tree

10 files changed

+19
-16
lines changed

10 files changed

+19
-16
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
## [Unreleased]
44

5+
## [0.14.0] - 2024-06-26
6+
57
### Bugfixes
68

79
- Significantly reduce memory allocation overhead and excessive GC pressure ([#401](https://github.com/tarantool/cartridge-java/issues/401))
@@ -19,6 +21,7 @@
1921
- Add support for crud `balance` option ([#462](https://github.com/tarantool/cartridge-java/pull/472))
2022
- Add support for crud `vshard_router` option ([#463](https://github.com/tarantool/cartridge-java/pull/473))
2123
- Add support for crud `fetch_latest_metadata` option ([#465](https://github.com/tarantool/cartridge-java/pull/474))
24+
- Use toString in StringValues to map incorrect UTF-8 string
2225

2326
### Features
2427

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ If you use this code in another project don't forget to add a `cartridge-driver`
4242
<dependency>
4343
<groupId>io.tarantool</groupId>
4444
<artifactId>cartridge-driver</artifactId>
45-
<version>0.13.0</version>
45+
<version>0.14.0</version>
4646
</dependency>
4747
```
4848
## Advanced usage

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
<plugin>
172172
<groupId>org.sonatype.plugins</groupId>
173173
<artifactId>nexus-staging-maven-plugin</artifactId>
174-
<version>1.6.8</version>
174+
<version>1.6.14</version>
175175
<extensions>true</extensions>
176176
<configuration>
177177
<serverId>ossrh</serverId>

src/main/java/io/tarantool/driver/api/space/options/crud/OperationWithYieldEveryOptions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public interface OperationWithYieldEveryOptions<T extends OperationWithYieldEver
1313
* Sets number of tuples processed on storage to yield after, "yield_every" should be > 0.
1414
* @param yieldEvery number of tuples processed on storage to yield after, "yield_every" should be > 0.
1515
* @return this option instance.
16-
* @throws IllegalArgumentException if yieldEvery < 0.
16+
* @throws IllegalArgumentException {@code if yieldEvery < 0}.
1717
*/
1818
default T withYieldEvery(int yieldEvery) throws IllegalArgumentException {
1919
if (yieldEvery <= 0) {

src/main/java/io/tarantool/driver/core/metadata/ArrayValueToSpaceFormatConverter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ public Map<String, TarantoolFieldMetadata> fromValue(ArrayValue format) {
4343
spaceFormatMetadata.put(
4444
fieldMap.get(FORMAT_FIELD_NAME).toString(),
4545
new TarantoolFieldMetadataImpl(
46-
fieldMap.get(FORMAT_FIELD_NAME).asStringValue().asString(),
47-
fieldMap.get(FORMAT_FIELD_TYPE).asStringValue().asString(),
46+
fieldMap.get(FORMAT_FIELD_NAME).asStringValue().toString(),
47+
fieldMap.get(FORMAT_FIELD_TYPE).asStringValue().toString(),
4848
fieldPosition,
4949
isNullable.isPresent() && isNullable.get().asBooleanValue().getBoolean()
5050
)

src/main/java/io/tarantool/driver/core/metadata/DDLTarantoolSpaceMetadataConverter.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public TarantoolMetadataContainer fromValue(Value value) {
9494

9595
TarantoolSpaceMetadataImpl spaceMetadata = new TarantoolSpaceMetadataImpl();
9696
spaceMetadata.setOwnerId(ID_UNKNOWN);
97-
spaceMetadata.setSpaceName(nameValue.asStringValue().asString());
97+
spaceMetadata.setSpaceName(nameValue.asStringValue().toString());
9898

9999
Value formatValue = space.get(SPACE_FORMAT_KEY);
100100
if (formatValue == null) {
@@ -140,14 +140,14 @@ private Map<String, TarantoolIndexMetadata> parseIndexes(
140140
throw new TarantoolClientException(
141141
"Unsupported index metadata format: key '" + INDEX_NAME_KEY + "' must have string value");
142142
}
143-
String indexName = indexNameValue.asStringValue().asString();
143+
String indexName = indexNameValue.asStringValue().toString();
144144

145145
Value indexTypeValue = indexMap.get(INDEX_TYPE_KEY);
146146
if (indexTypeValue == null || !indexTypeValue.isStringValue()) {
147147
throw new TarantoolClientException(
148148
"Unsupported index metadata format: key '" + INDEX_TYPE_KEY + "' must have string value");
149149
}
150-
String indexType = indexTypeValue.asStringValue().asString();
150+
String indexType = indexTypeValue.asStringValue().toString();
151151

152152
Value indexUniqueValue = indexMap.get(INDEX_UNIQUE_KEY);
153153
if (indexUniqueValue == null || !indexUniqueValue.isBooleanValue()) {
@@ -196,7 +196,7 @@ private Map<String, TarantoolIndexMetadata> parseIndexes(
196196
int fieldNumber;
197197
Object fieldPath;
198198
if (fieldPathValue.isStringValue()) {
199-
fieldPath = fieldPathValue.asStringValue().asString();
199+
fieldPath = fieldPathValue.asStringValue().toString();
200200
fieldNumber = getFieldNumberFromFieldPath(fields, (String) fieldPath);
201201
} else {
202202
fieldNumber = fieldPathValue.asIntegerValue().asInt();
@@ -208,7 +208,7 @@ private Map<String, TarantoolIndexMetadata> parseIndexes(
208208
throw new TarantoolClientException("Unsupported index metadata format: key '" +
209209
INDEX_PARTS_TYPE_KEY + "' must have string value");
210210
}
211-
String fieldType = fieldTypeValue.asStringValue().asString();
211+
String fieldType = fieldTypeValue.asStringValue().toString();
212212

213213
return new TarantoolIndexPartMetadataImpl<>(fieldNumber, fieldType, fieldPath);
214214
})

src/main/java/io/tarantool/driver/core/metadata/TarantoolIndexMetadataConverter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@ public TarantoolIndexMetadata fromValue(ArrayValue value) {
6161
indexParts = indexPartsValue.list().stream()
6262
.map(partValue -> new TarantoolIndexPartMetadataImpl<>(
6363
partValue.asArrayValue().get(0).asIntegerValue().asInt(),
64-
partValue.asArrayValue().get(1).asStringValue().asString()
64+
partValue.asArrayValue().get(1).asStringValue().toString()
6565
)).collect(Collectors.toList());
6666
} else {
6767
indexParts = indexPartsValue.list().stream()
6868
.map(partValue -> new TarantoolIndexPartMetadataImpl<>(
6969
partValue.asMapValue().map().get(INDEX_FIELD_KEY).asIntegerValue().asInt(),
70-
partValue.asMapValue().map().get(INDEX_TYPE_KEY).asStringValue().asString()
70+
partValue.asMapValue().map().get(INDEX_TYPE_KEY).asStringValue().toString()
7171
)).collect(Collectors.toList());
7272
}
7373
}

src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultStringValueToCharacterConverter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ public class DefaultStringValueToCharacterConverter implements ValueConverter<St
1515

1616
@Override
1717
public Character fromValue(StringValue value) {
18-
String stringFromStringValue = value.asString();
18+
String stringFromStringValue = value.toString();
1919
return stringFromStringValue.charAt(0);
2020
}
2121

2222
@Override
2323
public boolean canConvertValue(StringValue value) {
24-
String stringFromStringValue = value.asString();
24+
String stringFromStringValue = value.toString();
2525
return stringFromStringValue.length() == 1;
2626
}
2727
}

src/main/java/io/tarantool/driver/mappers/converters/value/defaults/DefaultStringValueToStringConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ public class DefaultStringValueToStringConverter implements ValueConverter<Strin
1515

1616
@Override
1717
public String fromValue(StringValue value) {
18-
return value.asString();
18+
return value.toString();
1919
}
2020
}

src/main/java/io/tarantool/driver/package-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
* // the default parameters are set to unlimited, though
4040
* new TarantoolSelectOptions(),
4141
* // convert raw MessagePack array to object by hand
42-
* (v) -> new CustomTuple(v.get(0).asIntegerValue().asInt(), v.get(1).asStringValue().asString()))
42+
* (v) -> new CustomTuple(v.get(0).asIntegerValue().asInt(), v.get(1).asStringValue().toString()))
4343
* .get();
4444
*
4545
* customTuples.forEach(

0 commit comments

Comments
 (0)