Skip to content
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.

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

Refactor aws smithy types #2638

Merged
merged 8 commits into from
Apr 26, 2023
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
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: 12 additions & 0 deletions CHANGELOG.next.toml
Original file line number Diff line number Diff line change
Expand Up @@ -171,3 +171,15 @@ message = "Update MSRV to Rust 1.67.1"
references = ["smithy-rs#2611"]
meta = { "breaking" = true, "tada" = false, "bug" = false, "target" = "all"}
author = "jdisanti"

[[aws-sdk-rust]]
message = "Refactor aws-smithy-types crate. Blob, Datetime, Number and Document structs now goes to it's own files. No breaking changes."
references = ["smithy-rs#2616"]
meta = { "breaking" = false, "tada" = false, "bug" = true }
author = "thomas-k-cameron"

[[smithy-rs]]
message = "Refactor aws-smithy-types crate. Blob, Datetime, Number and Document structs now goes to it's own files. No breaking changes."
references = ["smithy-rs#2616"]
meta = { "breaking" = false, "tada" = false, "bug" = true }
author = "thomas-k-cameron"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes don't change the public API in any way, right? If so, I don't think we need these changelog entries. I'm also not sure about why the "bug" = true either 🤔

Copy link
Contributor Author

@thomas-k-cameron thomas-k-cameron Apr 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it doesn't change the API.
I thought that I have to mention refactoring too.

"bug" = true

This one is simple mistake on my side.

Thank you for letting me know. Let me fix it up.

32 changes: 32 additions & 0 deletions rust-runtime/aws-smithy-types/src/blob.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/*
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
* SPDX-License-Identifier: Apache-2.0
*/

/// Binary Blob Type
///
/// Blobs represent protocol-agnostic binary content.
#[derive(Debug, PartialEq, Eq, Hash, Clone)]
pub struct Blob {
inner: Vec<u8>,
}

impl Blob {
/// Creates a new blob from the given `input`.
pub fn new<T: Into<Vec<u8>>>(input: T) -> Self {
Blob {
inner: input.into(),
}
}

/// Consumes the `Blob` and returns a `Vec<u8>` with its contents.
pub fn into_inner(self) -> Vec<u8> {
self.inner
}
}

impl AsRef<[u8]> for Blob {
fn as_ref(&self) -> &[u8] {
&self.inner
}
}
73 changes: 73 additions & 0 deletions rust-runtime/aws-smithy-types/src/document.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
/*
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
* SPDX-License-Identifier: Apache-2.0
*/

use crate::Number;
use std::collections::HashMap;

/* ANCHOR: document */

/// Document Type
///
/// Document types represents protocol-agnostic open content that is accessed like JSON data.
/// Open content is useful for modeling unstructured data that has no schema, data that can't be
/// modeled using rigid types, or data that has a schema that evolves outside of the purview of a model.
/// The serialization format of a document is an implementation detail of a protocol.
#[derive(Debug, Clone, PartialEq)]
pub enum Document {
/// JSON object
Object(HashMap<String, Document>),
/// JSON array
Array(Vec<Document>),
/// JSON number
Number(Number),
/// JSON string
String(String),
/// JSON boolean
Bool(bool),
/// JSON null
Null,
}

impl From<bool> for Document {
fn from(value: bool) -> Self {
Document::Bool(value)
}
}

impl From<String> for Document {
fn from(value: String) -> Self {
Document::String(value)
}
}

impl From<Vec<Document>> for Document {
fn from(values: Vec<Document>) -> Self {
Document::Array(values)
}
}

impl From<HashMap<String, Document>> for Document {
fn from(values: HashMap<String, Document>) -> Self {
Document::Object(values)
}
}

impl From<u64> for Document {
fn from(value: u64) -> Self {
Document::Number(Number::PosInt(value))
}
}

impl From<i64> for Document {
fn from(value: i64) -> Self {
Document::Number(Number::NegInt(value))
}
}

impl From<i32> for Document {
fn from(value: i32) -> Self {
Document::Number(Number::NegInt(value as i64))
}
}
Loading