cocina-models 0.54.0 → 0.58.0

data/lib/cocina/models/event.rb

@@ -5,9 +5,9 @@ module Cocina
     class Event < Struct
       attribute :structuredValue, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       # Description of the event (creation, publication, etc.).
-      attribute :type, Types::Strict::String.meta(omittable: true)
+      attribute :type, Types::Strict::String.optional.meta(omittable: true)
       # The preferred display label to use for the event in access systems.
-      attribute :displayLabel, Types::Strict::String.meta(omittable: true)
+      attribute :displayLabel, Types::Strict::String.optional.meta(omittable: true)
       attribute :date, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       attribute :contributor, Types::Strict::Array.of(Contributor).meta(omittable: true)
       attribute :location, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)

data/lib/cocina/models/file.rb

@@ -16,13 +16,13 @@ module Cocina
       # Filename for a file. Can be same as label.
       attribute :filename, Types::Strict::String
       # Size of the File (binary) in bytes.
-      attribute :size, Types::Strict::Integer.meta(omittable: true)
+      attribute :size, Types::Strict::Integer.optional.meta(omittable: true)
       # Version for the File within SDR.
       attribute :version, Types::Strict::Integer
       # MIME Type of the File.
-      attribute :hasMimeType, Types::Strict::String.meta(omittable: true)
+      attribute :hasMimeType, Types::Strict::String.optional.meta(omittable: true)
       # Use for the File.
-      attribute :use, Types::Strict::String.meta(omittable: true)
+      attribute :use, Types::Strict::String.optional.meta(omittable: true)
       attribute :hasMessageDigests, Types::Strict::Array.of(MessageDigest).default([].freeze)
       attribute(:access, FileAccess.default { FileAccess.new })
       attribute(:administrative, FileAdministrative.default { FileAdministrative.new })

data/lib/cocina/models/file_access.rb

@@ -4,13 +4,13 @@ module Cocina
   module Models
     class FileAccess < Struct
       # Access level
-      attribute :access, Types::Strict::String.default('dark').enum('world', 'stanford', 'location-based', 'citation-only', 'dark').meta(omittable: true)
+      attribute :access, Types::Strict::String.default('dark').enum('world', 'stanford', 'location-based', 'citation-only', 'dark').optional.meta(omittable: true)
       # Available for controlled digital lending.
-      attribute :controlledDigitalLending, Types::Strict::Bool.meta(omittable: true)
+      attribute :controlledDigitalLending, Types::Strict::Bool.optional.meta(omittable: true)
       # Download access level for a file
-      attribute :download, Types::Strict::String.default('none').enum('world', 'stanford', 'location-based', 'none').meta(omittable: true)
+      attribute :download, Types::Strict::String.default('none').enum('world', 'stanford', 'location-based', 'none').optional.meta(omittable: true)
       # If access is "location-based", which location should have access.
-      attribute :readLocation, Types::Strict::String.enum('spec', 'music', 'ars', 'art', 'hoover', 'm&m').meta(omittable: true)
+      attribute :readLocation, Types::Strict::String.enum('spec', 'music', 'ars', 'art', 'hoover', 'm&m').optional.meta(omittable: true)
     end
   end
 end

data/lib/cocina/models/file_set.rb

@@ -5,7 +5,22 @@ module Cocina
     class FileSet < Struct
       include Checkable
 
-      TYPES = ['http://cocina.sul.stanford.edu/models/fileset.jsonld'].freeze
+      TYPES = ['http://cocina.sul.stanford.edu/models/resources/audio.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/attachment.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/document.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/file.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/image.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/main-augmented.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/main-original.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/media.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/object.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/page.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/permissions.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/preview.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/supplement.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/3d.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/thumb.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/video.jsonld'].freeze
 
       # The content type of the Fileset.
       attribute :type, Types::Strict::String.enum(*FileSet::TYPES)

data/lib/cocina/models/identification.rb

@@ -6,8 +6,10 @@ module Cocina
       # Unique identifier in some other system. This is because a large proportion of what is deposited in SDR, historically and currently, are representations of objects that are also represented in other systems. For example, digitized paper and A/V collections have physical manifestations, and those physical objects are managed in systems that have their own identifiers. Similarly, books have barcodes, archival materials have collection numbers and physical locations, etc. The sourceId allows determining if an item has been deposited before and where to look for the original item if you're looking at its SDR representation. The format is: "namespace:identifier"
 
       # example: sul:PC0170_s3_Fiesta_Bowl_2012-01-02_210609_2026
-      attribute :sourceId, Types::Strict::String.meta(omittable: true)
+      attribute :sourceId, Types::Strict::String.optional.meta(omittable: true)
       attribute :catalogLinks, Types::Strict::Array.of(CatalogLink).meta(omittable: true)
+      # A barcode
+      attribute :barcode, Types::Nominal::Any.optional.meta(omittable: true)
     end
   end
 end

data/lib/cocina/models/language.rb

@@ -5,27 +5,27 @@ module Cocina
     class Language < Struct
       attribute :appliesTo, Types::Strict::Array.of(DescriptiveBasicValue).meta(omittable: true)
       # Code value of the descriptive element.
-      attribute :code, Types::Strict::String.meta(omittable: true)
+      attribute :code, Types::Strict::String.optional.meta(omittable: true)
       # The preferred display label to use for the descriptive element in access systems.
-      attribute :displayLabel, Types::Strict::String.meta(omittable: true)
+      attribute :displayLabel, Types::Strict::String.optional.meta(omittable: true)
       attribute :encoding, Standard.optional.meta(omittable: true)
       attribute :groupedValue, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       attribute :note, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       attribute :parallelValue, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       # present for mapping to additional schemas in the future and for consistency but not otherwise used
-      attribute :qualifier, Types::Strict::String.meta(omittable: true)
+      attribute :qualifier, Types::Strict::String.optional.meta(omittable: true)
       attribute :script, DescriptiveValue.optional.meta(omittable: true)
       attribute :source, Source.optional.meta(omittable: true)
       # Status of the language relative to other parallel language elements (e.g. the primary language)
-      attribute :status, Types::Strict::String.enum('primary').meta(omittable: true)
+      attribute :status, Types::Strict::String.enum('primary').optional.meta(omittable: true)
       attribute :standard, Standard.optional.meta(omittable: true)
       attribute :structuredValue, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       # URI value of the descriptive element.
-      attribute :uri, Types::Strict::String.meta(omittable: true)
+      attribute :uri, Types::Strict::String.optional.meta(omittable: true)
       # Value of the descriptive element.
-      attribute :value, Types::Strict::String.meta(omittable: true)
+      attribute :value, Types::Strict::String.optional.meta(omittable: true)
       # URL or other pointer to the location of the language information.
-      attribute :valueAt, Types::Strict::String.meta(omittable: true)
+      attribute :valueAt, Types::Strict::String.optional.meta(omittable: true)
       attribute :valueLanguage, DescriptiveValueLanguage.optional.meta(omittable: true)
     end
   end

data/lib/cocina/models/presentation.rb

@@ -4,9 +4,9 @@ module Cocina
   module Models
     class Presentation < Struct
       # Height in pixels
-      attribute :height, Types::Strict::Integer.meta(omittable: true)
+      attribute :height, Types::Strict::Integer.optional.meta(omittable: true)
       # Width in pixels
-      attribute :width, Types::Strict::Integer.meta(omittable: true)
+      attribute :width, Types::Strict::Integer.optional.meta(omittable: true)
     end
   end
 end

data/lib/cocina/models/related_resource.rb

@@ -4,11 +4,11 @@ module Cocina
   module Models
     class RelatedResource < Struct
       # The relationship of the related resource to the described resource.
-      attribute :type, Types::Strict::String.meta(omittable: true)
+      attribute :type, Types::Strict::String.optional.meta(omittable: true)
       # Status of the related resource relative to other related resources.
-      attribute :status, Types::Strict::String.meta(omittable: true)
+      attribute :status, Types::Strict::String.optional.meta(omittable: true)
       # The preferred display label to use for the related resource in access systems.
-      attribute :displayLabel, Types::Strict::String.meta(omittable: true)
+      attribute :displayLabel, Types::Strict::String.optional.meta(omittable: true)
       attribute :title, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       attribute :contributor, Types::Strict::Array.of(Contributor).meta(omittable: true)
       attribute :event, Types::Strict::Array.of(Event).meta(omittable: true)
@@ -19,14 +19,14 @@ module Cocina
       attribute :standard, Standard.optional.meta(omittable: true)
       attribute :subject, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       # Stanford persistent URL associated with the related resource.
-      attribute :purl, Types::Strict::String.meta(omittable: true)
+      attribute :purl, Types::Strict::String.optional.meta(omittable: true)
       attribute :access, DescriptiveAccessMetadata.optional.meta(omittable: true)
       attribute :relatedResource, Types::Strict::Array.of(RelatedResource).meta(omittable: true)
       attribute :adminMetadata, DescriptiveAdminMetadata.optional.meta(omittable: true)
       # The version of the related resource.
-      attribute :version, Types::Strict::String.meta(omittable: true)
+      attribute :version, Types::Strict::String.optional.meta(omittable: true)
       # URL or other pointer to the location of the related resource information.
-      attribute :valueAt, Types::Strict::String.meta(omittable: true)
+      attribute :valueAt, Types::Strict::String.optional.meta(omittable: true)
     end
   end
 end

data/lib/cocina/models/release_tag.rb

@@ -5,15 +5,15 @@ module Cocina
     class ReleaseTag < Struct
       # Who did this release
       # example: petucket
-      attribute :who, Types::Strict::String.meta(omittable: true)
+      attribute :who, Types::Strict::String.optional.meta(omittable: true)
       # What is being released. This item or the whole collection.
       # example: self
-      attribute :what, Types::Strict::String.enum('self', 'collection').meta(omittable: true)
+      attribute :what, Types::Strict::String.enum('self', 'collection').optional.meta(omittable: true)
       # When did this action happen
-      attribute :date, Types::Params::DateTime.meta(omittable: true)
+      attribute :date, Types::Params::DateTime.optional.meta(omittable: true)
       # What platform is it released to
       # example: Searchworks
-      attribute :to, Types::Strict::String.meta(omittable: true)
+      attribute :to, Types::Strict::String.optional.meta(omittable: true)
       attribute :release, Types::Strict::Bool.default(false)
     end
   end

data/lib/cocina/models/request_dro_structural.rb

@@ -6,7 +6,7 @@ module Cocina
       attribute :contains, Types::Strict::Array.of(RequestFileSet).meta(omittable: true)
       attribute :hasMemberOrders, Types::Strict::Array.of(Sequence).meta(omittable: true)
       attribute :isMemberOf, Types::Strict::Array.of(Druid).meta(omittable: true)
-      attribute :hasAgreement, Types::Strict::String.meta(omittable: true)
+      attribute :hasAgreement, Types::Strict::String.optional.meta(omittable: true)
     end
   end
 end

data/lib/cocina/models/request_file.rb

@@ -10,11 +10,11 @@ module Cocina
       attribute :type, Types::Strict::String.enum(*RequestFile::TYPES)
       attribute :label, Types::Strict::String
       attribute :filename, Types::Strict::String
-      attribute :size, Types::Strict::Integer.meta(omittable: true)
+      attribute :size, Types::Strict::Integer.optional.meta(omittable: true)
       attribute :version, Types::Strict::Integer
-      attribute :hasMimeType, Types::Strict::String.meta(omittable: true)
-      attribute :externalIdentifier, Types::Strict::String.meta(omittable: true)
-      attribute :use, Types::Strict::String.meta(omittable: true)
+      attribute :hasMimeType, Types::Strict::String.optional.meta(omittable: true)
+      attribute :externalIdentifier, Types::Strict::String.optional.meta(omittable: true)
+      attribute :use, Types::Strict::String.optional.meta(omittable: true)
       attribute :hasMessageDigests, Types::Strict::Array.of(MessageDigest).default([].freeze)
       attribute(:access, FileAccess.default { FileAccess.new })
       attribute(:administrative, FileAdministrative.default { FileAdministrative.new })

data/lib/cocina/models/request_file_set.rb

@@ -5,7 +5,22 @@ module Cocina
     class RequestFileSet < Struct
       include Checkable
 
-      TYPES = ['http://cocina.sul.stanford.edu/models/fileset.jsonld'].freeze
+      TYPES = ['http://cocina.sul.stanford.edu/models/resources/audio.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/attachment.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/document.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/file.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/image.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/main-augmented.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/main-original.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/media.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/object.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/page.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/permissions.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/preview.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/supplement.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/3d.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/thumb.jsonld',
+               'http://cocina.sul.stanford.edu/models/resources/video.jsonld'].freeze
 
       attribute :type, Types::Strict::String.enum(*RequestFileSet::TYPES)
       attribute :label, Types::Strict::String

data/lib/cocina/models/request_identification.rb

@@ -8,6 +8,8 @@ module Cocina
       # example: sul:PC0170_s3_Fiesta_Bowl_2012-01-02_210609_2026
       attribute :sourceId, Types::Strict::String
       attribute :catalogLinks, Types::Strict::Array.of(CatalogLink).meta(omittable: true)
+      # A barcode
+      attribute :barcode, Types::Nominal::Any.optional.meta(omittable: true)
     end
   end
 end

data/lib/cocina/models/sequence.rb

@@ -5,7 +5,7 @@ module Cocina
     class Sequence < Struct
       attribute :members, Types::Strict::Array.of(Types::Strict::String).meta(omittable: true)
       # The direction that a sequence of canvases should be displayed to the user
-      attribute :viewingDirection, Types::Strict::String.enum('right-to-left', 'left-to-right').meta(omittable: true)
+      attribute :viewingDirection, Types::Strict::String.enum('right-to-left', 'left-to-right').optional.meta(omittable: true)
     end
   end
 end

data/lib/cocina/models/source.rb

@@ -4,14 +4,14 @@ module Cocina
   module Models
     class Source < Struct
       # Code representing the value source.
-      attribute :code, Types::Strict::String.meta(omittable: true)
+      attribute :code, Types::Strict::String.optional.meta(omittable: true)
       # URI for the value source.
-      attribute :uri, Types::Strict::String.meta(omittable: true)
+      attribute :uri, Types::Strict::String.optional.meta(omittable: true)
       # String describing the value source.
-      attribute :value, Types::Strict::String.meta(omittable: true)
+      attribute :value, Types::Strict::String.optional.meta(omittable: true)
       attribute :note, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       # The version of the value source.
-      attribute :version, Types::Strict::String.meta(omittable: true)
+      attribute :version, Types::Strict::String.optional.meta(omittable: true)
     end
   end
 end

data/lib/cocina/models/standard.rb

@@ -4,14 +4,14 @@ module Cocina
   module Models
     class Standard < Struct
       # Code representing the standard or encoding.
-      attribute :code, Types::Strict::String.meta(omittable: true)
+      attribute :code, Types::Strict::String.optional.meta(omittable: true)
       # URI for the standard or encoding.
-      attribute :uri, Types::Strict::String.meta(omittable: true)
+      attribute :uri, Types::Strict::String.optional.meta(omittable: true)
       # String describing the standard or encoding.
-      attribute :value, Types::Strict::String.meta(omittable: true)
+      attribute :value, Types::Strict::String.optional.meta(omittable: true)
       attribute :note, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       # The version of the standard or encoding.
-      attribute :version, Types::Strict::String.meta(omittable: true)
+      attribute :version, Types::Strict::String.optional.meta(omittable: true)
       attribute :source, Source.optional.meta(omittable: true)
     end
   end

data/lib/cocina/models/standard_barcode.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    StandardBarcode = Types::String.constrained(
+      format: /^36105[0-9]{9}$/i
+    )
+  end
+end

data/lib/cocina/models/title.rb

@@ -7,27 +7,27 @@ module Cocina
       attribute :parallelValue, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       attribute :groupedValue, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       # String or integer value of the descriptive element.
-      attribute :value, Types::Nominal::Any.meta(omittable: true)
+      attribute :value, Types::Nominal::Any.optional.meta(omittable: true)
       # Type of value provided by the descriptive element.
-      attribute :type, Types::Strict::String.meta(omittable: true)
+      attribute :type, Types::Strict::String.optional.meta(omittable: true)
       # Status of the descriptive element value relative to other instances of the element.
-      attribute :status, Types::Strict::String.meta(omittable: true)
+      attribute :status, Types::Strict::String.optional.meta(omittable: true)
       # Code value of the descriptive element.
-      attribute :code, Types::Strict::String.meta(omittable: true)
+      attribute :code, Types::Strict::String.optional.meta(omittable: true)
       # URI value of the descriptive element.
-      attribute :uri, Types::Strict::String.meta(omittable: true)
+      attribute :uri, Types::Strict::String.optional.meta(omittable: true)
       attribute :standard, Standard.optional.meta(omittable: true)
       attribute :encoding, Standard.optional.meta(omittable: true)
       attribute :identifier, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       attribute :source, Source.optional.meta(omittable: true)
       # The preferred display label to use for the descriptive element in access systems.
-      attribute :displayLabel, Types::Strict::String.meta(omittable: true)
+      attribute :displayLabel, Types::Strict::String.optional.meta(omittable: true)
       # A term providing information about the circumstances of the statement (e.g., approximate dates).
-      attribute :qualifier, Types::Strict::String.meta(omittable: true)
+      attribute :qualifier, Types::Strict::String.optional.meta(omittable: true)
       attribute :note, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       attribute :valueLanguage, DescriptiveValueLanguage.optional.meta(omittable: true)
       # URL or other pointer to the location of the value of the descriptive element.
-      attribute :valueAt, Types::Strict::String.meta(omittable: true)
+      attribute :valueAt, Types::Strict::String.optional.meta(omittable: true)
       attribute :appliesTo, Types::Strict::Array.of(DescriptiveBasicValue).meta(omittable: true)
     end
   end

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.54.0'
+    VERSION = '0.58.0'
   end
 end

data/lib/cocina/models/vocab.rb

@@ -40,10 +40,6 @@ module Cocina
         'http://cocina.sul.stanford.edu/models/file.jsonld'
       end
 
-      def self.fileset
-        'http://cocina.sul.stanford.edu/models/fileset.jsonld'
-      end
-
       def self.geo
         'http://cocina.sul.stanford.edu/models/geo.jsonld'
       end
@@ -95,6 +91,72 @@ module Cocina
       def self.webarchive_seed
         'http://cocina.sul.stanford.edu/models/webarchive-seed.jsonld'
       end
+
+      class Resources
+        def self.three_dimensional
+          'http://cocina.sul.stanford.edu/models/resources/3d.jsonld'
+        end
+
+        def self.attachment
+          'http://cocina.sul.stanford.edu/models/resources/attachment.jsonld'
+        end
+
+        def self.audio
+          'http://cocina.sul.stanford.edu/models/resources/audio.jsonld'
+        end
+
+        def self.document
+          'http://cocina.sul.stanford.edu/models/resources/document.jsonld'
+        end
+
+        def self.file
+          'http://cocina.sul.stanford.edu/models/resources/file.jsonld'
+        end
+
+        def self.image
+          'http://cocina.sul.stanford.edu/models/resources/image.jsonld'
+        end
+
+        def self.main_augmented
+          'http://cocina.sul.stanford.edu/models/resources/main-augmented.jsonld'
+        end
+
+        def self.main_original
+          'http://cocina.sul.stanford.edu/models/resources/main-original.jsonld'
+        end
+
+        def self.media
+          'http://cocina.sul.stanford.edu/models/resources/media.jsonld'
+        end
+
+        def self.object
+          'http://cocina.sul.stanford.edu/models/resources/object.jsonld'
+        end
+
+        def self.page
+          'http://cocina.sul.stanford.edu/models/resources/page.jsonld'
+        end
+
+        def self.permissions
+          'http://cocina.sul.stanford.edu/models/resources/permissions.jsonld'
+        end
+
+        def self.preview
+          'http://cocina.sul.stanford.edu/models/resources/preview.jsonld'
+        end
+
+        def self.supplement
+          'http://cocina.sul.stanford.edu/models/resources/supplement.jsonld'
+        end
+
+        def self.thumb
+          'http://cocina.sul.stanford.edu/models/resources/thumb.jsonld'
+        end
+
+        def self.video
+          'http://cocina.sul.stanford.edu/models/resources/video.jsonld'
+        end
+      end
     end
   end
 end

data/openapi.yml

@@ -108,6 +108,10 @@ components:
             - 'citation-only'
             - 'dark'
           default: 'dark'
+        copyright:
+          description: The human readable copyright statement that applies
+          example: Copyright World Trade Organization
+          type: string
         readLocation:
           description: If access is "location-based", which location should have access.
           type: string
@@ -118,6 +122,13 @@ components:
             - 'art'
             - 'hoover'
             - 'm&m'
+        useAndReproductionStatement:
+          description: The human readable use and reproduction statement that applies
+          example: Property rights reside with the repository. Literary rights reside with the creators of the documents or their heirs. To obtain permission to publish or reproduce, please contact the Public Services Librarian of the Dept. of Special Collections (http://library.stanford.edu/spc).
+          type: string
+        license:
+          description: The license governing reuse of the Collection. Should be an IRI for known licenses (i.e. CC, RightsStatement.org URI, etc.).
+          type: string
     AccessRole:
       description: Access role conferred by an AdminPolicy to objects within it. (used by Argo)
       type: object
@@ -214,7 +225,11 @@ components:
       properties:
         defaultObjectRights:
           type: string
+          description: This is an XML expression of the default access (see defaultAccess)
+          deprecated: true
           default: <?xml version="1.0" encoding="UTF-8"?><rightsMetadata><access type="discover"><machine><world/></machine></access><access type="read"><machine><world/></machine></access><use><human type="useAndReproduction"/><human type="creativeCommons"/><machine type="creativeCommons" uri=""/><human type="openDataCommons"/><machine type="openDataCommons" uri=""/></use><copyright><human/></copyright></rightsMetadata>
+        defaultAccess:
+          $ref: '#/components/schemas/AdminPolicyDefaultAccess'
         registrationWorkflow:
           description: When you register an item with this admin policy, these are the workflows that are available.
           type: array
@@ -229,15 +244,70 @@ components:
           type: array
           items:
             type: string
+        hasAdminPolicy:
+          $ref: '#/components/schemas/Druid'
+        referencesAgreement:
+          $ref: '#/components/schemas/Druid'
         roles:
           description: The access roles conferred by this AdminPolicy (used by Argo)
           type: array
           items:
             $ref: '#/components/schemas/AccessRole'
-        hasAdminPolicy:
-          type: string
       required:
         - hasAdminPolicy
+    AdminPolicyDefaultAccess:
+      description: 'Provides the default access settings for an AdminPolicy. This is almost the same as DROAccess, but it provides no defaults and has no embargo.'
+      type: object
+      additionalProperties: false
+      properties:
+        access:
+          type: string
+          enum:
+            - 'world'
+            - 'stanford'
+            - 'location-based'
+            - 'citation-only'
+            - 'dark'
+        controlledDigitalLending:
+          description: Available for controlled digital lending.
+          type: boolean
+        copyright:
+          description: The human readable copyright statement that applies
+          example: Copyright World Trade Organization
+          type: string
+        download:
+          description: >
+            Download access level. This is used in the transition from Fedora as
+            a way to set a default download level at registration that is copied
+            down to all the files.
+
+          type: string
+          enum:
+            - 'world'
+            - 'stanford'
+            - 'location-based'
+            - 'none'
+        readLocation:
+          description: >
+            If access is "location-based", which location should have access.
+            This is used in the transition from Fedora as a way to set a default
+            readLocation at registration that is copied down to all the files.
+
+          type: string
+          enum:
+            - 'spec'
+            - 'music'
+            - 'ars'
+            - 'art'
+            - 'hoover'
+            - 'm&m'
+        useAndReproductionStatement:
+          description: The human readable use and reproduction statement that applies
+          example: Property rights reside with the repository. Literary rights reside with the creators of the documents or their heirs. To obtain permission to publish or reproduce, please contact the Public Services Librarian of the Dept. of Special Collections (http://library.stanford.edu/spc).
+          type: string
+        license:
+          description: The license governing reuse of the Collection. Should be an IRI for known licenses (i.e. CC, RightsStatement.org URI, etc.).
+          type: string
     AppliesTo:
       description: Property model for indicating the parts, aspects, or versions of the resource to which a
         descriptive element is applicable.
@@ -248,6 +318,17 @@ components:
           type: array
           items:
             $ref: "#/components/schemas/DescriptiveBasicValue"
+    Barcode:
+      description: 'A barcode'
+      oneOf:
+        - $ref: '#/components/schemas/BusinessBarcode'
+        - $ref: '#/components/schemas/CatkeyBarcode'
+        - $ref: '#/components/schemas/StandardBarcode'
+    BusinessBarcode:
+      description: The barcode associated with a business library DRO object, prefixed with 2050
+      type: string
+      pattern: '^2050[0-9]{7}$'
+      example: 20503740296
     CatalogLink:
       type: object
       additionalProperties: false
@@ -263,6 +344,11 @@ components:
           description: Record identifier that is unique within the context of the linked record's catalog.
           type: string
           example: 11403803
+    CatkeyBarcode:
+      description: The barcode associated with a DRO object based on catkey, prefixed with 36105
+      type: string
+      pattern: '^[0-9]+-[0-9]+$'
+      example: 6772719-1001
     Collection:
       description: A group of Digital Repository Objects that indicate some type of conceptual grouping within the domain that is worth reusing across the system.
       type: object
@@ -347,6 +433,11 @@ components:
         valueAt:
           description: URL or other pointer to the location of the contributor information.
           type: string
+        parallelContributor:
+          description: For multiple representations of information about the same contributor (e.g. in different languages).
+          type: array
+          items:
+            $ref: "#/components/schemas/DescriptiveParallelContributor"
     Description:
       type: object
       additionalProperties: false
@@ -581,6 +672,43 @@ components:
           type: array
           items:
             $ref: "#/components/schemas/DescriptiveValue"
+    DescriptiveParallelContributor:
+      description: Value model for multiple representations of information about the same contributor (e.g. in different languages).
+      type: object
+      additionalProperties: false
+      properties:
+        name:
+          description: Names associated with a contributor.
+          type: array
+          items:
+            $ref: "#/components/schemas/DescriptiveValue"
+        type:
+          description: Entity type of the contributor (person, organization, etc.).
+          type: string
+        status:
+          description: Status of the contributor relative to other parallel contributors (e.g. the primary author among a group of contributors).
+          type: string
+        role:
+          description: Relationships of the contributor to the resource or to an event in its history.
+          type: array
+          items:
+            $ref: "#/components/schemas/DescriptiveValue"
+        identifier:
+          description: Identifiers and URIs associated with the contributor entity.
+          type: array
+          items:
+            $ref: "#/components/schemas/DescriptiveValue"
+        note:
+          description: Other information associated with the contributor.
+          type: array
+          items:
+            $ref: "#/components/schemas/DescriptiveValue"
+        valueAt:
+          description: URL or other pointer to the location of the contributor information.
+          type: string
+        valueLanguage:
+          # description: Language of the descriptive element value
+          $ref: "#/components/schemas/DescriptiveValueLanguage"
     DescriptiveParallelEvent:
       description: Value model for multiple representations of information about the same event (e.g. in different languages).
       type: object
@@ -767,6 +895,9 @@ components:
           description: The human readable use and reproduction statement that applies
           example: Property rights reside with the repository. Literary rights reside with the creators of the documents or their heirs. To obtain permission to publish or reproduce, please contact the Public Services Librarian of the Dept. of Special Collections (http://library.stanford.edu/spc).
           type: string
+        license:
+          description: The license governing reuse of the DRO. Should be an IRI for known licenses (i.e. CC, RightsStatement.org URI, etc.).
+          type: string
     DROStructural:
       description: Structural metadata
       type: object
@@ -981,7 +1112,22 @@ components:
           description: The content type of the Fileset.
           type: string
           enum:
-            - 'http://cocina.sul.stanford.edu/models/fileset.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/audio.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/attachment.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/document.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/file.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/image.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/main-augmented.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/main-original.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/media.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/object.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/page.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/permissions.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/preview.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/supplement.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/3d.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/thumb.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/video.jsonld'
         externalIdentifier:
           type: string
         label:
@@ -1026,6 +1172,8 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/CatalogLink'
+        barcode:
+          $ref: '#/components/schemas/Barcode'
     Language:
       description: Languages, scripts, symbolic systems, and notations used in all
         or part of a resource or its descriptive metadata.
@@ -1398,7 +1546,22 @@ components:
         type:
           type: string
           enum:
-            - 'http://cocina.sul.stanford.edu/models/fileset.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/audio.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/attachment.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/document.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/file.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/image.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/main-augmented.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/main-original.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/media.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/object.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/page.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/permissions.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/preview.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/supplement.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/3d.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/thumb.jsonld'
+            - 'http://cocina.sul.stanford.edu/models/resources/video.jsonld'
         label:
           type: string
         version:
@@ -1430,6 +1593,8 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/CatalogLink'
+        barcode:
+          $ref: '#/components/schemas/Barcode'
       required:
         - sourceId
     Sequence:
@@ -1509,6 +1674,11 @@ components:
           type: string
         source:
           $ref: "#/components/schemas/Source"
+    StandardBarcode:
+      description: The standard barcode associated with a DRO object, prefixed with 36105
+      type: string
+      pattern: '^36105[0-9]{9}$'
+      example: 36105010362304
     Title:
       type: object
       additionalProperties: false