Skip to content

Fixing issues for API review. (#40489) #40495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Trevor Anderson (trande4884) merged 1 commit into from
Jun 5, 2024
Merged

Fixing issues for API review. (#40489) #40495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ...re-spring-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/CosmosTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ public <T> T insert(String containerName, T objectToSave, PartitionKey partition
JsonNode originalItem;
if (!transientFields.isEmpty()) {
originalItem = mappingCosmosConverter.writeJsonNode(objectToSave, transientFields);
transientFieldValuesMap = mappingCosmosConverter.getTransientFieldsAndValuesMap(objectToSave, transientFields);
transientFieldValuesMap = mappingCosmosConverter.getTransientFieldsMap(objectToSave, transientFields);
} else {
originalItem = mappingCosmosConverter.writeJsonNode(objectToSave);
}
Expand All @@ -253,7 +253,7 @@ public <T> T insert(String containerName, T objectToSave, PartitionKey partition
.block();

assert response != null;
return toDomainObject(domainType, mappingCosmosConverter.repopulateAnyTransientFieldsFromMap(response.getItem(), transientFieldValuesMap));
return toDomainObject(domainType, mappingCosmosConverter.repopulateTransientFields(response.getItem(), transientFieldValuesMap));
}

/**
Expand All @@ -279,7 +279,7 @@ public <S extends T, T> Iterable<S> insertAll(CosmosEntityInformation<T, ?> info
JsonNode originalItem;
if (!transientFields.isEmpty()) {
originalItem = mappingCosmosConverter.writeJsonNode(entity, transientFields);
Map<Field, Object> transientFieldValuesMap = mappingCosmosConverter.getTransientFieldsAndValuesMap(entity, transientFields);
Map<Field, Object> transientFieldValuesMap = mappingCosmosConverter.getTransientFieldsMap(entity, transientFields);
mapOfTransientFieldValuesMaps.put(originalItem.get("id").asText(), transientFieldValuesMap);
} else {
originalItem = mappingCosmosConverter.writeJsonNode(entity);
Expand Down Expand Up @@ -311,7 +311,7 @@ public <S extends T, T> Iterable<S> insertAll(CosmosEntityInformation<T, ?> info
if (responseItem != null) {
if (!mapOfTransientFieldValuesMaps.isEmpty()) {
Map<Field, Object> transientFieldValuesMap = mapOfTransientFieldValuesMaps.get(responseItem.get("id").asText());
return Flux.just(toDomainObject(domainType, mappingCosmosConverter.repopulateAnyTransientFieldsFromMap(responseItem, transientFieldValuesMap)));
return Flux.just(toDomainObject(domainType, mappingCosmosConverter.repopulateTransientFields(responseItem, transientFieldValuesMap)));
} else {
return Flux.just(toDomainObject(domainType, responseItem));
}
Expand Down Expand Up @@ -515,7 +515,7 @@ public <T> T upsertAndReturnEntity(String containerName, T object) {
JsonNode originalItem;
if (!transientFields.isEmpty()) {
originalItem = mappingCosmosConverter.writeJsonNode(object, transientFields);
transientFieldValuesMap = mappingCosmosConverter.getTransientFieldsAndValuesMap(object, transientFields);
transientFieldValuesMap = mappingCosmosConverter.getTransientFieldsMap(object, transientFields);
} else {
originalItem = mappingCosmosConverter.writeJsonNode(object);
}
Expand All @@ -542,7 +542,7 @@ public <T> T upsertAndReturnEntity(String containerName, T object) {
.block();

assert cosmosItemResponse != null;
return toDomainObject(domainType, mappingCosmosConverter.repopulateAnyTransientFieldsFromMap(cosmosItemResponse.getItem(), transientFieldValuesMap));
return toDomainObject(domainType, mappingCosmosConverter.repopulateTransientFields(cosmosItemResponse.getItem(), transientFieldValuesMap));
}

/**
Expand Down
12 changes: 6 additions & 6 deletions ...g-data-cosmos/src/main/java/com/azure/spring/data/cosmos/core/ReactiveCosmosTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ public <T> Mono<T> insert(String containerName, T objectToSave,
JsonNode originalItem;
if (!transientFields.isEmpty()) {
originalItem = mappingCosmosConverter.writeJsonNode(objectToSave, transientFields);
transientFieldValuesMap = mappingCosmosConverter.getTransientFieldsAndValuesMap(objectToSave, transientFields);
transientFieldValuesMap = mappingCosmosConverter.getTransientFieldsMap(objectToSave, transientFields);
} else {
originalItem = mappingCosmosConverter.writeJsonNode(objectToSave);
}
Expand All @@ -468,7 +468,7 @@ public <T> Mono<T> insert(String containerName, T objectToSave,
.flatMap(cosmosItemResponse -> {
CosmosUtils.fillAndProcessResponseDiagnostics(this.responseDiagnosticsProcessor,
cosmosItemResponse.getDiagnostics(), null);
return Mono.just(toDomainObject(domainType, mappingCosmosConverter.repopulateAnyTransientFieldsFromMap(cosmosItemResponse.getItem(), finalTransientFieldValuesMap)));
return Mono.just(toDomainObject(domainType, mappingCosmosConverter.repopulateTransientFields(cosmosItemResponse.getItem(), finalTransientFieldValuesMap)));
});
}

Expand Down Expand Up @@ -519,7 +519,7 @@ public <S extends T, T> Flux<S> insertAll(CosmosEntityInformation<T, ?> entityIn
JsonNode originalItem;
if (!transientFields.isEmpty()) {
originalItem = mappingCosmosConverter.writeJsonNode(entity, transientFields);
Map<Field, Object> transientFieldValuesMap = mappingCosmosConverter.getTransientFieldsAndValuesMap(entity, transientFields);
Map<Field, Object> transientFieldValuesMap = mappingCosmosConverter.getTransientFieldsMap(entity, transientFields);
mapOfTransientFieldValuesMaps.put(originalItem.get("id").asText(), transientFieldValuesMap);

} else {
Expand Down Expand Up @@ -552,7 +552,7 @@ public <S extends T, T> Flux<S> insertAll(CosmosEntityInformation<T, ?> entityIn
if (responseItem != null) {
if (mapOfTransientFieldValuesMaps.containsKey(responseItem.get("id").asText())) {
Map<Field, Object> transientFieldValuesMap = mapOfTransientFieldValuesMaps.get(responseItem.get("id").asText());
return Flux.just(toDomainObject(domainType, mappingCosmosConverter.repopulateAnyTransientFieldsFromMap(responseItem, transientFieldValuesMap)));
return Flux.just(toDomainObject(domainType, mappingCosmosConverter.repopulateTransientFields(responseItem, transientFieldValuesMap)));
} else {
return Flux.just(toDomainObject(domainType, responseItem));
}
Expand Down Expand Up @@ -655,7 +655,7 @@ public <T> Mono<T> upsert(String containerName, T object) {
JsonNode originalItem;
if (!transientFields.isEmpty()) {
originalItem = mappingCosmosConverter.writeJsonNode(object, transientFields);
transientFieldValuesMap = mappingCosmosConverter.getTransientFieldsAndValuesMap(object, transientFields);
transientFieldValuesMap = mappingCosmosConverter.getTransientFieldsMap(object, transientFields);
} else {
originalItem = mappingCosmosConverter.writeJsonNode(object);
}
Expand All @@ -669,7 +669,7 @@ public <T> Mono<T> upsert(String containerName, T object) {
.flatMap(cosmosItemResponse -> {
CosmosUtils.fillAndProcessResponseDiagnostics(this.responseDiagnosticsProcessor,
cosmosItemResponse.getDiagnostics(), null);
return Mono.just(toDomainObject(domainType, mappingCosmosConverter.repopulateAnyTransientFieldsFromMap(cosmosItemResponse.getItem(), finalTransientFieldValuesMap)));
return Mono.just(toDomainObject(domainType, mappingCosmosConverter.repopulateTransientFields(cosmosItemResponse.getItem(), finalTransientFieldValuesMap)));
})
.onErrorResume(throwable ->
CosmosExceptionUtils.exceptionHandler("Failed to upsert item", throwable,
Expand Down
5 changes: 2 additions & 3 deletions ...osmos/src/main/java/com/azure/spring/data/cosmos/core/convert/MappingCosmosConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ public <T> JsonNode writeJsonNode(Object sourceEntity, List<String> transientFie
* @throws MappingException no mapping metadata for entity type
* @throws CosmosAccessException fail to map document value
*/
public <T> JsonNode repopulateAnyTransientFieldsFromMap(JsonNode responseItem, Map<Field, Object> transientValues) {
public <T> JsonNode repopulateTransientFields(JsonNode responseItem, Map<Field, Object> transientValues) {
ObjectNode updatedItem = (ObjectNode) responseItem;
transientValues.forEach((field, value) -> {
if (value != null) {
Expand All @@ -203,7 +203,7 @@ public <T> JsonNode repopulateAnyTransientFieldsFromMap(JsonNode responseItem, M
* @throws MappingException no such field found
* @return HashMap
*/
public <T> Map<Field, Object> getTransientFieldsAndValuesMap(T object, List<String> transientFields) {
public <T> Map<Field, Object> getTransientFieldsMap(T object, List<String> transientFields) {
Map<Field, Object> transientValuesMap = new HashMap<>();
transientFields.forEach(fieldName -> {
try {
Expand All @@ -226,7 +226,6 @@ public <T> Map<Field, Object> getTransientFieldsAndValuesMap(T object, List<Stri
* @param entityInfo entity information
* @return List
*/

public <T> List<String> getTransientFields(T objectToSave, CosmosEntityInformation<T, ?> entityInfo) {
@SuppressWarnings("unchecked")
Class<T> domainType = (Class<T>) objectToSave.getClass();
Expand Down