Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
10 changes: 10 additions & 0 deletions src/serialization.jl
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,16 @@ serialize(uuids::Vector{Base.UUID}) = serialize.(uuids)
serialize(uuids::Set{Base.UUID}) = serialize.(uuids)
deserialize(::Type{Base.UUID}, data::Dict) = Base.UUID(data["value"])

# IS serializes a Base.UUID as Dict("value" => string). The default
# deserialize(::Type{T}, ::Any) = deepcopy(data) leaves the dicts unconverted,
# so structs with Vector{Base.UUID} or Set{Base.UUID} fields
# (e.g. Outage.monitored_components) would receive Vector{Dict} at construction
# time. Convert each element here.
deserialize(::Type{Vector{Base.UUID}}, data::AbstractVector) =
Base.UUID[deserialize(Base.UUID, x) for x in data]
deserialize(::Type{Set{Base.UUID}}, data::AbstractVector) =
Set{Base.UUID}(deserialize(Base.UUID, x) for x in data)

serialize(value::Complex) = Dict("real" => real(value), "imag" => imag(value))
deserialize(::Type{Complex}, data::Dict) = Complex(data["real"], data["imag"])
deserialize(::Type{Complex{T}}, data::Dict) where {T} =
Expand Down
26 changes: 26 additions & 0 deletions test/test_serialization.jl
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,32 @@ end
@test IS.serialize(nt_result) == nt_data
end

@testset "Test Vector{Base.UUID} Serialization/Deserialization" begin
uuids = [Base.UUID(rand(UInt128)) for _ in 1:3]
serialized = IS.serialize(uuids)
@test serialized isa Vector{<:Dict}
@test all(d -> haskey(d, "value"), serialized)
deserialized = IS.deserialize(Vector{Base.UUID}, serialized)
Comment thread
jd-lara marked this conversation as resolved.
@test deserialized isa Vector{Base.UUID}
@test deserialized == uuids
# Round-trip through JSON to mimic on-disk format.
json_round_trip = JSON3.read(JSON3.write(serialized), Vector{Dict})
@test IS.deserialize(Vector{Base.UUID}, json_round_trip) == uuids
end

@testset "Test Set{Base.UUID} Serialization/Deserialization" begin
uuids = Set(Base.UUID(rand(UInt128)) for _ in 1:3)
serialized = IS.serialize(uuids)
@test serialized isa Vector{<:Dict}
@test all(d -> haskey(d, "value"), serialized)
deserialized = IS.deserialize(Set{Base.UUID}, serialized)
@test deserialized isa Set{Base.UUID}
@test deserialized == uuids
# Round-trip through JSON to mimic on-disk format.
json_round_trip = JSON3.read(JSON3.write(serialized), Vector{Dict})
@test IS.deserialize(Set{Base.UUID}, json_round_trip) == uuids
end

@testset "Test JSON serialization of system data" begin
for in_memory in (true, false)
sys = create_system_data_shared_time_series(; time_series_in_memory = in_memory)
Expand Down
Loading