depr code and warns

Author: dehann

src/Deprecated.jl

@@ -63,6 +63,26 @@ end
 ## Deprecate before v0.20
 ##=================================================================================
 
+
+# Need to implement this to allow Unmarshal to deserialize Nullable UUIDs and ZonedDateTimes
+# TODO: Move to JSON3.
+# import Unmarshal: unmarshal
+
+function unmarshal(::Type{Union{UUID, Nothing}}, x, verbose :: Bool = false, verboseLvl :: Int = 0)
+    if x !== nothing 
+        return UUID(x)
+    else 
+        return nothing
+    end
+end
+function unmarshal(::Type{Union{ZonedDateTime, Nothing}}, x, verbose :: Bool = false, verboseLvl :: Int = 0) 
+    if x !== nothing 
+        return ZonedDateTime(x)
+    else 
+        return nothing
+    end
+end
+
 export DefaultDFG
 
 const DefaultDFG = GraphsDFG

src/GraphsDFG/entities/GraphsDFG.jl

@@ -29,21 +29,40 @@ Create an in-memory GraphsDFG with the following parameters:
 - V: Variable type
 - F: Factor type
 """
-function GraphsDFG{T,V,F}(g::FactorGraph{Int,V,F}=FactorGraph{Int,V,F}();
-                           description::String="Graphs.jl implementation",
-                           userLabel::String="DefaultUser",
-                           robotLabel::String="DefaultRobot",
-                           sessionLabel::String="Session_$(string(uuid4())[1:6])",
-                           userData::Dict{Symbol, String} = Dict{Symbol, String}(),
-                           robotData::Dict{Symbol, String} = Dict{Symbol, String}(),
-                           sessionData::Dict{Symbol, String} = Dict{Symbol, String}(),
-                           solverParams::T=T(),
-                           blobstores=Dict{Symbol, AbstractBlobStore}()) where {T <: AbstractParams, V <:AbstractDFGVariable, F<:AbstractDFGFactor}
-   # Validate the userLabel, robotLabel, and sessionLabel
-   !isValidLabel(userLabel) && error("'$userLabel' is not a valid User label")
-   !isValidLabel(robotLabel) && error("'$robotLabel' is not a valid Robot label")
-   !isValidLabel(sessionLabel) && error("'$sessionLabel' is not a valid Session label")
-   return GraphsDFG{T,V,F}(g, description, userLabel, robotLabel, sessionLabel, userData, robotData, sessionData, Symbol[], solverParams, blobstores)
+function GraphsDFG{T,V,F}(
+    g::FactorGraph{Int,V,F}=FactorGraph{Int,V,F}();
+    description::String="Graphs.jl implementation",
+    userLabel::String="DefaultUser",
+    robotLabel::String="DefaultRobot",
+    sessionLabel::String="Session_$(string(uuid4())[1:6])",
+    userData::Dict{Symbol, String} = Dict{Symbol, String}(),
+    robotData::Dict{Symbol, String} = Dict{Symbol, String}(),
+    sessionData::Dict{Symbol, String} = Dict{Symbol, String}(),
+    solverParams::T=T(),
+    blobstores=Dict{Symbol, AbstractBlobStore}(),
+    # deprecating
+    userId::Union{Nothing, String} = nothing,
+    robotId::Union{Nothing, String} = nothing,
+    sessionId::Union{Nothing, String} = nothing,
+) where {T <: AbstractParams, V <:AbstractDFGVariable, F<:AbstractDFGFactor}
+    # Validate the userLabel, robotLabel, and sessionLabel
+    if userId !== nothing
+        @error "Obsolete use of userId::String with GraphsDFG, use userLabel::String instead" maxlog=10
+        userLabel = userId
+    end
+    if robotId !== nothing
+        @error "Obsolete use of robotId::String with GraphsDFG, use robotLabel::String instead" maxlog=10
+        robotLabel = robotId
+    end
+    if sessionId !== nothing
+        @error "Obsolete use of sessionId::String with GraphsDFG, use sessionLabel::String instead" maxlog=10
+        sessionLabel = sessionId
+    end
+
+    !isValidLabel(userLabel) && error("'$userLabel' is not a valid User label")
+    !isValidLabel(robotLabel) && error("'$robotLabel' is not a valid Robot label")
+    !isValidLabel(sessionLabel) && error("'$sessionLabel' is not a valid Session label")
+    return GraphsDFG{T,V,F}(g, description, userLabel, robotLabel, sessionLabel, userData, robotData, sessionData, Symbol[], solverParams, blobstores)
 end
 
 # GraphsDFG{T}(; kwargs...) where T <: AbstractParams = GraphsDFG{T,DFGVariable,DFGFactor}(;kwargs...)

src/services/Serialization.jl

@@ -12,26 +12,9 @@ import JSON.Writer: StructuralContext, JSONContext, show_json
 import JSON.Serializations: CommonSerialization, StandardSerialization
 JSON.show_json(io::JSONContext, serialization::CommonSerialization, uuid::UUID) = print(io.io, "\"$uuid\"")
 
-# Need to implement this to allow Unmarshal to deserialize Nullable UUIDs and ZonedDateTimes
-# TODO: Move to JSON3.
-import Unmarshal: unmarshal
-
-function unmarshal(::Type{Union{UUID, Nothing}}, x, verbose :: Bool = false, verboseLvl :: Int = 0)
-    if x !== nothing 
-        return UUID(x)
-    else 
-        return nothing
-    end
-end
-function unmarshal(::Type{Union{ZonedDateTime, Nothing}}, x, verbose :: Bool = false, verboseLvl :: Int = 0) 
-    if x !== nothing 
-        return ZonedDateTime(x)
-    else 
-        return nothing
-    end
-end
 
 ## Version checking
+# FIXME return VersionNumber
 function _getDFGVersion()
     if haskey(Pkg.dependencies(), Base.UUID("b5cc3c7e-6572-11e9-2517-99fb8daf2f04"))
         return string(Pkg.dependencies()[Base.UUID("b5cc3c7e-6572-11e9-2517-99fb8daf2f04")].version)