rm JSON and JSON2

Author: dehann

Project.toml

@@ -9,8 +9,6 @@ Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
 DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
 Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
-JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
-JSON2 = "2535ab7d-5cd8-5a07-80ac-9b1792aadce3"
 JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 ManifoldsBase = "3362f125-f0bb-47a3-aa74-596ffd7ef2fb"
@@ -33,8 +31,6 @@ Distributions = "0.23, 0.24, 0.25"
 DocStringExtensions = "0.8, 0.9"
 GraphPlot = "0.5.0"
 Graphs = "1.4"
-JSON = "0.21"
-JSON2 = "0.3.1"
 JSON3 = "1"
 ManifoldsBase = "0.12, 0.13, 0.14"
 OrderedCollections = "1.4"

src/DataBlobs/DataBlobs.jl

@@ -1,6 +1,4 @@
-# using BlobFrames
-# using CSV
-using JSON
+
 using SHA
 
 include("entities/AbstractBlobEntries.jl")
@@ -12,6 +10,8 @@ include("services/BlobStores.jl")
 
 # include("services/InMemoryStore.jl")
 
+export InMemoryBlobStore
+export FolderStore
 
 export BlobEntry
 

src/DataBlobs/services/BlobStores.jl

@@ -116,25 +116,42 @@ deleteBlob!(dfg::AbstractDFG, blobstore::AbstractBlobStore, label::Symbol, entry
             deleteBlob!(dfg, blobstore, label, entry.label)
 
 function deleteBlob!(dfg::AbstractDFG, blobstore::AbstractBlobStore, label::Symbol, key::Symbol)
-    de = deleteDataEntry!(dfg, label, key)
+    de = deleteBlobEntry!(dfg, label, key)
     db = deleteBlob!(blobstore, de)
     return de=>db
 end
 
 ##==============================================================================
 
-addBlob!(dfg::AbstractDFG, blobstorekey::Symbol, label::Symbol, key::Symbol, blob::Vector{UInt8},
-         timestamp=now(localzone()); kwargs...) = addBlob!(dfg,
-                                                           getBlobStore(dfg, blobstorekey),
-                                                           label,
-                                                           key,
-                                                           blob,
-                                                           timestamp;
-                                                           kwargs...)
-
-function addBlob!(dfg::AbstractDFG, blobstore::AbstractBlobStore, label::Symbol, key::Symbol,
-                  blob::Vector{UInt8}, timestamp=now(localzone()); description="", mimeType = "application/octet-stream", id::UUID = uuid4(), hashfunction = sha256)
+addBlob!(
+    dfg::AbstractDFG, 
+    blobstorekey::Symbol, 
+    label::Symbol, 
+    key::Symbol, 
+    blob::Vector{UInt8},
+    timestamp=now(localzone()); 
+    kwargs...) = addBlob!(
+        dfg,
+        getBlobStore(dfg, blobstorekey),
+        label,
+        key,
+        blob,
+        timestamp;
+        kwargs...
+    )
 
+function addBlob!(
+    dfg::AbstractDFG, 
+    blobstore::AbstractBlobStore, 
+    label::Symbol, 
+    key::Symbol,
+    blob::Vector{UInt8}, 
+    timestamp=now(localzone()); 
+    description="", mimeType = "application/octet-stream", 
+    id::UUID = uuid4(), 
+    hashfunction = sha256
+)
+    #
     @warn "ID's and origin IDs should be reconciled here."
     entry = BlobEntry(
         id = id, 
@@ -155,7 +172,6 @@ end
 ##==============================================================================
 ## FolderStore
 ##==============================================================================
-export FolderStore
 
 struct FolderStore{T} <: AbstractBlobStore{T}
     key::Symbol
@@ -200,7 +216,7 @@ function addBlob!(store::FolderStore{T}, entry::BlobEntry, data::T) where T
             write(f, data)
         end
         open(entryfilename, "w") do f
-            JSON.print(f, entry)
+            JSON3.write(f, entry)
         end
         return data
     end
@@ -218,7 +234,7 @@ function updateBlob!(store::FolderStore{T},  entry::BlobEntry, data::T) where T
             write(f, data)
         end
         open(entryfilename, "w") do f
-            JSON.print(f, entry)
+            JSON3.write(f, entry)
         end
         return data
     end
@@ -238,7 +254,7 @@ end
 ##==============================================================================
 ## InMemoryBlobStore
 ##==============================================================================
-export InMemoryBlobStore
+
 struct InMemoryBlobStore{T} <: AbstractBlobStore{T}
     key::Symbol
     blobs::Dict{UUID, T}

src/DistributedFactorGraphs.jl

@@ -22,9 +22,6 @@ using Dates
 using TimeZones
 using Distributions
 using Reexport
-using JSON
-# using Unmarshal
-using JSON2 # JSON2 requires all properties to be in correct sequence, can't guarantee that from DB.
 using JSON3
 using StructTypes
 using LinearAlgebra

src/FileDFG/services/FileDFG.jl

@@ -155,9 +155,9 @@ function loadDFG!(dfgLoadInto::AbstractDFG, dst::AbstractString)
 
     # remove the temporary unzipped file
     if unzip
-      @info "DFG.loadDFG! is deleting a temp folder created during unzip, $loaddir"
-      # need this because the number of files created in /tmp/caesar/random is becoming redonkulous.
-      Base.rm(loaddir, recursive=true, force=true)
+        @info "DFG.loadDFG! is deleting a temp folder created during unzip, $loaddir"
+        # need this because the number of files created in /tmp/caesar/random is becoming redonkulous.
+        Base.rm(loaddir, recursive=true, force=true)
     end
 
     return dfgLoadInto