Skip to content

Commit

Permalink
chore: renamed class and imports from into their dependents
Browse files Browse the repository at this point in the history
Signed-off-by: Maximillian Arruda <dearrudam@gmail.com>
  • Loading branch information
dearrudam committed Mar 12, 2024
1 parent c6bac72 commit 4d4f24c
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 26 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@
import java.util.stream.StreamSupport;

import static java.util.Objects.requireNonNull;
import static org.eclipse.jnosql.databases.dynamodb.communication.DocumentEntityConverter.entityAttributeName;
import static org.eclipse.jnosql.databases.dynamodb.communication.DocumentEntityConverter.toAttributeValue;
import static org.eclipse.jnosql.databases.dynamodb.communication.DocumentEntityConverter.toDocumentEntity;
import static org.eclipse.jnosql.databases.dynamodb.communication.DocumentEntityConverter.toItem;
import static org.eclipse.jnosql.databases.dynamodb.communication.DocumentEntityConverter.toItemUpdate;
import static org.eclipse.jnosql.databases.dynamodb.communication.DynamoDBConverter.entityAttributeName;
import static org.eclipse.jnosql.databases.dynamodb.communication.DynamoDBConverter.toAttributeValue;
import static org.eclipse.jnosql.databases.dynamodb.communication.DynamoDBConverter.toDocumentEntity;
import static org.eclipse.jnosql.databases.dynamodb.communication.DynamoDBConverter.toItem;
import static org.eclipse.jnosql.databases.dynamodb.communication.DynamoDBConverter.toItemUpdate;

public class DefaultDynamoDBDocumentManager implements DynamoDBDocumentManager {

Expand Down Expand Up @@ -144,10 +144,10 @@ private DescribeTableResponse createTable(String tableName) {
try (var waiter = dynamoDbClient().waiter()) {
dynamoDbClient().createTable(CreateTableRequest.builder()
.tableName(tableName)
.keySchema(defaultKeySchemaFor(tableName))
.attributeDefinitions(defaultAttributeDefinitionsFor(tableName))
.provisionedThroughput(defaultProvisionedThroughputFor(tableName))
.streamSpecification(defaultStreamSpecificationFor(tableName))
.keySchema(defaultKeySchemaFor())
.attributeDefinitions(defaultAttributeDefinitionsFor())
.provisionedThroughput(defaultProvisionedThroughputFor())
.streamSpecification(defaultStreamSpecificationFor())
.build());

var tableRequest = DescribeTableRequest.builder().tableName(tableName).build();
Expand All @@ -156,25 +156,25 @@ private DescribeTableResponse createTable(String tableName) {
}
}

private StreamSpecification defaultStreamSpecificationFor(String tableName) {
private StreamSpecification defaultStreamSpecificationFor() {
return null;
}

private ProvisionedThroughput defaultProvisionedThroughputFor(String tableName) {
private ProvisionedThroughput defaultProvisionedThroughputFor() {
return DynamoTableUtils.createProvisionedThroughput(null, null);
}

private Collection<AttributeDefinition> defaultAttributeDefinitionsFor(String tableName) {
private Collection<AttributeDefinition> defaultAttributeDefinitionsFor() {
return List.of(
AttributeDefinition.builder().attributeName(getEntityAttributeName()).attributeType(ScalarAttributeType.S).build(),
AttributeDefinition.builder().attributeName(DocumentEntityConverter.ID).attributeType(ScalarAttributeType.S).build()
AttributeDefinition.builder().attributeName(DynamoDBConverter.ID).attributeType(ScalarAttributeType.S).build()
);
}

private Collection<KeySchemaElement> defaultKeySchemaFor(String tableName) {
private Collection<KeySchemaElement> defaultKeySchemaFor() {
return List.of(
KeySchemaElement.builder().attributeName(getEntityAttributeName()).keyType(KeyType.HASH).build(),
KeySchemaElement.builder().attributeName(DocumentEntityConverter.ID).keyType(KeyType.RANGE).build()
KeySchemaElement.builder().attributeName(DynamoDBConverter.ID).keyType(KeyType.RANGE).build()
);
}

Expand Down Expand Up @@ -320,13 +320,13 @@ public void close() {

@Override
public Stream<DocumentEntity> partiQL(String query) {
return partiQL(query, new Object[0]);
return partiQL(query,new Object[0]);
}

@Override
public Stream<DocumentEntity> partiQL(String query, Object... params) {
Objects.requireNonNull(query, "query is required");
List<AttributeValue> parameters = Stream.of(params).map(DocumentEntityConverter::toAttributeValue).toList();
List<AttributeValue> parameters = Stream.of(params).map(DynamoDBConverter::toAttributeValue).toList();
ExecuteStatementResponse executeStatementResponse = dynamoDbClient()
.executeStatement(ExecuteStatementRequest.builder()
.statement(query)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@
import static java.util.Collections.singletonMap;
import static java.util.stream.Collectors.toList;

class DocumentEntityConverter {
class DynamoDBConverter {

static final String ENTITY = "@entity";
static final String ID = "id";

private DocumentEntityConverter() {
private DynamoDBConverter() {
}

private static Object convertValue(Object value) {
Expand All @@ -61,7 +61,7 @@ private static Object convertValue(Object value) {
case BS:
return attributeValue.bs().stream().map(SdkBytes::asByteArray).toList();
case L:
return attributeValue.l().stream().map(DocumentEntityConverter::convertValue).toList();
return attributeValue.l().stream().map(DynamoDBConverter::convertValue).toList();
case M:
return attributeValue.m().entrySet().stream().map(e -> Document.of(e.getKey(), convertValue(e.getValue()))).toList();
case NUL:
Expand All @@ -88,18 +88,18 @@ public static String entityAttributeName(UnaryOperator<String> nameResolver) {
return Optional.ofNullable(nameResolver.apply(ENTITY)).orElse(ENTITY);
}

@SuppressWarnings({"rawtypes", "unchecked"})
private static Consumer<Document> feedJSON(Map<String, Object> jsonObject) {
return d -> {
Object value = ValueUtil.convert(d.value());
if (value instanceof Document) {
Document subDocument = Document.class.cast(value);
if (value instanceof Document subDocument) {
jsonObject.put(d.name(), singletonMap(subDocument.name(), subDocument.get()));
} else if (isSudDocument(value)) {
Map<String, Object> subDocument = getMap(value);
jsonObject.put(d.name(), subDocument);
} else if (isSudDocumentList(value)) {
jsonObject.put(d.name(), StreamSupport.stream(Iterable.class.cast(value).spliterator(), false)
.map(DocumentEntityConverter::getMap).collect(toList()));
jsonObject.put(d.name(), StreamSupport.stream(((Iterable) value).spliterator(), false)
.map(DynamoDBConverter::getMap).toList());
} else {
jsonObject.put(d.name(), value);
}
Expand Down Expand Up @@ -147,7 +147,7 @@ public static AttributeValue toAttributeValue(Object value) {
return AttributeValue.builder().bool(bool).build();
if (value instanceof List<?> list)
return AttributeValue.builder().l(list.stream().filter(Objects::nonNull)
.map(DocumentEntityConverter::toAttributeValue).toList()).build();
.map(DynamoDBConverter::toAttributeValue).toList()).build();
if (value instanceof Map<?, ?> mapValue) {
HashMap<String, AttributeValue> values = new HashMap<>();
mapValue.forEach((k, v) -> values.put(String.valueOf(k), toAttributeValue(v)));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import java.util.Map;
import java.util.function.Supplier;

import static org.eclipse.jnosql.databases.dynamodb.communication.DocumentEntityConverter.toAttributeValue;
import static org.eclipse.jnosql.databases.dynamodb.communication.DynamoDBConverter.toAttributeValue;

abstract class DynamoDBQueryBuilder implements Supplier<DynamoDBQuery> {

Expand Down

0 comments on commit 4d4f24c

Please sign in to comment.