zm-ruby-client 3.0.1 → 3.1.0

data/lib/zm/client/datasource/datasources_collection.rb

@@ -6,7 +6,7 @@ module Zm
     class DataSourcesCollection < Base::AccountObjectsCollection
       def initialize(parent)
         @child_class = DataSource
-        @builder_class = DataSourceBuilder
+        @builder_class = DataSourcesBuilder
         super
       end
 
@@ -15,7 +15,7 @@ module Zm
       end
 
       def build_query
-        SoapElement.mail(SoapMailConstants::GET_DATA_SOURCES_REQUEST)
+        SoapRequest::SoapElement.mail(SoapRequest::SoapMailConstants::GET_DATA_SOURCES_REQUEST)
       end
     end
   end

data/lib/zm/client/deprecated_constants.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Zm
+  module Client
+    # resolves the 3.0 constant names moved out of Zm::Client, with a deprecation warning
+    module DeprecatedConstants
+      NAMES = {
+        ZmError: 'Zm::Error::ZmError',
+        SoapError: 'Zm::Error::SoapError',
+        AuthError: 'Zm::Error::AuthError',
+        RestError: 'Zm::Error::RestError',
+        SoapBaseConnector: 'Zm::Connector::SoapBaseConnector',
+        SoapAdminConnector: 'Zm::Connector::SoapAdminConnector',
+        SoapAccountConnector: 'Zm::Connector::SoapAccountConnector',
+        RestConnector: 'Zm::Connector::RestConnector',
+        SoapElement: 'Zm::SoapRequest::SoapElement',
+        SoapConstants: 'Zm::SoapRequest::SoapConstants',
+        SoapAdminConstants: 'Zm::SoapRequest::SoapAdminConstants',
+        SoapAccountConstants: 'Zm::SoapRequest::SoapAccountConstants',
+        SoapMailConstants: 'Zm::SoapRequest::SoapMailConstants',
+        SoapUtils: 'Zm::Utils::SearchUtils',
+        Regex: 'Zm::Utils::Regex',
+        ContentType: 'Zm::Utils::ContentType',
+        ContentPart: 'Zm::Utils::ContentPart'
+      }.freeze
+
+      def const_missing(name)
+        target = NAMES[name]
+        return super if target.nil?
+
+        warn("#{self}::#{name} is deprecated and will be removed in 4.0, use #{target} instead", uplevel: 1)
+        const_set(name, Object.const_get(target))
+      end
+    end
+  end
+end

data/lib/zm/client/distributionlist/distributionlist.rb

@@ -1,46 +1,20 @@
 # frozen_string_literal: true
 
-require 'zm/client/distributionlist/distributionlist_aliases_collection'
-require 'zm/client/distributionlist/distributionlist_members_collection'
-require 'zm/client/distributionlist/distributionlist_owners_collection'
-require 'zm/client/distributionlist/distributionlist_aces_collection'
-
 module Zm
   module Client
     # objectClass: zimbraDistributionList
     class DistributionList < Base::Object
-      include HasSoapAdminConnector
-      include RequestMethodsAdmin
-
-      def aliases
-        return @aliases if defined? @aliases
-
-        @aliases = DistributionListAliasesCollection.new(self)
-      end
-
-      def members
-        return @members if defined? @members
+      extend Relationship
 
-        @members = DistributionListMembersCollection.new(self)
-      end
-
-      def owners
-        return @owners if defined? @owners
-
-        @owners = DistributionListOwnersCollection.new(self)
-      end
+      has_jsns_builder
+      include Zm::Utils::HasSoapAdminConnector
+      include SoapRequest::RequestMethodsAdmin
 
-      def memberships
-        return @memberships if defined? @memberships
-
-        @memberships = DlsMembershipCollection.new(self)
-      end
-
-      def aces
-        return @aces if defined? @aces
-
-        @aces = DistributionListAcesCollection.new(self)
-      end
+      has_many :aliases, klass: :'Zm::Client::DistributionListAliasesCollection'
+      has_many :members, klass: :'Zm::Client::DistributionListMembersCollection'
+      has_many :owners, klass: :'Zm::Client::DistributionListOwnersCollection'
+      has_many :memberships, klass: :'Zm::Client::DlsMembershipCollection'
+      has_many :aces, klass: :'Zm::Client::DistributionListAcesCollection'
 
       def create!
         resp = sac.invoke(build_create)
@@ -48,7 +22,7 @@ module Zm
       end
 
       def local_transport
-        raise Zm::Client::ZmError, 'zimbraMailHost is null' if zimbraMailHost.nil?
+        raise Zm::Error::ZmError, 'zimbraMailHost is null' if zimbraMailHost.nil?
 
         "lmtp:#{zimbraMailHost}:7025"
       end
@@ -60,36 +34,30 @@ module Zm
       def local_transport?
         return false unless zimbraMailTransport
 
-        zimbraMailTransport.start_with?(SoapConstants::LMTP)
+        zimbraMailTransport.start_with?(SoapRequest::SoapConstants::LMTP)
       end
 
       def external_transport?
         return false unless zimbraMailTransport
 
-        zimbraMailTransport.start_with?(SoapConstants::SMTP)
+        zimbraMailTransport.start_with?(SoapRequest::SoapConstants::SMTP)
       end
 
       def hide_in_gal?
-        zimbraHideInGal == SoapConstants::TRUE
+        zimbraHideInGal == SoapRequest::SoapConstants::TRUE
       end
 
       def group?
-        zimbraMailStatus == SoapConstants::DISABLED
+        zimbraMailStatus == SoapRequest::SoapConstants::DISABLED
       end
 
       def mailing_list?
-        zimbraMailStatus == SoapConstants::ENABLED
+        zimbraMailStatus == SoapRequest::SoapConstants::ENABLED
       end
 
       def attrs_write
         @parent.zimbra_attributes.all_distributionlist_attrs_writable_names
       end
-
-      def jsns_builder
-        return @jsns_builder if defined? @jsns_builder
-
-        @jsns_builder = DistributionListJsnsBuilder.new(self)
-      end
     end
   end
 end

data/lib/zm/client/distributionlist/distributionlist_aces_collection.rb

@@ -2,11 +2,11 @@
 
 module Zm
   module Client
-    DistributionListAce = Struct.new(:zimbra_id, :type, :right)
-
     # Collection Account Aliases
     class DistributionListAcesCollection
-      include MissingMethodStaticCollection
+      include Zm::Utils::MissingMethodStaticCollection
+
+      DistributionListAce = Data.define(:zimbra_id, :type, :right)
 
       def initialize(parent)
         @parent = parent
@@ -23,7 +23,7 @@ module Zm
 
         @all = zimbra_aces.map do |str|
           parts = str.split(/\s+/)
-          DistributionListAce.new(parts[0], parts[1], parts[2])
+          DistributionListAce.new(zimbra_id: parts[0], type: parts[1], right: parts[2])
         end
       end
     end

data/lib/zm/client/distributionlist/distributionlist_aliases_collection.rb

@@ -4,7 +4,7 @@ module Zm
   module Client
     # Collection Account Aliases
     class DistributionListAliasesCollection
-      include MissingMethodStaticCollection
+      include Zm::Utils::MissingMethodStaticCollection
 
       def initialize(parent)
         @parent = parent
@@ -13,7 +13,8 @@ module Zm
       end
 
       def add!(email)
-        return false if @all.include?(Utils.format_email(email))
+        email = Utils.format_email(email)
+        return false if @all.include?(email)
 
         @parent.sac.invoke(build_add(email))
 
@@ -22,13 +23,14 @@ module Zm
       end
 
       def build_add(email)
-        soap_request = SoapElement.admin(SoapAdminConstants::ADD_DISTRIBUTION_LIST_ALIAS_REQUEST)
+        soap_request = SoapRequest::SoapElement.admin(Zm::SoapRequest::SoapAdminConstants::ADD_DISTRIBUTION_LIST_ALIAS_REQUEST)
         soap_request.add_attributes({ id: @parent.id, alias: email })
         soap_request
       end
 
       def remove!(email)
-        return false unless @all.include?(Utils.format_email(email))
+        email = Utils.format_email(email)
+        return false unless @all.include?(email)
 
         @parent.sac.invoke(build_remove(email))
 
@@ -37,7 +39,7 @@ module Zm
       end
 
       def build_remove(email)
-        soap_request = SoapElement.admin(SoapAdminConstants::REMOVE_DISTRIBUTION_LIST_ALIAS_REQUEST)
+        soap_request = SoapRequest::SoapElement.admin(Zm::SoapRequest::SoapAdminConstants::REMOVE_DISTRIBUTION_LIST_ALIAS_REQUEST)
         soap_request.add_attributes({ id: @parent.id, alias: email })
         soap_request
       end

data/lib/zm/client/distributionlist/distributionlist_jsns_builder.rb

@@ -9,62 +9,34 @@ module Zm
       end
 
       def to_create
-        soap_request = SoapElement.admin(SoapAdminConstants::CREATE_DISTRIBUTION_LIST_REQUEST)
-                                  .add_attribute(SoapConstants::NAME, @item.name)
+        soap_request = SoapRequest::SoapElement.admin(Zm::SoapRequest::SoapAdminConstants::CREATE_DISTRIBUTION_LIST_REQUEST)
+                                               .add_attribute(SoapRequest::SoapConstants::NAME, @item.name)
 
-        attrs_only_set_h.each do |key, values|
-          values.each do |value|
-            node_attr = SoapElement.create(SoapConstants::A)
-                                   .add_attribute(SoapConstants::N, key)
-                                   .add_content(value)
-            soap_request.add_node(node_attr)
-          end
-        end
-
-        soap_request
+        add_attr_nodes(soap_request, attrs_only_set_h)
       end
 
       def to_update
-        soap_request = SoapElement.admin(SoapAdminConstants::MODIFY_DISTRIBUTION_LIST_REQUEST)
-                                  .add_attribute(SoapConstants::ID, @item.id)
-
-        attrs_only_set_h.each do |key, values|
-          values.each do |value|
-            node_attr = SoapElement.create(SoapConstants::A)
-                                   .add_attribute(SoapConstants::N, key)
-                                   .add_content(value)
-            soap_request.add_node(node_attr)
-          end
-        end
+        soap_request = SoapRequest::SoapElement.admin(Zm::SoapRequest::SoapAdminConstants::MODIFY_DISTRIBUTION_LIST_REQUEST)
+                                               .add_attribute(SoapRequest::SoapConstants::ID, @item.id)
 
-        soap_request
+        add_attr_nodes(soap_request, attrs_only_set_h)
       end
 
       def to_patch(hash)
-        soap_request = SoapElement.admin(SoapAdminConstants::MODIFY_DISTRIBUTION_LIST_REQUEST)
-                                  .add_attribute(SoapConstants::ID, @item.id)
+        soap_request = SoapRequest::SoapElement.admin(Zm::SoapRequest::SoapAdminConstants::MODIFY_DISTRIBUTION_LIST_REQUEST)
+                                               .add_attribute(SoapRequest::SoapConstants::ID, @item.id)
 
-        hash.each do |key, values|
-          values = [values] unless values.is_a?(Array)
-          values.each do |value|
-            node_attr = SoapElement.create(SoapConstants::A)
-                                   .add_attribute(SoapConstants::N, key)
-                                   .add_content(value)
-            soap_request.add_node(node_attr)
-          end
-        end
-
-        soap_request
+        add_attr_nodes(soap_request, hash)
       end
 
       def to_delete
-        SoapElement.admin(SoapAdminConstants::DELETE_DISTRIBUTION_LIST_REQUEST)
-                   .add_attribute(SoapConstants::ID, @item.id)
+        SoapRequest::SoapElement.admin(Zm::SoapRequest::SoapAdminConstants::DELETE_DISTRIBUTION_LIST_REQUEST)
+                                .add_attribute(SoapRequest::SoapConstants::ID, @item.id)
       end
 
       def to_rename(new_name)
-        SoapElement.admin(SoapAdminConstants::RENAME_DISTRIBUTION_LIST_REQUEST)
-                   .add_attributes({ id: @item.id, newName: new_name })
+        SoapRequest::SoapElement.admin(Zm::SoapRequest::SoapAdminConstants::RENAME_DISTRIBUTION_LIST_REQUEST)
+                                .add_attributes({ id: @item.id, newName: new_name })
       end
 
       def attrs_only_set_h
@@ -80,6 +52,22 @@ module Zm
 
         arr.to_h
       end
+
+      private
+
+      def add_attr_nodes(soap_request, hash)
+        hash.each do |key, values|
+          values = [values] unless values.is_a?(Array)
+          values.each do |value|
+            node_attr = SoapRequest::SoapElement.create(SoapRequest::SoapConstants::A)
+                                                .add_attribute(SoapRequest::SoapConstants::N, key)
+                                                .add_content(value)
+            soap_request.add_node(node_attr)
+          end
+        end
+
+        soap_request
+      end
     end
   end
 end

data/lib/zm/client/distributionlist/distributionlist_jsns_initializer.rb

@@ -15,15 +15,26 @@ module Zm
             item.zimbraMailForwardingAddress.compact!
           end
 
+          update_members(item, json)
+          update_owners(item, json)
+
+          item
+        end
+
+        private
+
+        def update_members(item, json)
           if json[:dlm].is_a?(Array)
-            item.members.all = json[:dlm].map { |a| a[:_content] }.compact
+            item.members.all = json[:dlm].filter_map { |a| a[:_content] }
           elsif !item.zimbraMailForwardingAddress.empty?
             item.members.all = item.zimbraMailForwardingAddress
           end
+        end
 
-          item.owners.all = json[:owners].first[:owner].map { |a| a[:name] }.compact if json[:owners].is_a?(Array)
+        def update_owners(item, json)
+          return unless json[:owners].is_a?(Array)
 
-          item
+          item.owners.all = json[:owners].first[:owner].filter_map { |a| a[:name] }
         end
       end
     end

data/lib/zm/client/distributionlist/distributionlist_members_collection.rb

@@ -12,8 +12,7 @@ module Zm
       end
 
       def add!(emails)
-        emails.each { |email| Utils.format_email(email) }
-        emails.delete_if { |email| @all.include?(email) }
+        emails = format_emails(emails).reject { |email| @all.include?(email) }
         return false if emails.empty?
 
         @parent.sac.invoke(build_add(emails))
@@ -23,17 +22,16 @@ module Zm
       end
 
       def build_add(emails)
-        soap_request = SoapElement.admin(SoapAdminConstants::ADD_DISTRIBUTION_LIST_MEMBER_REQUEST)
-        soap_request.add_attribute(SoapConstants::ID, @parent.id)
-        node_dlm = SoapElement.create(SoapConstants::DLM)
+        soap_request = SoapRequest::SoapElement.admin(Zm::SoapRequest::SoapAdminConstants::ADD_DISTRIBUTION_LIST_MEMBER_REQUEST)
+        soap_request.add_attribute(SoapRequest::SoapConstants::ID, @parent.id)
+        node_dlm = SoapRequest::SoapElement.create(SoapRequest::SoapConstants::DLM)
         node_dlm.add_content(emails)
         soap_request.add_node(node_dlm)
         soap_request
       end
 
       def remove!(emails)
-        emails.each { |email| Utils.format_email(email) }
-        emails.delete_if { |email| !@all.include?(email) }
+        emails = format_emails(emails).select { |email| @all.include?(email) }
         return false if emails.empty?
 
         @parent.sac.invoke(build_remove(emails))
@@ -43,13 +41,19 @@ module Zm
       end
 
       def build_remove(emails)
-        soap_request = SoapElement.admin(SoapAdminConstants::REMOVE_DISTRIBUTION_LIST_MEMBER_REQUEST)
-        soap_request.add_attribute(SoapConstants::ID, @parent.id)
-        node_dlm = SoapElement.create(SoapConstants::DLM)
+        soap_request = SoapRequest::SoapElement.admin(Zm::SoapRequest::SoapAdminConstants::REMOVE_DISTRIBUTION_LIST_MEMBER_REQUEST)
+        soap_request.add_attribute(SoapRequest::SoapConstants::ID, @parent.id)
+        node_dlm = SoapRequest::SoapElement.create(SoapRequest::SoapConstants::DLM)
         node_dlm.add_content(emails)
         soap_request.add_node(node_dlm)
         soap_request
       end
+
+      private
+
+      def format_emails(emails)
+        [emails].flatten.map { |email| Utils.format_email(email) }.uniq
+      end
     end
   end
 end

data/lib/zm/client/distributionlist/distributionlist_owners_collection.rb

@@ -12,9 +12,7 @@ module Zm
       end
 
       def add!(*emails)
-        emails.flatten!
-        emails.each { |email| Utils.format_email(email) }
-        emails.delete_if { |email| @all.include?(email) }
+        emails = format_emails(emails).reject { |email| @all.include?(email) }
         return false if emails.empty?
 
         @parent.sac.invoke(build_add(emails))
@@ -28,9 +26,7 @@ module Zm
       end
 
       def remove!(*emails)
-        emails.flatten!
-        emails.each { |email| Utils.format_email(email) }
-        emails.delete_if { |email| !@all.include?(email) }
+        emails = format_emails(emails).select { |email| @all.include?(email) }
         return false if emails.empty?
 
         @parent.sac.invoke(build_remove(emails))
@@ -43,20 +39,24 @@ module Zm
         jsns('removeOwners', emails)
       end
 
-      def jsns(op, emails)
-        soap_request = SoapElement.account(SoapAccountConstants::DISTRIBUTION_LIST_ACTION_REQUEST)
-        node_dl = SoapElement.create(SoapConstants::DL)
-                             .add_attribute(SoapConstants::BY, SoapConstants::ID)
-                             .add_content(@parent.id)
+      def jsns(operation, emails)
+        soap_request = SoapRequest::SoapElement.account(Zm::SoapRequest::SoapAccountConstants::DISTRIBUTION_LIST_ACTION_REQUEST)
+        node_dl = SoapRequest::SoapElement.create(SoapRequest::SoapConstants::DL)
+                                          .add_attribute(SoapRequest::SoapConstants::BY, SoapRequest::SoapConstants::ID)
+                                          .add_content(@parent.id)
         soap_request.add_node(node_dl)
-        node_action = SoapElement.create(SoapConstants::ACTION)
-                                 .add_attributes({ op: op, owner: jsns_owners(emails) })
+        node_action = SoapRequest::SoapElement.create(SoapRequest::SoapConstants::ACTION)
+                                              .add_attributes({ op: operation, owner: jsns_owners(emails) })
         soap_request.add_node(node_action)
         soap_request
       end
 
       private
 
+      def format_emails(emails)
+        emails.flatten.map { |email| Utils.format_email(email) }.uniq
+      end
+
       def jsns_owners(emails)
         emails.map { |email| { by: :name, type: :usr, _content: email } }
       end

data/lib/zm/client/distributionlist/distributionlists_collection.rb

@@ -7,7 +7,7 @@ module Zm
       def initialize(parent)
         @child_class = DistributionList
         @builder_class = DistributionListsBuilder
-        @search_type = SearchType::DL
+        @search_type = :distributionlists
         super
       end
 
@@ -19,12 +19,12 @@ module Zm
       end
 
       def build_find_by(hash)
-        soap_request = SoapElement.admin(SoapAdminConstants::GET_DISTRIBUTION_LIST_REQUEST)
-        node_dl = SoapElement.create(SoapConstants::DL)
-                             .add_attribute(SoapConstants::BY, hash.keys.first)
-                             .add_content(hash.values.first)
+        soap_request = SoapRequest::SoapElement.admin(Zm::SoapRequest::SoapAdminConstants::GET_DISTRIBUTION_LIST_REQUEST)
+        node_dl = SoapRequest::SoapElement.create(SoapRequest::SoapConstants::DL)
+                                          .add_attribute(SoapRequest::SoapConstants::BY, hash.keys.first)
+                                          .add_content(hash.values.first)
         soap_request.add_node(node_dl)
-        soap_request.add_attribute(SoapConstants::ATTRS, attrs_comma)
+        soap_request.add_attribute(SoapRequest::SoapConstants::ATTRS, attrs_comma)
         soap_request
       end
 
@@ -32,7 +32,15 @@ module Zm
 
       def reset_query_params
         super
-        @attrs = SearchType::Attributes::DL.dup
+        @attrs = %w[
+          displayName
+          zimbraId
+          zimbraMailHost
+          uid
+          description
+          zimbraMailStatus
+          zimbraMailAlias
+        ]
       end
     end
   end

data/lib/zm/client/distributionlist/dls_membership_collection.rb

@@ -2,10 +2,12 @@
 
 module Zm
   module Client
-    DlMembership = Struct.new(:name, :id, :via)
+    DlMembership = Data.define(:name, :id, :via)
 
+    # Collection distribution list dls membership
     class DlsMembershipCollection < Base::ObjectsCollection
       def initialize(parent)
+        super()
         @parent = parent
       end
 
@@ -14,10 +16,10 @@ module Zm
       end
 
       def build_query
-        soap_request = SoapElement.admin(SoapAdminConstants::GET_DISTRIBUTION_LIST_MEMBERSHIP_REQUEST)
-        node_account = SoapElement.create(SoapConstants::ACCOUNT)
-                                  .add_attribute(SoapConstants::BY, SoapConstants::ID)
-                                  .add_content(@parent.id)
+        soap_request = SoapRequest::SoapElement.admin(Zm::SoapRequest::SoapAdminConstants::GET_DISTRIBUTION_LIST_MEMBERSHIP_REQUEST)
+        node_account = SoapRequest::SoapElement.create(SoapRequest::SoapConstants::ACCOUNT)
+                                               .add_attribute(SoapRequest::SoapConstants::BY, SoapRequest::SoapConstants::ID)
+                                               .add_content(@parent.id)
         soap_request.add_node(node_account)
         soap_request
       end
@@ -26,7 +28,7 @@ module Zm
 
       def build_response
         collection = make_query.dig(:Body, :GetDistributionListMembershipResponse, :dl) || []
-        collection.map { |json| DlMembership.new(json[:name], json[:id], json[:via]) }
+        collection.map { |json| DlMembership.new(name: json[:name], id: json[:id], via: json[:via]) }
       end
     end
   end

data/lib/zm/client/document/document.rb

@@ -4,9 +4,11 @@ module Zm
   module Client
     # class for account document
     class Document < Base::Object
-      include BelongsToFolder
-      include BelongsToTag
-      include RequestMethodsMailbox
+      include Zm::Utils::BelongsToFolder
+      include Zm::Utils::BelongsToTag
+      include SoapRequest::RequestMethodsMailbox
+      extend Relationship
+      has_jsns_builder
 
       attr_accessor :id, :uuid, :name, :s, :d, :l, :luuid, :ms, :mdver, :md, :rev, :f, :t, :meta, :ct,
                     :descEnabled, :ver, :leb, :cr, :cd, :acl, :loid, :sf, :tn
@@ -47,14 +49,6 @@ module Zm
         uploader = @parent.build_uploader
         uploader.download_file(dest_file_path, id, nil)
       end
-
-      private
-
-      def jsns_builder
-        return @jsns_builder if defined? @jsns_builder
-
-        @jsns_builder = DocumentJsnsBuilder.new(self)
-      end
     end
   end
 end

data/lib/zm/client/document/document_jsns_builder.rb

@@ -3,11 +3,11 @@
 module Zm
   module Client
     # class for account document
-    class DocumentJsnsBuilder < BaseAccountJsnsBuilder
+    class DocumentJsnsBuilder < Base::BaseAccountJsnsBuilder
       def to_delete
         attrs = {
           op: :delete,
-          comp: SoapUtils::OFF,
+          comp: Zm::Utils::SearchUtils::OFF,
           id: @item.id
         }
 

data/lib/zm/client/document/documents_collection.rb

@@ -10,17 +10,17 @@ module Zm
         super
         @child_class = Document
         @builder_class = DocumentsBuilder
-        @type = SoapConstants::DOCUMENT
-        @sort_by = SoapConstants::DATE_ASC
+        @type = SoapRequest::SoapConstants::DOCUMENT
+        @sort_by = SoapRequest::SoapConstants::DATE_ASC
       end
 
-      def find_each(offset: 0, limit: 500, &block)
+      def find_each(offset: 0, limit: 500, &)
         @more = true
         @offset = offset
         @limit = limit
 
         while @more
-          build_response.each { |item| block.call(item) }
+          build_response.each(&)
           @offset += @limit
         end
       end

data/lib/zm/client/domain/domain.rb

@@ -4,32 +4,21 @@ module Zm
   module Client
     # objectClass: zimbraDomain
     class Domain < Base::Object
-      include HasSoapAdminConnector
-      include RequestMethodsAdmin
+      extend Zm::Relationship
+      has_jsns_builder
+      include Zm::Utils::HasSoapAdminConnector
+      include SoapRequest::RequestMethodsAdmin
 
       def create!
         resp = sac.invoke(build_create)
         @id = resp[:CreateDomainResponse][:domain].first[:id]
       end
 
-      def accounts
-        return @accounts if defined? @accounts
+      has_many :accounts, klass: :'Zm::Client::DomainAccountsCollection'
+      has_many :distribution_lists, klass: :'Zm::Client::DomainDistributionListsCollection'
+      alias distributionlists distribution_lists
 
-        @accounts = DomainAccountsCollection.new(self)
-      end
-
-      def distributionlists
-        return @distributionlists if defined? @distributionlists
-
-        @distributionlists = DomainDistributionListsCollection.new(self)
-      end
-      alias distribution_lists distributionlists
-
-      def resources
-        return @resources if defined? @resources
-
-        @resources = DomainResourcesCollection.new(self)
-      end
+      has_many :resources, klass: :'Zm::Client::DomainResourcesCollection'
 
       def cos
         return nil if zimbraDomainDefaultCOSId.nil?
@@ -58,12 +47,6 @@ module Zm
 
         @DKIMPublicTxt = matches.first.first.strip
       end
-
-      def jsns_builder
-        return @jsns_builder if defined? @jsns_builder
-
-        @jsns_builder = DomainJsnsBuilder.new(self)
-      end
     end
   end
 end