diff --git a/pom.xml b/pom.xml index 6cb769e..fe85d62 100644 --- a/pom.xml +++ b/pom.xml @@ -32,8 +32,8 @@ Gravitee.io APIM - Repository - AWS DynamoDB - 1.11.0 - 1.11.0 + 1.12.0-SNAPSHOT + 1.12.0-SNAPSHOT 2.10 1.11.123 diff --git a/src/main/java/io/gravitee/repository/dynamodb/management/DynamoDBViewRepository.java b/src/main/java/io/gravitee/repository/dynamodb/management/DynamoDBViewRepository.java index 7941987..991379f 100644 --- a/src/main/java/io/gravitee/repository/dynamodb/management/DynamoDBViewRepository.java +++ b/src/main/java/io/gravitee/repository/dynamodb/management/DynamoDBViewRepository.java @@ -31,6 +31,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; +import java.util.Date; import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; @@ -118,6 +119,11 @@ private View convert(final DynamoDBView dynamoDBView) { view.setId(dynamoDBView.getId()); view.setName(dynamoDBView.getName()); view.setDescription(dynamoDBView.getDescription()); + view.setDefaultView(dynamoDBView.isDefaultView()); + view.setHidden(dynamoDBView.isHidden()); + view.setOrder(dynamoDBView.getOrder()); + view.setUpdatedAt(new Date(dynamoDBView.getUpdatedAt())); + view.setCreatedAt(new Date(dynamoDBView.getCreatedAt())); return view; } @@ -129,6 +135,11 @@ private DynamoDBView convert(final View view) { dynamoDBView.setId(view.getId()); dynamoDBView.setName(view.getName()); dynamoDBView.setDescription(view.getDescription()); + dynamoDBView.setDefaultView(view.isDefaultView()); + dynamoDBView.setHidden(view.isHidden()); + dynamoDBView.setOrder(view.getOrder()); + dynamoDBView.setUpdatedAt(view.getUpdatedAt().getTime()); + dynamoDBView.setCreatedAt(view.getCreatedAt().getTime()); return dynamoDBView; } } diff --git a/src/main/java/io/gravitee/repository/dynamodb/management/model/DynamoDBView.java b/src/main/java/io/gravitee/repository/dynamodb/management/model/DynamoDBView.java index c447e90..a9c7d70 100644 --- a/src/main/java/io/gravitee/repository/dynamodb/management/model/DynamoDBView.java +++ b/src/main/java/io/gravitee/repository/dynamodb/management/model/DynamoDBView.java @@ -18,9 +18,12 @@ import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAttribute; import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; +import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTyped; import java.util.Objects; +import static com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperFieldModel.DynamoDBAttributeType.BOOL; + /** * @author Nicolas GERAUD (nicolas.geraud at graviteesource.com) * @author GraviteeSource Team @@ -34,6 +37,16 @@ public class DynamoDBView { private String name; @DynamoDBAttribute private String description; + @DynamoDBTyped(BOOL) + private boolean defaultView; + @DynamoDBTyped(BOOL) + private boolean hidden; + @DynamoDBAttribute + private int order; + @DynamoDBAttribute + private long createdAt; + @DynamoDBAttribute + private long updatedAt; public String getId() { return id; @@ -56,6 +69,41 @@ public void setDescription(String description) { this.description = description; } + public boolean isDefaultView() { + return defaultView; + } + public void setDefaultView(boolean defaultView) { + this.defaultView = defaultView; + } + + public boolean isHidden() { + return hidden; + } + public void setHidden(boolean hidden) { + this.hidden = hidden; + } + + public int getOrder() { + return order; + } + public void setOrder(int order) { + this.order = order; + } + + public long getCreatedAt() { + return createdAt; + } + public void setCreatedAt(long createdAt) { + this.createdAt = createdAt; + } + + public long getUpdatedAt() { + return updatedAt; + } + public void setUpdatedAt(long updatedAt) { + this.updatedAt = updatedAt; + } + @Override public boolean equals(Object o) { if (this == o) return true;