Mapping nested URIs

valkyrie/lib/valkyrie/persistence/solr/resource_factory.rb

@@ -170,12 +170,28 @@ def self.handles?(value)
         end
 
         def result
-          NestedResourceConverter.for(JSON.parse(json, symbolize_names: true)).result
+          NestedResourceConverter.for(convert_uris(JSON.parse(json, symbolize_names: true))).result
         end
 
         def json
           value.gsub(/^serialized-/, '')
         end
+
+        def convert_uris(h)
+          h.map { |k, v| [k, convert_uri_values(v)] }.to_h
+        end
+
+        def convert_uri_values(v)
+          return RDF::URI.new(v[:@id]) if uri?(v)
+          return v unless v.is_a?(Array)
+          v.map do |inner|
+            uri?(inner) ? ::RDF::URI.new(inner[:@id]) : inner
+          end
+        end
+
+        def uri?(obj)
+          obj.is_a?(Hash) && obj[:@id] && obj.length == 1
+        end
       end
 
       class NestedResourceConverter < ::Valkyrie::ValueMapper